Merge branch 'minor' into bwsy/feat/compilerSearchElm

Author: baiwusanyu-c

.github/workflows/canary-minor.yml

@@ -0,0 +1,33 @@
+name: canary minor release
+on:
+  # Runs every Monday at 1 AM UTC (9:00 AM in Singapore)
+  schedule:
+    - cron: 0 1 * * MON
+  workflow_dispatch:
+
+jobs:
+  canary:
+    # prevents this action from running on forks
+    if: github.repository == 'vuejs/core'
+    runs-on: ubuntu-latest
+    environment: Release
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: minor
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+
+      - name: Set node version to 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'pnpm'
+
+      - run: pnpm install
+
+      - run: pnpm release --canary --tag minor
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -1,12 +1,13 @@
 {
   "private": true,
   "version": "3.3.4",
-  "packageManager": "pnpm@8.6.2",
+  "packageManager": "pnpm@8.7.6",
   "type": "module",
   "scripts": {
     "dev": "node scripts/dev.js",
     "build": "node scripts/build.js",
     "build-dts": "tsc -p tsconfig.build.json && rollup -c rollup.dts.config.js",
+    "clean": "rimraf packages/*/dist temp .eslintcache",
     "size": "run-s \"size-*\" && tsx scripts/usage-size.ts",
     "size-global": "node scripts/build.js vue runtime-dom -f global -p --size",
     "size-esm-runtime": "node scripts/build.js vue -f esm-bundler-runtime",
@@ -56,53 +57,54 @@
     "node": ">=16.14.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.21.3",
-    "@babel/types": "^7.21.3",
-    "@rollup/plugin-alias": "^4.0.3",
-    "@rollup/plugin-commonjs": "^24.0.1",
+    "@babel/parser": "^7.22.16",
+    "@babel/types": "^7.22.19",
+    "@rollup/plugin-alias": "^5.0.0",
+    "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "^15.2.1",
     "@rollup/plugin-replace": "^5.0.2",
-    "@rollup/plugin-terser": "^0.4.0",
+    "@rollup/plugin-terser": "^0.4.3",
     "@types/hash-sum": "^1.0.0",
-    "@types/node": "^16.4.7",
-    "@typescript-eslint/parser": "^6.6.0",
-    "@vitest/coverage-istanbul": "^0.34.3",
+    "@types/node": "^18.18.5",
+    "@typescript-eslint/parser": "^6.7.2",
+    "@vitest/coverage-istanbul": "^0.34.4",
     "@vue/consolidate": "0.17.3",
     "chalk": "^4.1.0",
-    "conventional-changelog-cli": "^2.0.31",
-    "enquirer": "^2.3.2",
-    "esbuild": "^0.17.4",
-    "esbuild-plugin-polyfill-node": "^0.2.0",
-    "eslint": "^8.48.0",
-    "eslint-plugin-jest": "^27.2.3",
+    "conventional-changelog-cli": "^4.1.0",
+    "enquirer": "^2.4.1",
+    "esbuild": "^0.19.3",
+    "esbuild-plugin-polyfill-node": "^0.3.0",
+    "eslint": "^8.49.0",
+    "eslint-plugin-jest": "^27.4.0",
     "estree-walker": "^2.0.2",
-    "execa": "^4.0.2",
+    "execa": "^8.0.1",
     "jsdom": "^22.1.0",
     "lint-staged": "^14.0.1",
-    "lodash": "^4.17.15",
-    "magic-string": "^0.30.0",
+    "lodash": "^4.17.21",
+    "magic-string": "^0.30.3",
     "markdown-table": "^3.0.3",
-    "marked": "^4.0.10",
-    "minimist": "^1.2.0",
+    "marked": "^9.1.1",
+    "minimist": "^1.2.8",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.3",
     "pretty-bytes": "^6.1.1",
-    "pug": "^3.0.1",
-    "puppeteer": "~21.1.1",
-    "rollup": "^3.26.0",
-    "rollup-plugin-dts": "^5.3.0",
-    "rollup-plugin-esbuild": "^5.0.0",
+    "pug": "^3.0.2",
+    "puppeteer": "~21.2.1",
+    "rimraf": "^5.0.1",
+    "rollup": "^3.29.2",
+    "rollup-plugin-dts": "^6.0.2",
+    "rollup-plugin-esbuild": "^6.0.0",
     "rollup-plugin-polyfill-node": "^0.12.0",
-    "semver": "^7.3.2",
+    "semver": "^7.5.4",
     "serve": "^14.2.1",
     "simple-git-hooks": "^2.9.0",
-    "terser": "^5.19.2",
-    "todomvc-app-css": "^2.3.0",
-    "tslib": "^2.5.0",
-    "tsx": "^3.12.7",
+    "terser": "^5.19.4",
+    "todomvc-app-css": "^2.4.2",
+    "tslib": "^2.6.2",
+    "tsx": "^3.12.10",
     "typescript": "^5.1.6",
     "vite": "^4.3.0",
-    "vitest": "^0.34.3"
+    "vitest": "^0.34.4"
   }
 }

