Merge remote-tracking branch 'upstream/main'

2023-11-23 23:44:07 +08:00 · 2023-11-23 23:44:07 +08:00 · d21fd83a6d
parent cd768d262f 1c525f75a3
commit d21fd83a6d
21 changed files with 143 additions and 118 deletions
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "private": true,
  "version": "3.3.8",
-  "packageManager": "pnpm@8.10.3",
+  "packageManager": "pnpm@8.10.5",
  "type": "module",
  "scripts": {
    "dev": "node scripts/dev.js",
@ -66,7 +66,7 @@
    "@rollup/plugin-replace": "^5.0.4",
    "@rollup/plugin-terser": "^0.4.4",
    "@types/hash-sum": "^1.0.2",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.9.2",
    "@typescript-eslint/parser": "^6.11.0",
    "@vitest/coverage-istanbul": "^0.34.6",
    "@vue/consolidate": "0.17.3",
@ -102,7 +102,7 @@
    "terser": "^5.22.0",
    "todomvc-app-css": "^2.4.3",
    "tslib": "^2.6.2",
-    "tsx": "^4.1.3",
+    "tsx": "^4.1.4",
    "typescript": "^5.2.2",
    "vite": "^5.0.0",
    "vitest": "^0.34.6"
--- a/packages/compiler-core/package.json
+++ b/packages/compiler-core/package.json
@ -33,7 +33,7 @@
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-core#readme",
  "dependencies": {
    "@babel/parser": "^7.23.3",
-    "@vue/shared": "3.3.8",
+    "@vue/shared": "workspace:*",
    "estree-walker": "^2.0.2",
    "source-map-js": "^1.0.2"
  },
--- a/packages/compiler-dom/package.json
+++ b/packages/compiler-dom/package.json
@ -37,7 +37,7 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-dom#readme",
  "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-core": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-core": "workspace:*"
  }
 }
--- a/packages/compiler-sfc/package.json
+++ b/packages/compiler-sfc/package.json
@ -33,11 +33,11 @@
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-sfc#readme",
  "dependencies": {
    "@babel/parser": "^7.23.3",
-    "@vue/compiler-core": "3.3.8",
-    "@vue/compiler-dom": "3.3.8",
-    "@vue/compiler-ssr": "3.3.8",
-    "@vue/reactivity-transform": "3.3.8",
-    "@vue/shared": "3.3.8",
+    "@vue/compiler-core": "workspace:*",
+    "@vue/compiler-dom": "workspace:*",
+    "@vue/compiler-ssr": "workspace:*",
+    "@vue/reactivity-transform": "workspace:*",
+    "@vue/shared": "workspace:*",
    "estree-walker": "^2.0.2",
    "magic-string": "^0.30.5",
    "postcss": "^8.4.31",
@ -47,7 +47,7 @@
    "@babel/types": "^7.23.3",
    "@vue/consolidate": "^0.17.3",
    "hash-sum": "^2.0.0",
-    "lru-cache": "^10.0.2",
+    "lru-cache": "^10.0.3",
    "merge-source-map": "^1.1.0",
    "minimatch": "^9.0.3",
    "postcss-modules": "^4.3.1",
--- a/packages/compiler-ssr/package.json
+++ b/packages/compiler-ssr/package.json
@ -28,7 +28,7 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-ssr#readme",
  "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-dom": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-dom": "workspace:*"
  }
 }
--- a/packages/dts-built-test/package.json
+++ b/packages/dts-built-test/package.json
@ -1,11 +1,11 @@
 {
  "name": "@vue/dts-built-test",
  "private": true,
+  "version": "0.0.0",
  "types": "dist/dts-built-test.d.ts",
  "dependencies": {
    "@vue/shared": "workspace:*",
    "@vue/reactivity": "workspace:*",
    "vue": "workspace:*"
-  },
-  "version": "3.3.8"
+  }
 }
--- a/packages/dts-test/appUse.test-d.ts
+++ b/packages/dts-test/appUse.test-d.ts
@ -1,4 +1,4 @@
-import { createApp, App, Plugin } from 'vue'
+import { createApp, App, Plugin, defineComponent } from 'vue'

 const app = createApp({})

@ -93,3 +93,15 @@ const PluginTyped: Plugin<PluginOptions> = (app, options) => {}
 // @ts-expect-error: needs options
 app.use(PluginTyped)
 app.use(PluginTyped, { option2: 2, option3: true })
+
+// vuetify usage
+const key: string = ''
+const aliases: Record<string, any> = {}
+app.component(
+  key,
+  defineComponent({
+    ...aliases[key],
+    name: key,
+    aliasName: aliases[key].name
+  })
+)
--- a/packages/dts-test/package.json
+++ b/packages/dts-test/package.json
@ -1,9 +1,9 @@
 {
  "name": "dts-test",
  "private": true,
+  "version": "0.0.0",
  "dependencies": {
    "vue": "workspace:*",
    "@vue/dts-built-test": "workspace:*"
-  },
-  "version": "3.3.8"
+  }
 }
--- a/packages/reactivity-transform/package.json
+++ b/packages/reactivity-transform/package.json
@ -29,8 +29,8 @@
  "homepage": "https://github.com/vuejs/core-vapor/tree/dev/packages/reactivity-transform#readme",
  "dependencies": {
    "@babel/parser": "^7.23.3",
-    "@vue/compiler-core": "3.3.8",
-    "@vue/shared": "3.3.8",
+    "@vue/compiler-core": "workspace:*",
+    "@vue/shared": "workspace:*",
    "estree-walker": "^2.0.2",
    "magic-string": "^0.30.5"
  },
--- a/packages/reactivity/package.json
+++ b/packages/reactivity/package.json
@ -36,6 +36,6 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/reactivity#readme",
  "dependencies": {
-    "@vue/shared": "3.3.8"
+    "@vue/shared": "workspace:*"
  }
 }
--- a/packages/runtime-core/package.json
+++ b/packages/runtime-core/package.json
@ -32,7 +32,7 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/runtime-core#readme",
  "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/reactivity": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/reactivity": "workspace:*"
  }
 }
--- a/packages/runtime-core/src/apiCreateApp.ts
+++ b/packages/runtime-core/src/apiCreateApp.ts
@ -27,6 +27,7 @@ import { version } from '.'
 import { installAppCompatProperties } from './compat/global'
 import { NormalizedPropsOptions } from './componentProps'
 import { ObjectEmitsOptions } from './componentEmits'
+import { DefineComponent } from './apiDefineComponent'

 export interface App<HostElement = any> {
  version: string
@ -40,7 +41,7 @@ export interface App<HostElement = any> {

  mixin(mixin: ComponentOptions): this
  component(name: string): Component | undefined
-  component(name: string, component: Component): this
+  component(name: string, component: Component | DefineComponent): this
  directive(name: string): Directive | undefined
  directive(name: string, directive: Directive): this
  mount(
--- a/packages/runtime-dom/package.json
+++ b/packages/runtime-dom/package.json
@ -35,8 +35,8 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/runtime-dom#readme",
  "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/runtime-core": "3.3.8",
+    "@vue/shared": "workspace:*",
+    "@vue/runtime-core": "workspace:*",
    "csstype": "^3.1.2"
  }
 }
--- a/packages/runtime-test/package.json
+++ b/packages/runtime-test/package.json
@ -1,8 +1,8 @@
 {
  "name": "@vue/runtime-test",
-  "version": "3.3.8",
-  "description": "@vue/runtime-test",
  "private": true,
+  "version": "0.0.0",
+  "description": "@vue/runtime-test",
  "main": "index.js",
  "module": "dist/runtime-test.esm-bundler.js",
  "types": "dist/runtime-test.d.ts",
@ -25,7 +25,7 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/runtime-test#readme",
  "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/runtime-core": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/runtime-core": "workspace:*"
  }
 }
--- a/packages/server-renderer/package.json
+++ b/packages/server-renderer/package.json
@ -32,10 +32,10 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/server-renderer#readme",
  "peerDependencies": {
-    "vue": "3.3.8"
+    "vue": "workspace:*"
  },
  "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-ssr": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-ssr": "workspace:*"
  }
 }
