Merge remote-tracking branch 'upstream/main'

diff --cc package.json
index 62ddb7d7aa7a336f8cc210ff09b786c669982378,ee2404ca2067595a69e139000c3b0aa16ab54936..eab2a5502f7c2ff96d0d78b4a9f771404dc9a070
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -1,10 -1,10 +1,10 @@@
  {
    "private": true,
 -  "version": "3.4.4",
 +  "version": "0.0.0-vapor",
-   "packageManager": "pnpm@8.12.1",
+   "packageManager": "pnpm@8.14.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/compiler-core/package.json
Simple merge

diff --cc packages/compiler-dom/package.json
Simple merge

diff --cc packages/compiler-sfc/package.json
Simple merge

diff --cc packages/compiler-ssr/package.json
Simple merge

diff --cc packages/reactivity/package.json
Simple merge

diff --cc packages/runtime-core/package.json
Simple merge

diff --cc packages/runtime-dom/package.json
Simple merge

diff --cc packages/server-renderer/package.json
Simple merge

diff --cc packages/shared/package.json
Simple merge

diff --cc packages/vue-compat/package.json
Simple merge

diff --cc packages/vue/package.json
Simple merge

diff --cc pnpm-lock.yaml
index cd4bc93cb6f459be27232b0f761d4f76093de4e9,010d1d539ce578b0789a0af0d76529f8a0417266..5d7739bac44e5eee52f5616e9749722ff1de730e
--- 1/pnpm-lock.yaml
--- 2/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@@ -16,7 -16,7 +16,7 @@@ importers
          version: 7.23.6
        '@codspeed/vitest-plugin':
          specifier: ^2.3.1
-         version: 2.3.1(vite@5.0.10)(vitest@1.1.0)
 -        version: 2.3.1(vite@5.0.7)(vitest@1.1.1)
++        version: 2.3.1(vite@5.0.10)(vitest@1.1.1)
        '@rollup/plugin-alias':
          specifier: ^5.0.1
          version: 5.0.1(rollup@4.4.1)
@@@ -169,10 -169,10 +169,10 @@@
          version: 5.2.2
        vite:
          specifier: ^5.0.5
-         version: 5.0.10(@types/node@20.10.5)(terser@5.22.0)
 -        version: 5.0.7(@types/node@20.10.6)(terser@5.22.0)
++        version: 5.0.10(@types/node@20.10.6)(terser@5.22.0)
        vitest:
-         specifier: ^1.1.0
-         version: 1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0)
+         specifier: ^1.1.1
+         version: 1.1.1(@types/node@20.10.6)(jsdom@23.0.1)(terser@5.22.0)
  
    packages/compiler-core:
      dependencies:
@@@ -368,8 -347,8 +368,8 @@@
    packages/sfc-playground:
      dependencies:
        '@vue/repl':
-         specifier: ^3.1.0
-         version: 3.1.0
+         specifier: ^3.1.1
 -        version: 3.1.1
++        version: 3.2.0
        file-saver:
          specifier: ^2.0.5
          version: 2.0.5
@@@ -382,10 -361,10 +382,10 @@@
      devDependencies:
        '@vitejs/plugin-vue':
          specifier: ^4.4.0
 -        version: 4.4.0(vite@5.0.7)(vue@packages+vue)
 +        version: 4.4.0(vite@5.0.10)(vue@packages+vue)
        vite:
          specifier: ^5.0.5
-         version: 5.0.10(@types/node@20.10.5)(terser@5.22.0)
 -        version: 5.0.7(@types/node@20.10.6)(terser@5.22.0)
++        version: 5.0.10(@types/node@20.10.6)(terser@5.22.0)
  
    packages/shared: {}
  
@@@ -440,37 -413,6 +440,37 @@@
          specifier: workspace:*
          version: link:../vue
  
-         version: 5.0.2(@types/node@20.10.5)(terser@5.22.0)
 +  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: 0.1.1(@types/node@20.10.5)(terser@5.22.0)(vite@5.0.2)
++        version: 5.0.2(@types/node@20.10.6)(terser@5.22.0)
 +      vite-hyper-config:
 +        specifier: ^0.1.1
-         version: 0.34.6(@types/node@20.10.5)(terser@5.22.0)
++        version: 0.1.1(@types/node@20.10.6)(terser@5.22.0)(vite@5.0.2)
 +      vite-node:
 +        specifier: ^0.34.6
++        version: 0.34.6(@types/node@20.10.6)(terser@5.22.0)
 +      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:
@@@ -486,19 -428,6 +486,10 @@@
        '@jridgewell/trace-mapping': 0.3.20
      dev: true
  
-   /@babel/code-frame@7.22.13:
-     resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==}
-     engines: {node: '>=6.9.0'}
-     requiresBuild: true
-     dependencies:
-       '@babel/highlight': 7.22.20
-       chalk: 2.4.2
-     dev: true
- 
 +  /@antfu/utils@0.7.6:
 +    resolution: {integrity: sha512-pvFiLP2BeOKA/ZOS6jxx4XhKzdVLHDhGlFEaZ2flWWYf2xOqVniqpk38I04DFRyz+L0ASggl7SkItTc+ZLju4w==}
 +    dev: true
 +
    /@babel/code-frame@7.23.5:
      resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==}
      engines: {node: '>=6.9.0'}
