feat(nuxt): add import for 'auth' in serverDir

oku-ui · Jan 23, 2024 · 725c026 · 725c026
1 parent 932d95c
commit 725c026
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/packages/nuxt/src/runtime/core/setupModules.ts b/packages/nuxt/src/runtime/core/setupModules.ts
@@ -103,7 +103,8 @@ async function initModules(nuxt: Nuxt, resolver: Resolver) {
             projectName,
             rootModuleDir: join(nuxt._pergel.rootDir, `${moduleName}-${projectName}`),
             serverDir: join(nuxt._pergel.serverDir, `${moduleName}-${projectName}`),
-            projectNamePascalCase: camelCase(`pergel${firstLetterUppercase(projectName)}`, { normalize: true }),
+            projectNameCamelCase: camelCase(`${firstLetterUppercase(projectName)}`, { normalize: true }),
+            projectNameCamelCaseWithPergel: camelCase(`pergel${firstLetterUppercase(projectName)}`, { normalize: true }),
           },
           rootOptions: module,
         })
@@ -273,7 +274,8 @@ export async function setupModules(data: {
           projectName,
           rootModuleDir: join(data.nuxt._pergel.rootDir, `${moduleName}-${projectName}`),
           serverDir: join(data.nuxt._pergel.serverDir, `${moduleName}-${projectName}`),
-          projectNamePascalCase: camelCase(`pergel${firstLetterUppercase(projectName)}`),
+          projectNameCamelCase: camelCase(`${firstLetterUppercase(projectName)}`),
+          projectNameCamelCaseWithPergel: camelCase(`pergel${firstLetterUppercase(projectName)}`),
         },
         rootOptions: module,
       })

diff --git a/packages/nuxt/src/runtime/core/types/module.ts b/packages/nuxt/src/runtime/core/types/module.ts
@@ -30,11 +30,17 @@ export interface ResolvedPergelModuleOptions {
    * test -> Test
    */
 
+  /**
+   * @default
+   * TestHello -> testHello
+   */
+  projectNameCamelCase: string
+
   /**
    * @default
    * testHello -> pergelTestHello
    */
-  projectNamePascalCase: string
+  projectNameCamelCaseWithPergel: string
 
   /**
    * @default

diff --git a/packages/nuxt/src/runtime/modules/lucia/index.ts b/packages/nuxt/src/runtime/modules/lucia/index.ts
@@ -81,9 +81,9 @@ export default definePergelModule<LuciaModuleOptions, ResolvedLuciaModuleOptions
           /* ts */`
 import { session, user } from '#${options.projectName}/drizzle/schema'
 
-const connect = await ${options.projectNamePascalCase}().drizzle().postgresjs().connect({})
+const connect = await ${options.projectNameCamelCaseWithPergel}().drizzle().postgresjs().connect({})
 
-export const auth = ${options.projectNamePascalCase}().lucia().use({
+export const auth = ${options.projectNameCamelCaseWithPergel}().lucia().use({
   db: connect,
   options: { },
   session,
@@ -102,7 +102,7 @@ export const auth = ${options.projectNamePascalCase}().lucia().use({
         /* ts */`
 import { auth } from '#${options.projectName}/lucia'
 
-export default ${options.projectNamePascalCase}().lucia().definePergelNitroMiddleware({
+export default ${options.projectNameCamelCaseWithPergel}().lucia().definePergelNitroMiddleware({
   lucia: auth,
 })
         `,
@@ -125,6 +125,15 @@ export default ${options.projectNamePascalCase}().lucia().definePergelNitroMiddl
             'definePergelNitroMiddleware',
           ],
         },
+        {
+          from: `${options.serverDir}`,
+          imports: [
+            {
+              as: `${options.projectNameCamelCase}Auth`,
+              name: 'auth',
+            },
+          ],
+        },
       ],
     })