Release: npm@6.10.1

.mailmap

@@ -28,7 +28,8 @@ Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
 Gregers Gram Rygg <gregers.gram.rygg@finn.no>
 Ifeanyi Oraelosi <ifeanyioraelosi@gmail.com>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
-Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>
+Isaac Z. Schlueter <i@izs.me>
+isaacs <i@izs.me>
 Jake Verbaten <raynos2@gmail.com>
 James Sanders <jimmyjazz14@gmail.com>
 James Treworgy <jamietre@gmail.com>

CHANGELOG.md

@@ -1,3 +1,48 @@
+## v6.10.1 (2019-07-11):
+
+### BUGFIXES
+
+* [`3cbd57712`](https://github.com/npm/cli/commit/3cbd577120a9da6e51bb8b13534d1bf71ea5712c)
+  fix(git): strip GIT environs when running git
+  ([@isaacs](https://github.com/isaacs))
+* [`a81a8c4c4`](https://github.com/npm/cli/commit/a81a8c4c466f510215a51cef1bb08544d11844fe)
+  [#206](https://github.com/npm/cli/pull/206) improve isOnly(Dev,Optional)
+  ([@larsgw](https://github.com/larsgw))
+* [`172f9aca6`](https://github.com/npm/cli/commit/172f9aca67a66ee303c17f90a994cd52fc66552a)
+  [#179](https://github.com/npm/cli/pull/179) fix-xmas-underline
+  ([@raywu0123](https://github.com/raywu0123))
+
+### DEPENDENCIES
+
+* [`429226a5e`](https://github.com/npm/cli/commit/429226a5e992cd907d4f19bd738037007cf78c1f)
+  `lru-cache@5.1.1` ([@isaacs](https://github.com/isaacs))
+* [`175670ea6`](https://github.com/npm/cli/commit/175670ea65cca03f8b2e957df3dd4b8b0efd0e1f)
+  `npm-registry-fetch@3.9.1`: ([@isaacs](https://github.com/isaacs))
+* [`0d0517f7f`](https://github.com/npm/cli/commit/0d0517f7f8c902b5064ac18fb4015b31750ad2b2)
+  `call-limit@1.1.1` ([@isaacs](https://github.com/isaacs))
+* [`741400429`](https://github.com/npm/cli/commit/74140042917ea241062a812ceb65c5423c2bafa9)
+  `glob@7.1.4` ([@isaacs](https://github.com/isaacs))
+* [`bddd60e30`](https://github.com/npm/cli/commit/bddd60e302283a4a70d35f8f742e42bd13f4dabf)
+  `inherits@2.0.4` ([@isaacs](https://github.com/isaacs))
+* [`4acf03fd1`](https://github.com/npm/cli/commit/4acf03fd140ed3ddb2dcf3fdc9756bc3f5a8bcbb)
+  `libnpmsearch@2.0.1` ([@isaacs](https://github.com/isaacs))
+* [`c2bd17291`](https://github.com/npm/cli/commit/c2bd17291a86bea7ced2fbd07d66d013bd7a7560)
+  `marked@0.6.3` ([@isaacs](https://github.com/isaacs))
+* [`7f0221bb1`](https://github.com/npm/cli/commit/7f0221bb1bb41ffc933c785940e227feae38c80c)
+  `marked-man@0.6.0` ([@isaacs](https://github.com/isaacs))
+* [`f458fe7dd`](https://github.com/npm/cli/commit/f458fe7dd3bebddf603aaae183a424ea8aaa018f)
+  `npm-lifecycle@2.1.1` ([@isaacs](https://github.com/isaacs))
+* [`009752978`](https://github.com/npm/cli/commit/0097529780269c28444f1efa0d7c131d47a933eb)
+  `node-gyp@4.0.0` ([@isaacs](https://github.com/isaacs))
+* [`0fa2bb438`](https://github.com/npm/cli/commit/0fa2bb4386379d6e9d8c95db08662ec0529964f9)
+  `query-string@6.8.1` ([@isaacs](https://github.com/isaacs))
+* [`b86450929`](https://github.com/npm/cli/commit/b86450929796950a1fe4b1f9b02b1634c812f3bb)
+  `tar-stream@2.1.0` ([@isaacs](https://github.com/isaacs))
+* [`25db00fe9`](https://github.com/npm/cli/commit/25db00fe953453198adb9e1bd71d1bc2a9f04aaa)
+  `worker-farm@1.7.0` ([@isaacs](https://github.com/isaacs))
+* [`8dfbe8610`](https://github.com/npm/cli/commit/8dfbe861085dfa8fa56bb504b4a00fba04c34f9d)
+  `readable-stream@3.4.0` ([@isaacs](https://github.com/isaacs))
+
 ## v6.10.0 (2019-07-03):
 
 ### FEATURES

lib/fetch-package-metadata.js

@@ -26,7 +26,8 @@ function andLogAndFinish (spec, tracker, done) {
   }
 }
 
-const CACHE = require('lru-cache')({
+const LRUCache = require('lru-cache')
+const CACHE = new LRUCache({
   max: 300 * 1024 * 1024,
   length: (p) => p._contentLength
 })

lib/install/is-only-dev.js

@@ -28,9 +28,10 @@ function andIsOnlyDev (name, seen) {
       return isDev && !isProd
     } else {
       if (seen.has(req)) return true
-      seen = new Set(seen)
       seen.add(req)
-      return isOnlyDev(req, seen)
+      const result = isOnlyDev(req, seen)
+      seen.delete(req)
+      return result
     }
   }
 }

lib/install/is-only-optional.js

@@ -11,11 +11,12 @@ function isOptional (node, seen) {
   if (seen.has(node) || node.requiredBy.length === 0) {
     return false
   }
-  seen = new Set(seen)
   seen.add(node)
   const swOptional = node.fromShrinkwrap && node.package._optional
-  return node.requiredBy.every(function (req) {
+  const result = node.requiredBy.every(function (req) {
     if (req.fakeChild && swOptional) return true
     return isOptDep(req, moduleName(node)) || isOptional(req, seen)
   })
+  seen.delete(node)
+  return result
 }

lib/utils/git.js

@@ -28,6 +28,16 @@ function execGit (args, options, cb) {
 
 function spawnGit (args, options) {
   log.info('git', args)
+  // If we're already in a git command (eg, running test as an exec
+  // line in an interactive rebase) then these environment variables
+  // will force git to operate on the current project, instead of
+  // checking out/fetching/etc. whatever the user actually intends.
+  options.env = options.env || Object.keys(process.env)
+    .filter(k => !/^GIT/.test(k))
+    .reduce((set, k) => {
+      set[k] = process.env[k]
+      return set
+    }, {})
   return spawn(git, prefixGitArgs().concat(args || []), options)
 }
 

lib/xmas.js

@@ -11,7 +11,7 @@ module.exports = function (args, cb) {
     '\u0020', '\u0020', '\u0020', '\u0020', '\u0020', '\u0020',
     '\u0020', '\u2E1B', '\u2042', '\u2E2E', '&', '@', '\uFF61'
   ]
-  var oc = [21, 33, 34, 35, 36, 37]
+  var oc = [33, 34, 35, 36, 37]
   var l = '\u005e'
 
   function w (s) { process.stderr.write(s) }
@@ -25,6 +25,7 @@ module.exports = function (args, cb) {
       var O = L * 2 - 2
       var S = (M - O) / 2
       for (i = 0; i < S; i++) w(' ')
+      w(x + '\u001b[21m')
       w(x + '\u001b[32m' + f)
       for (i = 0; i < O; i++) {
         w(
@@ -33,6 +34,7 @@ module.exports = function (args, cb) {
         )
       }
       w(x + '\u001b[32m' + b + '\n')
+      w(x + '\u001b[0m')
     }
     w(' ')
     for (i = 1; i < H; i++) w('\u001b[32m' + l)