chore: Merge branch 'main' into minor

diff --cc package.json
index 3bc9d1464a9ddcb71e150b4157fce37c8ba654e6,fa0b4dffdcbd0c327d903513cd04594af3f990a5..9fc97c592e2a27cd437c2a1b9a67ee6cb3b76c69
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -1,7 -1,7 +1,7 @@@
  {
    "private": true,
 -  "version": "3.3.13",
 +  "version": "3.4.0-beta.4",
-   "packageManager": "pnpm@8.12.0",
+   "packageManager": "pnpm@8.12.1",
    "type": "module",
    "scripts": {
      "dev": "node scripts/dev.js",
@@@ -69,18 -69,15 +69,18 @@@
      "@rollup/plugin-replace": "^5.0.4",
      "@rollup/plugin-terser": "^0.4.4",
      "@types/hash-sum": "^1.0.2",
-     "@types/node": "^20.10.4",
 +    "@types/minimist": "^1.2.5",
-     "@typescript-eslint/parser": "^6.13.2",
-     "@vitest/coverage-istanbul": "^1.0.4",
+     "@types/node": "^20.10.5",
 +    "@types/semver": "^7.5.5",
+     "@typescript-eslint/parser": "^6.15.0",
+     "@vitest/coverage-istanbul": "^1.1.0",
      "@vue/consolidate": "0.17.3",
      "conventional-changelog-cli": "^4.1.0",
      "enquirer": "^2.4.1",
      "esbuild": "^0.19.5",
      "esbuild-plugin-polyfill-node": "^0.3.0",
-     "eslint": "^8.55.0",
+     "eslint": "^8.56.0",
 +    "eslint-define-config": "^1.24.1",
      "eslint-plugin-jest": "^27.6.0",
      "estree-walker": "^2.0.2",
      "execa": "^8.0.1",

diff --cc packages/compiler-core/package.json
index b39f6addd256afe301491ea3d9506fa33f7cf7c8,72125ff72952343efb412b4ea985d16d9133a2e5..0149cdd119f068120d16de7e40f81f6b3ef549ed
--- 1/packages/compiler-core/package.json
--- 2/packages/compiler-core/package.json
+++ b/packages/compiler-core/package.json
@@@ -32,9 -32,8 +32,9 @@@
    },
    "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
    "dependencies": {
-     "@babel/parser": "^7.23.5",
+     "@babel/parser": "^7.23.6",
      "@vue/shared": "workspace:*",
 +    "entities": "^4.5.0",
      "estree-walker": "^2.0.2",
      "source-map-js": "^1.0.2"
    },

diff --cc packages/compiler-sfc/package.json
Simple merge

diff --cc packages/compiler-sfc/src/script/resolveType.ts
Simple merge

diff --cc packages/vue-compat/package.json
Simple merge

diff --cc pnpm-lock.yaml
index b432c5bef9976c45480d5053b3092c76b4f918b4,60a01d9826f5b5e26ea1f05e044dbbf36a3ebd34..44c48a0836bd551ee2f4a05d3bfd496b45c6fb38
--- 1/pnpm-lock.yaml
--- 2/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@@ -9,14 -9,14 +9,14 @@@ importers
    .:
      devDependencies:
        '@babel/parser':
-         specifier: ^7.23.5
-         version: 7.23.5
+         specifier: ^7.23.6
+         version: 7.23.6
        '@babel/types':
-         specifier: ^7.23.5
-         version: 7.23.5
+         specifier: ^7.23.6
+         version: 7.23.6
        '@codspeed/vitest-plugin':
          specifier: ^2.3.1
-         version: 2.3.1(vite@5.0.7)(vitest@1.0.4)
 -        version: 2.3.1(vite@5.0.6)(vitest@1.1.0)
++        version: 2.3.1(vite@5.0.7)(vitest@1.1.0)
        '@rollup/plugin-alias':
          specifier: ^5.0.1
          version: 5.0.1(rollup@4.1.4)
@@@ -38,21 -38,15 +38,21 @@@
        '@types/hash-sum':
          specifier: ^1.0.2
          version: 1.0.2
 +      '@types/minimist':
 +        specifier: ^1.2.5
 +        version: 1.2.5
        '@types/node':
-         specifier: ^20.10.4
-         version: 20.10.4
+         specifier: ^20.10.5
+         version: 20.10.5
 +      '@types/semver':
 +        specifier: ^7.5.5
 +        version: 7.5.5
        '@typescript-eslint/parser':
-         specifier: ^6.13.2
-         version: 6.13.2(eslint@8.55.0)(typescript@5.2.2)
+         specifier: ^6.15.0
+         version: 6.15.0(eslint@8.56.0)(typescript@5.2.2)
        '@vitest/coverage-istanbul':
-         specifier: ^1.0.4
-         version: 1.0.4(vitest@1.0.4)
+         specifier: ^1.1.0
+         version: 1.1.0(vitest@1.1.0)
        '@vue/consolidate':
          specifier: 0.17.3
          version: 0.17.3
@@@ -69,14 -63,11 +69,14 @@@
          specifier: ^0.3.0
          version: 0.3.0(esbuild@0.19.5)
        eslint:
-         specifier: ^8.55.0
-         version: 8.55.0
+         specifier: ^8.56.0
+         version: 8.56.0
 +      eslint-define-config:
 +        specifier: ^1.24.1
 +        version: 1.24.1
        eslint-plugin-jest:
          specifier: ^27.6.0
-         version: 27.6.0(eslint@8.55.0)(typescript@5.2.2)
+         version: 27.6.0(eslint@8.56.0)(typescript@5.2.2)
        estree-walker:
          specifier: ^2.0.2
          version: 2.0.2
@@@ -163,10 -154,10 +163,10 @@@
          version: 5.2.2
        vite:
          specifier: ^5.0.5
-         version: 5.0.7(@types/node@20.10.4)(terser@5.22.0)
 -        version: 5.0.6(@types/node@20.10.5)(terser@5.22.0)
++        version: 5.0.7(@types/node@20.10.5)(terser@5.22.0)
        vitest:
-         specifier: ^1.0.4
-         version: 1.0.4(@types/node@20.10.4)(jsdom@23.0.1)(terser@5.22.0)
+         specifier: ^1.1.0
+         version: 1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0)
  
    packages/compiler-core:
      dependencies:
