chore: merge branch 'minor' of https://github.com/vuejs/core into fea…

…t/onEffectCleanup-and-baseWatch

.eslintrc.cjs

@@ -1,12 +1,11 @@
-/* eslint-disable no-restricted-globals */
-
+const { builtinModules } = require('node:module')
 const DOMGlobals = ['window', 'document']
 const NodeGlobals = ['module', 'require']
 
 const banConstEnum = {
   selector: 'TSEnumDeclaration[const=true]',
   message:
-    'Please use non-const enums. This project automatically inlines enums.'
+    'Please use non-const enums. This project automatically inlines enums.',
 }
 
 /**
@@ -15,9 +14,9 @@ const banConstEnum = {
 module.exports = {
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    sourceType: 'module'
+    sourceType: 'module',
   },
-  plugins: ['jest'],
+  plugins: ['jest', 'import', '@typescript-eslint'],
   rules: {
     'no-debugger': 'error',
     // most of the codebase are expected to be env agnostic
@@ -32,8 +31,27 @@ module.exports = {
       // tsc compiles assignment spread into Object.assign() calls, but esbuild
       // still generates verbose helpers, so spread assignment is also prohiboted
       'ObjectExpression > SpreadElement',
-      'AwaitExpression'
-    ]
+      'AwaitExpression',
+    ],
+    'sort-imports': ['error', { ignoreDeclarationSort: true }],
+
+    'import/no-nodejs-modules': [
+      'error',
+      { allow: builtinModules.map(mod => `node:${mod}`) },
+    ],
+    // This rule enforces the preference for using '@ts-expect-error' comments in TypeScript
+    // code to indicate intentional type errors, improving code clarity and maintainability.
+    '@typescript-eslint/prefer-ts-expect-error': 'error',
+    // Enforce the use of 'import type' for importing types
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      {
+        fixStyle: 'inline-type-imports',
+        disallowTypeAnnotations: false,
+      },
+    ],
+    // Enforce the use of top-level import type qualifier when an import only has specifiers with inline type qualifiers
+    '@typescript-eslint/no-import-type-side-effects': 'error',
   },
   overrides: [
     // tests, no restrictions (runs in Node / jest with jsdom)
@@ -43,54 +61,66 @@ module.exports = {
         'no-restricted-globals': 'off',
         'no-restricted-syntax': 'off',
         'jest/no-disabled-tests': 'error',
-        'jest/no-focused-tests': 'error'
-      }
+        'jest/no-focused-tests': 'error',
+      },
     },
     // shared, may be used in any env
     {
-      files: ['packages/shared/**'],
+      files: ['packages/shared/**', '.eslintrc.cjs'],
       rules: {
-        'no-restricted-globals': 'off'
-      }
+        'no-restricted-globals': 'off',
+      },
     },
     // Packages targeting DOM
     {
       files: ['packages/{vue,vue-compat,runtime-dom}/**'],
       rules: {
-        'no-restricted-globals': ['error', ...NodeGlobals]
-      }
+        'no-restricted-globals': ['error', ...NodeGlobals],
+      },
     },
     // Packages targeting Node
     {
       files: ['packages/{compiler-sfc,compiler-ssr,server-renderer}/**'],
       rules: {
         'no-restricted-globals': ['error', ...DOMGlobals],
-        'no-restricted-syntax': ['error', banConstEnum]
-      }
+        'no-restricted-syntax': ['error', banConstEnum],
+      },
     },
     // Private package, browser only + no syntax restrictions
     {
       files: ['packages/template-explorer/**', 'packages/sfc-playground/**'],
       rules: {
         'no-restricted-globals': ['error', ...NodeGlobals],
-        'no-restricted-syntax': ['error', banConstEnum]
-      }
+        'no-restricted-syntax': ['error', banConstEnum],
+      },
     },
     // JavaScript files
     {
       files: ['*.js', '*.cjs'],
       rules: {
         // We only do `no-unused-vars` checks for js files, TS files are checked by TypeScript itself.
-        'no-unused-vars': ['error', { vars: 'all', args: 'none' }]
-      }
+        'no-unused-vars': ['error', { vars: 'all', args: 'none' }],
+      },
     },
     // Node scripts
     {
-      files: ['scripts/**', '*.{js,ts}', 'packages/**/index.js'],
+      files: [
+        'scripts/**',
+        './*.{js,ts}',
+        'packages/*/*.js',
+        'packages/vue/*/*.js',
+      ],
       rules: {
         'no-restricted-globals': 'off',
-        'no-restricted-syntax': ['error', banConstEnum]
-      }
-    }
-  ]
+        'no-restricted-syntax': ['error', banConstEnum],
+      },
+    },
+    // Import nodejs modules in compiler-sfc
+    {
+      files: ['packages/compiler-sfc/src/**'],
+      rules: {
+        'import/no-nodejs-modules': ['error', { allow: builtinModules }],
+      },
+    },
+  ],
 }

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# update prettier & eslint config (#9162)
+bfe6b459d3a0ce6168611ee1ac7e6e789709df9d

