fix: macros (#39)

Innei · Jul 15, 2023 · 010e53d · 010e53d
1 parent c300db1
commit 010e53d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/storybook/config.ts b/storybook/config.ts
@@ -1 +1 @@
-export const GLOB_PATH = () => '../../src/components/ui/*/index.demo.(tsx|mdx)'
+export const GLOB_PATH = '../../src/components/ui/*/index.demo.(tsx|mdx)'
diff --git a/storybook/package.json b/storybook/package.json
@@ -22,7 +22,7 @@
  "@vitejs/plugin-react": "^4.0.3",
  "buffer": "6.0.3",
  "concurrently": "^8.2.0",
- "unplugin-macros": "0.4.2",
+ "unplugin-macros": "0.5.1",
  "vite-tsconfig-paths": "^4.2.0"
  }
 }
diff --git a/storybook/pnpm-lock.yaml b/storybook/pnpm-lock.yaml
diff --git a/storybook/src/glob.tsx b/storybook/src/glob.tsx
@@ -6,11 +6,7 @@ import { Markdown } from './components/Mardown'
 
 import { GLOB_PATH } from '../config' assert { type: 'macro' }
 // TODO find project root
-const modulesPath2PromiseMapping = import.meta.glob(
- GLOB_PATH(),
-
- {},
-)
+const modulesPath2PromiseMapping = import.meta.glob(GLOB_PATH)
 
 // const mdxPath2PromiseMapping = import.meta.glob('../../*/index.demo.mdx', {
 // as: 'raw',

diff --git a/storybook/vite.config.mts b/storybook/vite.config.mts
@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'
 import path, { resolve } from 'node:path'
 import react from '@vitejs/plugin-react'
 import { parse } from 'dotenv'
-import Macros from 'unplugin-macros/vite'
+import Macros from 'unplugin-macros'
 import { defineConfig } from 'vite'
 import ViteRestart from 'vite-plugin-restart'
 import tsConfigPaths from 'vite-tsconfig-paths'
@@ -24,10 +24,8 @@ const options = {
 // https://vitejs.dev/config/
 export default defineConfig({
  plugins: [
- Macros(),
+ Macros.vite(),
  react(),
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-
  tsConfigPaths(),
  mdx(options),
  ViteRestart({
@@ -48,4 +46,10 @@ export default defineConfig({
  '~': resolve(__dirname, '../src'),
  },
  },
+
+ optimizeDeps: {
+ esbuildOptions: {
+ plugins: [Macros.esbuild()],
+ },
+ },
 })