@@@ -518,14 -446,14 +509,14 @@@
      engines: {node: '>=6.9.0'}
      dependencies:
        '@ampproject/remapping': 2.2.1
-       '@babel/code-frame': 7.22.13
+       '@babel/code-frame': 7.23.5
 -      '@babel/generator': 7.23.5
 +      '@babel/generator': 7.23.3
        '@babel/helper-compilation-targets': 7.22.15
 -      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5)
 -      '@babel/helpers': 7.23.5
 +      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3)
 +      '@babel/helpers': 7.23.2
        '@babel/parser': 7.23.6
        '@babel/template': 7.22.15
 -      '@babel/traverse': 7.23.5
 +      '@babel/traverse': 7.23.3
        '@babel/types': 7.23.6
        convert-source-map: 2.0.0
        debug: 4.3.4
@@@ -673,12 -591,12 +654,12 @@@
        '@babel/types': 7.23.6
      dev: true
  
 -  /@babel/traverse@7.23.5:
 -    resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==}
 +  /@babel/traverse@7.23.3:
 +    resolution: {integrity: sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==}
      engines: {node: '>=6.9.0'}
      dependencies:
-       '@babel/code-frame': 7.22.13
+       '@babel/code-frame': 7.23.5
 -      '@babel/generator': 7.23.5
 +      '@babel/generator': 7.23.3
        '@babel/helper-environment-visitor': 7.22.20
        '@babel/helper-function-name': 7.23.0
        '@babel/helper-hoist-variables': 7.22.5
@@@ -706,15 -624,15 +687,15 @@@
        node-gyp-build: 4.7.1
      dev: true
  
-   /@codspeed/vitest-plugin@2.3.1(vite@5.0.10)(vitest@1.1.0):
 -  /@codspeed/vitest-plugin@2.3.1(vite@5.0.7)(vitest@1.1.1):
++  /@codspeed/vitest-plugin@2.3.1(vite@5.0.10)(vitest@1.1.1):
      resolution: {integrity: sha512-/e4G2B/onX/hG/EjUU/NpDxnIryeTDamVRTBeWfgQDoex3g7GDzTwoQktaU5l/Asw3ZjEErQg+oQVToQ6jYZlA==}
      peerDependencies:
        vite: ^4.2.0 || ^5.0.0
        vitest: '>=1.0.0-beta.4 || >=1'
      dependencies:
        '@codspeed/core': 2.3.1
-       vite: 5.0.10(@types/node@20.10.5)(terser@5.22.0)
-       vitest: 1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0)
 -      vite: 5.0.7(@types/node@20.10.6)(terser@5.22.0)
++      vite: 5.0.10(@types/node@20.10.6)(terser@5.22.0)
+       vitest: 1.1.1(@types/node@20.10.6)(jsdom@23.0.1)(terser@5.22.0)
      dev: true
  
    /@esbuild/aix-ppc64@0.19.10:
@@@ -1570,18 -1484,7 +1551,18 @@@
        vite: ^4.0.0
        vue: ^3.2.25
      dependencies:
-       vite: 5.0.10(@types/node@20.10.5)(terser@5.22.0)
 -      vite: 5.0.7(@types/node@20.10.6)(terser@5.22.0)
++      vite: 5.0.10(@types/node@20.10.6)(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.10.5)(terser@5.22.0)
++      vite: 5.0.2(@types/node@20.10.6)(terser@5.22.0)
        vue: link:packages/vue
      dev: true
  
@@@ -1647,8 -1550,8 +1628,8 @@@
      engines: {node: '>= 0.12.0'}
      dev: true
  