@@@ -355,10 -371,10 +355,10 @@@
      devDependencies:
        '@vitejs/plugin-vue':
          specifier: ^4.4.0
 -        version: 4.4.0(vite@5.0.6)(vue@packages+vue)
 +        version: 4.4.0(vite@5.0.7)(vue@packages+vue)
        vite:
          specifier: ^5.0.5
-         version: 5.0.7(@types/node@20.10.4)(terser@5.22.0)
 -        version: 5.0.6(@types/node@20.10.5)(terser@5.22.0)
++        version: 5.0.7(@types/node@20.10.5)(terser@5.22.0)
  
    packages/shared: {}
  
@@@ -450,14 -457,14 +450,14 @@@ packages
      dependencies:
        '@ampproject/remapping': 2.2.1
        '@babel/code-frame': 7.23.5
 -      '@babel/generator': 7.23.6
 -      '@babel/helper-compilation-targets': 7.23.6
 -      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6)
 -      '@babel/helpers': 7.23.6
 +      '@babel/generator': 7.23.5
 +      '@babel/helper-compilation-targets': 7.22.15
 +      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5)
 +      '@babel/helpers': 7.23.5
-       '@babel/parser': 7.23.5
+       '@babel/parser': 7.23.6
        '@babel/template': 7.22.15
 -      '@babel/traverse': 7.23.6
 +      '@babel/traverse': 7.23.5
-       '@babel/types': 7.23.5
+       '@babel/types': 7.23.6
        convert-source-map: 2.0.0
        debug: 4.3.4
        gensync: 1.0.0-beta.2
@@@ -467,11 -474,11 +467,11 @@@
        - supports-color
      dev: true
  
 -  /@babel/generator@7.23.6:
 -    resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
 +  /@babel/generator@7.23.5:
 +    resolution: {integrity: sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==}
      engines: {node: '>=6.9.0'}
      dependencies:
