Browse Source

changed lodash merge to mergeWith to solve breaking changes when upgrading

Peter Svensson 3 years ago
parent
commit
fbbfa2be9f
3 changed files with 20 additions and 2 deletions
  1. 1 1
      lib/config-builder.js
  2. 18 0
      package-lock.json
  3. 1 1
      package.json

+ 1 - 1
lib/config-builder.js

@@ -137,7 +137,7 @@ exports.produceConfigObject = function (root, callback) {
             var json = JSON.parse(JSON.stringify(require(file)));
             transformShimDeps(json);
             transformPaths(json, root, file, dirMap);
-            _.merge(result, json, function (a, b) {
+            _.mergeWith(result, json, function (a, b) {
                 return _.isArray(a) ? b.concat(a) : undefined;
             });
         }

+ 18 - 0
package-lock.json

@@ -0,0 +1,18 @@
+{
+  "name": "amd-config-builder",
+  "version": "0.3.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "findit2": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz",
+      "integrity": "sha1-WKRmaX34piBc39vzlVNri9d3pfY="
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    }
+  }
+}

+ 1 - 1
package.json

@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "findit2": "^2.2.3",
-    "lodash": "^2.4.1"
+    "lodash": "^4.17.21"
   }
 }