fix(better-define): support mixed setup blocks

closes #268
vue-macros · Feb 16, 2023 · 4844ebd · 4844ebd · vercel · Feb 16, 2023
1 parent 219646f
commit 4844ebd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/spotty-buses-sleep.md b/.changeset/spotty-buses-sleep.md
@@ -0,0 +1,6 @@
+---
+'@vue-macros/better-define': patch
+'@vue-macros/api': patch
+---
+
+support mixed setup blocks for `better-define`
diff --git a/packages/api/src/vue/analyze.ts b/packages/api/src/vue/analyze.ts
@@ -25,8 +25,7 @@ export async function analyzeSFC(
   s: MagicString,
   sfc: SFC
 ): Promise<AnalyzeResult> {
-  if (sfc.script || !sfc.scriptSetup)
-    throw new Error('Only <script setup> is supported')
+  if (!sfc.scriptSetup) throw new Error('Only <script setup> is supported')
 
   const { scriptSetup } = sfc
 

diff --git a/packages/better-define/src/core/index.ts b/packages/better-define/src/core/index.ts
@@ -9,7 +9,7 @@ export async function transformBetterDefine(
 ) {
   const s = new MagicString(code)
   const sfc = parseSFC(code, id)
-  if (sfc.script || !sfc.scriptSetup) return
+  if (!sfc.scriptSetup) return
 
   const offset = sfc.scriptSetup.loc.start.offset
   const result = await analyzeSFC(s, sfc)