-       '@babel/types': 7.23.5
+       '@babel/types': 7.23.6
        '@jridgewell/gen-mapping': 0.3.3
        '@jridgewell/trace-mapping': 0.3.20
        jsesc: 2.5.2
@@@ -512,10 -519,10 +512,10 @@@
      resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
      engines: {node: '>=6.9.0'}
      dependencies:
-       '@babel/types': 7.23.5
+       '@babel/types': 7.23.6
      dev: true
  
 -  /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.6):
 +  /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.5):
      resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
      engines: {node: '>=6.9.0'}
      peerDependencies:
@@@ -562,8 -569,8 +562,8 @@@
      engines: {node: '>=6.9.0'}
      dependencies:
        '@babel/template': 7.22.15
 -      '@babel/traverse': 7.23.6
 +      '@babel/traverse': 7.23.5
-       '@babel/types': 7.23.5
+       '@babel/types': 7.23.6
      transitivePeerDependencies:
        - supports-color
      dev: true
@@@ -600,12 -596,12 +600,12 @@@
      engines: {node: '>=6.9.0'}
      dependencies:
        '@babel/code-frame': 7.23.5
-       '@babel/parser': 7.23.5
-       '@babel/types': 7.23.5
+       '@babel/parser': 7.23.6
+       '@babel/types': 7.23.6
      dev: true
  
 -  /@babel/traverse@7.23.6:
 -    resolution: {integrity: sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==}
 +  /@babel/traverse@7.23.5:
 +    resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==}
      engines: {node: '>=6.9.0'}
      dependencies:
        '@babel/code-frame': 7.23.5
@@@ -637,19 -633,28 +637,28 @@@
        node-gyp-build: 4.7.1
      dev: true
  
-   /@codspeed/vitest-plugin@2.3.1(vite@5.0.7)(vitest@1.0.4):
 -  /@codspeed/vitest-plugin@2.3.1(vite@5.0.6)(vitest@1.1.0):
++  /@codspeed/vitest-plugin@2.3.1(vite@5.0.7)(vitest@1.1.0):
      resolution: {integrity: sha512-/e4G2B/onX/hG/EjUU/NpDxnIryeTDamVRTBeWfgQDoex3g7GDzTwoQktaU5l/Asw3ZjEErQg+oQVToQ6jYZlA==}
      peerDependencies:
        vite: ^4.2.0 || ^5.0.0
        vitest: '>=1.0.0-beta.4 || >=1'
      dependencies:
        '@codspeed/core': 2.3.1
-       vite: 5.0.7(@types/node@20.10.4)(terser@5.22.0)
-       vitest: 1.0.4(@types/node@20.10.4)(jsdom@23.0.1)(terser@5.22.0)
 -      vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0)
++      vite: 5.0.7(@types/node@20.10.5)(terser@5.22.0)
+       vitest: 1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0)
+     dev: true
+ 
+   /@esbuild/aix-ppc64@0.19.10:
+     resolution: {integrity: sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==}
+     engines: {node: '>=12'}
+     cpu: [ppc64]
+     os: [aix]
+     requiresBuild: true
      dev: true
+     optional: true
  
-   /@esbuild/android-arm64@0.18.20:
-     resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
+   /@esbuild/android-arm64@0.19.10:
+     resolution: {integrity: sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==}
      engines: {node: '>=12'}
      cpu: [arm64]
      os: [android]
@@@ -1547,12 -1552,8 +1556,12 @@@
      resolution: {integrity: sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==}
      dev: true
  
-   /@types/node@20.10.4:
-     resolution: {integrity: sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==}
 +  /@types/minimist@1.2.5:
 +    resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==}
 +    dev: true
 +
+   /@types/node@20.10.5:
+     resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==}
      dependencies:
        undici-types: 5.26.5
      dev: true
@@@ -1713,7 -1714,7 +1722,7 @@@
        vite: ^4.0.0
        vue: ^3.2.25
      dependencies:
-       vite: 5.0.7(@types/node@20.10.4)(terser@5.22.0)
 -      vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0)
