Merge branch 'main' into main

Innei · web-flow · commit 694007a662bb · 2022-07-03T13:30:58.000+08:00
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     ]
   },
   "engines": {
-    "node": ">=16.5.0"
+    "node": ">=16.11.0"
   },
   "devDependencies": {
     "@babel/types": "^7.12.0",
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
@@ -185,7 +185,12 @@ export function compileScript(
       )
   }
   if (options.babelParserPlugins) plugins.push(...options.babelParserPlugins)
-  if (isTS) plugins.push('typescript', 'decorators-legacy')
+  if (isTS) {
+    plugins.push('typescript')
+    if (!plugins.includes('decorators')) {
+      plugins.push('decorators-legacy')
+    }
+  }
 
   if (!scriptSetup) {
     if (!script) {

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,12 @@ export function compileScript(`
`185`	`185`	`)`
`186`	`186`	`}`
`187`	`187`	`if (options.babelParserPlugins) plugins.push(...options.babelParserPlugins)`
`188`		`- if (isTS) plugins.push('typescript', 'decorators-legacy')`
	`188`	`+ if (isTS) {`
	`189`	`+ plugins.push('typescript')`
	`190`	`+ if (!plugins.includes('decorators')) {`
	`191`	`+ plugins.push('decorators-legacy')`
	`192`	`+ }`
	`193`	`+ }`
`189`	`194`
`190`	`195`	`if (!scriptSetup) {`
`191`	`196`	`if (!script) {`