refactor: clean up

slidevjs · Sep 13, 2021 · 22164a0 · 22164a0
1 parent 49deaf4
commit 22164a0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 12 deletions.
diff --git a/packages/slidev/node/plugins/config.ts → packages/slidev/node/plugins/extendConfig.ts b/packages/slidev/node/plugins/config.ts → packages/slidev/node/plugins/extendConfig.ts
@@ -14,7 +14,6 @@ const EXCLUDE = [
   'mermaid',
   'vite-plugin-windicss',
   'vue-demi',
-  'drauu',
 ]
 
 export function createConfigPlugin(options: ResolvedSlidevOptions): Plugin {

diff --git a/packages/slidev/node/plugins/jiti.ts b/packages/slidev/node/plugins/jiti.ts
diff --git a/packages/slidev/node/plugins/monaco.ts → ...es/slidev/node/plugins/monacoTransform.ts b/packages/slidev/node/plugins/monaco.ts → ...es/slidev/node/plugins/monacoTransform.ts
diff --git a/packages/slidev/node/plugins/fix.ts → ...ges/slidev/node/plugins/patchTransform.ts b/packages/slidev/node/plugins/fix.ts → ...ges/slidev/node/plugins/patchTransform.ts
diff --git a/packages/slidev/node/plugins/preset.ts b/packages/slidev/node/plugins/preset.ts
@@ -6,14 +6,14 @@ import ViteComponents from 'vite-plugin-components'
 import RemoteAssets, { DefaultRules } from 'vite-plugin-remote-assets'
 import { notNullish } from '@antfu/utils'
 import { ResolvedSlidevOptions, SlidevPluginOptions, SlidevServerOptions } from '../options'
-import { createConfigPlugin } from './config'
+import { createConfigPlugin } from './extendConfig'
 import { createSlidesLoader } from './loaders'
-import { createMonacoTypesLoader } from './monaco'
+import { createMonacoTypesLoader } from './monacoTransform'
 import { createClientSetupPlugin } from './setupClient'
-import VitePluginServerRef from './server-ref'
+import VitePluginServerRef from './serverRef'
 import { createMarkdownPlugin } from './markdown'
 import { createWindiCSSPlugin } from './windicss'
-import { createFixPlugins } from './fix'
+import { createFixPlugins } from './patchTransform'
 
 const customElements = new Set([
   // katex

diff --git a/packages/slidev/node/plugins/server-ref.ts → packages/slidev/node/plugins/serverRef.ts b/packages/slidev/node/plugins/server-ref.ts → packages/slidev/node/plugins/serverRef.ts
diff --git a/packages/slidev/node/plugins/setupNode.ts b/packages/slidev/node/plugins/setupNode.ts
@@ -1,7 +1,7 @@
 import { resolve } from 'path'
 import { existsSync } from 'fs-extra'
 import { isObject } from '@antfu/utils'
-import { jiti } from './jiti'
+import jiti from 'jiti'
 
 function deepMerge(a: any, b: any, rootPath = '') {
   a = { ...a }
@@ -21,7 +21,7 @@ export async function loadSetups<T, R extends object>(roots: string[], name: str
   for (const root of roots) {
     const path = resolve(root, 'setup', name)
     if (existsSync(path)) {
-      const { default: setup } = jiti(path)
+      const { default: setup } = jiti(__filename)(path)
       const result = await setup(arg)
       if (result !== null) {
         returns = merge

diff --git a/packages/slidev/node/plugins/windicss.ts b/packages/slidev/node/plugins/windicss.ts
@@ -2,9 +2,9 @@ import { resolve, dirname } from 'path'
 import { existsSync } from 'fs'
 import { slash, uniq } from '@antfu/utils'
 import WindiCSS, { defaultConfigureFiles, WindiCssOptions } from 'vite-plugin-windicss'
+import jiti from 'jiti'
 import { ResolvedSlidevOptions, SlidevPluginOptions } from '..'
 import { resolveImportPath } from '../utils'
-import { jiti } from './jiti'
 import { loadSetups } from './setupNode'
 
 export async function createWindiCSSPlugin(
@@ -18,7 +18,7 @@ export async function createWindiCSSPlugin(
   ])
 
   const configFile = configFiles.find(i => existsSync(i))!
-  let config = jiti(configFile) as WindiCssOptions
+  let config = jiti(__filename)(configFile) as WindiCssOptions
   if (config.default)
     config = config.default