refactor: modules folder

package.json

@@ -52,13 +52,9 @@
     "vite": "5.0.11",
     "vitest": "^1.1.1"
   },
-  "pnpm": {
-    "overrides": {
-      "rollup": "^4.2.0"
-    }
-  },
   "resolutions": {
-    "@pergel/nuxt": "link:./packages/nuxt"
+    "@pergel/nuxt": "link:./packages/nuxt",
+    "unbuild": "3.0.0-rc.1"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"

packages/nuxt/build.config.ts

@@ -1,8 +1,14 @@
+import { join } from 'node:path'
+import { readFileSync } from 'node:fs'
 import { defineBuildConfig } from 'unbuild'
 
 import pkgBox from '../box/package.json'
+import graphql from '../graphql/package.json'
+import s3 from '../s3/package.json'
 
-const externalBox = Object.keys(pkgBox.dependencies)
+const version = JSON.parse(
+  readFileSync(join(__dirname, 'package.json'), 'utf-8'),
+).version
 
 export const external = [
   'consola',
@@ -25,30 +31,39 @@ export const external = [
   'lucia',
   '@lucia-auth/adapter-drizzle',
   '@lucia-auth/adapter-postgresql',
+  'chokidar',
+  '@nuxt/kit',
+  '@nuxt/schema',
+  'globby',
   'fsevents',
   'node:path',
   'node:fs',
+  '@pergel/cli/types',
+  'defu',
+  'pathe',
   'node:http',
   'node:child_process',
   'node:stream',
   'node:url',
   'slugify',
+  'c12',
+  'ioredis',
+  '#pergel-useGlobalContext',
+  '#pergel-usePergelState',
   '@pergel/module-box',
-  ...externalBox,
+  '@aws-sdk/client-ses',
+  ...Object.keys(pkgBox.dependencies),
+  ...Object.keys(graphql.dependencies),
+  ...Object.keys(s3.dependencies),
 ]
 export default defineBuildConfig([
-  // Auto preset
   {
     externals: [
       ...external,
     ],
-    rollup: {
-      inlineDependencies: true,
-      output: {
-        preserveModules: true,
-        strict: true,
-        preserveModulesRoot: 'src',
-      },
+    replace: {
+      __VERSION__: JSON.stringify(version),
     },
+    failOnWarn: false,
   },
 ])

packages/nuxt/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pergel/nuxt",
   "type": "module",
-  "version": "0.7.25",
+  "version": "0.7.36",
   "description": "Nuxt Full Stack modules. Start your next nuxt project fast and strong.",
   "author": "Mehmet @productdevbook",
   "license": "MIT",
@@ -61,43 +61,45 @@
   "dependencies": {
     "@nuxt/devtools": "^1.0.8",
     "@nuxt/devtools-kit": "^1.0.8",
-    "@nuxt/kit": "^3.9.1",
-    "@vueuse/core": "^10.7.1",
+    "@nuxt/kit": "^3.9.3",
+    "@vueuse/core": "^10.7.2",
     "defu": "^6.1.4",
+    "globby": "^14.0.0",
     "local-pkg": "^0.5.0",
     "minimatch": "^9.0.3",
-    "pathe": "^1.1.1",
+    "pathe": "^1.1.2",
     "sirv": "^2.0.4",
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@aws-sdk/client-ses": "^3.485.0",
+    "@aws-sdk/client-ses": "^3.499.0",
     "@faker-js/faker": "^8.3.1",
-    "@iconify-json/carbon": "^1.1.27",
-    "@iconify-json/ph": "^1.1.9",
-    "@json2csv/node": "^7.0.4",
+    "@iconify-json/carbon": "^1.1.28",
+    "@iconify-json/ph": "^1.1.10",
+    "@json2csv/node": "^7.0.5",
     "@lucia-auth/adapter-drizzle": "1.0.0-beta.6",
     "@lucia-auth/adapter-postgresql": "3.0.0-beta.9",
     "@nuxt/devtools-ui-kit": "^1.0.8",
     "@nuxt/module-builder": "^0.5.5",
-    "@nuxt/schema": "^3.9.1",
-    "@nuxt/test-utils": "^3.9.0",
-    "@pergel/cli": "^0.6.1",
+    "@nuxt/schema": "^3.9.3",
+    "@nuxt/test-utils": "^3.10.0",
+    "@pergel/cli": "^0.6.2",
     "@pergel/graphql": "workspace:^",
     "@pergel/module-box": "workspace:^",
     "@pergel/module-s3": "workspace:^",
-    "@types/node": "^20.10.7",
+    "@types/node": "^20.11.6",
     "@types/node-cron": "^3.0.11",
-    "bullmq": "^5.1.1",
+    "bullmq": "^5.1.5",
     "esbuild-plugin-file-path-extensions": "^2.0.0",
-    "json-schema-to-typescript": "^13.1.1",
+    "h3": "^1.10.1",
+    "json-schema-to-typescript": "^13.1.2",
     "lucia": "3.0.0-beta.14",
     "node-cron": "^3.0.3",
-    "nuxt": "^3.9.1",
-    "oslo": "^0.27.0",
+    "nuxt": "^3.9.3",
+    "oslo": "^0.27.1",
     "p-timeout": "^6.1.2",
     "typescript": "^5.3.3",
-    "vitest": "^1.1.3"
+    "vitest": "^1.2.1"
   },
   "publishConfig": {
     "access": "public"

packages/nuxt/src/module.ts

@@ -1,13 +1,17 @@
 import { join, relative } from 'node:path'
 import { writeFileSync } from 'node:fs'
 import {
+  addImportsDir,
+  addPlugin,
+  addServerHandler,
   addServerImportsDir,
   addTemplate,
   createResolver,
   defineNuxtModule,
   logger,
 } from '@nuxt/kit'
 import YAML from 'yaml'
+import { globbySync } from 'globby'
 
 import defu from 'defu'
 import type { NuxtConfigLayer } from '@nuxt/schema'
@@ -16,10 +20,12 @@ import { version } from '../package.json'
 import { setupDevToolsUI } from './devtools'
 import { DEVTOOLS_MODULE_KEY, DEVTOOLS_MODULE_NAME } from './constants'
 import { useNitroImports, useNuxtImports } from './runtime/core/utils/useImports'
+
 import { setupPergel } from './runtime/core/setupPergel'
 import { generateReadmeJson } from './runtime/core/utils/generateYaml'
 import { setupModules } from './runtime/core/setupModules'
-import type { PergelOptions, ResolvedPergelOptions } from './runtime/core/types/nuxtModule'
+import type { PergelModuleNames, PergelOptions, ResolvedPergelOptions } from './runtime/core/types/nuxtModule'
+import type { PergelH3ContextItem } from './runtime/modules'
 
 export interface ModulePublicRuntimeConfig {
   slugify: {
@@ -34,6 +40,14 @@ declare module '@nuxt/schema' {
   interface PublicRuntimeConfig extends ModulePublicRuntimeConfig { }
 }
 
+declare module 'h3' {
+  interface H3EventContext {
+    pergelContext: {
+      [key: string]: PergelH3ContextItem
+    }
+  }
+}
+
 export default defineNuxtModule<PergelOptions>({
   meta: {
     name: DEVTOOLS_MODULE_NAME,
@@ -81,13 +95,67 @@ export default defineNuxtModule<PergelOptions>({
     }
 
     const _resolver = createResolver(import.meta.url)
+
+    addServerImportsDir(_resolver.resolve('./runtime/composables'))
+
+    // Nitro auto imports
+    nuxt.hook('nitro:config', (config) => {
+      if (config.imports) {
+        config.imports.imports = config.imports.imports || []
+
+        config.imports.imports.push({
+          name: 'usePergelContext',
+          from: _resolver.resolve('./runtime/server/utils/usePergelContext'),
+        })
+
+        config.imports.imports.push({
+          name: 'getPergelContext',
+          from: _resolver.resolve('./runtime/server/utils/getPergelContext'),
+        })
+
+        config.alias = config.alias || {}
+
+        config.alias['#pergel/usePergelContext'] = _resolver.resolve(
+          './runtime/server/utils/usePergelContext',
+        )
+      }
+    })
+
+    addImportsDir(_resolver.resolve('./runtime/composables'))
+    addPlugin(_resolver.resolve('./runtime/plugin'))
+
     await setupPergel({
       options: pergelOptions,
       nuxt,
       resolver: _resolver,
       version,
     })
 
+    async function moduleSetup() {
+      const modules = globbySync('./runtime/modules/**/index.@(ts|mjs)', {
+        cwd: _resolver.resolve('./'),
+        onlyFiles: true,
+        deep: 2,
+      })
+
+      const modulesResolve: {
+        name: PergelModuleNames
+        path: string
+      }[] = []
+
+      for await (const module of modules) {
+        const moduleName = module.replace('./runtime/modules/', '').replace('/index.ts', '').replace('/index.mjs', '')
+        modulesResolve.push({
+          name: moduleName as PergelModuleNames,
+          path: _resolver.resolve(module),
+        })
+      }
+
+      nuxt._pergel.resolveModules = modulesResolve
+    }
+
+    await moduleSetup()
+
     const { saveNitroImports } = useNitroImports(nuxt)
     const { saveNuxtImports } = useNuxtImports(nuxt)
 
@@ -110,18 +178,20 @@ export default defineNuxtModule<PergelOptions>({
 
     await setupModules({
       nuxt,
-      resolver: _resolver,
     })
 
-    addServerImportsDir(_resolver.resolve('./runtime/composables'))
-
     saveNitroImports()
     saveNuxtImports()
 
     generateReadmeJson({
       nuxt,
     })
 
+    addServerHandler({
+      handler: _resolver.resolve('./runtime/serverContext'),
+      middleware: true,
+    })
+
     nuxt._pergel.devServerHandler.forEach(({ fn }) => fn())
 
     for (const project of Object.keys(nuxt._pergel.dts)) {
@@ -132,7 +202,7 @@ export default defineNuxtModule<PergelOptions>({
         write: true,
         getContents: () => /* ts */`
         ${contents}
-        
+
         ${declareModules}
         `.trim(),
       })