fix: update module runtime config generation

oku-ui · Feb 4, 2024 · ef7bc5f · ef7bc5f
1 parent 0467817
commit ef7bc5f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 12 deletions.
diff --git a/packages/nuxt/src/runtime/core/utils/moduleRuntimeConfig.ts b/packages/nuxt/src/runtime/core/utils/moduleRuntimeConfig.ts
@@ -8,9 +8,16 @@ import { runtimeConfigToEnv } from './runtimeConfigToEnv'
 export function generateModuleRuntimeConfig<T>(
   nuxt: NuxtPergel,
   moduleOptions: ResolvedPergelModuleOptions,
-  config: Record<string, any>,
+  config: Record<string, any> | {
+    [key: string]: any
+    default?: Record<string, any>
+  },
   publicRuntime?: boolean,
+  generateEnv?: boolean,
 ) {
+  const defaultConfig = Object.assign({}, config.default)
+  delete config.default
+
   const projectName = moduleOptions.projectName
   const moduleName = moduleOptions.moduleName
 
@@ -33,19 +40,35 @@ export function generateModuleRuntimeConfig<T>(
             ...acc,
             ...cur,
           }
-        }),
+        }, {}),
       },
     }) as T
 
-    const { keyEnvValue, envs } = runtimeConfigToEnv(runtimeConfig.public[projectName as any] as any, [projectName])
+    const { envs, keyEnvValue } = runtimeConfigToEnv(
+      (runtimeConfig.public as any)[projectName][moduleName] as any,
+      [projectName, moduleName],
+    )
 
-    nuxt._pergel.readmeJson[projectName] ??= {}
-    nuxt._pergel.readmeJson[projectName][moduleName] ??= {} as any
-    nuxt._pergel.readmeJson[projectName][moduleName] = defu(nuxt._pergel.readmeJson[projectName][moduleName], {
-      env: {
-        ...envs,
-      },
-    })
+    if (generateEnv === true) {
+      nuxt._pergel.readmeJson[projectName] ??= {}
+      nuxt._pergel.readmeJson[projectName][moduleName] ??= {} as any
+      nuxt._pergel.readmeJson[projectName][moduleName] = defu(nuxt._pergel.readmeJson[projectName][moduleName], {
+        env: {
+          ...Object.entries(config).map(([key, __value]) => {
+            const _key = `NUXT_${snakeCase(`${projectName}_${moduleName}_${key}` as string).toUpperCase()}`
+            const _value = envs[`NUXT_${snakeCase(`${projectName}_${moduleName}_${key}` as string).toUpperCase()}`]
+            return {
+              [_key]: defaultConfig[key] ?? '',
+            }
+          }).reduce((acc, cur) => {
+            return {
+              ...acc,
+              ...cur,
+            }
+          }, {}),
+        },
+      })
+    }
 
     return {
       runtimeConfig: (runtimeConfig.public[projectName] as any)[moduleName] as T,

diff --git a/packages/nuxt/src/runtime/modules/graphqlYoga/index.ts b/packages/nuxt/src/runtime/modules/graphqlYoga/index.ts
@@ -80,7 +80,14 @@ export default definePergelModule<GraphQLYogaConfig, ResolvedGraphQLYogaConfig>(
 
     generateModuleRuntimeConfig<ResolvedGraphQLYogaConfig>(nuxt, options, {
       ...options,
-    }, true)
+    }, true, false)
+
+    generateModuleRuntimeConfig<ResolvedGraphQLYogaConfig>(nuxt, options, {
+      origin: undefined,
+      default: {
+        origin: 'http://localhost:3000,http://localhost:3001',
+      },
+    }, true, true)
 
     addServerImportsDir(resolver.resolve('./composables/**'))
 

diff --git a/packages/nuxt/src/runtime/modules/urql/index.ts b/packages/nuxt/src/runtime/modules/urql/index.ts
@@ -27,7 +27,10 @@ export default definePergelModule<UrqlModuleOptions>({
 
     generateModuleRuntimeConfig<UrqlModuleRuntimeConfig>(nuxt, options, {
       endpoint: undefined,
-    }, true)
+      default: {
+        endpoint: 'http://localhost:3000/api/graphql',
+      },
+    }, true, true)
 
     addImportsDir(resolver.resolve(join('plugins')))