fix(okam-build): fix merge not plain object not correct #23

ecomfe · Dec 24, 2018 · b2214a8 · b2214a8
1 parent 4ed8712
commit b2214a8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/okam-build/lib/util/index.js b/packages/okam-build/lib/util/index.js
@@ -7,6 +7,10 @@
 
 const helper = require('okam-helper');
 
+function isPlainObject(obj) {
+    return toString.call(obj) === '[object Object]';
+}
+
 function doMerge(target, source, selector, doNotMergeSelectors) {
     if (doNotMergeSelectors && doNotMergeSelectors.includes(selector)) {
         return source;
@@ -24,8 +28,8 @@ function doMerge(target, source, selector, doNotMergeSelectors) {
         return result;
     }
 
-    let isTargetObj = !isTargetArr && target && typeof target === 'object';
-    let isSourceObj = !isSourceArr && source && typeof source === 'object';
+    let isTargetObj = !isTargetArr && isPlainObject(target);
+    let isSourceObj = !isSourceArr && isPlainObject(source);
     if (isTargetObj && isSourceObj) {
         let result = Object.assign({}, target);
         Object.keys(source).forEach(k => {