.github/contributing.md

@@ -86,7 +86,7 @@ The project uses [simple-git-hooks](https://github.com/toplenboren/simple-git-ho
 
 - Type check the entire project
 - Automatically format changed files using Prettier
-- Verify commit message format (logic in `scripts/verifyCommit.js`)
+- Verify commit message format (logic in `scripts/verify-commit.js`)
 
 ## Scripts
 

.github/renovate.json5

@@ -7,35 +7,35 @@
   packageRules: [
     {
       depTypeList: ['peerDependencies'],
-      enabled: false
+      enabled: false,
     },
     {
       groupName: 'test',
       matchPackageNames: ['vitest', 'jsdom', 'puppeteer'],
-      matchPackagePrefixes: ['@vitest']
+      matchPackagePrefixes: ['@vitest'],
     },
     {
       groupName: 'playground',
       matchFileNames: [
         'packages/sfc-playground/package.json',
-        'packages/template-explorer/package.json'
-      ]
+        'packages/template-explorer/package.json',
+      ],
     },
     {
       groupName: 'compiler',
       matchPackageNames: ['magic-string'],
-      matchPackagePrefixes: ['@babel', 'postcss']
+      matchPackagePrefixes: ['@babel', 'postcss'],
     },
     {
       groupName: 'build',
       matchPackageNames: ['vite', 'terser'],
-      matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs']
+      matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs'],
     },
     {
       groupName: 'lint',
       matchPackageNames: ['simple-git-hooks', 'lint-staged'],
-      matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier']
-    }
+      matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier'],
+    },
   ],
   ignoreDeps: [
     'vue',
@@ -45,6 +45,6 @@
     'typescript',
 
     // ESM only
-    'estree-walker'
-  ]
+    'estree-walker',
+  ],
 }

.github/workflows/autofix.yml

@@ -30,4 +30,4 @@ jobs:
       - name: Run prettier
         run: pnpm run format
 
-      - uses: autofix-ci/action@bee19d72e71787c12ca0f29de72f2833e437e4c9
+      - uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84

.github/workflows/ci.yml

@@ -85,6 +85,9 @@ jobs:
       - name: Run e2e tests
         run: pnpm run test-e2e
 
+      - name: verify treeshaking
+        run: node scripts/verify-treeshaking.js
+
   lint-and-test-dts:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

.prettierignore

@@ -1 +1,4 @@
 dist
+*.md
+*.html
+pnpm-lock.yaml

.prettierrc

@@ -1,5 +1,5 @@
-semi: false
-singleQuote: true
-printWidth: 80
-trailingComma: 'none'
-arrowParens: 'avoid'
+{
+  "semi": false,
+  "singleQuote": true,
+  "arrowParens": "avoid"
+}

