Release 6.12.0

.travis.yml

@@ -1,4 +1,3 @@
-sudo: true
 # need to declare the language as well as the matrix below
 language: node_js
 

AUTHORS

@@ -656,3 +656,9 @@ Olivier Chevet <olivr70@outlook.fr>
 Maël Nison <nison.mael@gmail.com>
 Sara Ahbabou <ahbabousara@gmail.com>
 Gareth Jones <Jones258@Gmail.com>
+Ruy Adorno <ruyadorno@hotmail.com>
+Michael Perrotte <mike@npmjs.com>
+Ben Blank <ben.blank+github@gmail.com>
+Christian Clauss <cclauss@me.com>
+Nikita Lebedev <bloomber111@gmail.com>
+Henrik Gemal <henrik@gemal.dk>

CHANGELOG.md

@@ -1,3 +1,68 @@
+## 6.12.0 (2019-10-08):
+
+Now `npm ci` runs prepare scripts for git dependencies, and respects the
+`--no-optional` argument.  Warnings for `engine` mismatches are printed
+again.  Various other fixes and cleanups.
+
+### BUG FIXES
+
+* [`890b245dc`](https://github.com/npm/cli/commit/890b245dc1f609590d8ab993fac7cf5a37ed46a5)
+  [#252](https://github.com/npm/cli/pull/252) ci: add dirPacker to options
+  ([@claudiahdz](https://github.com/claudiahdz))
+* [`f3299acd0`](https://github.com/npm/cli/commit/f3299acd0b4249500e940776aca77cc6c0977263)
+  [#257](https://github.com/npm/cli/pull/257)
+  [npm.community#4792](https://npm.community/t/engines-and-engines-strict-ignored/4792)
+  warn message on engine mismatch
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`bbc92fb8f`](https://github.com/npm/cli/commit/bbc92fb8f3478ff67071ebaff551f01c1ea42ced)
+  [#259](https://github.com/npm/cli/pull/259)
+  [npm.community#10288](https://npm.community/t/npm-token-err-figgypudding-options-cannot-be-modified-use-concat-instead/10288)
+  Fix figgyPudding error in `npm token`
+  ([@benblank](https://github.com/benblank))
+* [`70f54dcb5`](https://github.com/npm/cli/commit/70f54dcb5693b301c6b357922b7e8d16b57d8b00)
+  [#241](https://github.com/npm/cli/pull/241) doctor: Make OK more
+  consistent ([@gemal](https://github.com/gemal))
+
+### FEATURES
+
+* [`ed993a29c`](https://github.com/npm/cli/commit/ed993a29ccf923425317c433844d55dbea2f23ee)
+  [#249](https://github.com/npm/cli/pull/249) Add CI environment variables
+  to user-agent ([@isaacs](https://github.com/isaacs))
+* [`f6b0459a4`](https://github.com/npm/cli/commit/f6b0459a466a2c663dbd549cdc331e7732552dca)
+  [#248](https://github.com/npm/cli/pull/248) Add option to save
+  package-lock without formatting Adds a new config
+  `--format-package-lock`, which defaults to true.
+  ([@bl00mber](https://github.com/bl00mber))
+
+### DEPENDENCIES
+
+* [`0ca063c5d`](https://github.com/npm/cli/commit/0ca063c5dc961c4aa17373f4b33fb54c51c8c8d6)
+  `npm-lifecycle@3.1.4`:
+  - fix: filter functions and undefined out of makeEnv
+    ([@isaacs](https://github.com/isaacs))
+* [`5df6b0ea2`](https://github.com/npm/cli/commit/5df6b0ea2e3106ba65bba649cc8d7f02f4738236)
+  `libcipm@4.0.4`:
+  - fix: pack git directories properly
+    ([@claudiahdz](https://github.com/claudiahdz))
+  - respect no-optional argument
+    ([@cruzdanilo](https://github.com/cruzdanilo))
+* [`7e04f728c`](https://github.com/npm/cli/commit/7e04f728cc4cd4853a8fc99e2df0a12988897589)
+  `tar@4.4.12`
+* [`5c380e5a3`](https://github.com/npm/cli/commit/5c380e5a33d760bb66a4285b032ae5f50af27199)
+  `stringify-package@1.0.1` ([@isaacs](https://github.com/isaacs))
+* [`62f2ca692`](https://github.com/npm/cli/commit/62f2ca692ac0c0467ef4cf74f91777a5175258c4)
+  `node-gyp@5.0.5` ([@isaacs](https://github.com/isaacs))
+* [`0ff0ea47a`](https://github.com/npm/cli/commit/0ff0ea47a8840dd7d952bde7f7983a5016cda8ea)
+  `npm-install-checks@3.0.2` ([@isaacs](https://github.com/isaacs))
+* [`f46edae94`](https://github.com/npm/cli/commit/f46edae9450b707650a0efab09aa1e9295a18070)
+  `hosted-git-info@2.8.5` ([@isaacs](https://github.com/isaacs))
+
+### TESTING
+
+* [`44a2b036b`](https://github.com/npm/cli/commit/44a2b036b34324ec85943908264b2e36de5a9435)
+  [#262](https://github.com/npm/cli/pull/262) fix root-ownership race
+  conditions in meta-test ([@isaacs](https://github.com/isaacs))
+
 ## 6.11.3 (2019-09-03):
 
 Fix npm ci regressions and npm outdated depth.

doc/misc/npm-config.md

@@ -387,6 +387,13 @@ Makes various commands more forceful.
 * skips cache when requesting from the registry.
 * prevents checks against clobbering non-npm files.
 
+### format-package-lock
+
+* Default: true
+* Type: Boolean
+
+Format `package-lock.json` or `npm-shrinkwrap.json` as a human readable file.
+
 ### fetch-retries
 
 * Default: 2

lib/ci.js

@@ -4,6 +4,7 @@ const npm = require('./npm.js')
 const Installer = require('libcipm')
 const log = require('npmlog')
 const path = require('path')
+const pack = require('./pack.js')
 
 ci.usage = 'npm ci'
 
@@ -27,7 +28,8 @@ function ci (args, cb) {
     fmode: npm.modes.file,
     umask: npm.modes.umask,
     npmVersion: npm.version,
-    tmp: npm.tmp
+    tmp: npm.tmp,
+    dirPacker: pack.packGitDep
   }
 
   for (const key in npm.config.list[0]) {

lib/config/defaults.js

@@ -141,6 +141,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
     editor: osenv.editor(),
     'engine-strict': false,
     force: false,
+    'format-package-lock': true,
 
     'fetch-retries': 2,
     'fetch-retry-factor': 10,
@@ -201,7 +202,8 @@ Object.defineProperty(exports, 'defaults', {get: function () {
     'user-agent': 'npm/{npm-version} ' +
                     'node/{node-version} ' +
                     '{platform} ' +
-                    '{arch}',
+                    '{arch} ' +
+                    '{ci}',
     'read-only': false,
     'rebuild-bundle': true,
     registry: 'https://registry.npmjs.org/',
@@ -282,6 +284,7 @@ exports.types = {
   editor: String,
   'engine-strict': Boolean,
   force: Boolean,
+  'format-package-lock': Boolean,
   'fetch-retries': Number,
   'fetch-retry-factor': Number,
   'fetch-retry-mintimeout': Number,

lib/doctor/check-ping.js

@@ -8,7 +8,7 @@ function checkPing (cb) {
     if (err && err.code && err.code.match(/^E\d{3}$/)) {
       return cb(null, [err.code.substr(1)])
     } else {
-      cb(null, [200, 'OK'])
+      cb(null, [200, 'ok'])
     }
   })
 }

lib/install/actions.js

@@ -49,7 +49,7 @@ Object.keys(actions).forEach(function (actionName) {
     if (pkg.knownInstallable) {
       actionP = runAction(action, staging, pkg, log)
     } else {
-      actionP = isInstallable(pkg.package).then(() => {
+      actionP = isInstallable(null, pkg.package).then(() => {
         pkg.knownInstallable = true
         return runAction(action, staging, pkg, log)
       })

lib/install/deps.js

@@ -665,7 +665,7 @@ function resolveWithNewModule (pkg, tree, log, next) {
   validate('OOOF', arguments)
 
   log.silly('resolveWithNewModule', packageId(pkg), 'checking installable status')
-  return isInstallable(pkg, (err) => {
+  return isInstallable(tree, pkg, (err) => {
     let installable = !err
     addBundled(pkg, (bundleErr) => {
       var parent = earliestInstallable(tree, tree, pkg, log) || tree

lib/install/validate-args.js

@@ -16,7 +16,7 @@ module.exports = function (idealTree, args, next) {
     chain([
       [hasMinimumFields, pkg],
       [checkSelf, idealTree, pkg, force],
-      [isInstallable, pkg]
+      [isInstallable, idealTree, pkg]
     ], done)
   }, next)
 }
@@ -31,13 +31,24 @@ function hasMinimumFields (pkg, cb) {
   }
 }
 
-function getWarnings (pkg) {
-  while (pkg.parent) pkg = pkg.parent
-  if (!pkg.warnings) pkg.warnings = []
-  return pkg.warnings
+function setWarnings (idealTree, warn) {
+  function top (tree) {
+    if (tree.parent) return top(tree.parent)
+    return tree
+  }
+
+  var topTree = top(idealTree)
+  if (!topTree.warnings) topTree.warnings = []
+
+  if (topTree.warnings.every(i => (
+    i.code !== warn.code ||
+    i.required !== warn.required ||
+    i.pkgid !== warn.pkgid))) {
+    topTree.warnings.push(warn)
+  }
 }
 
-var isInstallable = module.exports.isInstallable = function (pkg, next) {
+var isInstallable = module.exports.isInstallable = function (idealTree, pkg, next) {
   var force = npm.config.get('force')
   var nodeVersion = npm.config.get('node-version')
   if (/-/.test(nodeVersion)) {
@@ -48,7 +59,7 @@ var isInstallable = module.exports.isInstallable = function (pkg, next) {
   var strict = npm.config.get('engine-strict')
   checkEngine(pkg, npm.version, nodeVersion, force, strict, iferr(next, thenWarnEngineIssues))
   function thenWarnEngineIssues (warn) {
-    if (warn) getWarnings(pkg).push(warn)
+    if (idealTree && warn) setWarnings(idealTree, warn)
     checkPlatform(pkg, force, next)
   }
 }

lib/npm.js

@@ -281,7 +281,27 @@
         ua = ua.replace(/\{npm-version\}/gi, npm.version)
         ua = ua.replace(/\{platform\}/gi, process.platform)
         ua = ua.replace(/\{arch\}/gi, process.arch)
-        config.set('user-agent', ua)
+
+        // continuous integration platforms
+        const ci = process.env.GERRIT_PROJECT ? 'ci/gerrit'
+          : process.env.GITLAB_CI ? 'ci/gitlab'
+            : process.env.CIRCLECI ? 'ci/circle-ci'
+              : process.env.SEMAPHORE ? 'ci/semaphore'
+                : process.env.DRONE ? 'ci/drone'
+                  : process.env.GITHUB_ACTION ? 'ci/github-actions'
+                    : process.env.TDDIUM ? 'ci/tddium'
+                      : process.env.JENKINS_URL ? 'ci/jenkins'
+                        : process.env['bamboo.buildKey'] ? 'ci/bamboo'
+                          : process.env.GO_PIPELINE_NAME ? 'ci/gocd'
+                          // codeship and a few others
+                            : process.env.CI_NAME ? `ci/${process.env.CI_NAME}`
+                            // test travis last, since many of these mimic it
+                              : process.env.TRAVIS ? 'ci/travis-ci'
+                                : process.env.CI === 'true' || process.env.CI === '1' ? 'ci/custom'
+                                  : ''
+        ua = ua.replace(/\{ci\}/gi, ci)
+
+        config.set('user-agent', ua.trim())
 
         if (config.get('metrics-registry') == null) {
           config.set('metrics-registry', config.get('registry'))

lib/shrinkwrap.js

@@ -282,11 +282,15 @@ function checkPackageFile (dir, name) {
   return readFile(
     file, 'utf8'
   ).then((data) => {
+    const format = npm.config.get('format-package-lock') !== false
+    const indent = format ? detectIndent(data).indent : 0
+    const newline = format ? detectNewline(data) : 0
+
     return {
       path: file,
       raw: data,
-      indent: detectIndent(data).indent,
-      newline: detectNewline(data)
+      indent,
+      newline
     }
   }).catch({code: 'ENOENT'}, () => {})
 }

lib/token.js

@@ -118,7 +118,6 @@ function config () {
     })
   } else {
     conf = conf.concat({ auth: {} })
-    conf.auth = {}
   }
   if (conf.otp) conf.auth.otp = conf.otp
   return conf