feat(app.config): improve merging strategy

nuxt · Aug 24, 2022 · c54292b · c54292b
1 parent 856c2a6
commit c54292b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/examples/advanced/config-extends/app.config.ts b/examples/advanced/config-extends/app.config.ts
@@ -1,5 +1,20 @@
 export default defineAppConfig({
   foo: 'user',
   bar: 'user',
-  baz: 'base'
+  baz: 'base',
+  array: [
+    'user',
+    'user',
+    'user'
+  ],
+  arrayNested: {
+    nested: {
+      key: 'user',
+      array: [
+        'user',
+        'user',
+        'user'
+      ]
+    }
+  }
 })
diff --git a/examples/advanced/config-extends/base/app.config.ts b/examples/advanced/config-extends/base/app.config.ts
@@ -1,4 +1,18 @@
 export default defineAppConfig({
   bar: 'base',
-  baz: 'base'
+  baz: 'base',
+  array: [
+    'base',
+    'base',
+    'base'
+  ],
+  arrayNested: {
+    nested: {
+      array: [
+        'base',
+        'base',
+        'base'
+      ]
+    }
+  }
 })
diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
@@ -207,12 +207,20 @@ export const appConfigTemplate: NuxtTemplate = {
   write: true,
   getContents: ({ app, nuxt }) => {
     return `
-import defu from 'defu'
+import { createDefu } from 'defu'
 
 const inlineConfig = ${JSON.stringify(nuxt.options.appConfig, null, 2)}
 
 ${app.configs.map((id: string, index: number) => `import ${`cfg${index}`} from ${JSON.stringify(id)}`).join('\n')}
-export default defu(${app.configs.map((_id: string, index: number) => `cfg${index}`).concat(['inlineConfig']).join(', ')})
+
+const merge = createDefu((obj, key, value) => {
+  if (obj[key] && Array.isArray(obj[key])) {
+    obj[key] = value
+    return true
+  }
+})
+
+export default merge(${app.configs.map((_id: string, index: number) => `cfg${index}`).concat(['inlineConfig']).join(', ')})
 `
   }
 }