diff options
Diffstat (limited to 'node_modules/deep-extend')
| -rw-r--r-- | node_modules/deep-extend/CHANGELOG.md | 31 | ||||
| -rw-r--r-- | node_modules/deep-extend/LICENSE | 2 | ||||
| -rw-r--r-- | node_modules/deep-extend/README.md | 3 | ||||
| -rw-r--r-- | node_modules/deep-extend/lib/deep-extend.js | 16 | ||||
| -rw-r--r-- | node_modules/deep-extend/package.json | 21 |
5 files changed, 52 insertions, 21 deletions
diff --git a/node_modules/deep-extend/CHANGELOG.md b/node_modules/deep-extend/CHANGELOG.md index f3efe0b22..dd13ec131 100644 --- a/node_modules/deep-extend/CHANGELOG.md +++ b/node_modules/deep-extend/CHANGELOG.md @@ -1,19 +1,44 @@ Changelog ========= +v0.6.0 +------ + +- Updated "devDependencies" versions to fix vulnerability alerts +- Dropped support of io.js and node.js v0.12.x and lower since new versions of + "devDependencies" couldn't work with those old node.js versions + (minimal supported version of node.js now is v4.0.0) + +v0.5.1 +------ + +- Fix prototype pollution vulnerability (thanks to @mwakerman for the PR) +- Avoid using deprecated Buffer API (thanks to @ChALkeR for the PR) + +v0.5.0 +------ + +- Auto-testing provided by Travis CI; +- Support older Node.JS versions (`v0.11.x` and `v0.10.x`); +- Removed tests files from npm package. + +v0.4.2 +------ + +- Fix for `null` as an argument. + v0.4.1 ------ - Removed test code from <b>npm</b> package ([see pull request #21](https://github.com/unclechu/node-deep-extend/pull/21)); -- Increased minimal version of Node from 0.4.0 to 0.12.0 +- Increased minimal version of Node from `0.4.0` to `0.12.0` (because can't run tests on lesser version anyway). v0.4.0 ------ -Broken backward compatibility with v0.3.x - +- **WARNING!** Broken backward compatibility with `v0.3.x`; - Fixed bug with extending arrays instead of cloning; - Deep cloning for arrays; - Check for own property; diff --git a/node_modules/deep-extend/LICENSE b/node_modules/deep-extend/LICENSE index acc4662ea..5c58916f2 100644 --- a/node_modules/deep-extend/LICENSE +++ b/node_modules/deep-extend/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013-2015, Viacheslav Lotsmanov +Copyright (c) 2013-2018, Viacheslav Lotsmanov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/node_modules/deep-extend/README.md b/node_modules/deep-extend/README.md index 70022248d..67c7fc085 100644 --- a/node_modules/deep-extend/README.md +++ b/node_modules/deep-extend/README.md @@ -3,8 +3,9 @@ Deep Extend Recursive object extending. +[](https://travis-ci.org/unclechu/node-deep-extend) + [](https://nodei.co/npm/deep-extend/) -[](https://nodei.co/npm/deep-extend/) Install ------- diff --git a/node_modules/deep-extend/lib/deep-extend.js b/node_modules/deep-extend/lib/deep-extend.js index 08f70ed76..651fd8d3e 100644 --- a/node_modules/deep-extend/lib/deep-extend.js +++ b/node_modules/deep-extend/lib/deep-extend.js @@ -5,7 +5,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2013-2015 Viacheslav Lotsmanov + * Copyright (c) 2013-2018 Viacheslav Lotsmanov * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -37,7 +37,9 @@ function isSpecificValue(val) { function cloneSpecificValue(val) { if (val instanceof Buffer) { - var x = new Buffer(val.length); + var x = Buffer.alloc + ? Buffer.alloc(val.length) + : new Buffer(val.length); val.copy(x); return x; } else if (val instanceof Date) { @@ -70,6 +72,10 @@ function deepCloneArray(arr) { return clone; } +function safeGetProperty(object, property) { + return property === '__proto__' ? undefined : object[property]; +} + /** * Extening object that entered in first argument. * @@ -102,8 +108,8 @@ var deepExtend = module.exports = function (/*obj_1, [obj_2], [obj_N]*/) { } Object.keys(obj).forEach(function (key) { - src = target[key]; // source value - val = obj[key]; // new value + src = safeGetProperty(target, key); // source value + val = safeGetProperty(obj, key); // new value // recursion prevention if (val === target) { @@ -141,4 +147,4 @@ var deepExtend = module.exports = function (/*obj_1, [obj_2], [obj_N]*/) { }); return target; -} +}; diff --git a/node_modules/deep-extend/package.json b/node_modules/deep-extend/package.json index a6dfab575..5f2195ff9 100644 --- a/node_modules/deep-extend/package.json +++ b/node_modules/deep-extend/package.json @@ -2,7 +2,7 @@ "name": "deep-extend", "description": "Recursive object extending", "license": "MIT", - "version": "0.4.2", + "version": "0.6.0", "homepage": "https://github.com/unclechu/node-deep-extend", "keywords": [ "deep-extend", @@ -38,26 +38,25 @@ { "name": "Marshall Bowers", "url": "https://github.com/maxdeviant" + }, + { + "name": "Misha Wakerman", + "url": "https://github.com/mwakerman" } ], "main": "lib/deep-extend.js", "engines": { - "node": ">=0.12.0", - "iojs": ">=1.0.0" + "node": ">=4.0.0" }, "scripts": { "test": "./node_modules/.bin/mocha" }, "devDependencies": { - "mocha": "^2.2.1", - "should": "^5.2.0" - }, - "directories": { - "lib": "./lib/", - "test": "./test/" + "mocha": "5.2.0", + "should": "13.2.1" }, "files": [ - "lib/deep-extend.js", - "index.js" + "index.js", + "lib/" ] } |