chore: try resolve

slidevjs · May 27, 2021 · e10ed60 · e10ed60
1 parent b70c7ba
commit e10ed60
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/packages/client/windi.config.ts b/packages/client/windi.config.ts
@@ -1,14 +1,7 @@
-import { resolve, dirname } from 'path'
+import { resolve } from 'path'
 import { isTruthy } from '@antfu/utils'
 import { DefaultExtractor, defineConfig } from 'vite-plugin-windicss'
 import typography from 'windicss/plugin/typography'
-import { sync as resolvePkg } from 'resolve'
-
-export function resolveImportPath(importName: string) {
-  return resolvePkg(importName, {
-    preserveSymlinks: false,
-  })
-}
 
 export default defineConfig({
   extract: {
@@ -23,9 +16,6 @@ export default defineConfig({
       // @slidev/client/node_modules
       resolve(__dirname, 'node_modules'),
       resolve(__dirname, 'windi.config.ts'),
-      // for monorepo like demo folder
-      dirname(resolveImportPath('monaco-editor/package.json')),
-      dirname(resolveImportPath('katex/package.json')),
     ],
     extractors: [
       {

diff --git a/packages/slidev/node/plugins/config.ts b/packages/slidev/node/plugins/config.ts
@@ -1,4 +1,4 @@
-import { join } from 'path'
+import { join, dirname } from 'path'
 import { InlineConfig, mergeConfig, Plugin } from 'vite'
 import isInstalledGlobally from 'is-installed-globally'
 import { getIndexHtml } from '../common'
@@ -48,8 +48,10 @@ export function createConfigPlugin(options: ResolvedSlidevOptions): Plugin {
         },
       }
 
-      if (isInstalledGlobally)
-        injection.cacheDir = join(options.cliRoot, 'node_module/.vite')
+      if (isInstalledGlobally) {
+        injection.cacheDir = join(options.cliRoot, 'node_modules/.vite')
+        injection.root = dirname(dirname(options.cliRoot))
+      }
 
       return mergeConfig(config, injection)
     },

diff --git a/packages/slidev/node/plugins/windicss.ts b/packages/slidev/node/plugins/windicss.ts
@@ -1,7 +1,8 @@
-import { resolve } from 'path'
+import { resolve, dirname } from 'path'
 import { slash } from '@antfu/utils'
 import WindiCSS, { defaultConfigureFiles } from 'vite-plugin-windicss'
 import { ResolvedSlidevOptions, SlidevPluginOptions } from '..'
+import { resolveImportPath } from '../utils'
 
 export function createWindiCSSPlugin(
   { themeRoots, clientRoot, userRoot }: ResolvedSlidevOptions,
@@ -16,6 +17,8 @@ export function createWindiCSSPlugin(
       ],
       onOptionsResolved(config) {
         config.scanOptions.include.push(`!${slash(resolve(userRoot, 'node_modules'))}`)
+        config.scanOptions.exclude.push(dirname(resolveImportPath('monaco-editor/package.json', true)))
+        config.scanOptions.exclude.push(dirname(resolveImportPath('katex/package.json', true)))
       },
       ...windiOptions,
     },