From: 三咲智子 Kevin Deng Date: Wed, 6 Dec 2023 10:50:31 +0000 (+0800) Subject: Merge remote-tracking branch 'upstream/minor' X-Git-Tag: v3.6.0-alpha.1~16^2~741 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c695fdc1de6cad46ece33e3a36bbf96b5e714ee6;p=thirdparty%2Fvuejs%2Fcore.git Merge remote-tracking branch 'upstream/minor' --- c695fdc1de6cad46ece33e3a36bbf96b5e714ee6 diff --cc package.json index ae1d485628,9564d3e51f..03e063ae6a --- a/package.json +++ b/package.json @@@ -25,18 -25,17 +25,19 @@@ "release": "node scripts/release.js", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "dev-esm": "node scripts/dev.js -if esm-bundler-runtime", + "dev-prepare-cjs": "node scripts/prepare-cjs.js || npm run build-all-cjs", "dev-compiler": "run-p \"dev template-explorer\" serve", - "dev-sfc": "run-s dev-sfc-prepare dev-sfc-run", - "dev-sfc-prepare": "node scripts/pre-dev-sfc.js || npm run build-all-cjs", + "dev-sfc": "run-s dev-prepare-cjs dev-sfc-run", "dev-sfc-serve": "vite packages/sfc-playground --host", "dev-sfc-run": "run-p \"dev compiler-sfc -f esm-browser\" \"dev vue -if esm-bundler-runtime\" \"dev vue -ipf esm-browser-runtime\" \"dev server-renderer -if esm-bundler\" dev-sfc-serve", + "dev-vapor": "run-s dev-prepare-cjs dev-vapor-serve", + "dev-vapor-serve": "pnpm -C playground run dev", "serve": "serve", "open": "open http://localhost:3000/packages/template-explorer/local.html", - "build-sfc-playground": "run-s build-all-cjs build-runtime-esm build-ssr-esm build-sfc-playground-self", + "build-sfc-playground": "run-s build-all-cjs build-runtime-esm build-browser-esm build-ssr-esm build-sfc-playground-self", "build-all-cjs": "node scripts/build.js vue runtime compiler reactivity shared -af cjs", "build-runtime-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler-runtime && node scripts/build.js vue -f esm-browser-runtime", + "build-browser-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler && node scripts/build.js vue -f esm-browser", "build-ssr-esm": "node scripts/build.js compiler-sfc server-renderer -f esm-browser", "build-sfc-playground-self": "cd packages/sfc-playground && npm run build", "preinstall": "npx only-allow pnpm", diff --cc packages/compiler-core/package.json index c0172c84d9,4a4e4cafb8..db1c94c380 --- a/packages/compiler-core/package.json +++ b/packages/compiler-core/package.json @@@ -28,11 -28,11 +28,11 @@@ "author": "Evan You", "license": "MIT", "bugs": { - "url": "https://github.com/vuejs/core/issues" + "url": "https://github.com/vuejs/core-vapor/issues" }, - "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme", + "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-core#readme", "dependencies": { - "@babel/parser": "^7.23.4", + "@babel/parser": "^7.23.5", "@vue/shared": "workspace:*", "entities": "^4.5.0", "estree-walker": "^2.0.2", diff --cc packages/compiler-sfc/package.json index e1563d86fc,376d302720..07f31f0e91 --- a/packages/compiler-sfc/package.json +++ b/packages/compiler-sfc/package.json @@@ -28,11 -28,11 +28,11 @@@ "author": "Evan You", "license": "MIT", "bugs": { - "url": "https://github.com/vuejs/core/issues" + "url": "https://github.com/vuejs/core-vapor/issues" }, - "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme", + "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-sfc#readme", "dependencies": { - "@babel/parser": "^7.23.4", + "@babel/parser": "^7.23.5", "@vue/compiler-core": "workspace:*", "@vue/compiler-dom": "workspace:*", "@vue/compiler-ssr": "workspace:*", diff --cc packages/vue-compat/package.json index 9d99717e2a,3904c55ab2..16ba4fd9e9 --- a/packages/vue-compat/package.json +++ b/packages/vue-compat/package.json @@@ -34,11 -34,11 +34,11 @@@ "author": "Evan You", "license": "MIT", "bugs": { - "url": "https://github.com/vuejs/core/issues" + "url": "https://github.com/vuejs/core-vapor/issues" }, - "homepage": "https://github.com/vuejs/core/tree/main/packages/vue-compat#readme", + "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/vue-compat#readme", "dependencies": { - "@babel/parser": "^7.23.4", + "@babel/parser": "^7.23.5", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" }, diff --cc pnpm-lock.yaml index 4b45499bde,7bb90f77a2..c1cb8d7a0b --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@@ -39,17 -39,17 +39,17 @@@ importers specifier: ^1.2.5 version: 1.2.5 '@types/node': - specifier: ^20.10.0 - version: 20.10.0 + specifier: ^20.10.3 + version: 20.10.3 '@types/semver': specifier: ^7.5.5 - version: 7.5.5 + version: 7.5.6 '@typescript-eslint/parser': specifier: ^6.13.0 - version: 6.13.0(eslint@8.54.0)(typescript@5.2.2) + version: 6.13.1(eslint@8.54.0)(typescript@5.2.2) '@vitest/coverage-istanbul': specifier: ^0.34.6 - version: 0.34.6(vitest@0.34.6) + version: 0.34.6(vitest@1.0.1) '@vue/consolidate': specifier: 0.17.3 version: 0.17.3 @@@ -431,37 -404,6 +431,37 @@@ specifier: workspace:* version: link:../vue + packages/vue-vapor: + dependencies: + '@vue/compiler-vapor': + specifier: workspace:* + version: link:../compiler-vapor + '@vue/runtime-vapor': + specifier: workspace:* + version: link:../runtime-vapor + + playground: + dependencies: + vue: + specifier: workspace:* + version: link:../packages/vue + devDependencies: + '@vitejs/plugin-vue': + specifier: ^4.5.0 + version: 4.5.0(vite@5.0.2)(vue@packages+vue) + vite: + specifier: ^5.0.2 - version: 5.0.2(@types/node@20.10.0)(terser@5.22.0) ++ version: 5.0.2(@types/node@20.10.3)(terser@5.22.0) + vite-hyper-config: + specifier: ^0.1.1 - version: 0.1.1(@types/node@20.10.0)(terser@5.22.0)(vite@5.0.2) ++ version: 0.1.1(@types/node@20.10.3)(terser@5.22.0)(vite@5.0.2) + vite-node: + specifier: ^0.34.6 - version: 0.34.6(@types/node@20.10.0)(terser@5.22.0) ++ version: 0.34.6(@types/node@20.10.3)(terser@5.22.0) + vite-plugin-inspect: + specifier: ^0.7.42 + version: 0.7.42(rollup@4.1.4)(vite@5.0.2) + packages: /@aashutoshrathi/word-wrap@1.2.6: @@@ -1759,18 -1700,7 +1749,18 @@@ vue: link:packages/vue dev: true + /@vitejs/plugin-vue@4.5.0(vite@5.0.2)(vue@packages+vue): + resolution: {integrity: sha512-a2WSpP8X8HTEww/U00bU4mX1QpLINNuz/2KMNpLsdu3BzOpak3AGI1CJYBTXcc4SPhaD0eNRUp7IyQK405L5dQ==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: ^4.0.0 || ^5.0.0 + vue: ^3.2.25 + dependencies: - vite: 5.0.2(@types/node@20.10.0)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.10.3)(terser@5.22.0) + vue: link:packages/vue + dev: true + - /@vitest/coverage-istanbul@0.34.6(vitest@0.34.6): + /@vitest/coverage-istanbul@0.34.6(vitest@1.0.1): resolution: {integrity: sha512-5KaBNZPDSk2ybavC3rZ1pWGniw7sJ5usuwVGRUYzJwiBfWvnLpuUer7bjw7qUCRGdKJXrBgb/Dsgif9rkwMX/A==} peerDependencies: vitest: '>=0.32.0 <1' @@@ -1866,8 -1796,8 +1856,8 @@@ acorn: 8.10.0 dev: true - /acorn-walk@8.2.0: - resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} - /acorn-walk@8.3.0: - resolution: {integrity: sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==} ++ /acorn-walk@8.3.1: ++ resolution: {integrity: sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==} engines: {node: '>=0.4.0'} dev: true @@@ -4477,10 -4308,10 +4470,16 @@@ resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} dev: true + /nanoid@3.3.6: + resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true ++ dev: true ++ + /nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} @@@ -4924,13 -4752,13 +4930,22 @@@ resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: true + /postcss@8.4.31: + resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.6 + picocolors: 1.0.0 + source-map-js: 1.0.2 ++ dev: true ++ + /postcss@8.4.32: + resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.0.2 /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} @@@ -6179,38 -5971,16 +6194,59 @@@ engines: {node: '>= 0.8'} dev: true - /vite-hyper-config@0.1.1(@types/node@20.10.0)(terser@5.22.0)(vite@5.0.2): ++ /vite-hyper-config@0.1.1(@types/node@20.10.3)(terser@5.22.0)(vite@5.0.2): + resolution: {integrity: sha512-Sc9WuuLImezPUG6JUnBU/L0KHZDHRyvLKEU1fEPCR6gBsC9QTnmnX78doRQpKt6P/rRcawlytbA2xt9Qb/kaVQ==} + engines: {node: '>=18.0.0'} + peerDependencies: + vite: ^4.0.0 || ^5.0.0 + dependencies: + cac: 6.7.14 + picocolors: 1.0.0 - vite: 5.0.2(@types/node@20.10.0)(terser@5.22.0) - vite-node: 0.34.6(@types/node@20.10.0)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.10.3)(terser@5.22.0) ++ vite-node: 0.34.6(@types/node@20.10.3)(terser@5.22.0) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + - /vite-node@0.34.6(@types/node@20.10.0)(terser@5.22.0): ++ /vite-node@0.34.6(@types/node@20.10.3)(terser@5.22.0): + resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==} + engines: {node: '>=v14.18.0'} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4 + mlly: 1.4.2 + pathe: 1.1.1 + picocolors: 1.0.0 - vite: 5.0.2(@types/node@20.10.0)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.10.3)(terser@5.22.0) ++ transitivePeerDependencies: ++ - '@types/node' ++ - less ++ - lightningcss ++ - sass ++ - stylus ++ - sugarss ++ - supports-color ++ - terser ++ dev: true ++ + /vite-node@1.0.1(@types/node@20.10.3)(terser@5.22.0): + resolution: {integrity: sha512-Y2Jnz4cr2azsOMMYuVPrQkp3KMnS/0WV8ezZjCy4hU7O5mUHCAVOnFmoEvs1nvix/4mYm74Len8bYRWZJMNP6g==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4 + pathe: 1.1.1 + picocolors: 1.0.0 - vite: 5.0.0(@types/node@20.10.3)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.10.3)(terser@5.22.0) transitivePeerDependencies: - '@types/node' - less @@@ -6222,71 -5992,10 +6258,71 @@@ - terser dev: true + /vite-plugin-inspect@0.7.42(rollup@4.1.4)(vite@5.0.2): + resolution: {integrity: sha512-JCyX86wr3siQc+p9Kd0t8VkFHAJag0RaQVIpdFGSv5FEaePEVB6+V/RGtz2dQkkGSXQzRWrPs4cU3dRKg32bXw==} + engines: {node: '>=14'} + peerDependencies: + '@nuxt/kit': '*' + vite: ^3.1.0 || ^4.0.0 || ^5.0.0-0 + peerDependenciesMeta: + '@nuxt/kit': + optional: true + dependencies: + '@antfu/utils': 0.7.6 + '@rollup/pluginutils': 5.0.5(rollup@4.1.4) + debug: 4.3.4 + error-stack-parser-es: 0.1.1 + fs-extra: 11.1.1 + open: 9.1.0 + picocolors: 1.0.0 + sirv: 2.0.3 - vite: 5.0.2(@types/node@20.10.0)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.10.3)(terser@5.22.0) + transitivePeerDependencies: + - rollup + - supports-color + dev: true + - /vite@5.0.0(@types/node@20.10.0)(terser@5.22.0): + /vite@5.0.0(@types/node@20.10.3)(terser@5.22.0): resolution: {integrity: sha512-ESJVM59mdyGpsiNAeHQOR/0fqNoOyWPYesFto8FFZugfmhdHx8Fzd8sF3Q/xkVhZsyOxHfdM7ieiVAorI9RjFw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: - '@types/node': 20.10.0 ++ '@types/node': 20.10.3 + esbuild: 0.19.5 + postcss: 8.4.31 + rollup: 4.4.1 + terser: 5.22.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + - /vite@5.0.2(@types/node@20.10.0)(terser@5.22.0): ++ /vite@5.0.2(@types/node@20.10.3)(terser@5.22.0): + resolution: {integrity: sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true peerDependencies: '@types/node': ^18.0.0 || >=20.0.0 less: '*' @@@ -6344,23 -6053,14 +6380,14 @@@ optional: true jsdom: optional: true - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true dependencies: - '@types/chai': 4.3.9 - '@types/chai-subset': 1.3.4 - '@types/node': 20.10.0 - '@vitest/expect': 0.34.6 - '@vitest/runner': 0.34.6 - '@vitest/snapshot': 0.34.6 - '@vitest/spy': 0.34.6 - '@vitest/utils': 0.34.6 - acorn: 8.10.0 - acorn-walk: 8.2.0 + '@types/node': 20.10.3 + '@vitest/expect': 1.0.1 + '@vitest/runner': 1.0.1 + '@vitest/snapshot': 1.0.1 + '@vitest/spy': 1.0.1 + '@vitest/utils': 1.0.1 - acorn-walk: 8.3.0 ++ acorn-walk: 8.3.1 cac: 6.7.14 chai: 4.3.10 debug: 4.3.4 @@@ -6369,12 -6070,12 +6397,12 @@@ magic-string: 0.30.5 pathe: 1.1.1 picocolors: 1.0.0 - std-env: 3.4.3 + std-env: 3.6.0 strip-literal: 1.3.0 tinybench: 2.5.1 - tinypool: 0.7.0 - vite: 5.0.0(@types/node@20.10.0)(terser@5.22.0) - vite-node: 0.34.6(@types/node@20.10.0)(terser@5.22.0) + tinypool: 0.8.1 - vite: 5.0.0(@types/node@20.10.3)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.10.3)(terser@5.22.0) + vite-node: 1.0.1(@types/node@20.10.3)(terser@5.22.0) why-is-node-running: 2.2.2 transitivePeerDependencies: - less