-   /@vue/repl@3.1.0:
-     resolution: {integrity: sha512-lnR010NTkysg71Z0TVsFCTfiF5ARZbyohqymGpOxOrSuSI4o9RlSvWH6YmJdv9OHm5j69HKLVVUhXlCScMCQrg==}
 -  /@vue/repl@3.1.1:
 -    resolution: {integrity: sha512-9nJImsUeywU2MTqvzf4ueqWC49UC3LVXVPk1HmoNnLVumfWXv+w5ytuSA//fxb/N/O5vCqE0UV63/dYvnCZpwQ==}
++  /@vue/repl@3.2.0:
++    resolution: {integrity: sha512-heKXXwAm4p3wYqVsYqW5i9bAkiGqwbZygfBx8stZ48QqTvaTGiGY3qASJwvhc5FrZDPGoGcFRjab6XDImKxPvA==}
      dev: false
  
    /@zeit/schemas@2.29.0:
@@@ -6041,51 -5790,8 +6022,51 @@@
      engines: {node: '>= 0.8'}
      dev: true
  
-   /vite-hyper-config@0.1.1(@types/node@20.10.5)(terser@5.22.0)(vite@5.0.2):
++  /vite-hyper-config@0.1.1(@types/node@20.10.6)(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.5)(terser@5.22.0)
-       vite-node: 0.34.6(@types/node@20.10.5)(terser@5.22.0)
++      vite: 5.0.2(@types/node@20.10.6)(terser@5.22.0)
++      vite-node: 0.34.6(@types/node@20.10.6)(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.5)(terser@5.22.0):
++  /vite-node@0.34.6(@types/node@20.10.6)(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.10(@types/node@20.10.5)(terser@5.22.0)
++      vite: 5.0.10(@types/node@20.10.6)(terser@5.22.0)
 +    transitivePeerDependencies:
 +      - '@types/node'
 +      - less
 +      - lightningcss
 +      - sass
 +      - stylus
 +      - sugarss
 +      - supports-color
 +      - terser
 +    dev: true
 +
-   /vite-node@1.1.0(@types/node@20.10.5)(terser@5.22.0):
-     resolution: {integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==}
+   /vite-node@1.1.1(@types/node@20.10.6)(terser@5.22.0):
+     resolution: {integrity: sha512-2bGE5w4jvym5v8llF6Gu1oBrmImoNSs4WmRVcavnG2me6+8UQntTqLiAMFyiAobp+ZXhj5ZFhI7SmLiFr/jrow==}
      engines: {node: ^18.0.0 || >=20.0.0}
      hasBin: true
      dependencies:
@@@ -6093,7 -5799,7 +6074,7 @@@
        debug: 4.3.4
        pathe: 1.1.1
        picocolors: 1.0.0
-       vite: 5.0.10(@types/node@20.10.5)(terser@5.22.0)
 -      vite: 5.0.7(@types/node@20.10.6)(terser@5.22.0)
++      vite: 5.0.10(@types/node@20.10.6)(terser@5.22.0)
      transitivePeerDependencies:
        - '@types/node'
        - less
@@@ -6105,69 -5811,8 +6086,69 @@@
        - terser
      dev: true
  
 -  /vite@5.0.7(@types/node@20.10.6)(terser@5.22.0):
 -    resolution: {integrity: sha512-B4T4rJCDPihrQo2B+h1MbeGL/k/GMAHzhQ8S0LjQ142s6/+l3hHTT095ORvsshj4QCkoWu3Xtmob5mazvakaOw==}
 +  /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.10.5)(terser@5.22.0)
++      vite: 5.0.2(@types/node@20.10.6)(terser@5.22.0)
 +    transitivePeerDependencies:
 +      - rollup
 +      - supports-color
 +    dev: true
 +
-   /vite@5.0.10(@types/node@20.10.5)(terser@5.22.0):
++  /vite@5.0.10(@types/node@20.10.6)(terser@5.22.0):
 +    resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==}
 +    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.5
++      '@types/node': 20.10.6
 +      esbuild: 0.19.10
 +      postcss: 8.4.32
 +      rollup: 4.4.1
 +      terser: 5.22.0
 +    optionalDependencies:
 +      fsevents: 2.3.3
 +    dev: true
 +
-   /vite@5.0.2(@types/node@20.10.5)(terser@5.22.0):
++  /vite@5.0.2(@types/node@20.10.6)(terser@5.22.0):
 +    resolution: {integrity: sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g==}
      engines: {node: ^18.0.0 || >=20.0.0}
      hasBin: true
      peerDependencies:
@@@ -6228,13 -5873,13 +6209,13 @@@
        jsdom:
          optional: true
      dependencies:
-       '@types/node': 20.10.5
-       '@vitest/expect': 1.1.0
-       '@vitest/runner': 1.1.0
-       '@vitest/snapshot': 1.1.0
-       '@vitest/spy': 1.1.0
-       '@vitest/utils': 1.1.0
+       '@types/node': 20.10.6
+       '@vitest/expect': 1.1.1
+       '@vitest/runner': 1.1.1
+       '@vitest/snapshot': 1.1.1
+       '@vitest/spy': 1.1.1
+       '@vitest/utils': 1.1.1
 -      acorn-walk: 8.3.0
 +      acorn-walk: 8.3.1
        cac: 6.7.14
        chai: 4.3.10
        debug: 4.3.4
@@@ -6248,8 -5893,8 +6229,8 @@@
        strip-literal: 1.3.0
        tinybench: 2.5.1
        tinypool: 0.8.1
-       vite: 5.0.10(@types/node@20.10.5)(terser@5.22.0)
-       vite-node: 1.1.0(@types/node@20.10.5)(terser@5.22.0)
 -      vite: 5.0.7(@types/node@20.10.6)(terser@5.22.0)
++      vite: 5.0.10(@types/node@20.10.6)(terser@5.22.0)
+       vite-node: 1.1.1(@types/node@20.10.6)(terser@5.22.0)
        why-is-node-running: 2.2.2
      transitivePeerDependencies:
        - less