From 7a6bbfbd93a6e6c1a350eddabccfdc121e1a8fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?= Date: Sun, 1 Jun 2025 10:48:00 +0800 Subject: [PATCH 1/4] docs: add analytics --- docs/.vitepress/config/theme.ts | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/.vitepress/config/theme.ts b/docs/.vitepress/config/theme.ts index b0622f38f..add286e7c 100644 --- a/docs/.vitepress/config/theme.ts +++ b/docs/.vitepress/config/theme.ts @@ -22,20 +22,11 @@ export function getLocaleConfig(lang: string) { [ 'script', { - async: '', - src: 'https://www.googletagmanager.com/gtag/js?id=G-29NKGSL23C', + defer: '', + 'data-domain': 'vue-macros.dev', + src: 'https://evt.sxzz.dev/js/script.js', }, ], - [ - 'script', - {}, - `window.dataLayer = window.dataLayer || [] - function gtag() { - dataLayer.push(arguments) - } - gtag('js', new Date()) - gtag('config', 'G-29NKGSL23C')`, - ], ] const nav: DefaultTheme.NavItem[] = [ From b169cd4030ec3b1ecc07523e77f21c3c600d1602 Mon Sep 17 00:00:00 2001 From: zhiyuanzmj <260480378@qq.com> Date: Mon, 2 Jun 2025 22:16:07 +0800 Subject: [PATCH 2/4] fix(jsx-directive): prevent generating component context for native elements (#958) --- packages/volar/package.json | 1 + packages/volar/src/jsx-directive/context.ts | 9 +++++---- pnpm-lock.yaml | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/volar/package.json b/packages/volar/package.json index f78d04dea..10cdcbbca 100644 --- a/packages/volar/package.json +++ b/packages/volar/package.json @@ -181,6 +181,7 @@ "@vue-macros/short-bind": "workspace:*", "@vue-macros/short-vmodel": "workspace:*", "@vue/language-core": "catalog:", + "@vue/shared": "catalog:", "muggle-string": "catalog:", "ts-macro": "catalog:" }, diff --git a/packages/volar/src/jsx-directive/context.ts b/packages/volar/src/jsx-directive/context.ts index 1fd59bab9..0ff06d3af 100644 --- a/packages/volar/src/jsx-directive/context.ts +++ b/packages/volar/src/jsx-directive/context.ts @@ -1,6 +1,6 @@ +import { isHTMLTag, isSVGTag } from '@vue/shared' import { replaceSourceRange } from 'muggle-string' import { addCode, getText, isJsxExpression } from '../common' -import { isNativeFormElement } from './v-model' import { getOpeningElement, getTagName, @@ -105,8 +105,9 @@ export function transformCtx( } const ctxName = `__VLS_ctx_${refValue || index}` - let tagName = getTagName(node, options) - if (isNativeFormElement(tagName)) { + let tagName = '' + const originTagName = (tagName = getTagName(node, options)) + if (isHTMLTag(tagName) || isSVGTag(tagName) || tagName.includes('-')) { tagName = `{}` } else { let types = '' @@ -117,7 +118,7 @@ export function transformCtx( tagName += types } } - const result = `\nconst ${ctxName} = __VLS_getFunctionalComponentCtx(${tagName}, __VLS_asFunctionalComponent(${tagName})({${props}}), '${tagName}');\n` + const result = `\nconst ${ctxName} = __VLS_getFunctionalComponentCtx(${tagName}, __VLS_asFunctionalComponent(${tagName})({${props}}), '${originTagName}');\n` if (root) { replaceSourceRange( codes, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b65b3f338..4e53591f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1206,6 +1206,9 @@ importers: '@vue/language-core': specifier: 2.2.10 version: 2.2.10(typescript@5.8.3) + '@vue/shared': + specifier: 'catalog:' + version: 3.5.16 muggle-string: specifier: 'catalog:' version: 0.4.1 From b0dc81e073a33f66e6435342618fff6492d7fdfa Mon Sep 17 00:00:00 2001 From: zhiyuanzmj <260480378@qq.com> Date: Tue, 3 Jun 2025 09:20:00 +0800 Subject: [PATCH 3/4] feat(nuxt): expose volar plugin (#959) --- packages/nuxt/package.json | 5 +++++ packages/nuxt/src/index.ts | 2 +- packages/nuxt/src/volar.ts | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/nuxt/src/volar.ts diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 5e7dc0f5a..42db6d863 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -35,12 +35,17 @@ "dev": "./src/index.ts", "default": "./dist/index.js" }, + "./volar": { + "dev": "./src/volar.ts", + "default": "./dist/volar.js" + }, "./*": "./*" }, "publishConfig": { "access": "public", "exports": { ".": "./dist/index.js", + "./volar": "./dist/volar.js", "./*": "./*" }, "tag": "next" diff --git a/packages/nuxt/src/index.ts b/packages/nuxt/src/index.ts index 9389595ae..4a75ad9be 100644 --- a/packages/nuxt/src/index.ts +++ b/packages/nuxt/src/index.ts @@ -21,7 +21,7 @@ const module: NuxtModule = defineNuxtModule({ const vueCompilerOptions = (nuxt.options.typescript.tsConfig.vueCompilerOptions ||= {}) vueCompilerOptions.plugins ||= [] - vueCompilerOptions.plugins.push('vue-macros/volar') + vueCompilerOptions.plugins.push('@vue-macros/nuxt/volar') nuxt.hook( 'vite:configResolved', diff --git a/packages/nuxt/src/volar.ts b/packages/nuxt/src/volar.ts new file mode 100644 index 000000000..5c25f736a --- /dev/null +++ b/packages/nuxt/src/volar.ts @@ -0,0 +1 @@ +export * from 'vue-macros/volar' From 1084b55e2a7b7e08ebe592f69407f84d6560a820 Mon Sep 17 00:00:00 2001 From: zhiyuanzmj <260480378@qq.com> Date: Tue, 3 Jun 2025 09:29:13 +0800 Subject: [PATCH 4/4] chore: release v3.0.0-beta.14 --- package.json | 2 +- packages/api/package.json | 2 +- packages/astro/package.json | 2 +- packages/better-define/package.json | 2 +- packages/boolean-prop/package.json | 2 +- packages/chain-call/package.json | 2 +- packages/common/package.json | 2 +- packages/config/package.json | 2 +- packages/define-emit/package.json | 2 +- packages/define-models/package.json | 2 +- packages/define-options/package.json | 2 +- packages/define-prop/package.json | 2 +- packages/define-props-refs/package.json | 2 +- packages/define-props/package.json | 2 +- packages/define-render/package.json | 2 +- packages/define-slots/package.json | 2 +- packages/define-stylex/package.json | 2 +- packages/devtools/package.json | 2 +- packages/eslint-config/package.json | 2 +- packages/export-expose/package.json | 2 +- packages/export-props/package.json | 2 +- packages/export-render/package.json | 2 +- packages/hoist-static/package.json | 2 +- packages/jsx-directive/package.json | 2 +- packages/macros/package.json | 2 +- packages/named-template/package.json | 2 +- packages/nuxt/package.json | 2 +- packages/reactivity-transform/package.json | 2 +- packages/script-lang/package.json | 2 +- packages/setup-block/package.json | 2 +- packages/setup-component/package.json | 2 +- packages/setup-sfc/package.json | 2 +- packages/short-bind/package.json | 2 +- packages/short-emits/package.json | 2 +- packages/short-vmodel/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/volar/package.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 35a51ce16..1aba94a34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monorepo-vue-macros", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "private": true, "packageManager": "pnpm@10.11.0", "description": "Monorepo for Vue Macros.", diff --git a/packages/api/package.json b/packages/api/package.json index f339cfa90..9e3d24ea5 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/api", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "General API for Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/astro/package.json b/packages/astro/package.json index 5cc26d62c..24c2c90e3 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/astro", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "Astro integration of Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/better-define/package.json b/packages/better-define/package.json index 69cbb3870..0447e523b 100644 --- a/packages/better-define/package.json +++ b/packages/better-define/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/better-define", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "betterDefine feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/boolean-prop/package.json b/packages/boolean-prop/package.json index 64d419d7d..04597d7cf 100644 --- a/packages/boolean-prop/package.json +++ b/packages/boolean-prop/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/boolean-prop", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "booleanProp feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/chain-call/package.json b/packages/chain-call/package.json index c4ac73579..b0b129cc8 100644 --- a/packages/chain-call/package.json +++ b/packages/chain-call/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/chain-call", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "chainCall feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/common/package.json b/packages/common/package.json index ea03b1ad9..be712cd05 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/common", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "common feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/config/package.json b/packages/config/package.json index bd956a32e..be924a73c 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/config", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "Config API for Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-emit/package.json b/packages/define-emit/package.json index fe7992fae..4bf239344 100644 --- a/packages/define-emit/package.json +++ b/packages/define-emit/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/define-emit", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "defineEmit feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-models/package.json b/packages/define-models/package.json index d75448de0..40ef8f91c 100644 --- a/packages/define-models/package.json +++ b/packages/define-models/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/define-models", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "defineModels feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-options/package.json b/packages/define-options/package.json index f8e140630..0210db28f 100644 --- a/packages/define-options/package.json +++ b/packages/define-options/package.json @@ -1,6 +1,6 @@ { "name": "unplugin-vue-define-options", - "version": "3.0.0-beta.13", + "version": "3.0.0-beta.14", "description": "Add defineOptions macro for Vue