From: 三咲智子 Kevin Deng Date: Wed, 31 Jan 2024 09:01:56 +0000 (+0800) Subject: Merge remote-tracking branch 'upstream/main' X-Git-Tag: v3.6.0-alpha.1~16^2~622 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c88c6d12aa6f28301fa50a1845f43da00aceafd1;p=thirdparty%2Fvuejs%2Fcore.git Merge remote-tracking branch 'upstream/main' --- c88c6d12aa6f28301fa50a1845f43da00aceafd1 diff --cc package.json index 80668b51db,bbf1c8f45f..cd0dfa2547 --- a/package.json +++ b/package.json @@@ -1,10 -1,10 +1,10 @@@ { "private": true, - "version": "3.4.15", + "version": "0.0.0-vapor", - "packageManager": "pnpm@8.14.1", + "packageManager": "pnpm@8.15.0", "type": "module", "scripts": { - "dev": "node scripts/dev.js", + "dev": "node scripts/dev.js vue vue-vapor", "build": "node scripts/build.js", "build-dts": "tsc -p tsconfig.build.json && rollup -c rollup.dts.config.js", "clean": "rimraf packages/*/dist temp .eslintcache", diff --cc packages/sfc-playground/package.json index 867333e1a0,a298a12882..916ba43daa --- a/packages/sfc-playground/package.json +++ b/packages/sfc-playground/package.json @@@ -10,10 -10,10 +10,10 @@@ }, "devDependencies": { "@vitejs/plugin-vue": "^4.4.0", - "vite": "^5.0.5" + "vite": "^5.0.12" }, "dependencies": { - "@vue/repl": "^3.1.1", + "@vue/repl": "4.0.0-alpha.1", "file-saver": "^2.0.5", "jszip": "^3.10.1", "vue": "workspace:*" diff --cc pnpm-lock.yaml index 32d4f53a41,04e7a4a0e6..876cfb024b --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@@ -42,20 -42,20 +42,20 @@@ importers specifier: ^1.2.5 version: 1.2.5 '@types/node': - specifier: ^20.11.1 - version: 20.11.5 + specifier: ^20.11.10 - version: 20.11.10 ++ version: 20.11.13 '@types/semver': specifier: ^7.5.6 version: 7.5.6 '@typescript-eslint/eslint-plugin': specifier: ^6.18.1 - version: 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.2.2) + version: 6.19.0(@typescript-eslint/parser@6.19.0)(eslint@8.56.0)(typescript@5.2.2) '@typescript-eslint/parser': specifier: ^6.18.1 - version: 6.18.1(eslint@8.56.0)(typescript@5.2.2) + version: 6.19.0(eslint@8.56.0)(typescript@5.2.2) '@vitest/coverage-istanbul': - specifier: ^1.2.0 - version: 1.2.0(vitest@1.2.0) + specifier: ^1.2.2 + version: 1.2.2(vitest@1.2.2) '@vue/consolidate': specifier: 0.17.3 version: 0.17.3 @@@ -168,11 -168,11 +168,11 @@@ specifier: ^5.2.2 version: 5.2.2 vite: - specifier: ^5.0.5 - version: 5.0.10(@types/node@20.11.5)(terser@5.22.0) + specifier: ^5.0.12 - version: 5.0.12(@types/node@20.11.10)(terser@5.22.0) ++ version: 5.0.12(@types/node@20.11.13)(terser@5.22.0) vitest: - specifier: ^1.2.0 - version: 1.2.0(@types/node@20.11.5)(jsdom@23.2.0)(terser@5.22.0) + specifier: ^1.2.2 - version: 1.2.2(@types/node@20.11.10)(jsdom@23.2.0)(terser@5.22.0) ++ version: 1.2.2(@types/node@20.11.13)(jsdom@23.2.0)(terser@5.22.0) packages/compiler-core: dependencies: @@@ -385,10 -361,10 +385,10 @@@ devDependencies: '@vitejs/plugin-vue': specifier: ^4.4.0 - version: 4.4.0(vite@5.0.10)(vue@packages+vue) + version: 4.4.0(vite@5.0.12)(vue@packages+vue) vite: - specifier: ^5.0.5 - version: 5.0.10(@types/node@20.11.5)(terser@5.22.0) + specifier: ^5.0.12 - version: 5.0.12(@types/node@20.11.10)(terser@5.22.0) ++ version: 5.0.12(@types/node@20.11.13)(terser@5.22.0) packages/shared: {} @@@ -443,37 -413,6 +443,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: + '@vueuse/core': + specifier: ^10.7.2 + version: 10.7.2(vue@packages+vue) + 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.11.5)(terser@5.22.0) ++ version: 5.0.2(@types/node@20.11.13)(terser@5.22.0) + vite-hyper-config: + specifier: ^0.2.1 - version: 0.2.1(@types/node@20.11.5)(terser@5.22.0)(vite@5.0.2) ++ version: 0.2.1(@types/node@20.11.13)(terser@5.22.0)(vite@5.0.2) + vite-plugin-inspect: + specifier: ^0.7.42 + version: 0.7.42(rollup@4.4.1)(vite@5.0.2) + packages: /@aashutoshrathi/word-wrap@1.2.6: @@@ -705,8 -639,8 +705,8 @@@ vitest: '>=1.0.0-beta.4 || >=1' dependencies: '@codspeed/core': 2.3.1 - vite: 5.0.10(@types/node@20.11.5)(terser@5.22.0) - vitest: 1.2.0(@types/node@20.11.5)(jsdom@23.2.0)(terser@5.22.0) - vite: 5.0.12(@types/node@20.11.10)(terser@5.22.0) - vitest: 1.2.2(@types/node@20.11.10)(jsdom@23.2.0)(terser@5.22.0) ++ vite: 5.0.12(@types/node@20.11.13)(terser@5.22.0) ++ vitest: 1.2.2(@types/node@20.11.13)(jsdom@23.2.0)(terser@5.22.0) dev: true /@esbuild/aix-ppc64@0.19.10: @@@ -1331,8 -1261,8 +1331,8 @@@ resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} dev: true - /@types/node@20.11.5: - resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==} - /@types/node@20.11.10: - resolution: {integrity: sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==} ++ /@types/node@20.11.13: ++ resolution: {integrity: sha512-5G4zQwdiQBSWYTDAH1ctw2eidqdhMJaNsiIDKHFr55ihz5Trl2qqR8fdrT732yPBho5gkNxXm67OxWFBqX9aPg==} dependencies: undici-types: 5.26.5 dev: true @@@ -1357,7 -1283,7 +1357,7 @@@ resolution: {integrity: sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==} requiresBuild: true dependencies: - '@types/node': 20.11.5 - '@types/node': 20.11.10 ++ '@types/node': 20.11.13 dev: true optional: true @@@ -1566,18 -1492,7 +1566,18 @@@ vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 5.0.10(@types/node@20.11.5)(terser@5.22.0) - vite: 5.0.12(@types/node@20.11.10)(terser@5.22.0) ++ vite: 5.0.12(@types/node@20.11.13)(terser@5.22.0) + 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.11.5)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.11.13)(terser@5.22.0) vue: link:packages/vue dev: true @@@ -1592,10 -1507,10 +1592,10 @@@ istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 4.0.1 istanbul-reports: 3.1.6 - magicast: 0.3.2 + magicast: 0.3.3 picocolors: 1.0.0 test-exclude: 6.0.0 - vitest: 1.2.0(@types/node@20.11.5)(jsdom@23.2.0)(terser@5.22.0) - vitest: 1.2.2(@types/node@20.11.10)(jsdom@23.2.0)(terser@5.22.0) ++ vitest: 1.2.2(@types/node@20.11.13)(jsdom@23.2.0)(terser@5.22.0) transitivePeerDependencies: - supports-color dev: true @@@ -2551,20 -2372,6 +2515,11 @@@ has-property-descriptors: 1.0.0 dev: true + /define-lazy-prop@3.0.0: + resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==} + engines: {node: '>=12'} + dev: true + - /define-properties@1.2.1: - resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} - engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.1 - has-property-descriptors: 1.0.0 - object-keys: 1.1.1 - dev: true - /degenerator@5.0.1: resolution: {integrity: sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==} engines: {node: '>= 14'} @@@ -2657,55 -2469,6 +2617,10 @@@ is-arrayish: 0.2.1 dev: true + /error-stack-parser-es@0.1.1: + resolution: {integrity: sha512-g/9rfnvnagiNf+DRMHEVGuGuIBlCIMDFoTA616HaP2l9PlCjGjVhD98PNbVSJvmK4TttqT5mV5tInMhoFgi+aA==} + dev: true + - /es-abstract@1.22.2: - resolution: {integrity: sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==} - engines: {node: '>= 0.4'} - dependencies: - array-buffer-byte-length: 1.0.0 - arraybuffer.prototype.slice: 1.0.2 - available-typed-arrays: 1.0.5 - call-bind: 1.0.5 - es-set-tostringtag: 2.0.1 - es-to-primitive: 1.2.1 - function.prototype.name: 1.1.6 - get-intrinsic: 1.2.1 - get-symbol-description: 1.0.0 - globalthis: 1.0.3 - gopd: 1.0.1 - has: 1.0.4 - has-property-descriptors: 1.0.0 - has-proto: 1.0.1 - has-symbols: 1.0.3 - internal-slot: 1.0.5 - is-array-buffer: 3.0.2 - is-callable: 1.2.7 - is-negative-zero: 2.0.2 - is-regex: 1.1.4 - is-shared-array-buffer: 1.0.2 - is-string: 1.0.7 - is-typed-array: 1.1.12 - is-weakref: 1.0.2 - object-inspect: 1.13.1 - object-keys: 1.1.1 - object.assign: 4.1.4 - regexp.prototype.flags: 1.5.1 - safe-array-concat: 1.0.1 - safe-regex-test: 1.0.0 - string.prototype.trim: 1.2.8 - string.prototype.trimend: 1.0.7 - string.prototype.trimstart: 1.0.7 - typed-array-buffer: 1.0.0 - typed-array-byte-length: 1.0.0 - typed-array-byte-offset: 1.0.0 - typed-array-length: 1.0.4 - unbox-primitive: 1.0.2 - which-typed-array: 1.1.13 - dev: true - /es-module-lexer@1.3.1: resolution: {integrity: sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==} dev: true @@@ -3663,17 -3311,6 +3490,12 @@@ builtin-modules: 3.3.0 dev: true - /is-callable@1.2.7: - resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} - engines: {node: '>= 0.4'} - dev: true - + /is-core-module@2.13.0: + resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} + dependencies: + has: 1.0.4 + dev: true + /is-core-module@2.13.1: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: @@@ -6092,50 -5392,8 +5649,50 @@@ engines: {node: '>= 0.8'} dev: true - /vite-hyper-config@0.2.1(@types/node@20.11.5)(terser@5.22.0)(vite@5.0.2): - /vite-node@1.2.2(@types/node@20.11.10)(terser@5.22.0): ++ /vite-hyper-config@0.2.1(@types/node@20.11.13)(terser@5.22.0)(vite@5.0.2): + resolution: {integrity: sha512-ItRIpzWp0XMh/Sn1H0GCWnQIUcBjnSaZy/EbOpJcRr9H/KTBHUSTCEOigE9K0KTN01Z0GDi/8WgVT9+RPL932A==} + 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.11.5)(terser@5.22.0) - vite-node: 1.1.1(@types/node@20.11.5)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.11.13)(terser@5.22.0) ++ vite-node: 1.1.1(@types/node@20.11.13)(terser@5.22.0) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + - /vite-node@1.1.1(@types/node@20.11.5)(terser@5.22.0): ++ /vite-node@1.1.1(@types/node@20.11.13)(terser@5.22.0): + resolution: {integrity: sha512-2bGE5w4jvym5v8llF6Gu1oBrmImoNSs4WmRVcavnG2me6+8UQntTqLiAMFyiAobp+ZXhj5ZFhI7SmLiFr/jrow==} + 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.10(@types/node@20.11.5)(terser@5.22.0) ++ vite: 5.0.12(@types/node@20.11.13)(terser@5.22.0) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + - /vite-node@1.2.0(@types/node@20.11.5)(terser@5.22.0): - resolution: {integrity: sha512-ETnQTHeAbbOxl7/pyBck9oAPZZZo+kYnFt1uQDD+hPReOc+wCjXw4r4jHriBRuVDB5isHmPXxrfc1yJnfBERqg==} ++ /vite-node@1.2.2(@types/node@20.11.13)(terser@5.22.0): + resolution: {integrity: sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@@ -6143,7 -5401,7 +5700,7 @@@ debug: 4.3.4 pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.5)(terser@5.22.0) - vite: 5.0.12(@types/node@20.11.10)(terser@5.22.0) ++ vite: 5.0.12(@types/node@20.11.13)(terser@5.22.0) transitivePeerDependencies: - '@types/node' - less @@@ -6155,32 -5413,8 +5712,32 @@@ - terser dev: true - /vite@5.0.12(@types/node@20.11.10)(terser@5.22.0): + /vite-plugin-inspect@0.7.42(rollup@4.4.1)(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.4.1) + 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.11.5)(terser@5.22.0) ++ vite: 5.0.2(@types/node@20.11.13)(terser@5.22.0) + transitivePeerDependencies: + - rollup + - supports-color + dev: true + - /vite@5.0.10(@types/node@20.11.5)(terser@5.22.0): - resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} ++ /vite@5.0.12(@types/node@20.11.13)(terser@5.22.0): + resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@@ -6207,44 -5441,7 +5764,44 @@@ terser: optional: true dependencies: - '@types/node': 20.11.5 - '@types/node': 20.11.10 ++ '@types/node': 20.11.13 + esbuild: 0.19.10 - postcss: 8.4.32 ++ postcss: 8.4.33 + rollup: 4.4.1 + terser: 5.22.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + - /vite@5.0.2(@types/node@20.11.5)(terser@5.22.0): ++ /vite@5.0.2(@types/node@20.11.13)(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: '*' + 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.11.5 ++ '@types/node': 20.11.13 esbuild: 0.19.10 postcss: 8.4.33 rollup: 4.4.1 @@@ -6253,8 -5450,8 +5810,8 @@@ fsevents: 2.3.3 dev: true - /vitest@1.2.0(@types/node@20.11.5)(jsdom@23.2.0)(terser@5.22.0): - resolution: {integrity: sha512-Ixs5m7BjqvLHXcibkzKRQUvD/XLw0E3rvqaCMlrm/0LMsA0309ZqYvTlPzkhh81VlEyVZXFlwWnkhb6/UMtcaQ==} - /vitest@1.2.2(@types/node@20.11.10)(jsdom@23.2.0)(terser@5.22.0): ++ /vitest@1.2.2(@types/node@20.11.13)(jsdom@23.2.0)(terser@5.22.0): + resolution: {integrity: sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@@ -6278,13 -5475,13 +5835,13 @@@ jsdom: optional: true dependencies: - '@types/node': 20.11.5 - '@vitest/expect': 1.2.0 - '@vitest/runner': 1.2.0 - '@vitest/snapshot': 1.2.0 - '@vitest/spy': 1.2.0 - '@vitest/utils': 1.2.0 - acorn-walk: 8.3.1 - '@types/node': 20.11.10 ++ '@types/node': 20.11.13 + '@vitest/expect': 1.2.2 + '@vitest/runner': 1.2.2 + '@vitest/snapshot': 1.2.2 + '@vitest/spy': 1.2.2 + '@vitest/utils': 1.2.2 + acorn-walk: 8.3.2 cac: 6.7.14 chai: 4.3.10 debug: 4.3.4 @@@ -6297,9 -5494,9 +5854,9 @@@ std-env: 3.6.0 strip-literal: 1.3.0 tinybench: 2.5.1 - tinypool: 0.8.1 - vite: 5.0.10(@types/node@20.11.5)(terser@5.22.0) - vite-node: 1.2.0(@types/node@20.11.5)(terser@5.22.0) + tinypool: 0.8.2 - vite: 5.0.12(@types/node@20.11.10)(terser@5.22.0) - vite-node: 1.2.2(@types/node@20.11.10)(terser@5.22.0) ++ vite: 5.0.12(@types/node@20.11.13)(terser@5.22.0) ++ vite-node: 1.2.2(@types/node@20.11.13)(terser@5.22.0) why-is-node-running: 2.2.2 transitivePeerDependencies: - less