From 5b7776a9d08c76437919269bdbbe1fa01e73d7fa Mon Sep 17 00:00:00 2001 From: productdevbook Date: Sun, 10 Mar 2024 11:11:52 +0300 Subject: [PATCH] fix(nuxt): module runtime config to use process.env instead of import.meta.env --- .../runtime/core/utils/moduleRuntimeConfig.ts | 19 ++++--------------- .../src/runtime/modules/capacitor/index.ts | 6 +++--- .../nuxt/src/runtime/modules/drizzle/index.ts | 8 ++++---- .../nuxt/src/runtime/modules/urql/index.ts | 8 ++++---- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/packages/nuxt/src/runtime/core/utils/moduleRuntimeConfig.ts b/packages/nuxt/src/runtime/core/utils/moduleRuntimeConfig.ts index 827b498e..c813be92 100644 --- 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( 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( }, }, { ...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 index 4d4836af..3cbe48cc 100644 --- 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({ }) const envData = generateModuleRuntimeConfig(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 index 4b25c60f..33a79d97 100644 --- 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({ const resolver = createResolver(import.meta.url) const envData = generateModuleRuntimeConfig(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 index 3076af5e..0a0debd1 100644 --- 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({ }) generateModuleRuntimeConfig(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',