Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 21:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(schema): handle null/undefined values in runtimeConfig (#2456)

Browse Source
This commit is contained in:
Daniel Roe 2021-12-20 12:19:31 +00:00 committed by GitHub
parent c288907f72
commit c824905b99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/nitro/src/rollup/config.ts
View File

@ -14,6 +14,7 @@ import wasmPlugin from '@rollup/plugin-wasm'
import inject from '@rollup/plugin-inject' import inject from '@rollup/plugin-inject'
import { visualizer } from 'rollup-plugin-visualizer' import { visualizer } from 'rollup-plugin-visualizer'
import * as unenv from 'unenv' import * as unenv from 'unenv'
import devalue from '@nuxt/devalue'
import type { Preset } from 'unenv' import type { Preset } from 'unenv'
import { sanitizeFilePath } from 'mlly' import { sanitizeFilePath } from 'mlly'
@ -164,7 +165,7 @@ export const getRollupConfig = (nitroContext: NitroContext) => {
'process.env.NUXT_STATIC_VERSION': JSON.stringify(nitroContext._nuxt.staticAssets.version), 'process.env.NUXT_STATIC_VERSION': JSON.stringify(nitroContext._nuxt.staticAssets.version),
'process.env.NUXT_FULL_STATIC': nitroContext._nuxt.fullStatic as unknown as string, 'process.env.NUXT_FULL_STATIC': nitroContext._nuxt.fullStatic as unknown as string,
'process.env.NITRO_PRESET': JSON.stringify(nitroContext.preset), 'process.env.NITRO_PRESET': JSON.stringify(nitroContext.preset),
'process.env.RUNTIME_CONFIG': JSON.stringify(nitroContext._nuxt.runtimeConfig), 'process.env.RUNTIME_CONFIG': devalue(nitroContext._nuxt.runtimeConfig),
'process.env.DEBUG': JSON.stringify(nitroContext._nuxt.dev) 'process.env.DEBUG': JSON.stringify(nitroContext._nuxt.dev)
} }
})) }))

2
packages/schema/src/config/_common.ts
View File

@ -714,6 +714,6 @@ export default {
* @version 3 * @version 3
*/ */
publicRuntimeConfig: { publicRuntimeConfig: {
$resolve: (val, get) => defu(val, { app: get('app') }) $resolve: (val = {}, get) => ({ ...val, app: defu(val.app, get('app')) })
}, },
} }