packages/compiler-core/package.json

@@ -32,12 +32,12 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
   "dependencies": {
-    "@babel/parser": "^7.21.3",
+    "@babel/parser": "^7.22.16",
     "@vue/shared": "3.3.4",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.21.3"
+    "@babel/types": "^7.22.19"
   }
 }

packages/compiler-core/src/index.ts

@@ -24,6 +24,7 @@ export {
 export { generate, type CodegenContext, type CodegenResult } from './codegen'
 export {
   ErrorCodes,
+  errorMessages,
   createCompilerError,
   type CoreCompilerError,
   type CompilerError

packages/compiler-dom/src/index.ts

@@ -68,5 +68,9 @@ export function parse(template: string, options: ParserOptions = {}): RootNode {
 
 export * from './runtimeHelpers'
 export { transformStyle } from './transforms/transformStyle'
-export { createDOMCompilerError, DOMErrorCodes } from './errors'
+export {
+  createDOMCompilerError,
+  DOMErrorCodes,
+  DOMErrorMessages
+} from './errors'
 export * from '@vue/compiler-core'

packages/compiler-sfc/package.json

@@ -32,29 +32,29 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
   "dependencies": {
-    "@babel/parser": "^7.20.15",
+    "@babel/parser": "^7.22.16",
     "@vue/compiler-core": "3.3.4",
     "@vue/compiler-dom": "3.3.4",
     "@vue/compiler-ssr": "3.3.4",
     "@vue/reactivity-transform": "3.3.4",
     "@vue/shared": "3.3.4",
     "estree-walker": "^2.0.2",
-    "magic-string": "^0.30.0",
-    "postcss": "^8.1.10",
+    "magic-string": "^0.30.3",
+    "postcss": "^8.4.30",
     "source-map-js": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.21.3",
-    "@types/estree": "^0.0.48",
-    "@types/lru-cache": "^5.1.0",
+    "@babel/types": "^7.22.19",
+    "@types/estree": "^0.0.52",
+    "@types/lru-cache": "^5.1.1",
     "@vue/consolidate": "^0.17.3",
     "hash-sum": "^2.0.0",
     "lru-cache": "^5.1.1",
     "merge-source-map": "^1.1.0",
-    "minimatch": "^9.0.0",
-    "postcss-modules": "^4.0.0",
-    "postcss-selector-parser": "^6.0.4",
-    "pug": "^3.0.1",
-    "sass": "^1.26.9"
+    "minimatch": "^9.0.3",
+    "postcss-modules": "^4.3.1",
+    "postcss-selector-parser": "^6.0.13",
+    "pug": "^3.0.2",
+    "sass": "^1.67.0"
   }
 }

packages/compiler-sfc/src/index.ts

@@ -33,6 +33,8 @@ export {
 
 // Internals for type resolution
 export { invalidateTypeCache, registerTS } from './script/resolveType'
+export { extractRuntimeProps } from './script/defineProps'
+export { extractRuntimeEmits } from './script/defineEmits'
 
 // Types
 export type {
@@ -58,6 +60,7 @@ export type { SFCScriptCompileOptions } from './compileScript'
 export type { ScriptCompileContext } from './script/context'
 export type {
   TypeResolveContext,
+  SimpleTypeResolveOptions,
   SimpleTypeResolveContext
 } from './script/resolveType'
 export type {

packages/compiler-sfc/src/rewriteDefault.ts

@@ -37,7 +37,7 @@ export function rewriteDefaultAST(
   // multi-line comments or template strings. fallback to a full parse.
   ast.forEach(node => {
     if (node.type === 'ExportDefaultDeclaration') {
-      if (node.declaration.type === 'ClassDeclaration') {
+      if (node.declaration.type === 'ClassDeclaration' && node.declaration.id) {
         let start: number =
           node.declaration.decorators && node.declaration.decorators.length > 0
             ? node.declaration.decorators[

packages/compiler-sfc/src/script/defineEmits.ts

@@ -1,7 +1,18 @@
-import { Identifier, LVal, Node, RestElement } from '@babel/types'
+import {
+  ArrayPattern,
+  Identifier,
+  LVal,
+  Node,
+  ObjectPattern,
+  RestElement
+} from '@babel/types'
 import { isCallOf } from './utils'
 import { ScriptCompileContext } from './context'
-import { resolveTypeElements, resolveUnionType } from './resolveType'
+import {
+  TypeResolveContext,
+  resolveTypeElements,
+  resolveUnionType
+} from './resolveType'
 
 export const DEFINE_EMITS = 'defineEmits'
 
@@ -57,7 +68,7 @@ export function genRuntimeEmits(ctx: ScriptCompileContext): string | undefined {
   return emitsDecl
 }
 
-function extractRuntimeEmits(ctx: ScriptCompileContext): Set<string> {
+export function extractRuntimeEmits(ctx: TypeResolveContext): Set<string> {
   const emits = new Set<string>()
   const node = ctx.emitsTypeDecl!
 
@@ -90,8 +101,8 @@ function extractRuntimeEmits(ctx: ScriptCompileContext): Set<string> {
 }
 
 function extractEventNames(
-  ctx: ScriptCompileContext,
-  eventName: Identifier | RestElement,
+  ctx: TypeResolveContext,
+  eventName: ArrayPattern | Identifier | ObjectPattern | RestElement,
   emits: Set<string>
 ) {
   if (

packages/compiler-sfc/src/script/defineProps.ts

@@ -8,7 +8,11 @@ import {
 } from '@babel/types'
 import { BindingTypes, isFunctionType } from '@vue/compiler-dom'
 import { ScriptCompileContext } from './context'
-import { inferRuntimeType, resolveTypeElements } from './resolveType'
+import {
+  TypeResolveContext,
+  inferRuntimeType,
+  resolveTypeElements
+} from './resolveType'
 import {
   resolveObjectKey,
   UNKNOWN_TYPE,
@@ -150,7 +154,7 @@ export function genRuntimeProps(ctx: ScriptCompileContext): string | undefined {
       }
     }
   } else if (ctx.propsTypeDecl) {
-    propsDecls = genRuntimePropsFromTypes(ctx)
+    propsDecls = extractRuntimeProps(ctx)
   }
 
   const modelsDecls = genModelProps(ctx)
@@ -162,7 +166,9 @@ export function genRuntimeProps(ctx: ScriptCompileContext): string | undefined {
   }
 }
 
-function genRuntimePropsFromTypes(ctx: ScriptCompileContext) {
+export function extractRuntimeProps(
+  ctx: TypeResolveContext
+): string | undefined {
   // this is only called if propsTypeDecl exists
   const props = resolveRuntimePropsFromType(ctx, ctx.propsTypeDecl!)
   if (!props.length) {
@@ -175,7 +181,7 @@ function genRuntimePropsFromTypes(ctx: ScriptCompileContext) {
   for (const prop of props) {
     propStrings.push(genRuntimePropFromType(ctx, prop, hasStaticDefaults))
     // register bindings
-    if (!(prop.key in ctx.bindingMetadata)) {
+    if ('bindingMetadata' in ctx && !(prop.key in ctx.bindingMetadata)) {
       ctx.bindingMetadata[prop.key] = BindingTypes.PROPS
     }
   }
@@ -193,7 +199,7 @@ function genRuntimePropsFromTypes(ctx: ScriptCompileContext) {
 }
 
 function resolveRuntimePropsFromType(
-  ctx: ScriptCompileContext,
+  ctx: TypeResolveContext,
   node: Node
 ): PropTypeData[] {
   const props: PropTypeData[] = []
@@ -222,7 +228,7 @@ function resolveRuntimePropsFromType(
 }
 
 function genRuntimePropFromType(
-  ctx: ScriptCompileContext,
+  ctx: TypeResolveContext,
   { key, required, type, skipCheck }: PropTypeData,
   hasStaticDefaults: boolean
 ): string {
@@ -284,7 +290,7 @@ function genRuntimePropFromType(
  * static properties, we can directly generate more optimized default
  * declarations. Otherwise we will have to fallback to runtime merging.
  */
-function hasStaticWithDefaults(ctx: ScriptCompileContext) {
+function hasStaticWithDefaults(ctx: TypeResolveContext) {
   return !!(
     ctx.propsRuntimeDefaults &&
     ctx.propsRuntimeDefaults.type === 'ObjectExpression' &&
@@ -297,7 +303,7 @@ function hasStaticWithDefaults(ctx: ScriptCompileContext) {
 }
 
 function genDestructuredDefaultValue(
-  ctx: ScriptCompileContext,
+  ctx: TypeResolveContext,
   key: string,
   inferredType?: string[]
 ):