fix: rewrite rules when user defined rules are array

aiji42 · Jul 4, 2021 · 313f9f1 · 313f9f1
1 parent f73360c
commit 313f9f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/merge-rewrites.spec.ts b/src/merge-rewrites.spec.ts
@@ -21,7 +21,7 @@ describe('mergeRewrites', () => {
   })
 
   describe('originalRewrite is array type rewrite', () => {
-    it('must return merged array rules', () => {
+    it('must return merged object type rules', () => {
       expect(
         mergeRewrites(
           [
@@ -32,13 +32,15 @@ describe('mergeRewrites', () => {
           ],
           newRewrites
         )
-      ).toEqual([
-        ...newRewrites,
-        {
-          destination: '/foo/',
-          source: '/bar'
-        }
-      ])
+      ).toEqual({
+        beforeFiles: newRewrites,
+        afterFiles: [
+          {
+            destination: '/foo/',
+            source: '/bar'
+          }
+        ]
+      })
     })
   })
 

diff --git a/src/merge-rewrites.ts b/src/merge-rewrites.ts
@@ -8,10 +8,11 @@ export const mergeRewrites = (
   if (!originalRules) return {
     beforeFiles: newRules
   }
-  if (Array.isArray(originalRules)) return [
-    ...newRules,
-    ...originalRules
-  ]
+
+  if (Array.isArray(originalRules)) return {
+    beforeFiles: newRules,
+    afterFiles: originalRules
+  }
 
   return {
     ...originalRules,