fix(merge): don't serialize getters when merging

Ignigena · Aug 19, 2023 · 2e55932 · 2e55932
1 parent 06afe59
commit 2e55932
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/config/merge.js b/core/config/merge.js
@@ -9,7 +9,7 @@ const merge = (...sources) => sources.reduce((result, toMerge) => {
     } else if (isObject(oldValue) && isObject(newValue)) {
       result[key] = merge(oldValue, newValue)
     } else {
-      result[key] = newValue
+      Object.defineProperty(result, key, Object.getOwnPropertyDescriptor(toMerge, key))
     }
   }
 

diff --git a/core/config/merge.spec.js b/core/config/merge.spec.js
@@ -74,10 +74,10 @@ describe('merge', () => {
       get foo () {
         return 'bar'
       },
-      bar: 'bat'
+      bat: 'baz'
     }, {
       get bar () {
-        return 'baz'
+        return this.bat
       }
     })