]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
Merge remote-tracking branch 'upstream/minor'
author三咲智子 Kevin Deng <sxzz@sxzz.moe>
Sun, 31 Dec 2023 10:51:34 +0000 (18:51 +0800)
committer三咲智子 Kevin Deng <sxzz@sxzz.moe>
Sun, 31 Dec 2023 10:51:34 +0000 (18:51 +0800)
12 files changed:
1  2 
packages/compiler-core/package.json
packages/compiler-dom/package.json
packages/compiler-sfc/package.json
packages/compiler-ssr/package.json
packages/reactivity/package.json
packages/runtime-core/package.json
packages/runtime-dom/package.json
packages/server-renderer/package.json
packages/shared/package.json
packages/vue-compat/package.json
packages/vue/package.json
pnpm-lock.yaml

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pnpm-lock.yaml
index 9acf0841f6e6aab2f7d5144d733944f93335d0e4,e9cc8202a0bf110305c4bb3e6530775fac589e92..cd4bc93cb6f459be27232b0f761d4f76093de4e9
@@@ -16,25 -16,25 +16,25 @@@ importers
          version: 7.23.6
        '@codspeed/vitest-plugin':
          specifier: ^2.3.1
 -        version: 2.3.1(vite@5.0.7)(vitest@1.1.0)
 +        version: 2.3.1(vite@5.0.10)(vitest@1.1.0)
        '@rollup/plugin-alias':
          specifier: ^5.0.1
-         version: 5.0.1(rollup@4.1.4)
+         version: 5.0.1(rollup@4.4.1)
        '@rollup/plugin-commonjs':
          specifier: ^25.0.7
-         version: 25.0.7(rollup@4.1.4)
+         version: 25.0.7(rollup@4.4.1)
        '@rollup/plugin-json':
          specifier: ^6.0.1
-         version: 6.0.1(rollup@4.1.4)
+         version: 6.0.1(rollup@4.4.1)
        '@rollup/plugin-node-resolve':
          specifier: ^15.2.3
-         version: 15.2.3(rollup@4.1.4)
+         version: 15.2.3(rollup@4.4.1)
        '@rollup/plugin-replace':
          specifier: ^5.0.4
-         version: 5.0.4(rollup@4.1.4)
+         version: 5.0.4(rollup@4.4.1)
        '@rollup/plugin-terser':
          specifier: ^0.4.4
-         version: 0.4.4(rollup@4.1.4)
+         version: 0.4.4(rollup@4.4.1)
        '@types/hash-sum':
          specifier: ^1.0.2
          version: 1.0.2
          specifier: workspace:*
          version: link:../vue
  
-         version: 0.7.42(rollup@4.1.4)(vite@5.0.2)
 +  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.5)(terser@5.22.0)
 +      vite-hyper-config:
 +        specifier: ^0.1.1
 +        version: 0.1.1(@types/node@20.10.5)(terser@5.22.0)(vite@5.0.2)
 +      vite-node:
 +        specifier: ^0.34.6
 +        version: 0.34.6(@types/node@20.10.5)(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:
        '@jridgewell/trace-mapping': 0.3.20
      dev: true
  
 +  /@antfu/utils@0.7.6:
 +    resolution: {integrity: sha512-pvFiLP2BeOKA/ZOS6jxx4XhKzdVLHDhGlFEaZ2flWWYf2xOqVniqpk38I04DFRyz+L0ASggl7SkItTc+ZLju4w==}
 +    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
 +
+   /@babel/code-frame@7.23.5:
+     resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==}
+     engines: {node: '>=6.9.0'}
++    requiresBuild: true
+     dependencies:
+       '@babel/highlight': 7.23.4
+       chalk: 2.4.2
+     dev: true
    /@babel/compat-data@7.23.2:
      resolution: {integrity: sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==}
      engines: {node: '>=6.9.0'}
        - supports-color
      dev: true
  
 +  /@babel/highlight@7.22.20:
 +    resolution: {integrity: sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==}
 +    engines: {node: '>=6.9.0'}
 +    requiresBuild: true
 +    dependencies:
 +      '@babel/helper-validator-identifier': 7.22.20
 +      chalk: 2.4.2
 +      js-tokens: 4.0.0
 +    dev: true
 +
+   /@babel/highlight@7.23.4:
+     resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
+     engines: {node: '>=6.9.0'}
+     requiresBuild: true
+     dependencies:
+       '@babel/helper-validator-identifier': 7.22.20
+       chalk: 2.4.2
+       js-tokens: 4.0.0
+     dev: true
    /@babel/parser@7.23.6:
      resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==}
      engines: {node: '>=6.0.0'}
      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:
+       hasown: 2.0.0
+     dev: true
    /is-date-object@1.0.5:
      resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
      engines: {node: '>= 0.4'}
        - terser
      dev: true
  
-   /vite-plugin-inspect@0.7.42(rollup@4.1.4)(vite@5.0.2):
 -  /vite@5.0.7(@types/node@20.10.5)(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.1.4)
++      '@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)
 +    transitivePeerDependencies:
 +      - rollup
 +      - supports-color
 +    dev: true
 +
 +  /vite@5.0.10(@types/node@20.10.5)(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
-       esbuild: 0.19.5
++      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):
 +    resolution: {integrity: sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g==}
      engines: {node: ^18.0.0 || >=20.0.0}
      hasBin: true
      peerDependencies: