Merge remote-tracking branch 'upstream/main'

vuejs · Nov 23, 2023 · d21fd83 · d21fd83
2 parents cd768d2 + 1c525f7
commit d21fd83
Show file tree

Hide file tree

Showing 21 changed files with 143 additions and 118 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "version": "3.3.8",
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].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"

diff --git 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"
   },

diff --git 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:*"
   }
 }
diff --git 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",

diff --git 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:*"
   }
 }
diff --git 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"
+  }
 }
diff --git 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
+  })
+)
diff --git 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"
+  }
 }
diff --git 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"
   },

diff --git 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:*"
   }
 }
diff --git 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:*"
   }
 }
diff --git 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(

diff --git 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"
   }
 }
diff --git 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:*"
   }
 }
diff --git 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:*"
   }
 }
diff --git 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",

diff --git 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"

diff --git 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:*"
   }
 }
diff --git 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": "*"