Merge pull request #1014 from stealjs/npm-106

Upgrade to steal-npm 1.0.6
stealjs · Jan 18, 2017 · 6f0cb66 · 6f0cb66
2 parents 1e58ac8 + 35b9ca1
commit 6f0cb66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ext/npm-utils.js b/ext/npm-utils.js
@@ -47,7 +47,7 @@ var utils = {
 			if(deep) {
 				if(utils.isArray(val)) {
 					d[prop] = slice.call(val);
-				} else if(utils.isObject(val)) {
+				} else if(utils.isPlainObject(val)) {
 					d[prop] = utils.extend({}, val, deep, set);
 				} else {
 					d[prop] = s[prop];
@@ -84,6 +84,10 @@ var utils = {
 	isObject: function(obj){
 		return typeof obj === "object";
 	},
+	isPlainObject: function(obj){
+		// A plain object has a proto that is the Object
+		return utils.isObject(obj) && (!obj || obj.__proto__ === Object.prototype);
+	},
 	isArray: Array.isArray || function(arr){
 		return Object.prototype.toString.call(arr) === "[object Array]";
 	},

diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "saucelabs": "^1.3.0",
     "steal-env": "^1.0.0",
     "steal-es6-module-loader": "0.17.14",
-    "steal-npm": "1.0.5",
+    "steal-npm": "1.0.6",
     "steal-qunit": "^1.0.0",
     "system-bower": "stealjs/system-bower#v0.2.1",
     "system-live-reload": "1.5.3",