fix: correct path for detecting vue version

vue-macros · Mar 22, 2023 · ceb4fba · ceb4fba
1 parent e200ba8
commit ceb4fba
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/.changeset/yellow-jokes-explode.md b/.changeset/yellow-jokes-explode.md
@@ -0,0 +1,7 @@
+---
+'@vue-macros/setup-component': patch
+'@vue-macros/common': patch
+'unplugin-vue-macros': patch
+---
+
+correct path for detecting vue version
diff --git a/.gitignore b/.gitignore
@@ -5,8 +5,9 @@ coverage
 .idea
 dev-dist
 docs/.vitepress/cache
+.vercel
+.vite-inspect
 
 .DS_Store
 .pnpm-debug.log*
 .eslintcache
-.vercel
diff --git a/packages/common/src/dep.ts b/packages/common/src/dep.ts
@@ -1,7 +1,7 @@
 import { getPackageInfoSync } from 'local-pkg'
 
-export function detectVueVersion(): 2 | 3 {
-  const vuePkg = getPackageInfoSync('vue')
+export function detectVueVersion(root: string = process.cwd()): 2 | 3 {
+  const vuePkg = getPackageInfoSync('vue', { paths: [root] })
   if (vuePkg) {
     return +vuePkg.version.slice(0, 1) as 2 | 3
   } else {

diff --git a/packages/macros/src/index.ts b/packages/macros/src/index.ts
@@ -119,7 +119,7 @@ function resolveOptions({
   }
 
   root = root || process.cwd()
-  version = version || detectVueVersion()
+  version = version || detectVueVersion(root)
   isProduction = isProduction ?? process.env.NODE_ENV === 'production'
 
   return {

diff --git a/packages/setup-component/src/index.ts b/packages/setup-component/src/index.ts
@@ -30,12 +30,13 @@ export type OptionsResolved = MarkRequired<
 >
 
 function resolveOption(options: Options): OptionsResolved {
-  const version = options.version || detectVueVersion()
+  const root = options.root || process.cwd()
+  const version = options.version || detectVueVersion(root)
   return {
     include: [REGEX_SRC_FILE],
     exclude: [REGEX_SETUP_SFC, REGEX_VUE_SUB, REGEX_NODE_MODULES],
-    root: process.cwd(),
     ...options,
+    root,
     version,
   }
 }

diff --git a/playground/vue2/tsconfig.json b/playground/vue2/tsconfig.json
@@ -11,7 +11,8 @@
     "isolatedModules": true,
     "esModuleInterop": true,
     "lib": ["ESNext", "DOM"],
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "customConditions": ["dev"]
   },
   "vueCompilerOptions": {
     "target": 2.7,

diff --git a/playground/vue2/vite.config.ts b/playground/vue2/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
   },
   plugins: [
     VueMacros({
-      version: 2,
+      // version: 2,
       plugins: {
         vue: Vue({
           include: [/\.vue$/, /\.setup\.[cm]?[jt]sx?$/],
@@ -19,6 +19,8 @@ export default defineConfig({
       },
     }),
 
-    Inspect(),
+    Inspect({
+      build: true,
+    }),
   ],
 })
diff --git a/playground/vue3/vite.config.ts b/playground/vue3/vite.config.ts
@@ -30,6 +30,8 @@ export default defineConfig({
       },
     }),
 
-    Inspect(),
+    Inspect({
+      build: true,
+    }),
   ],
 })