++      vite: 5.0.7(@types/node@20.10.5)(terser@5.22.0)
        vue: link:packages/vue
      dev: true
  
@@@ -2864,12 -2867,7 +2874,12 @@@
        source-map: 0.6.1
      dev: true
  
-   /eslint-plugin-jest@27.6.0(eslint@8.55.0)(typescript@5.2.2):
 +  /eslint-define-config@1.24.1:
 +    resolution: {integrity: sha512-o36vBhPSWyIQlHoMqGhhcGmOOm2A2ccBVIdLTG/AWdm9YmjpsLpf+5ntf9LlHR6dduLREgxtGwvwPwSt7vnXJg==}
 +    engines: {node: '>=18.0.0', npm: '>=9.0.0', pnpm: '>= 8.6.0'}
 +    dev: true
 +
+   /eslint-plugin-jest@27.6.0(eslint@8.56.0)(typescript@5.2.2):
      resolution: {integrity: sha512-MTlusnnDMChbElsszJvrwD1dN3x6nZl//s4JD23BxB6MgR66TZlL064su24xEIS3VACfAoHV1vgyMgPw8nkdng==}
      engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
      peerDependencies:
@@@ -3823,8 -3825,8 +3833,8 @@@
      resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==}
      engines: {node: '>=10'}
      dependencies:
 -      '@babel/core': 7.23.6
 +      '@babel/core': 7.23.5
-       '@babel/parser': 7.23.5
+       '@babel/parser': 7.23.6
        '@istanbuljs/schema': 0.1.3
        istanbul-lib-coverage: 3.2.2
        semver: 7.5.4
@@@ -6002,7 -5999,7 +6012,7 @@@
        debug: 4.3.4
        pathe: 1.1.1
        picocolors: 1.0.0
-       vite: 5.0.7(@types/node@20.10.4)(terser@5.22.0)
 -      vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0)
++      vite: 5.0.7(@types/node@20.10.5)(terser@5.22.0)
      transitivePeerDependencies:
        - '@types/node'
        - less
@@@ -6014,8 -6011,8 +6024,8 @@@
        - terser
      dev: true
  
-   /vite@5.0.7(@types/node@20.10.4)(terser@5.22.0):
 -  /vite@5.0.6(@types/node@20.10.5)(terser@5.22.0):
 -    resolution: {integrity: sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ==}
++  /vite@5.0.7(@types/node@20.10.5)(terser@5.22.0):
 +    resolution: {integrity: sha512-B4T4rJCDPihrQo2B+h1MbeGL/k/GMAHzhQ8S0LjQ142s6/+l3hHTT095ORvsshj4QCkoWu3Xtmob5mazvakaOw==}
      engines: {node: ^18.0.0 || >=20.0.0}
      hasBin: true
      peerDependencies:
@@@ -6096,8 -6093,8 +6106,8 @@@
        strip-literal: 1.3.0
        tinybench: 2.5.1
        tinypool: 0.8.1
-       vite: 5.0.7(@types/node@20.10.4)(terser@5.22.0)
-       vite-node: 1.0.4(@types/node@20.10.4)(terser@5.22.0)
 -      vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0)
++      vite: 5.0.7(@types/node@20.10.5)(terser@5.22.0)
+       vite-node: 1.1.0(@types/node@20.10.5)(terser@5.22.0)
        why-is-node-running: 2.2.2
      transitivePeerDependencies:
        - less

diff --cc scripts/setupVitest.ts
index 41df611a267e6b95889e25be8bc019a28f609703,781e713e4c14ba5f79b91dbbb701e03a6322f32b..c0b0aa92376f258a18db5bb892078804ba2fa294
--- 1/scripts/setupVitest.ts
--- 2/scripts/setupVitest.ts
+++ b/scripts/setupVitest.ts
@@@ -1,7 -1,5 +1,7 @@@
- import { type SpyInstance } from 'vitest'
+ import { type MockInstance } from 'vitest'
  
 +vi.stubGlobal('MathMLElement', class MathMLElement {})
 +
  expect.extend({
    toHaveBeenWarned(received: string) {
      asserted.add(received)