From: Evan You Date: Wed, 29 Jan 2025 07:37:54 +0000 (+0800) Subject: chore: Merge branch 'minor' into vapor X-Git-Tag: v3.6.0-alpha.1~16^2~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=674151c9b953aed2599df9f3a8cf12e298711488;p=thirdparty%2Fvuejs%2Fcore.git chore: Merge branch 'minor' into vapor --- 674151c9b953aed2599df9f3a8cf12e298711488 diff --cc package.json index 9e502ec604,03897cb198..80a86145a1 --- a/package.json +++ b/package.json @@@ -64,17 -65,16 +64,17 @@@ "@babel/parser": "catalog:", "@babel/types": "catalog:", "@rollup/plugin-alias": "^5.1.1", - "@rollup/plugin-commonjs": "^28.0.1", + "@rollup/plugin-commonjs": "^28.0.2", "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.3.0", + "@rollup/plugin-node-resolve": "^16.0.0", "@rollup/plugin-replace": "5.0.4", - "@swc/core": "^1.9.1", + "@swc/core": "^1.10.8", "@types/hash-sum": "^1.0.2", - "@types/node": "^22.8.7", + "@types/node": "^22.10.7", "@types/semver": "^7.5.8", "@types/serve-handler": "^6.1.4", - "@vitest/coverage-v8": "^2.1.1", - "@vitest/ui": "^2.1.1", + "@vitest/coverage-v8": "^3.0.2", ++ "@vitest/ui": "^3.0.2", "@vue/consolidate": "1.0.0", "conventional-changelog-cli": "^5.0.0", "enquirer": "^2.4.1", diff --cc packages-private/template-explorer/package.json index fafca26640,08da34b173..c546f4a298 --- a/packages-private/template-explorer/package.json +++ b/packages-private/template-explorer/package.json @@@ -11,8 -11,7 +11,8 @@@ "enableNonBrowserBranches": true }, "dependencies": { + "@vue/compiler-vapor": "workspace:^", - "monaco-editor": "^0.52.0", + "monaco-editor": "^0.52.2", "source-map-js": "^1.2.1" } } diff --cc packages/compiler-sfc/src/compileScript.ts index 0d1dc0976f,962b7bc793..5403788ed7 --- a/packages/compiler-sfc/src/compileScript.ts +++ b/packages/compiler-sfc/src/compileScript.ts @@@ -174,10 -169,7 +174,8 @@@ export function compileScript const scopeId = options.id ? options.id.replace(/^data-v-/, '') : '' const scriptLang = script && script.lang const scriptSetupLang = scriptSetup && scriptSetup.lang + const vapor = sfc.vapor || options.vapor - let refBindings: string[] | undefined - if (!scriptSetup) { if (!script) { throw new Error(`[@vue/compiler-sfc] SFC contains no