From 94fad8ab72e1108b80422d7317b5b4c64c9e8073 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: Tue, 29 Jul 2025 23:18:41 +0800 Subject: [PATCH 1/5] chore: fix lint --- docs/.vitepress/theme/Layout.vue | 2 +- .../src/core/transform.ts | 2 +- pnpm-lock.yaml | 20 +++++++++---------- pnpm-workspace.yaml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/.vitepress/theme/Layout.vue b/docs/.vitepress/theme/Layout.vue index fec717ab4..e262a00ef 100644 --- a/docs/.vitepress/theme/Layout.vue +++ b/docs/.vitepress/theme/Layout.vue @@ -40,7 +40,7 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => { }).ready document.documentElement.animate( - { clipPath: isDark.value ? clipPath.reverse() : clipPath }, + { clipPath: isDark.value ? clipPath.toReversed() : clipPath }, { duration: 300, easing: 'ease-in', diff --git a/packages/reactivity-transform/src/core/transform.ts b/packages/reactivity-transform/src/core/transform.ts index 228b50f7b..eb585351a 100644 --- a/packages/reactivity-transform/src/core/transform.ts +++ b/packages/reactivity-transform/src/core/transform.ts @@ -275,7 +275,7 @@ export function transformAST( function findUpParent() { return parentStack .slice() - .reverse() + .toReversed() .find(({ type }) => !TS_NODE_TYPES.includes(type as any)) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 41a83cfd9..be479683b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -61,8 +61,8 @@ catalogs: specifier: ^0.14.3 version: 0.14.3 '@sxzz/eslint-config': - specifier: ^7.1.0 - version: 7.1.0 + specifier: ^7.1.1 + version: 7.1.1 '@sxzz/prettier-config': specifier: ^2.2.3 version: 2.2.3 @@ -310,7 +310,7 @@ importers: version: 1.4.10(@swc/helpers@0.5.17) '@sxzz/eslint-config': specifier: 'catalog:' - version: 7.1.0(@types/eslint@9.6.1)(@typescript-eslint/eslint-plugin@8.38.0(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/utils@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@unocss/eslint-plugin@66.3.3(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3) + version: 7.1.1(@types/eslint@9.6.1)(@typescript-eslint/eslint-plugin@8.38.0(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/utils@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@unocss/eslint-plugin@66.3.3(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3) '@sxzz/prettier-config': specifier: 'catalog:' version: 2.2.3 @@ -3379,8 +3379,8 @@ packages: '@swc/helpers@0.5.17': resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} - '@sxzz/eslint-config@7.1.0': - resolution: {integrity: sha512-lIB511LSWv7JkNbC6+vFVYCYrvukBZMvRTinVwx8sVx7BWG0QAxblxaPuwT11T0JFMTC2/9NBbOTjbp4raVTRQ==} + '@sxzz/eslint-config@7.1.1': + resolution: {integrity: sha512-d6vApHpbgyG6BCOZ7ZmL9WinKXbwl/lZbOPTEN6eiDiqk32IXGdxml3a/HDJxr1pTfXHzPgbYJP9kR3cm9EUaw==} engines: {node: '>=20.0.0'} peerDependencies: '@unocss/eslint-plugin': '>=65.0.0' @@ -4867,8 +4867,8 @@ packages: peerDependencies: eslint: '>=7.0.0' - eslint-flat-config-utils@2.1.0: - resolution: {integrity: sha512-6fjOJ9tS0k28ketkUcQ+kKptB4dBZY2VijMZ9rGn8Cwnn1SH0cZBoPXT8AHBFHxmHcLFQK9zbELDinZ2Mr1rng==} + eslint-flat-config-utils@2.1.1: + resolution: {integrity: sha512-K8eaPkBemHkfbYsZH7z4lZ/tt6gNSsVh535Wh9W9gQBS2WjvfUbbVr2NZR3L1yiRCLuOEimYfPxCxODczD4Opg==} eslint-import-context@0.1.9: resolution: {integrity: sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==} @@ -10179,7 +10179,7 @@ snapshots: dependencies: tslib: 2.8.1 - '@sxzz/eslint-config@7.1.0(@types/eslint@9.6.1)(@typescript-eslint/eslint-plugin@8.38.0(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/utils@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@unocss/eslint-plugin@66.3.3(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3)': + '@sxzz/eslint-config@7.1.1(@types/eslint@9.6.1)(@typescript-eslint/eslint-plugin@8.38.0(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/parser@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@typescript-eslint/utils@8.38.0(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(@unocss/eslint-plugin@66.3.3(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.32.0(jiti@2.5.1))(typescript@5.8.3)': dependencies: '@eslint-community/eslint-plugin-eslint-comments': 4.5.0(eslint@9.32.0(jiti@2.5.1)) '@eslint/js': 9.32.0 @@ -10187,7 +10187,7 @@ snapshots: eslint: 9.32.0(jiti@2.5.1) eslint-config-flat-gitignore: 2.1.0(eslint@9.32.0(jiti@2.5.1)) eslint-config-prettier: 10.1.8(eslint@9.32.0(jiti@2.5.1)) - eslint-flat-config-utils: 2.1.0 + eslint-flat-config-utils: 2.1.1 eslint-plugin-antfu: 3.1.1(eslint@9.32.0(jiti@2.5.1)) eslint-plugin-command: 3.3.1(eslint@9.32.0(jiti@2.5.1)) eslint-plugin-de-morgan: 1.3.0(eslint@9.32.0(jiti@2.5.1)) @@ -12047,7 +12047,7 @@ snapshots: dependencies: eslint: 9.32.0(jiti@2.5.1) - eslint-flat-config-utils@2.1.0: + eslint-flat-config-utils@2.1.1: dependencies: pathe: 2.0.3 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 46951e6f5..6d27cd956 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -74,7 +74,7 @@ catalog: '@rollup/plugin-node-resolve': ^16.0.1 '@rspack/core': ^1.4.10 '@stylexjs/stylex': ^0.14.3 - '@sxzz/eslint-config': ^7.1.0 + '@sxzz/eslint-config': ^7.1.1 '@sxzz/prettier-config': ^2.2.3 '@sxzz/test-utils': ^0.5.7 '@types/node': ^24.1.0 From 648f9e960ab0a3a15153bf51d4a410b28183ef45 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: Tue, 29 Jul 2025 23:24:03 +0800 Subject: [PATCH 2/5] chore: update lib to ES2023 --- tsconfig.fixture.json | 2 +- tsconfig.test.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tsconfig.fixture.json b/tsconfig.fixture.json index dc5a900ce..b9ae4e296 100644 --- a/tsconfig.fixture.json +++ b/tsconfig.fixture.json @@ -3,7 +3,7 @@ "compilerOptions": { "incremental": true, "tsBuildInfoFile": "dist/fixture.tsbuildinfo", - "lib": ["ES2022", "DOM"] + "lib": ["ES2023", "DOM"] }, "references": [ { diff --git a/tsconfig.test.json b/tsconfig.test.json index 767a2daed..f7a74f35a 100644 --- a/tsconfig.test.json +++ b/tsconfig.test.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.lib.json", "compilerOptions": { "tsBuildInfoFile": "dist/test.tsbuildinfo", - "lib": ["ES2022", "DOM"], + "lib": ["ES2023", "DOM"], "types": ["node", "vite/client"], "allowImportingTsExtensions": true, "isolatedDeclarations": false, From 294b2072a4c6294d4712128f72b9b38f9724cc04 Mon Sep 17 00:00:00 2001 From: zhiyuanzmj <260480378@qq.com> Date: Wed, 30 Jul 2025 18:54:21 +0800 Subject: [PATCH 3/5] fix(volar/jsx-directive): show errors for default v-model (#981) --- packages/volar/src/jsx-directive/v-model.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/volar/src/jsx-directive/v-model.ts b/packages/volar/src/jsx-directive/v-model.ts index c2375dd19..6a3ba9755 100644 --- a/packages/volar/src/jsx-directive/v-model.ts +++ b/packages/volar/src/jsx-directive/v-model.ts @@ -150,7 +150,10 @@ function transform( ? isRadioOrCheckbox(node, options) ? 'v-model' : [[modelValue, start + 2]] - : [modelValue.slice(0, 3), [modelValue.slice(3), start]]) as Code[]), + : [ + [modelValue.slice(0, 3), start], + [modelValue.slice(3), start], + ]) as Code[]), ) if (modifiers.length) { From 9bcfac216a04cd8f5066756fe58a5661f8b8ab98 Mon Sep 17 00:00:00 2001 From: zhiyuanzmj <260480378@qq.com> Date: Fri, 1 Aug 2025 08:30:58 +0800 Subject: [PATCH 4/5] feat(volar/jsx-directive): support infer type from setup (#982) --- packages/volar/src/jsx-directive/context.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/volar/src/jsx-directive/context.ts b/packages/volar/src/jsx-directive/context.ts index 6886f4586..9b7189dd2 100644 --- a/packages/volar/src/jsx-directive/context.ts +++ b/packages/volar/src/jsx-directive/context.ts @@ -41,13 +41,11 @@ declare function __VLS_getFunctionalComponentCtx( s: S, ): S extends keyof typeof __VLS_nativeElements ? { expose: (exposed: (typeof __VLS_nativeElements)[S]) => any } - : '__ctx' extends keyof __VLS_PickNotAny - ? K extends { __ctx?: infer Ctx } - ? Ctx - : never - : T extends (props: infer P, ctx: infer Ctx) => any - ? { props: P } & Ctx - : {};\n`) + : T extends { setup: (props: infer P, ctx: infer Ctx) => any } ? { props: P } & Ctx : + '__ctx' extends keyof __VLS_PickNotAny + ? K extends { __ctx?: infer Ctx } ? Ctx : never + : T extends (props: infer P, ctx: infer Ctx) => any ? { props: P } & Ctx + : {};\n`) } return new Map( From 7f25df8405d3f25450f672ef3256c43efc9ff497 Mon Sep 17 00:00:00 2001 From: zhiyuanzmj <260480378@qq.com> Date: Fri, 1 Aug 2025 08:31:32 +0800 Subject: [PATCH 5/5] chore: release v3.0.0-beta.20 --- 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 74a79bd6b..39c6645d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monorepo-vue-macros", - "version": "3.0.0-beta.19", + "version": "3.0.0-beta.20", "private": true, "packageManager": "pnpm@10.13.1", "description": "Monorepo for Vue Macros.", diff --git a/packages/api/package.json b/packages/api/package.json index 0342d6697..b2756ab66 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/api", - "version": "3.0.0-beta.19", + "version": "3.0.0-beta.20", "description": "General API for Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/astro/package.json b/packages/astro/package.json index c9b1fd657..b30ca9cfe 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/astro", - "version": "3.0.0-beta.19", + "version": "3.0.0-beta.20", "description": "Astro integration of Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/better-define/package.json b/packages/better-define/package.json index 010a7cf15..ff5d1ae67 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.19", + "version": "3.0.0-beta.20", "description": "betterDefine feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/boolean-prop/package.json b/packages/boolean-prop/package.json index 87a623040..d84d5ce57 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.19", + "version": "3.0.0-beta.20", "description": "booleanProp feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/chain-call/package.json b/packages/chain-call/package.json index 6af2ccf78..e789f44ed 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.19", + "version": "3.0.0-beta.20", "description": "chainCall feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/common/package.json b/packages/common/package.json index 66d59b7fd..d6abcd502 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/common", - "version": "3.0.0-beta.19", + "version": "3.0.0-beta.20", "description": "common feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/config/package.json b/packages/config/package.json index aaff238ed..7d24b6187 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/config", - "version": "3.0.0-beta.19", + "version": "3.0.0-beta.20", "description": "Config API for Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-emit/package.json b/packages/define-emit/package.json index 8f4d302d5..e93fb6132 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.19", + "version": "3.0.0-beta.20", "description": "defineEmit feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-models/package.json b/packages/define-models/package.json index a41bf46c0..22b301ade 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.19", + "version": "3.0.0-beta.20", "description": "defineModels feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-options/package.json b/packages/define-options/package.json index 554172428..665c813db 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.19", + "version": "3.0.0-beta.20", "description": "Add defineOptions macro for Vue