recursive-merge - npm Package Compare versions

Comparing version 1.1.2 to 1.1.3

lib/Merge.js

@@ -29,7 +29,9 @@ // Generated by CoffeeScript 1.6.3
           value = right[name];
-          valueType = type.call(value);
-          if (typeof left[name] === 'undefined' || left[name] === null) {
-            left[name] = value;
-          } else if (valueType === '[object Array]' || valueType === '[object Object]') {
-            left[name] = merge(left[name], value);
+          if (right.hasOwnProperty(name) && (name !== '__proto__')) {
+            valueType = type.call(value);
+            if (typeof left[name] === 'undefined' || left[name] === null) {
+              left[name] = value;
+            } else if (valueType === '[object Array]' || valueType === '[object Object]') {
+              left[name] = merge(left[name], value);
+            }
           }
@@ -36,0 +38,0 @@ }

package.json

 {
 	"name": "recursive-merge",
 	"description": "Recursive merge tool for arrays and objects",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"author": {
@@ -6,0 +6,0 @@ "name": "David Kudera",

README.md

@@ -43,4 +43,4 @@ # Recursive merge
 
-* 1.1.2
-	+ Bug with null items in IE8
+* 1.1.2 - 1.1.3
+	+ Bugs in IE8
 
@@ -47,0 +47,0 @@ * 1.1.0 - 1.1.1

test/browser/application.js

@@ -200,7 +200,9 @@ /** Generated by SimQ **/
 	          value = right[name];
-	          valueType = type.call(value);
-	          if (typeof left[name] === 'undefined' || left[name] === null) {
-	            left[name] = value;
-	          } else if (valueType === '[object Array]' || valueType === '[object Object]') {
-	            left[name] = merge(left[name], value);
+	          if (right.hasOwnProperty(name) && (name !== '__proto__')) {
+	            valueType = type.call(value);
+	            if (typeof left[name] === 'undefined' || left[name] === null) {
+	              left[name] = value;
+	            } else if (valueType === '[object Array]' || valueType === '[object Object]') {
+	              left[name] = merge(left[name], value);
+	            }
 	          }
@@ -382,3 +384,3 @@ }
 		"description": "Recursive merge tool for arrays and objects",
-		"version": "1.1.1",
+		"version": "1.1.2",
 		"author": {
@@ -418,3 +420,3 @@ "name": "David Kudera",
 });
-require.__setStats({"/lib/Merge.js":{"atime":1385387764000,"mtime":1385387762000,"ctime":1385387762000},"/test/browser/tests/Merge.coffee":{"atime":1385387157000,"mtime":1385387105000,"ctime":1385387105000},"/package.json":{"atime":1385387640000,"mtime":1385387634000,"ctime":1385387634000}});
+require.__setStats({"/lib/Merge.js":{"atime":1385388465000,"mtime":1385388458000,"ctime":1385388458000},"/test/browser/tests/Merge.coffee":{"atime":1385387157000,"mtime":1385387105000,"ctime":1385387105000},"/package.json":{"atime":1385388477000,"mtime":1385388471000,"ctime":1385388471000}});
 require.version = '5.1.2';
@@ -421,0 +423,0 @@

New alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Fixed alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

25220

increased by1.01%

Lines of code

593

increased by0.68%

No dependency changes