From 00e0766934cf8c9d145845b53514e532c84e32c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=B6=E8=BF=9C=E6=96=B9?= <yangpanteng@gmail.com>
Date: Sat, 10 Jun 2023 17:08:02 +0800
Subject: [PATCH 01/16] refactor(shared): merge if statements (#8394)

---
 packages/shared/src/normalizeProp.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/shared/src/normalizeProp.ts b/packages/shared/src/normalizeProp.ts
index 6a1dd20e3..10d54c6b5 100644
--- a/packages/shared/src/normalizeProp.ts
+++ b/packages/shared/src/normalizeProp.ts
@@ -19,9 +19,7 @@ export function normalizeStyle(
       }
     }
     return res
-  } else if (isString(value)) {
-    return value
-  } else if (isObject(value)) {
+  } else if (isString(value) || isObject(value)) {
     return value
   }
 }

From e78c223b30fb0ca8241661df77630cb178ea4382 Mon Sep 17 00:00:00 2001
From: zqran <215244947@qq.com>
Date: Sat, 10 Jun 2023 17:09:44 +0800
Subject: [PATCH 02/16] chore: fix typo (#8392)

---
 packages/dts-test/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dts-test/README.md b/packages/dts-test/README.md
index 2ac0b80ab..197005a56 100644
--- a/packages/dts-test/README.md
+++ b/packages/dts-test/README.md
@@ -4,4 +4,4 @@ Tests Typescript types to ensure the types remain as expected.
 
 - This directory is included in the root `tsconfig.json`, where package imports are aliased to `src` directories, so in IDEs and the `pnpm check` script the types are validated against source code.
 
-- When running `tsc` with `packages/dts-test/tsconfig.test.json`, packages are resolved using using normal `node` resolution, so the types are validated against actual **built** types. This requires the types to be built first via `pnpm build-types`.
+- When running `tsc` with `packages/dts-test/tsconfig.test.json`, packages are resolved using normal `node` resolution, so the types are validated against actual **built** types. This requires the types to be built first via `pnpm build-types`.

From 23c81691d9f722763ee0d74d4c0aa480ca973fbe Mon Sep 17 00:00:00 2001
From: Vadim <vadimgerasimenko101@gmail.com>
Date: Sat, 10 Jun 2023 12:10:20 +0300
Subject: [PATCH 03/16] chore: fix typo (#7416)

---
 packages/compiler-sfc/src/compileScript.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 6f096ff3e..2c15b7f49 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -274,7 +274,7 @@ export function compileScript(
   const scriptAst = ctx.scriptAst
   const scriptSetupAst = ctx.scriptSetupAst!
 
-  // 1.1 walk import delcarations of <script>
+  // 1.1 walk import declarations of <script>
   if (scriptAst) {
     for (const node of scriptAst.body) {
       if (node.type === 'ImportDeclaration') {

From 975397319599777a197486908ab4d3ca0bfee544 Mon Sep 17 00:00:00 2001
From: saveHK <125777259+rescueHk@users.noreply.github.com>
Date: Sat, 10 Jun 2023 17:11:35 +0800
Subject: [PATCH 04/16] chore: fix typo (#7753)

---
 scripts/const-enum.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/const-enum.js b/scripts/const-enum.js
index 8feb5f9f7..a12ac2cec 100644
--- a/scripts/const-enum.js
+++ b/scripts/const-enum.js
@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * We use rollup-plugin-esbuild for faster builds, but esbuild in insolation
+ * We use rollup-plugin-esbuild for faster builds, but esbuild in isolation
  * mode compiles const enums into runtime enums, bloating bundle size.
  *
  * Here we pre-process all the const enums in the project and turn them into

From 1941a25a421e23af4924f4809a016801c3dd2b12 Mon Sep 17 00:00:00 2001
From: Domantas Bazys <58552481+DomantasBazys@users.noreply.github.com>
Date: Sat, 10 Jun 2023 12:11:57 +0300
Subject: [PATCH 05/16] chore: fix typo (#7692)

---
 .github/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/contributing.md b/.github/contributing.md
index c535aa7f4..0f37e3f8e 100644
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -261,7 +261,7 @@ import { h } from '@vue/runtime-core'
 This is made possible via several configurations:
 
 - For TypeScript, `compilerOptions.paths` in `tsconfig.json`
-- Vitest and Rollup share the sae set of aliases from `scripts/aliases.js`
+- Vitest and Rollup share the same set of aliases from `scripts/aliases.js`
 - For plain Node.js, they are linked using [PNPM Workspaces](https://pnpm.io/workspaces).
 
 ### Package Dependencies

From fd1a3f95990d7c372fa1c0c40c55caca761a33a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Sat, 10 Jun 2023 11:17:21 +0200
Subject: [PATCH 06/16] fix(compiler-sfc): typo in experimental feature
 warnings (#8513)

---
 packages/compiler-sfc/src/script/defineModel.ts            | 2 +-
 packages/compiler-sfc/src/script/definePropsDestructure.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-sfc/src/script/defineModel.ts b/packages/compiler-sfc/src/script/defineModel.ts
index 2e7800aba..987e67fc1 100644
--- a/packages/compiler-sfc/src/script/defineModel.ts
+++ b/packages/compiler-sfc/src/script/defineModel.ts
@@ -30,7 +30,7 @@ export function processDefineModel(
 
   warnOnce(
     `This project is using defineModel(), which is an experimental ` +
-      ` feature. It may receive breaking changes or be removed in the future, so ` +
+      `feature. It may receive breaking changes or be removed in the future, so ` +
       `use at your own risk.\n` +
       `To stay updated, follow the RFC at https://github.com/vuejs/rfcs/discussions/503.`
   )
diff --git a/packages/compiler-sfc/src/script/definePropsDestructure.ts b/packages/compiler-sfc/src/script/definePropsDestructure.ts
index 158491385..a81b4a5c5 100644
--- a/packages/compiler-sfc/src/script/definePropsDestructure.ts
+++ b/packages/compiler-sfc/src/script/definePropsDestructure.ts
@@ -34,7 +34,7 @@ export function processPropsDestructure(
 
   warnOnce(
     `This project is using reactive props destructure, which is an experimental ` +
-      ` feature. It may receive breaking changes or be removed in the future, so ` +
+      `feature. It may receive breaking changes or be removed in the future, so ` +
       `use at your own risk.\n` +
       `To stay updated, follow the RFC at https://github.com/vuejs/rfcs/discussions/502.`
   )

From 6277cb994acecf56f5f0745f5e2dac9785a34957 Mon Sep 17 00:00:00 2001
From: Lioness100 <jchickmm2@gmail.com>
Date: Sat, 10 Jun 2023 05:17:41 -0400
Subject: [PATCH 07/16] chore: fix typo (#7693)

---
 packages/runtime-core/__tests__/apiWatch.spec.ts      | 4 ++--
 packages/runtime-core/src/component.ts                | 2 +-
 packages/runtime-dom/__tests__/customElement.spec.ts  | 2 +-
 packages/server-renderer/__tests__/ssrScopeId.spec.ts | 2 +-
 packages/shared/src/general.ts                        | 2 +-
 rollup.dts.config.js                                  | 2 +-
 scripts/const-enum.js                                 | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/runtime-core/__tests__/apiWatch.spec.ts b/packages/runtime-core/__tests__/apiWatch.spec.ts
index 21aae3410..f24ce80b9 100644
--- a/packages/runtime-core/__tests__/apiWatch.spec.ts
+++ b/packages/runtime-core/__tests__/apiWatch.spec.ts
@@ -1000,7 +1000,7 @@ describe('api: watch', () => {
       },
       mounted() {
         // this call runs while Comp is currentInstance, but
-        // the effect for this `$watch` should nontheless be registered with Child
+        // the effect for this `$watch` should nonetheless be registered with Child
         this.comp!.$watch(
           () => this.show,
           () => void 0
@@ -1171,7 +1171,7 @@ describe('api: watch', () => {
     expect(instance!.scope.effects.length).toBe(1)
   })
 
-  test('watchEffect should keep running if created in a detatched scope', async () => {
+  test('watchEffect should keep running if created in a detached scope', async () => {
     const trigger = ref(0)
     let countWE = 0
     let countW = 0
diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index e68a8560b..57a53a39b 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -256,7 +256,7 @@ export interface ComponentInternalInstance {
    */
   ssrRender?: Function | null
   /**
-   * Object containing values this component provides for its descendents
+   * Object containing values this component provides for its descendants
    * @internal
    */
   provides: Data
diff --git a/packages/runtime-dom/__tests__/customElement.spec.ts b/packages/runtime-dom/__tests__/customElement.spec.ts
index da3d1a3a5..6ccf02c4f 100644
--- a/packages/runtime-dom/__tests__/customElement.spec.ts
+++ b/packages/runtime-dom/__tests__/customElement.spec.ts
@@ -322,7 +322,7 @@ describe('defineCustomElement', () => {
               emit('my-click', 1)
             },
             onMousedown: () => {
-              emit('myEvent', 1) // validate hypenization
+              emit('myEvent', 1) // validate hyphenation
             }
           })
       }
diff --git a/packages/server-renderer/__tests__/ssrScopeId.spec.ts b/packages/server-renderer/__tests__/ssrScopeId.spec.ts
index 3091153e1..2637fd784 100644
--- a/packages/server-renderer/__tests__/ssrScopeId.spec.ts
+++ b/packages/server-renderer/__tests__/ssrScopeId.spec.ts
@@ -156,7 +156,7 @@ describe('ssr: scopedId runtime behavior', () => {
   })
 
   // #3513
-  test('scopeId inheritance across ssr-compiled andn on-ssr compiled parent chain', async () => {
+  test('scopeId inheritance across ssr-compiled and on-ssr compiled parent chain', async () => {
     const Child = {
       ssrRender: (ctx: any, push: any, parent: any, attrs: any) => {
         push(`<div${ssrRenderAttrs(attrs)}></div>`)
diff --git a/packages/shared/src/general.ts b/packages/shared/src/general.ts
index 6efaf5252..b36ec89c6 100644
--- a/packages/shared/src/general.ts
+++ b/packages/shared/src/general.ts
@@ -149,7 +149,7 @@ export const looseToNumber = (val: any): any => {
 }
 
 /**
- * Only conerces number-like strings
+ * Only concerns number-like strings
  * "123-foo" will be returned as-is
  */
 export const toNumber = (val: any): any => {
diff --git a/rollup.dts.config.js b/rollup.dts.config.js
index 961e8ee2a..f2d33d0e8 100644
--- a/rollup.dts.config.js
+++ b/rollup.dts.config.js
@@ -46,7 +46,7 @@ export default targetPackages.map(pkg => {
  *    and remove them from the big export {} declaration
  *    otherwise it gets weird in vitepress `defineComponent` call with
  *    "the inferred type cannot be named without a reference"
- * 3. Append custom agumentations (jsx, macros)
+ * 3. Append custom augmentations (jsx, macros)
  * @returns {import('rollup').Plugin}
  */
 function patchTypes(pkg) {
diff --git a/scripts/const-enum.js b/scripts/const-enum.js
index a12ac2cec..0e262285f 100644
--- a/scripts/const-enum.js
+++ b/scripts/const-enum.js
@@ -189,7 +189,7 @@ export function constEnum() {
   )
 
   // 3. during transform:
-  //    3.1 files w/ const enum declaration: remove delcaration
+  //    3.1 files w/ const enum declaration: remove declaration
   //    3.2 files using const enum: inject into esbuild define
   /**
    * @type {import('rollup').Plugin}

From 0e63cbfaf57979e2c6fcfa986281c7521d82d893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=B6=E8=BF=9C=E6=96=B9?= <yangpanteng@gmail.com>
Date: Sat, 10 Jun 2023 22:43:56 +0800
Subject: [PATCH 08/16] chore: remove unused imports (#8283)

---
 scripts/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.js b/scripts/build.js
index 689d3dc93..75a619046 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -17,7 +17,7 @@ nr build core --formats cjs
 */
 
 import fs from 'node:fs/promises'
-import { existsSync, readFileSync, rmSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import path from 'node:path'
 import minimist from 'minimist'
 import { gzipSync, brotliCompressSync } from 'node:zlib'

From 7cdd13bd1eaf72c0ea07ae667b868e8ce72c50a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Sun, 11 Jun 2023 11:29:10 +0800
Subject: [PATCH 09/16] chore: fix typo

---
 packages/runtime-core/src/apiCreateApp.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiCreateApp.ts b/packages/runtime-core/src/apiCreateApp.ts
index ec45611dd..c5ac9d68a 100644
--- a/packages/runtime-core/src/apiCreateApp.ts
+++ b/packages/runtime-core/src/apiCreateApp.ts
@@ -221,7 +221,7 @@ export function createAppAPI<HostElement>(
         set() {
           warn(
             `app.config.unwrapInjectedRef has been deprecated. ` +
-              `3.3 now alawys unwraps injected refs in Options API.`
+              `3.3 now always unwraps injected refs in Options API.`
           )
         }
       })

From 1f83020a2baad1588c964b6dabc819a22bb43b94 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Tue, 13 Jun 2023 05:16:48 +0800
Subject: [PATCH 10/16] chore: fix contributors link (#7654)

---
 .github/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/contributing.md b/.github/contributing.md
index 0f37e3f8e..43f3c532b 100644
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -330,4 +330,4 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
 
 Thank you to all the people who have already contributed to Vue.js!
 
-<a href="https://github.com/vuejs/vue/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>
+<a href="https://github.com/vuejs/core/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>

From 96c76facb7de37fc241ccd55e121fd60a49a1452 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Jun 2023 12:12:22 +0800
Subject: [PATCH 11/16] fix(transition): handle possible auto value for
 transition/animation durations

close #8409
---
 packages/runtime-dom/src/components/Transition.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/runtime-dom/src/components/Transition.ts b/packages/runtime-dom/src/components/Transition.ts
index 0cbf924b0..eebfdccca 100644
--- a/packages/runtime-dom/src/components/Transition.ts
+++ b/packages/runtime-dom/src/components/Transition.ts
@@ -445,6 +445,8 @@ function getTimeout(delays: string[], durations: string[]): number {
 // If comma is not replaced with a dot, the input will be rounded down
 // (i.e. acting as a floor function) causing unexpected behaviors
 function toMs(s: string): number {
+  // #8409 default value for CSS durations can be 'auto'
+  if (s === 'auto') return 0
   return Number(s.slice(0, -1).replace(',', '.')) * 1000
 }
 

From 63dfe8eab499979bcc2f7829e82464e13899c895 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 14 Jun 2023 14:02:53 +0800
Subject: [PATCH 12/16] fix: add isGloballyWhitelisted back, but deprecated
 (#8556)

Fixes the regression described at https://github.com/vuejs/core/issues/8416#issuecomment-1566583260
---
 packages/shared/src/globalsAllowList.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/shared/src/globalsAllowList.ts b/packages/shared/src/globalsAllowList.ts
index c303be11d..4af518c22 100644
--- a/packages/shared/src/globalsAllowList.ts
+++ b/packages/shared/src/globalsAllowList.ts
@@ -6,3 +6,6 @@ const GLOBALS_ALLOWED =
   'Object,Boolean,String,RegExp,Map,Set,JSON,Intl,BigInt,console'
 
 export const isGloballyAllowed = /*#__PURE__*/ makeMap(GLOBALS_ALLOWED)
+
+/** @deprecated use `isGloballyAllowed` instead */
+export const isGloballyWhitelisted = isGloballyAllowed

From 60cd23c7520f9098bf31fc2d0c09d58ded75f173 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Jun 2023 19:04:06 +0800
Subject: [PATCH 13/16] chore: bump repl

---
 packages/sfc-playground/package.json |  2 +-
 pnpm-lock.yaml                       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/sfc-playground/package.json b/packages/sfc-playground/package.json
index 1cf02f79c..38916073a 100644
--- a/packages/sfc-playground/package.json
+++ b/packages/sfc-playground/package.json
@@ -12,7 +12,7 @@
     "vite": "^4.3.0"
   },
   "dependencies": {
-    "@vue/repl": "^1.4.1",
+    "@vue/repl": "^1.5.0",
     "file-saver": "^2.0.5",
     "jszip": "^3.6.0",
     "vue": "workspace:*"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 67268789a..37e9bd7fe 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,8 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
 
 importers:
 
@@ -329,8 +333,8 @@ importers:
   packages/sfc-playground:
     dependencies:
       '@vue/repl':
-        specifier: ^1.4.1
-        version: 1.4.1(vue@packages+vue)
+        specifier: ^1.5.0
+        version: 1.5.0(vue@packages+vue)
       file-saver:
         specifier: ^2.0.5
         version: 2.0.5
@@ -1296,8 +1300,8 @@ packages:
     engines: {node: '>= 0.12.0'}
     dev: true
 
-  /@vue/repl@1.4.1(vue@packages+vue):
-    resolution: {integrity: sha512-7ONz/o1OtS611jW6SdAOZXn4HdN8gfyatcOzcEu+3bDMvgbyr7ZUcbRV6Y4xdkxDARKDBzs+sb3/oz1Na5hAeQ==}
+  /@vue/repl@1.5.0(vue@packages+vue):
+    resolution: {integrity: sha512-qFqKtvA2FM9viYXzbWrpGrL8mDGswsqDsEjfaibr/YOqeza7i49VmO0AKPrOdQDOS2qmq9uV+G6OPX1rGhUSIQ==}
     peerDependencies:
       vue: ^3.2.13
     dependencies:

From 365184c93e0362eaf8e6eb31c86ffd87a31432a4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Jun 2023 15:44:47 +0800
Subject: [PATCH 14/16] chore: fix ci

---
 package.json   | 2 +-
 pnpm-lock.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e848fc831..9ad6b011c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "version": "3.3.4",
-  "packageManager": "pnpm@8.4.0",
+  "packageManager": "pnpm@8.6.2",
   "type": "module",
   "scripts": {
     "dev": "node scripts/dev.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 37e9bd7fe..ea58fdc70 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '6.1'
+lockfileVersion: '6.0'
 
 settings:
   autoInstallPeers: true

From 6f45f76df2c43796b35067ef8f8b9a7bca454040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Thu, 15 Jun 2023 16:35:41 +0800
Subject: [PATCH 15/16] fix(compiler-sfc): don't registerTS when bundling for
 browsers (#8582)

---
 packages/vue/compiler-sfc/index.browser.js  |  1 +
 packages/vue/compiler-sfc/index.browser.mjs |  1 +
 packages/vue/package.json                   | 10 ++++++++++
 pnpm-lock.yaml                              |  4 +++-
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 packages/vue/compiler-sfc/index.browser.js
 create mode 100644 packages/vue/compiler-sfc/index.browser.mjs

diff --git a/packages/vue/compiler-sfc/index.browser.js b/packages/vue/compiler-sfc/index.browser.js
new file mode 100644
index 000000000..774f9da27
--- /dev/null
+++ b/packages/vue/compiler-sfc/index.browser.js
@@ -0,0 +1 @@
+module.exports = require('@vue/compiler-sfc')
diff --git a/packages/vue/compiler-sfc/index.browser.mjs b/packages/vue/compiler-sfc/index.browser.mjs
new file mode 100644
index 000000000..3c30abc8c
--- /dev/null
+++ b/packages/vue/compiler-sfc/index.browser.mjs
@@ -0,0 +1 @@
+export * from '@vue/compiler-sfc'
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 0f41b3f62..7627b60ca 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -44,10 +44,12 @@
     "./compiler-sfc": {
       "import": {
         "types": "./compiler-sfc/index.d.mts",
+        "browser": "./compiler-sfc/index.browser.mjs",
         "default": "./compiler-sfc/index.mjs"
       },
       "require": {
         "types": "./compiler-sfc/index.d.ts",
+        "browser": "./compiler-sfc/index.browser.js",
         "default": "./compiler-sfc/index.js"
       }
     },
@@ -99,5 +101,13 @@
     "@vue/runtime-dom": "3.3.4",
     "@vue/compiler-sfc": "3.3.4",
     "@vue/server-renderer": "3.3.4"
+  },
+  "peerDependencies": {
+    "typescript": "*"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea58fdc70..ea36e5476 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -386,6 +386,9 @@ importers:
       '@vue/shared':
         specifier: 3.3.4
         version: link:../shared
+      typescript:
+        specifier: '*'
+        version: 5.0.2
 
   packages/vue-compat:
     dependencies:
@@ -5410,7 +5413,6 @@ packages:
     resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==}
     engines: {node: '>=12.20'}
     hasBin: true
-    dev: true
 
   /ufo@1.1.1:
     resolution: {integrity: sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==}

From d2c3d8b70b2df6e16f053a7ac58e6b04e7b2078f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Jun 2023 16:38:44 +0800
Subject: [PATCH 16/16] perf(compiler-sfc): lazy require typescript

---
 .../compileScript/resolveType.spec.ts         |  2 +-
 .../compiler-sfc/src/script/resolveType.ts    | 44 ++++++++++++-------
 packages/vue/compiler-sfc/register-ts.js      |  2 +-
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts b/packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts
index 85d67e01c..607654a95 100644
--- a/packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts
@@ -10,7 +10,7 @@ import {
 } from '../../src/script/resolveType'
 
 import ts from 'typescript'
-registerTS(ts)
+registerTS(() => ts)
 
 describe('resolveType', () => {
   test('type literal', () => {
diff --git a/packages/compiler-sfc/src/script/resolveType.ts b/packages/compiler-sfc/src/script/resolveType.ts
index d30150a82..146c45472 100644
--- a/packages/compiler-sfc/src/script/resolveType.ts
+++ b/packages/compiler-sfc/src/script/resolveType.ts
@@ -708,13 +708,14 @@ function resolveGlobalScope(ctx: TypeResolveContext): TypeScope[] | undefined {
   }
 }
 
-let ts: typeof TS
+let ts: typeof TS | undefined
+let loadTS: (() => typeof TS) | undefined
 
 /**
  * @private
  */
-export function registerTS(_ts: any) {
-  ts = _ts
+export function registerTS(_loadTS: () => typeof TS) {
+  loadTS = _loadTS
 }
 
 type FS = NonNullable<SFCScriptCompileOptions['fs']>
@@ -723,7 +724,10 @@ function resolveFS(ctx: TypeResolveContext): FS | undefined {
   if (ctx.fs) {
     return ctx.fs
   }
-  const fs = ctx.options.fs || ts.sys
+  if (!ts && loadTS) {
+    ts = loadTS()
+  }
+  const fs = ctx.options.fs || ts?.sys
   if (!fs) {
     return
   }
@@ -779,22 +783,25 @@ function importSourceToScope(
     } else {
       // module or aliased import - use full TS resolution, only supported in Node
       if (!__NODE_JS__) {
-        ctx.error(
+        return ctx.error(
           `Type import from non-relative sources is not supported in the browser build.`,
           node,
           scope
         )
       }
       if (!ts) {
-        ctx.error(
-          `Failed to resolve import source ${JSON.stringify(source)}. ` +
-            `typescript is required as a peer dep for vue in order ` +
-            `to support resolving types from module imports.`,
-          node,
-          scope
-        )
+        if (loadTS) ts = loadTS()
+        if (!ts) {
+          return ctx.error(
+            `Failed to resolve import source ${JSON.stringify(source)}. ` +
+              `typescript is required as a peer dep for vue in order ` +
+              `to support resolving types from module imports.`,
+            node,
+            scope
+          )
+        }
       }
-      resolved = resolveWithTS(scope.filename, source, fs)
+      resolved = resolveWithTS(scope.filename, source, ts, fs)
     }
     if (resolved) {
       resolved = scope.resolvedImportSources[source] = normalizePath(resolved)
@@ -839,6 +846,7 @@ const tsConfigRefMap = new Map<string, string>()
 function resolveWithTS(
   containingFile: string,
   source: string,
+  ts: typeof TS,
   fs: FS
 ): string | undefined {
   if (!__NODE_JS__) return
@@ -853,7 +861,7 @@ function resolveWithTS(
     const normalizedConfigPath = normalizePath(configPath)
     const cached = tsConfigCache.get(normalizedConfigPath)
     if (!cached) {
-      configs = loadTSConfig(configPath, fs).map(config => ({ config }))
+      configs = loadTSConfig(configPath, ts, fs).map(config => ({ config }))
       tsConfigCache.set(normalizedConfigPath, configs)
     } else {
       configs = cached
@@ -918,7 +926,11 @@ function resolveWithTS(
   }
 }
 
-function loadTSConfig(configPath: string, fs: FS): TS.ParsedCommandLine[] {
+function loadTSConfig(
+  configPath: string,
+  ts: typeof TS,
+  fs: FS
+): TS.ParsedCommandLine[] {
   // The only case where `fs` is NOT `ts.sys` is during tests.
   // parse config host requires an extra `readDirectory` method
   // during tests, which is stubbed.
@@ -940,7 +952,7 @@ function loadTSConfig(configPath: string, fs: FS): TS.ParsedCommandLine[] {
   if (config.projectReferences) {
     for (const ref of config.projectReferences) {
       tsConfigRefMap.set(ref.path, configPath)
-      res.unshift(...loadTSConfig(ref.path, fs))
+      res.unshift(...loadTSConfig(ref.path, ts, fs))
     }
   }
   return res
diff --git a/packages/vue/compiler-sfc/register-ts.js b/packages/vue/compiler-sfc/register-ts.js
index 87f61b648..7a073b3a3 100644
--- a/packages/vue/compiler-sfc/register-ts.js
+++ b/packages/vue/compiler-sfc/register-ts.js
@@ -1,5 +1,5 @@
 if (typeof require !== 'undefined') {
   try {
-    require('@vue/compiler-sfc').registerTS(require('typescript'))
+    require('@vue/compiler-sfc').registerTS(() => require('typescript'))
   } catch (e) {}
 }