From b979f748878d89b9452555561451d7d2bf701b5d Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Wed, 6 Apr 2022 14:17:57 +0200 Subject: [PATCH] fix: update runtime/config --- src/runtime/config.ts | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/runtime/config.ts b/src/runtime/config.ts index a58a14f5d8..9477bb0047 100644 --- a/src/runtime/config.ts +++ b/src/runtime/config.ts @@ -1,33 +1,26 @@ import destr from 'destr' -import defu from 'defu' import { snakeCase } from 'scule' // Bundled runtime config (injected by nitro) const _runtimeConfig = process.env.RUNTIME_CONFIG as any // Allow override from process.env and deserialize -for (const type of ['private', 'public']) { - for (const key in _runtimeConfig[type]) { - // baseURL can be overridden by BASE_URL - const envKey = snakeCase(key).toUpperCase() - _runtimeConfig[type][key] = destr(process.env[envKey] || _runtimeConfig[type][key]) - if (_runtimeConfig[type][key] && typeof _runtimeConfig[type][key] === 'object') { - for (const subkey in _runtimeConfig[type][key]) { - // key: { subKey } can be overridden by KEY_SUB_KEY` - const envKeyName = `${envKey}_${snakeCase(subkey).toUpperCase()}` - _runtimeConfig[type][key][subkey] = destr(process.env[envKeyName]) || _runtimeConfig[type][key][subkey] - } +for (const key in _runtimeConfig) { + // baseURL can be overridden by BASE_URL + const envKey = snakeCase(key).toUpperCase() + _runtimeConfig[key] = destr(process.env[envKey] || _runtimeConfig[key]) + if (_runtimeConfig[key] && typeof _runtimeConfig[key] === 'object') { + for (const subkey in _runtimeConfig[key]) { + // key: { subKey } can be overridden by KEY_SUB_KEY` + const envKeyName = `${envKey}_${snakeCase(subkey).toUpperCase()}` + _runtimeConfig[key][subkey] = destr(process.env[envKeyName]) || _runtimeConfig[key][subkey] } } } // Named exports -export const privateConfig = deepFreeze(defu(_runtimeConfig.private, _runtimeConfig.public)) -export const publicConfig = deepFreeze(_runtimeConfig.public) - -// Default export (usable for server) -export const config = privateConfig -export default privateConfig +export const config = deepFreeze(_runtimeConfig) +export default config // Utils function deepFreeze (object: Record) {