diff options
| author | Rebecca Turner <me@re-becca.org> | 2018-04-20 18:26:37 -0700 |
|---|---|---|
| committer | Rebecca Turner <me@re-becca.org> | 2018-05-24 23:24:45 -0700 |
| commit | 468ab4519e1b92473acefb22801497a1af6aebae (patch) | |
| tree | bdac1d062cd4b094bde3a21147bab5d82c792ece /deps/npm/test/tap/install-package-lock-only.js | |
| parent | ac8226115e2192a7a46ba07789fa5136f74223e1 (diff) | |
| download | android-node-v8-468ab4519e1b92473acefb22801497a1af6aebae.tar.gz android-node-v8-468ab4519e1b92473acefb22801497a1af6aebae.tar.bz2 android-node-v8-468ab4519e1b92473acefb22801497a1af6aebae.zip | |
deps: upgrade npm to 6.1.0
PR-URL: https://github.com/nodejs/node/pull/20190
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Diffstat (limited to 'deps/npm/test/tap/install-package-lock-only.js')
| -rw-r--r-- | deps/npm/test/tap/install-package-lock-only.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/deps/npm/test/tap/install-package-lock-only.js b/deps/npm/test/tap/install-package-lock-only.js index b117dc97e3..9d8aa8dbec 100644 --- a/deps/npm/test/tap/install-package-lock-only.js +++ b/deps/npm/test/tap/install-package-lock-only.js @@ -6,7 +6,6 @@ var mr = require('npm-registry-mock') var Tacks = require('tacks') var File = Tacks.File var Dir = Tacks.Dir -var extend = Object.assign || require('util')._extend var common = require('../common-tap.js') var basedir = path.join(__dirname, path.basename(__filename, '.js')) @@ -20,7 +19,7 @@ var nodeModulesPath = path.join(testdir, 'node_modules') var conf = { cwd: testdir, - env: extend(extend({}, process.env), { + env: Object.assign({}, process.env, { npm_config_cache: cachedir, npm_config_tmp: tmpdir, npm_config_prefix: globaldir, |