From bbff7403fbf46f9ad92240ac213df8d30ef31b64 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Sep 2018 02:56:13 +0200 Subject: update packages --- node_modules/mixin-deep/index.js | 4 ++++ node_modules/mixin-deep/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'node_modules/mixin-deep') 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", -- cgit v1.2.3