fix: improve array config merging (#6344)

vitejs · Jan 13, 2022 · 631bf45 · 631bf45
1 parent dd4c111
commit 631bf45
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/packages/vite/src/node/__tests__/config.spec.ts b/packages/vite/src/node/__tests__/config.spec.ts
@@ -46,6 +46,22 @@ describe('mergeConfig', () => {
     expect(mergeConfig(baseConfig, newConfig)).toEqual(mergedConfig)
   })
 
+  test('handles arrays', () => {
+    const baseConfig: UserConfigExport = {
+      envPrefix: 'string1'
+    }
+
+    const newConfig: UserConfigExport = {
+      envPrefix: ['string2', 'string3']
+    }
+
+    const mergedConfig: UserConfigExport = {
+      envPrefix: ['string1', 'string2', 'string3']
+    }
+
+    expect(mergeConfig(baseConfig, newConfig)).toEqual(mergedConfig)
+  })
+
   test('handles assetsInclude', () => {
     const baseConfig: UserConfigExport = {
       assetsInclude: 'some-string'

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -669,18 +669,6 @@ function mergeConfigRecursively(
     }
 
     const existing = merged[key]
-    if (Array.isArray(existing) && Array.isArray(value)) {
-      merged[key] = [...existing, ...value]
-      continue
-    }
-    if (isObject(existing) && isObject(value)) {
-      merged[key] = mergeConfigRecursively(
-        existing,
-        value,
-        rootPath ? `${rootPath}.${key}` : key
-      )
-      continue
-    }
 
     // fields that require special handling
     if (existing != null) {
@@ -695,6 +683,19 @@ function mergeConfigRecursively(
       }
     }
 
+    if (Array.isArray(existing) || Array.isArray(value)) {
+      merged[key] = [...arraify(existing), ...arraify(value)]
+      continue
+    }
+    if (isObject(existing) && isObject(value)) {
+      merged[key] = mergeConfigRecursively(
+        existing,
+        value,
+        rootPath ? `${rootPath}.${key}` : key
+      )
+      continue
+    }
+
     merged[key] = value
   }
   return merged