diff options
| author | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
| commit | bbff7403fbf46f9ad92240ac213df8d30ef31b64 (patch) | |
| tree | c58400ec5124da1c7d56b01aea83309f80a56c3b /node_modules/mixin-deep | |
| parent | 003fb34971cf63466184351b4db5f7c67df4f444 (diff) | |
update packages
Diffstat (limited to 'node_modules/mixin-deep')
| -rw-r--r-- | node_modules/mixin-deep/index.js | 4 | ||||
| -rw-r--r-- | node_modules/mixin-deep/package.json | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/node_modules/mixin-deep/index.js b/node_modules/mixin-deep/index.js index 60f704985..909fbef75 100644 --- a/node_modules/mixin-deep/index.js +++ b/node_modules/mixin-deep/index.js @@ -23,6 +23,10 @@ function mixinDeep(target, objects) { */ function copy(val, key) { + if (key === '__proto__') { + return; + } + var obj = this[key]; if (isObject(val) && isObject(obj)) { mixinDeep(obj, val); diff --git a/node_modules/mixin-deep/package.json b/node_modules/mixin-deep/package.json index 87d63ea04..d199f1c99 100644 --- a/node_modules/mixin-deep/package.json +++ b/node_modules/mixin-deep/package.json @@ -1,7 +1,7 @@ { "name": "mixin-deep", "description": "Deeply mix the properties of objects into the first object. Like merge-deep, but doesn't clone.", - "version": "1.3.0", + "version": "1.3.1", "homepage": "https://github.com/jonschlinkert/mixin-deep", "author": "Jon Schlinkert (https://github.com/jonschlinkert)", "repository": "jonschlinkert/mixin-deep", |