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

fix(nuxt): allow updating appConfig with non-iterable objects (#28773)

Browse Source
This commit is contained in:
Gianluca Di Francesco 2024-09-02 13:12:58 +02:00 committed by Daniel Roe
parent 2d9e1442d8
commit 3c4949acfb
No known key found for this signature in database
GPG Key ID: 3714AB03996F442B
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/nuxt/src/app/config.ts
View File

@ -11,6 +11,15 @@ type DeepPartial<T> = T extends Function ? T : T extends Record<string, any> ? {
// Workaround for vite HMR with virtual modules // Workaround for vite HMR with virtual modules
export const _getAppConfig = () => __appConfig as AppConfig export const _getAppConfig = () => __appConfig as AppConfig
function isPojoOrArray (val: unknown): val is object {
return (
Array.isArray(val) ||
(!!val &&
typeof val === 'object' &&
val.constructor?.name === 'Object')
)
}
function deepDelete (obj: any, newObj: any) { function deepDelete (obj: any, newObj: any) {
for (const key in obj) { for (const key in obj) {
const val = newObj[key] const val = newObj[key]
@ -18,7 +27,7 @@ function deepDelete (obj: any, newObj: any) {
delete (obj as any)[key] delete (obj as any)[key]
} }
if (val !== null && typeof val === 'object') { if (isPojoOrArray(val)) {
deepDelete(obj[key], newObj[key]) deepDelete(obj[key], newObj[key])
} }
} }
@ -27,7 +36,7 @@ function deepDelete (obj: any, newObj: any) {
function deepAssign (obj: any, newObj: any) { function deepAssign (obj: any, newObj: any) {
for (const key in newObj) { for (const key in newObj) {
const val = newObj[key] const val = newObj[key]
if (val !== null && typeof val === 'object') { if (isPojoOrArray(val)) {
const defaultVal = Array.isArray(val) ? [] : {} const defaultVal = Array.isArray(val) ? [] : {}
obj[key] = obj[key] || defaultVal obj[key] = obj[key] || defaultVal
deepAssign(obj[key], val) deepAssign(obj[key], val)

38
test/nuxt/composables.test.ts
View File

@ -33,23 +33,33 @@ registerEndpoint('/api/test', defineEventHandler(event => ({
describe('app config', () => { describe('app config', () => {
it('can be updated', () => { it('can be updated', () => {
const appConfig = useAppConfig() const appConfig = useAppConfig()
expect(appConfig).toMatchInlineSnapshot(` expect(appConfig).toStrictEqual({ nuxt: {} })
{
"nuxt": {}, type UpdateAppConfig = Parameters<typeof updateAppConfig>[0]
}
`) const initConfig: UpdateAppConfig = {
updateAppConfig({
new: 'value', new: 'value',
nuxt: { nested: 42 }, nuxt: { nested: 42 },
}) regExp: /foo/g,
expect(appConfig).toMatchInlineSnapshot(` date: new Date(1111, 11, 11),
{ arr: [1, 2, 3],
"new": "value",
"nuxt": {
"nested": 42,
},
} }
`) updateAppConfig(initConfig)
expect(appConfig).toStrictEqual(initConfig)
const newConfig: UpdateAppConfig = {
nuxt: { anotherNested: 24 },
regExp: /bar/g,
date: new Date(2222, 12, 12),
arr: [4, 5],
}
updateAppConfig(newConfig)
expect(appConfig).toStrictEqual({
...initConfig,
...newConfig,
nuxt: { ...initConfig.nuxt, ...newConfig.nuxt },
arr: [4, 5, 3],
})
}) })
}) })