.vscode/launch.json

@@ -21,7 +21,7 @@
       "console": "integratedTerminal",
       "sourceMaps": true,
       "windows": {
-        "program": "${workspaceFolder}/node_modules/jest/bin/jest",
+        "program": "${workspaceFolder}/node_modules/jest/bin/jest"
       }
     }
   ]

CHANGELOG.md

@@ -1,3 +1,19 @@
+# [3.4.0-rc.2](https://github.com/vuejs/core/compare/v3.4.0-rc.1...v3.4.0-rc.2) (2023-12-26)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @vue/repl to ^3.1.0 ([#9911](https://github.com/vuejs/core/issues/9911)) ([f96c413](https://github.com/vuejs/core/commit/f96c413e8ef2f24cacda5bb499492922f62c6e8b))
+* **types:** fix distribution of union types when unwrapping setup bindings ([#9909](https://github.com/vuejs/core/issues/9909)) ([0695c69](https://github.com/vuejs/core/commit/0695c69e0dfaf99882a623fe75b433c9618ea648)), closes [#9903](https://github.com/vuejs/core/issues/9903)
+* **warning:** ensure prod hydration warnings actually work ([b4ebe7a](https://github.com/vuejs/core/commit/b4ebe7ae8b904f28cdda33caf87bc05718d3a08a))
+
+
+### Features
+
+* **compiler-sfc:** export aggregated error messages for compiler-core and compiler-dom ([25c726e](https://github.com/vuejs/core/commit/25c726eca81fc384b41fafbeba5e8dfcda1f030f))
+
+
+
 # [3.4.0-rc.1](https://github.com/vuejs/core/compare/v3.4.0-beta.4...v3.4.0-rc.1) (2023-12-25)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.4.0-rc.1",
+  "version": "3.4.0-rc.2",
   "packageManager": "[email protected]",
   "type": "module",
   "scripts": {
@@ -13,9 +13,9 @@
     "size-esm-runtime": "node scripts/build.js vue -f esm-bundler-runtime",
     "size-esm": "node scripts/build.js runtime-dom runtime-core reactivity shared -f esm-bundler",
     "check": "tsc --incremental --noEmit",
-    "lint": "eslint --cache --ext .ts packages/*/{src,__tests__}/**.ts",
-    "format": "prettier --write --cache \"**/*.[tj]s?(x)\"",
-    "format-check": "prettier --check --cache \"**/*.[tj]s?(x)\"",
+    "lint": "eslint --cache --ext .js,.ts,.tsx .",
+    "format": "prettier --write --cache .",
+    "format-check": "prettier --check --cache .",
     "test": "vitest",
     "test-unit": "vitest -c vitest.unit.config.ts",
     "test-e2e": "node scripts/build.js vue -f global -d && vitest -c vitest.e2e.config.ts",
@@ -44,14 +44,14 @@
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged && pnpm check",
-    "commit-msg": "node scripts/verifyCommit.js"
+    "commit-msg": "node scripts/verify-commit.js"
   },
   "lint-staged": {
     "*.{js,json}": [
       "prettier --write"
     ],
     "*.ts?(x)": [
-      "eslint",
+      "eslint --fix",
       "prettier --parser=typescript --write"
     ]
   },
@@ -72,6 +72,7 @@
     "@types/minimist": "^1.2.5",
     "@types/node": "^20.10.5",
     "@types/semver": "^7.5.5",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.15.0",
     "@vitest/coverage-istanbul": "^1.1.0",
     "@vue/consolidate": "0.17.3",
@@ -81,6 +82,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "eslint": "^8.56.0",
     "eslint-define-config": "^1.24.1",
+    "eslint-plugin-import": "npm:eslint-plugin-i@^2.29.1",
     "eslint-plugin-jest": "^27.6.0",
     "estree-walker": "^2.0.2",
     "execa": "^8.0.1",