fix(nuxt): pergel object

oku-ui · Dec 10, 2023 · f4fcc28 · f4fcc28
1 parent 4e06e90
commit f4fcc28
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 22 deletions.
diff --git a/examples/devtools-test/nuxt.config.ts b/examples/devtools-test/nuxt.config.ts
@@ -5,6 +5,10 @@ export default defineNuxtConfig({
   ],
   devtools: { enabled: true },
   pergel: {
-    text: 'Hello World!',
+    projects: {
+      test: {
+        S3: true,
+      },
+    },
   },
 })
diff --git a/examples/devtools-test/package.json b/examples/devtools-test/package.json
@@ -10,7 +10,7 @@
     "postinstall": "nuxt prepare"
   },
   "dependencies": {
-    "@pergel/nuxt": "0.0.1-beta.3"
+    "@pergel/nuxt": "0.0.1-beta.4"
   },
   "devDependencies": {
     "@nuxt/devtools": "latest",

diff --git a/examples/devtools-test/pnpm-lock.yaml b/examples/devtools-test/pnpm-lock.yaml
diff --git a/packages/nuxt/playground/nuxt.config.ts b/packages/nuxt/playground/nuxt.config.ts
@@ -47,6 +47,10 @@ export default defineNuxtConfig({
     }),
   ],
   pergel: {
-    devtools: true,
+    projects: {
+      test: {
+        S3: true,
+      },
+    },
   },
 })
diff --git a/packages/nuxt/src/core/setupModules.ts b/packages/nuxt/src/core/setupModules.ts
@@ -55,7 +55,7 @@ export async function setupModules(data: {
 
       try {
         const getIndexExt = () => {
-          const datas = readdirSync(data.resolver.resolve(join('runtime/modules', moduleName)))
+          const datas = readdirSync(data.resolver.resolve(join('modules', moduleName)))
           const indexExt = datas.find(file => file.includes('index') && !file.includes('.d.'))
           if (!indexExt)
             throw new Error(`Module ${moduleName} does not have index file`)

diff --git a/packages/nuxt/src/module.ts b/packages/nuxt/src/module.ts
@@ -31,20 +31,6 @@ export default defineNuxtModule<PergelOptions>({
   },
   async setup(options, nuxt) {
     const _resolver = createResolver(import.meta.url)
-
-    const { status } = await checkOptions(options)
-    if (!status)
-      return
-
-    const { saveNitroImports } = useNitroImports(nuxt)
-    const { saveNuxtImports } = useNuxtImports(nuxt)
-
-    const { resolvedPergelOptions } = await setupPergel(options, nuxt)
-
-    nuxt.options.vite.optimizeDeps ??= {}
-    nuxt.options.vite.optimizeDeps.include ??= []
-    nuxt.options.vite.optimizeDeps.include.push('@nuxt/devtools-kit/iframe-client')
-
     // Pergel _pergel default options
     nuxt._pergel = {
       nitroImports: {},
@@ -61,6 +47,19 @@ export default defineNuxtModule<PergelOptions>({
       resolver: _resolver,
     }
 
+    const { status } = await checkOptions(options)
+    if (!status)
+      return
+
+    const { saveNitroImports } = useNitroImports(nuxt)
+    const { saveNuxtImports } = useNuxtImports(nuxt)
+
+    const { resolvedPergelOptions } = await setupPergel(options, nuxt)
+
+    nuxt.options.vite.optimizeDeps ??= {}
+    nuxt.options.vite.optimizeDeps.include ??= []
+    nuxt.options.vite.optimizeDeps.include.push('@nuxt/devtools-kit/iframe-client')
+
     if (options.esnext) {
       nuxt.options.vite.build ??= {}
       nuxt.options.vite.build.target = 'esnext'