fix(nuxt): module runtime config to use process.env instead of import…

….meta.env
oku-ui · Mar 10, 2024 · 5b7776a · 5b7776a
1 parent 2249417
commit 5b7776a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/packages/nuxt/src/runtime/core/utils/moduleRuntimeConfig.ts b/packages/nuxt/src/runtime/core/utils/moduleRuntimeConfig.ts
@@ -27,9 +27,11 @@ export function generateModuleRuntimeConfig<T>(
     runtimeConfig.public[projectName] ??= {}
     runtimeConfig.public[projectName] = defu({
       [moduleName]: {
-        ...Object.entries(config).map(([key, _]) => {
+        ...Object.entries(config).map(([key, value]) => {
           return {
-            [key]: import.meta.env[`NUXT_${snakeCase(`${projectName}_${moduleName}_${key}` as string).toUpperCase()}`],
+            [key]: value === 'process'
+              ? import.meta.env[`NUXT_${snakeCase(`${projectName}_${moduleName}_${key}` as string).toUpperCase()}`] ?? (runtimeConfig.public as any)[projectName][moduleName][key] ?? defaultConfig[key] ?? ''
+              : value,
           }
         }).reduce((acc, cur) => {
           return {
@@ -40,19 +42,6 @@ export function generateModuleRuntimeConfig<T>(
       },
     }, {
       ...runtimeConfig.public[projectName] as any,
-    }, {
-      [moduleName]: {
-        ...Object.entries(config).map(([key, _]) => {
-          return {
-            [key]: defaultConfig[key] ?? '',
-          }
-        }).reduce((acc, cur) => {
-          return {
-            ...acc,
-            ...cur,
-          }
-        }),
-      },
     }) as T
 
     const { keyEnvValue } = runtimeConfigToEnv(

diff --git a/packages/nuxt/src/runtime/modules/capacitor/index.ts b/packages/nuxt/src/runtime/modules/capacitor/index.ts
@@ -79,9 +79,9 @@ export default definePergelModule<CapacitorOptions, ResolvedCapacitorOptions>({
     })
 
     const envData = generateModuleRuntimeConfig<CapacitorModuleRuntimeConfig>(nuxt, options, {
-      runTargetIOSSimulator: undefined,
-      runTargetAndroidEmulator: undefined,
-      runScheme: undefined,
+      runTargetIOSSimulator: 'process',
+      runTargetAndroidEmulator: 'process',
+      runScheme: 'process',
     }, true)
 
     const capacitorConfig = `import { type CapacitorConfig } from '@capacitor/cli';

diff --git a/packages/nuxt/src/runtime/modules/drizzle/index.ts b/packages/nuxt/src/runtime/modules/drizzle/index.ts
@@ -86,10 +86,10 @@ export default definePergelModule<DrizzleConfig, ResolvedDrizzleConfig>({
     const resolver = createResolver(import.meta.url)
 
     const envData = generateModuleRuntimeConfig<DrizzleRuntimeConfig>(nuxt, options, {
-      drop: true, // Drop database before migration
-      seed: true, // Seed database after migration
-      migrate: true, // Migrate database
-      mode: 'dev', // Development mode || 'production'
+      drop: 'process', // Drop database before migration
+      seed: 'process', // Seed database after migration
+      migrate: 'process', // Migrate database
+      mode: 'process', // Development mode || 'production'
     }, true)
 
     generateModuleRuntimeConfigEnv(nuxt, options, {

diff --git a/packages/nuxt/src/runtime/modules/urql/index.ts b/packages/nuxt/src/runtime/modules/urql/index.ts
@@ -49,10 +49,10 @@ export default definePergelModule<UrqlModuleOptions, ResolvedUrqlConfig>({
     })
 
     generateModuleRuntimeConfig<UrqlModuleRuntimeConfig>(nuxt, options, {
-      productionEndpoint: undefined,
-      devEndpoint: undefined,
-      client: undefined,
-      ssr: undefined,
+      productionEndpoint: 'process',
+      devEndpoint: 'process',
+      client: 'process',
+      ssr: 'process',
       default: {
         productionEndpoint: 'http://localhost:3000/api/graphql',
         devEndpoint: 'http://localhost:3000/api/graphql',