Changed over to npm@5

Author: ctrlplusb

commonjs/componentQueries.js

@@ -48,7 +48,8 @@ var defaultConfig = {
   monitorHeight: false,
   monitorWidth: true,
   refreshRate: 16,
-  pure: true
+  pure: true,
+  noPlaceholder: false
 };
 
 var defaultConflictResolver = function defaultConflictResolver(x, y) {
@@ -94,13 +95,15 @@ function componentQueries() {
           monitorHeight = _params$0$config.monitorHeight,
           monitorWidth = _params$0$config.monitorWidth,
           refreshRate = _params$0$config.refreshRate,
-          refreshMode = _params$0$config.refreshMode;
+          refreshMode = _params$0$config.refreshMode,
+          noPlaceholder = _params$0$config.noPlaceholder;
 
       sizeMeConfig = {
         monitorHeight: monitorHeight != null ? monitorHeight : defaultConfig.monitorHeight,
         monitorWidth: monitorWidth != null ? monitorWidth : defaultConfig.monitorWidth,
         refreshRate: refreshRate != null ? refreshRate : defaultConfig.refreshRate,
-        refreshMode: refreshMode != null ? refreshMode : defaultConfig.refreshMode
+        refreshMode: refreshMode != null ? refreshMode : defaultConfig.refreshMode,
+        noPlaceholder: noPlaceholder != null ? noPlaceholder : defaultConfig.noPlaceholder
       };
     }
     conflictResolver = conflictResolver || params[0].conflictResolver || defaultConflictResolver;

commonjs/utils/__tests__/mergeWith.test.js

@@ -0,0 +1,76 @@
+'use strict';
+
+var _mergeWith = require('../mergeWith');
+
+var _mergeWith2 = _interopRequireDefault(_mergeWith);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+describe('When mering props with `mergeWith`', function () {
+  describe('and we are using "apply left prop" as resolver', function () {
+    var resolver = function resolver(x) {
+      return x;
+    };
+    it('it should keep all defined values on left side.', function () {
+      var a = {
+        string: 'string',
+        zero: 0,
+        negaive: -1,
+        float: 0.555555,
+        deep: {
+          er: 'foo'
+        },
+        array: [0, 1],
+        emptyArray: []
+      };
+      expect((0, _mergeWith2.default)(a, {}, resolver)).toMatchObject({
+        string: 'string',
+        zero: 0,
+        negaive: -1,
+        float: 0.555555,
+        deep: {
+          er: 'foo'
+        },
+        array: [0, 1],
+        emptyArray: []
+      });
+    });
+
+    it('it should keep all defined values on right side.', function () {
+      var b = {
+        string: 'string',
+        zero: 0,
+        negaive: -1,
+        float: 0.555555,
+        deep: {
+          er: 'foo'
+        },
+        array: [0, 1],
+        emptyArray: []
+      };
+      expect((0, _mergeWith2.default)({}, b, resolver)).toMatchObject({
+        string: 'string',
+        zero: 0,
+        negaive: -1,
+        float: 0.555555,
+        deep: {
+          er: 'foo'
+        },
+        array: [0, 1],
+        emptyArray: []
+      });
+    });
+
+    it('it should copy existing values and use left one on conflict.', function () {
+      var a = {
+        string: 'string'
+      };
+      var b = {
+        string: 'my string'
+      };
+      expect((0, _mergeWith2.default)(a, b, resolver)).toMatchObject({
+        string: 'string'
+      });
+    });
+  });
+});

commonjs/utils/mergeWith.js

@@ -10,7 +10,7 @@ var mergeWith = function mergeWith(x, y, fn) {
   Object.keys(y).forEach(function (key) {
     if (x[key] && y[key]) {
       result[key] = fn(x[key], y[key], key);
-    } else if (y[key]) {
+    } else {
       result[key] = y[key];
     }
   });