--- a/packages/sfc-playground/package.json
+++ b/packages/sfc-playground/package.json
@ -1,8 +1,8 @@
 {
  "name": "@vue/sfc-playground",
-  "version": "3.3.8",
-  "type": "module",
  "private": true,
+  "version": "0.0.0",
+  "type": "module",
  "scripts": {
    "dev": "vite",
    "build": "vite build",
--- a/packages/template-explorer/package.json
+++ b/packages/template-explorer/package.json
@ -1,7 +1,7 @@
 {
  "name": "@vue/template-explorer",
-  "version": "3.3.8",
  "private": true,
+  "version": "0.0.0",
  "buildOptions": {
    "formats": [
      "global"
--- a/packages/vue-compat/package.json
+++ b/packages/vue-compat/package.json
@ -43,6 +43,6 @@
    "source-map-js": "^1.0.2"
  },
  "peerDependencies": {
-    "vue": "3.3.8"
+    "vue": "workspace:*"
  }
 }
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@ -116,13 +116,13 @@
  },
  "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/vue#readme",
  "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-dom": "3.3.8",
-    "@vue/runtime-dom": "3.3.8",
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-dom": "workspace:*",
+    "@vue/runtime-dom": "workspace:*",
    "@vue/runtime-vapor": "workspace:*",
    "@vue/compiler-vapor": "workspace:*",
-    "@vue/compiler-sfc": "3.3.8",
-    "@vue/server-renderer": "3.3.8"
+    "@vue/compiler-sfc": "workspace:*",
+    "@vue/server-renderer": "workspace:*"
  },
  "peerDependencies": {
    "typescript": "*"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -36,8 +36,8 @@ importers:
        specifier: ^1.0.2
        version: 1.0.2
      '@types/node':
-        specifier: ^20.9.0
-        version: 20.9.0
+        specifier: ^20.9.2
+        version: 20.9.4
      '@typescript-eslint/parser':
        specifier: ^6.11.0
        version: 6.11.0(eslint@8.54.0)(typescript@5.2.2)
@ -144,14 +144,14 @@ importers:
        specifier: ^2.6.2
        version: 2.6.2
      tsx:
-        specifier: ^4.1.3
-        version: 4.1.3
+        specifier: ^4.1.4
+        version: 4.4.0
      typescript:
        specifier: ^5.2.2
        version: 5.2.2
      vite:
        specifier: ^5.0.0
-        version: 5.0.0(@types/node@20.9.0)(terser@5.22.0)
+        version: 5.0.0(@types/node@20.9.4)(terser@5.22.0)
      vitest:
        specifier: ^0.34.6
        version: 0.34.6(jsdom@22.1.0)(terser@5.22.0)
@ -162,7 +162,7 @@ importers:
        specifier: ^7.23.3
        version: 7.23.3
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared
      estree-walker:
        specifier: ^2.0.2
@ -178,10 +178,10 @@ importers:
  packages/compiler-dom:
    dependencies:
      '@vue/compiler-core':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-core
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared

  packages/compiler-sfc:
@ -190,19 +190,19 @@ importers:
        specifier: ^7.23.3
        version: 7.23.3
      '@vue/compiler-core':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-core
      '@vue/compiler-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-dom
      '@vue/compiler-ssr':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-ssr
      '@vue/reactivity-transform':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../reactivity-transform
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared
      estree-walker:
        specifier: ^2.0.2
@ -227,8 +227,8 @@ importers:
        specifier: ^2.0.0
        version: 2.0.0
      lru-cache:
-        specifier: ^10.0.2
-        version: 10.0.2
+        specifier: ^10.0.3
+        version: 10.1.0
      merge-source-map:
        specifier: ^1.1.0
        version: 1.1.0
@ -251,10 +251,10 @@ importers:
  packages/compiler-ssr:
    dependencies:
      '@vue/compiler-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-dom
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared

  packages/compiler-vapor:
@ -297,7 +297,7 @@ importers:
  packages/reactivity:
    dependencies:
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared

  packages/reactivity-transform:
@ -306,10 +306,10 @@ importers:
        specifier: ^7.23.3
        version: 7.23.3
      '@vue/compiler-core':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-core
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared
      estree-walker:
        specifier: ^2.0.2
@ -328,19 +328,19 @@ importers:
  packages/runtime-core:
    dependencies:
      '@vue/reactivity':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../reactivity
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared

  packages/runtime-dom:
    dependencies:
      '@vue/runtime-core':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../runtime-core
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared
      csstype:
        specifier: ^3.1.2
@ -349,10 +349,10 @@ importers:
  packages/runtime-test:
    dependencies:
      '@vue/runtime-core':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../runtime-core
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared

  packages/runtime-vapor: {}
@ -360,13 +360,13 @@ importers:
  packages/server-renderer:
    dependencies:
      '@vue/compiler-ssr':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-ssr
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared
      vue:
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../vue

  packages/sfc-playground:
@ -389,7 +389,7 @@ importers:
        version: 4.4.0(vite@5.0.0)(vue@packages+vue)
      vite:
        specifier: ^5.0.0
-        version: 5.0.0(@types/node@20.9.0)(terser@5.22.0)
+        version: 5.0.0(@types/node@20.9.4)(terser@5.22.0)

  packages/shared: {}

@ -408,25 +408,25 @@ importers:
  packages/vue:
    dependencies:
      '@vue/compiler-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-dom
      '@vue/compiler-sfc':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../compiler-sfc
      '@vue/compiler-vapor':
        specifier: workspace:*
        version: link:../compiler-vapor
      '@vue/runtime-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../runtime-dom
      '@vue/runtime-vapor':
        specifier: workspace:*
        version: link:../runtime-vapor
      '@vue/server-renderer':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../server-renderer
      '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../shared
      typescript:
        specifier: '*'
@ -444,7 +444,7 @@ importers:
        specifier: ^1.0.2
        version: 1.0.2
      vue:
-        specifier: 3.3.8
+        specifier: workspace:*
        version: link:../vue

  playground:
@ -458,7 +458,7 @@ importers:
        version: link:../../../vite-plugin-vue/packages/plugin-vue
      vite:
        specifier: ^5.0.2
-        version: 5.0.2(@types/node@20.9.0)(terser@5.22.0)
+        version: 5.0.2(@types/node@20.9.4)(terser@5.22.0)
      vite-plugin-inspect:
        specifier: ^0.7.42
        version: 0.7.42(rollup@4.1.4)(vite@5.0.2)
@ -1576,8 +1576,8 @@ packages:
    resolution: {integrity: sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==}
    dev: true

-  /@types/node@20.9.0:
-    resolution: {integrity: sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==}
+  /@types/node@20.9.4:
+    resolution: {integrity: sha512-wmyg8HUhcn6ACjsn8oKYjkN/zUzQeNtMy44weTJSM6p4MMzEOuKbA3OjJ267uPCOW7Xex9dyrNTful8XTQYoDA==}
    dependencies:
      undici-types: 5.26.5
    dev: true
@ -1598,7 +1598,7 @@ packages:
    resolution: {integrity: sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==}
    requiresBuild: true
    dependencies:
-      '@types/node': 20.9.0
+      '@types/node': 20.9.4
    dev: true
    optional: true

@ -1738,7 +1738,7 @@ packages:
      vite: ^4.0.0
      vue: ^3.2.25
    dependencies:
-      vite: 5.0.0(@types/node@20.9.0)(terser@5.22.0)
+      vite: 5.0.0(@types/node@20.9.4)(terser@5.22.0)
      vue: link:packages/vue
    dev: true

@ -3573,7 +3573,7 @@ packages:
    resolution: {integrity: sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==}
    engines: {node: ^16.14.0 || >=18.0.0}
    dependencies:
-      lru-cache: 10.0.2
+      lru-cache: 10.1.0
    dev: true

  /html-encoding-sniffer@3.0.0:
@ -4283,11 +4283,9 @@ packages:
      get-func-name: 2.0.2
    dev: true

-  /lru-cache@10.0.2:
-    resolution: {integrity: sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==}
+  /lru-cache@10.1.0:
+    resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==}
    engines: {node: 14 || >=16.14}
-    dependencies:
-      semver: 7.5.4
    dev: true

  /lru-cache@5.1.1:
@ -4774,7 +4772,7 @@ packages:
    resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
    engines: {node: '>=16 || 14 >=14.17'}
    dependencies:
-      lru-cache: 10.0.2
+      lru-cache: 10.1.0
      minipass: 7.0.4
    dev: true

@ -5967,14 +5965,13 @@ packages:
      typescript: 5.2.2
    dev: true

-  /tsx@4.1.3:
-    resolution: {integrity: sha512-DLiTy1eri4nhqgVVy+15YKC6Ij2BMFxGdDMkVrSDkNuISUJLv7n0NgZpFLpdM+qmwXar34XllgYi4cxkNMbDwQ==}
+  /tsx@4.4.0:
+    resolution: {integrity: sha512-4fwcEjRUxW20ciSaMB8zkpGwCPxuRGnadDuj/pBk5S9uT29zvWz15PK36GrKJo45mSJomDxVejZ73c6lr3811Q==}
    engines: {node: '>=18.0.0'}
    hasBin: true
    dependencies:
      esbuild: 0.18.20
      get-tsconfig: 4.7.2
-      source-map-support: 0.5.21
    optionalDependencies:
      fsevents: 2.3.3
    dev: true
@ -6161,7 +6158,7 @@ packages:
    engines: {node: '>= 0.8'}
    dev: true

-  /vite-node@0.34.6(@types/node@20.9.0)(terser@5.22.0):
+  /vite-node@0.34.6(@types/node@20.9.4)(terser@5.22.0):
    resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
    engines: {node: '>=v14.18.0'}
    hasBin: true
@ -6171,7 +6168,7 @@ packages:
      mlly: 1.4.2
      pathe: 1.1.1
      picocolors: 1.0.0
-      vite: 5.0.2(@types/node@20.9.0)(terser@5.22.0)
+      vite: 5.0.2(@types/node@20.9.4)(terser@5.22.0)
    transitivePeerDependencies:
      - '@types/node'
      - less
@ -6201,13 +6198,13 @@ packages:
      open: 9.1.0
      picocolors: 1.0.0
      sirv: 2.0.3
-      vite: 5.0.2(@types/node@20.9.0)(terser@5.22.0)
+      vite: 5.0.2(@types/node@20.9.4)(terser@5.22.0)
    transitivePeerDependencies:
      - rollup
      - supports-color
    dev: true

-  /vite@5.0.0(@types/node@20.9.0)(terser@5.22.0):
+  /vite@5.0.0(@types/node@20.9.4)(terser@5.22.0):
    resolution: {integrity: sha512-ESJVM59mdyGpsiNAeHQOR/0fqNoOyWPYesFto8FFZugfmhdHx8Fzd8sF3Q/xkVhZsyOxHfdM7ieiVAorI9RjFw==}
    engines: {node: ^18.0.0 || >=20.0.0}
    hasBin: true
@ -6235,7 +6232,7 @@ packages:
      terser:
        optional: true
    dependencies:
-      '@types/node': 20.9.0
+      '@types/node': 20.9.4
      esbuild: 0.19.5
      postcss: 8.4.31
      rollup: 4.4.1
@ -6244,7 +6241,7 @@ packages:
      fsevents: 2.3.3
    dev: true

-  /vite@5.0.2(@types/node@20.9.0)(terser@5.22.0):
+  /vite@5.0.2(@types/node@20.9.4)(terser@5.22.0):
    resolution: {integrity: sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g==}
    engines: {node: ^18.0.0 || >=20.0.0}
    hasBin: true
@ -6272,7 +6269,7 @@ packages:
      terser:
        optional: true
    dependencies:
-      '@types/node': 20.9.0
+      '@types/node': 20.9.4
      esbuild: 0.19.5
      postcss: 8.4.31
      rollup: 4.4.1
@ -6314,7 +6311,7 @@ packages:
    dependencies:
      '@types/chai': 4.3.9
      '@types/chai-subset': 1.3.4
-      '@types/node': 20.9.0
+      '@types/node': 20.9.4
      '@vitest/expect': 0.34.6
      '@vitest/runner': 0.34.6
      '@vitest/snapshot': 0.34.6
@ -6334,8 +6331,8 @@ packages:
      strip-literal: 1.3.0
      tinybench: 2.5.1
      tinypool: 0.7.0
-      vite: 5.0.0(@types/node@20.9.0)(terser@5.22.0)
-      vite-node: 0.34.6(@types/node@20.9.0)(terser@5.22.0)
+      vite: 5.0.0(@types/node@20.9.4)(terser@5.22.0)
+      vite-node: 0.34.6(@types/node@20.9.4)(terser@5.22.0)
      why-is-node-running: 2.2.2
    transitivePeerDependencies:
      - less
--- a/scripts/release.js
+++ b/scripts/release.js
@ -33,7 +33,15 @@ const skipGit = args.skipGit || args.canary

 const packages = fs
  .readdirSync(path.resolve(__dirname, '../packages'))
-  .filter(p => !p.endsWith('.ts') && !p.startsWith('.'))
+  .filter(p => {
+    const pkgRoot = path.resolve(__dirname, '../packages', p)
+    if (fs.statSync(pkgRoot).isDirectory()) {
+      const pkg = JSON.parse(
+        fs.readFileSync(path.resolve(pkgRoot, 'package.json'), 'utf-8')
+      )
+      return !pkg.private
+    }
+  })

 const isCorePackage = pkgName => {
  if (!pkgName) return
@ -325,10 +333,22 @@ async function isInSyncWithRemote() {
      `https://api.github.com/repos/vuejs/core/commits/${branch}?per_page=1`
    )
    const data = await res.json()
-    return data.sha === sha
+    if (data.sha === sha) {
+      return true
+    } else {
+      // @ts-ignore
+      const { yes } = await prompt({
+        type: 'confirm',
+        name: 'yes',
+        message: pico.red(
+          `Local HEAD is not up-to-date with remote. Are you sure you want to continue?`
+        )
+      })
+      return yes
+    }
  } catch (e) {
    console.error(
-      'Failed to check whether local HEAD is up-to-date with remote.'
+      pico.red('Failed to check whether local HEAD is up-to-date with remote.')
    )
    return false
  }
@ -348,8 +368,10 @@ function updatePackage(pkgRoot, version, getNewPackageName) {
  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
  pkg.name = getNewPackageName(pkg.name)
  pkg.version = version
-  updateDeps(pkg, 'dependencies', version, getNewPackageName)
-  updateDeps(pkg, 'peerDependencies', version, getNewPackageName)
+  if (isCanary) {
+    updateDeps(pkg, 'dependencies', version, getNewPackageName)
+    updateDeps(pkg, 'peerDependencies', version, getNewPackageName)
+  }
  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
 }

@ -357,9 +379,6 @@ function updateDeps(pkg, depType, version, getNewPackageName) {
  const deps = pkg[depType]
  if (!deps) return
  Object.keys(deps).forEach(dep => {
-    if (deps[dep] === 'workspace:*') {
-      return
-    }
    if (isCorePackage(dep)) {
      const newName = getNewPackageName(dep)
      const newVersion = newName === dep ? version : `npm:${newName}@${version}`
@ -375,12 +394,6 @@ async function publishPackage(pkgName, version) {
  if (skippedPackages.includes(pkgName)) {
    return
  }
-  const pkgRoot = getPkgRoot(pkgName)
-  const pkgPath = path.resolve(pkgRoot, 'package.json')
-  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
-  if (pkg.private) {
-    return
-  }

  let releaseTag = null
  if (args.tag) {
@ -395,6 +408,8 @@ async function publishPackage(pkgName, version) {

  step(`Publishing ${pkgName}...`)
  try {
+    // Don't change the package manager here as we rely on pnpm to handle
+    // workspace:* deps
    await run(
      'pnpm',
      [
@ -406,7 +421,7 @@ async function publishPackage(pkgName, version) {
        ...(skipGit ? ['--no-git-checks'] : [])
      ],
      {
-        cwd: pkgRoot,
+        cwd: getPkgRoot(pkgName),
        stdio: 'pipe'
      }
    )