fix: vue resolve

slidevjs · May 26, 2021 · 727ff48 · 727ff48
1 parent 9abca77
commit 727ff48
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/packages/slidev/node/cli.ts b/packages/slidev/node/cli.ts
@@ -9,6 +9,7 @@ import { blue, bold, cyan, dim, gray, green, yellow } from 'kolorist'
 import { LogLevel, ViteDevServer } from 'vite'
 import * as parser from '@slidev/parser/fs'
 import { SlidevConfig } from '@slidev/types'
+import isInstalledGlobally from 'is-installed-globally'
 import { version } from '../package.json'
 import { createServer } from './server'
 import { getThemeRoots, isRelative, ResolvedSlidevOptions, resolveOptions } from './options'
@@ -318,7 +319,7 @@ function printInfo(options: ResolvedSlidevOptions, port?: number, remote?: strin
   console.log()
   console.log()
   console.log(`  ${cyan('●') + blue('■') + yellow('▲')}`)
-  console.log(`${bold('  Slidev')}  ${blue(`v${version}`)}`)
+  console.log(`${bold('  Slidev')}  ${blue(`v${version}`)} ${isInstalledGlobally ? yellow('(global)') : ''}`)
   console.log()
   console.log(dim('  theme   ') + (options.theme ? green(options.theme) : gray('none')))
   console.log(dim('  entry   ') + dim(path.dirname(options.entry) + path.sep) + path.basename(options.entry))

diff --git a/packages/slidev/node/plugins/config.ts b/packages/slidev/node/plugins/config.ts
@@ -26,7 +26,7 @@ export function createConfigPlugin(options: ResolvedSlidevOptions): Plugin {
         resolve: {
           alias: {
             '@slidev/client/': `${toAtFS(options.clientRoot)}/`,
-            'vue': `${toAtFS(resolveImportPath('vue', true))}`,
+            'vue': `${resolveImportPath('vue/dist/vue.esm-browser.js', true)}`,
           },
         },
         optimizeDeps: {

diff --git a/packages/slidev/node/utils.ts b/packages/slidev/node/utils.ts
@@ -1,4 +1,5 @@
 import { ensurePrefix, slash } from '@antfu/utils'
+import isInstalledGlobally from 'is-installed-globally'
 import { sync as resolve } from 'resolve'
 import resolveFrom from 'resolve-from'
 import resolveGlobal from 'resolve-global'
@@ -22,10 +23,12 @@ export function resolveImportPath(importName: string, ensure = false) {
   }
   catch {}
 
-  try {
-    return resolveGlobal(importName)
+  if (isInstalledGlobally) {
+    try {
+      return resolveGlobal(importName)
+    }
+    catch {}
   }
-  catch {}
 
   if (ensure)
     throw new Error(`Failed to resolve package "${importName}"`)