Skip to content

Commit 4fc42dd

Browse files
authored
fix: config merging order on the server side (#568)
1 parent e4a3eae commit 4fc42dd

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/options.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ export async function resolveServerOptions (nuxt: Nuxt, moduleOptions: ModuleCon
291291
}
292292
}
293293

294-
const config = defu(defaultConfig, options.config, options.serverConfig, getRuntimeConfig(nuxt, options))
294+
const config = defu(getServerRuntimeConfig(nuxt, options), options.serverConfig, options.config, defaultConfig)
295295
resolveTracingOptions(options, options.config)
296296

297297
return {
@@ -303,10 +303,13 @@ export async function resolveServerOptions (nuxt: Nuxt, moduleOptions: ModuleCon
303303
}
304304
}
305305

306-
function getRuntimeConfig (nuxt: Nuxt, options: ModuleConfiguration): Partial<ModuleConfiguration['config']> | undefined {
306+
function getServerRuntimeConfig (nuxt: Nuxt, options: ModuleConfiguration): Partial<ModuleConfiguration['config']> | undefined {
307307
const { publicRuntimeConfig } = nuxt.options
308308
const { runtimeConfigKey } = options
309309
if (publicRuntimeConfig && typeof (publicRuntimeConfig) !== 'function' && runtimeConfigKey in publicRuntimeConfig) {
310-
return defu(publicRuntimeConfig[runtimeConfigKey].config as Partial<ModuleConfiguration['config']>, publicRuntimeConfig[runtimeConfigKey].serverConfig as Partial<ModuleConfiguration['serverConfig']>)
310+
return defu(
311+
publicRuntimeConfig[runtimeConfigKey].serverConfig as Partial<ModuleConfiguration['serverConfig']>,
312+
publicRuntimeConfig[runtimeConfigKey].config as Partial<ModuleConfiguration['config']>,
313+
)
311314
}
312315
}

0 commit comments

Comments
 (0)