deps: upgrade npm to 7.0.13

PR-URL: #36202
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

deps/npm/AUTHORS

@@ -734,3 +734,4 @@ Jason Attwood <jason_attwood@hotmail.co.uk>
 Vlad GURDIGA <gurdiga@gmail.com>
 Sébastien Puech <s.puech@tricentis.com>
 Jannis Hell <Primajin@users.noreply.github.com>
+Hollow Man <hollowman@hollowman.ml>

deps/npm/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 7.0.13 (2020-11-20)
+
+### BUG FIXES
+* [`5fc56b6db`](https://github.com/npm/cli/commit/5fc56b6dbcc7d7d1463a761abb67d2fc16ad3657)
+  [npm/statusboard#174](https://github.com/npm/statusboard/issues/174)
+  [#2204](https://github.com/npm/cli/issues/2204)
+  fix npm unstar command
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`7842b4d4d`](https://github.com/npm/cli/commit/7842b4d4dca1e076b0d26d554f9dce67484cd7be)
+  [npm/statusboard#182](https://github.com/npm/statusboard/issues/182)
+  [#2205](https://github.com/npm/cli/issues/2205)
+  fix npm version usage output
+  ([@ruyadorno](https://github.com/ruyadorno))
+* [`a0adbf9f8`](https://github.com/npm/cli/commit/a0adbf9f8f77531fcf81ae31bbc7102698765ee3)
+  [#2206](https://github.com/npm/cli/issues/2206)
+  [#2213](https://github.com/npm/cli/issues/2213)
+  fix: fix flatOptions usage in npm init
+  ([@ruyadorno](https://github.com/ruyadorno))
+
+### DEPENDENCIES
+
+* [`3daaf000a`](https://github.com/npm/cli/commit/3daaf000aee0ba81af855977d7011850e79099e6)
+  `@npmcli/arborist@1.0.12`
+    - fixes some windows specific bugs in how paths are handled and compared
+
+### DOCUMENTATION
+
+* [`084a7b6ad`](https://github.com/npm/cli/commit/084a7b6ad6eaf9f2d92eb05da93e745f5357cce2)
+  [#2210](https://github.com/npm/cli/issues/2210)
+  docs: Fix typo
+  ([@HollowMan6](https://github.com/HollowMan6))
+
 ## 7.0.12 (2020-11-17)
 
 ### BUG FIXES

deps/npm/docs/content/commands/npm-explain.md

@@ -56,7 +56,7 @@ node_modules/nyc/node_modules/find-up
 #### json
 
 * Default: false
-* Type: Bolean
+* Type: Boolean
 
 Show information in JSON format.
 

deps/npm/docs/output/commands/npm-explain.html

@@ -183,7 +183,7 @@ <h3 id="configuration">Configuration</h3>
 <h4 id="json">json</h4>
 <ul>
 <li>Default: false</li>
-<li>Type: Bolean</li>
+<li>Type: Boolean</li>
 </ul>
 <p>Show information in JSON format.</p>
 <h3 id="see-also">See Also</h3>

deps/npm/docs/output/commands/npm-ls.html

@@ -156,7 +156,7 @@ <h3 id="description">Description</h3>
 limit the results to only the paths to the packages named.  Note that
 nested packages will <em>also</em> show the paths to the specified packages.
 For example, running <code>npm ls promzard</code> in npm’s source tree will show:</p>
-<pre lang="bash"><code>    npm@7.0.12 /path/to/npm
+<pre lang="bash"><code>    npm@7.0.13 /path/to/npm
     └─┬ init-package-json@0.0.4
       └── promzard@0.1.5
 </code></pre>

deps/npm/docs/output/commands/npm.html

@@ -148,7 +148,7 @@ <h2 id="table-of-contents">Table of contents</h2>
 <pre lang="bash"><code>npm &lt;command&gt; [args]
 </code></pre>
 <h3 id="version">Version</h3>
-<p>7.0.12</p>
+<p>7.0.13</p>
 <h3 id="description">Description</h3>
 <p>npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency

deps/npm/lib/init.js

@@ -43,7 +43,6 @@ const init = async args => {
       }
     }
     npm.config.set('package', [])
-    npm.flatOptions = { ...npm.flatOptions, package: [] }
     return new Promise((res, rej) => {
       npm.commands.exec([packageName, ...args.slice(1)], er => er ? rej(er) : res())
     })

deps/npm/lib/star.js

@@ -3,73 +3,75 @@
 const fetch = require('npm-registry-fetch')
 const log = require('npmlog')
 const npa = require('npm-package-arg')
+
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
-const usage = require('./utils/usage.js')
-const getItentity = require('./utils/get-identity')
+const usageUtil = require('./utils/usage.js')
+const getIdentity = require('./utils/get-identity')
+const completion = require('./utils/completion/none.js')
 
-star.usage = usage(
+const usage = usageUtil(
   'star',
   'npm star [<pkg>...]\n' +
   'npm unstar [<pkg>...]'
 )
 
-star.completion = function (opts, cb) {
-  // FIXME: there used to be registry completion here, but it stopped making
-  // sense somewhere around 50,000 packages on the registry
-  cb()
-}
+const cmd = (args, cb) => star(args).then(() => cb()).catch(cb)
+
+const star = async args => {
+  if (!args.length)
+    throw new Error(usage)
+
+  // if we're unstarring, then show an empty star image
+  // otherwise, show the full star image
+  const { unicode } = npm.flatOptions
+  const unstar = npm.config.get('star.unstar')
+  const full = unicode ? '\u2605 ' : '(*)'
+  const empty = unicode ? '\u2606 ' : '( )'
+  const show = unstar ? empty : full
+
+  const pkgs = args.map(npa)
+  for (const pkg of pkgs) {
+    const [username, fullData] = await Promise.all([
+      getIdentity(npm.flatOptions),
+      fetch.json(pkg.escapedName, {
+        ...npm.flatOptions,
+        spec: pkg,
+        query: { write: true },
+        preferOnline: true,
+      }),
+    ])
 
-module.exports = star
-function star (args, cb) {
-  const opts = npm.flatOptions
-  return Promise.resolve().then(() => {
-    if (!args.length)
-      throw new Error(star.usage)
-    // if we're unstarring, then show an empty star image
-    // otherwise, show the full star image
-    const unstar = /^un/.test(npm.command)
-    const full = opts.unicode ? '\u2605 ' : '(*)'
-    const empty = opts.unicode ? '\u2606 ' : '( )'
-    const show = unstar ? empty : full
-    return Promise.all(args.map(npa).map(pkg => {
-      return Promise.all([
-        getItentity(opts),
-        fetch.json(pkg.escapedName, {
-          ...opts,
-          spec: pkg,
-          query: { write: true },
-          preferOnline: true,
-        }),
-      ]).then(([username, fullData]) => {
-        if (!username)
-          throw new Error('You need to be logged in!')
-        const body = {
-          _id: fullData._id,
-          _rev: fullData._rev,
-          users: fullData.users || {},
-        }
+    if (!username)
+      throw new Error('You need to be logged in!')
 
-        if (!unstar) {
-          log.info('star', 'starring', body._id)
-          body.users[username] = true
-          log.verbose('star', 'starring', body)
-        } else {
-          delete body.users[username]
-          log.info('star', 'unstarring', body._id)
-          log.verbose('star', 'unstarring', body)
-        }
-        return fetch.json(pkg.escapedName, {
-          ...opts,
-          spec: pkg,
-          method: 'PUT',
-          body,
-        })
-      }).then(data => {
-        output(show + ' ' + pkg.name)
-        log.verbose('star', data)
-        return data
-      })
-    }))
-  }).then(() => cb(), cb)
+    const body = {
+      _id: fullData._id,
+      _rev: fullData._rev,
+      users: fullData.users || {},
+    }
+
+    if (!unstar) {
+      log.info('star', 'starring', body._id)
+      body.users[username] = true
+      log.verbose('star', 'starring', body)
+    } else {
+      delete body.users[username]
+      log.info('unstar', 'unstarring', body._id)
+      log.verbose('unstar', 'unstarring', body)
+    }
+
+    const data = await fetch.json(pkg.escapedName, {
+      ...npm.flatOptions,
+      spec: pkg,
+      method: 'PUT',
+      body,
+    })
+
+    output(show + ' ' + pkg.name)
+    log.verbose('star', data)
+    return data
+  }
 }
+
+module.exports = Object.assign(cmd, { completion, usage })

deps/npm/lib/unstar.js

@@ -0,0 +1,9 @@
+const { usage, completion } = require('./star.js')
+const npm = require('./npm.js')
+
+const unstar = (args, cb) => {
+  npm.config.set('star.unstar', true)
+  return npm.commands.star(args, cb)
+}
+
+module.exports = Object.assign(unstar, { usage, completion })

deps/npm/lib/utils/cmd-list.js

@@ -12,7 +12,6 @@ const shorthands = {
   c: 'config',
   s: 'search',
   se: 'search',
-  unstar: 'star', // same function
   tst: 'test',
   t: 'test',
   ddp: 'dedupe',
@@ -88,6 +87,7 @@ const cmdList = [
   'publish',
   'star',
   'stars',
+  'unstar',
   'adduser',
   'login', // This is an alias for `adduser` but it can be confusing
   'logout',

deps/npm/lib/version.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const libversion = require('libnpmversion')
 const npm = require('./npm.js')
 const output = require('./utils/output.js')
@@ -42,7 +44,7 @@ const version = async args => {
         path: npm.prefix,
       }))
     default:
-      throw version.usage
+      throw usage
   }
 }
 

deps/npm/man/man1/npm-explain.1

@@ -58,7 +58,7 @@ node_modules/nyc/node_modules/find\-up
 .IP \(bu 2
 Default: false
 .IP \(bu 2
-Type: Bolean
+Type: Boolean
 
 .RE
 .P

deps/npm/man/man1/npm-ls.1

@@ -22,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-    npm@7\.0\.12 /path/to/npm
+    npm@7\.0\.13 /path/to/npm
     └─┬ init\-package\-json@0\.0\.4
       └── promzard@0\.1\.5
 .fi

deps/npm/man/man1/npm.1

@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SS Version
 .P
-7\.0\.12
+7\.0\.13
 .SS Description
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts

deps/npm/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.0.12",
+  "version": "7.0.13",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -42,7 +42,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@npmcli/arborist": "^1.0.11",
+    "@npmcli/arborist": "^1.0.12",
     "@npmcli/ci-detect": "^1.2.0",
     "@npmcli/config": "^1.2.1",
     "@npmcli/run-script": "^1.8.0",
@@ -204,12 +204,10 @@
     "sudotest:nocleanup": "sudo NO_TEST_CLEANUP=1 npm run test --",
     "posttest": "npm run lint",
     "eslint": "eslint",
-    "lint": "npm run eslint -- \"lib/**/*.js\"",
-    "linttest": "npm run eslint -- test/lib test/bin --fix",
+    "lint": "npm run eslint -- test/lib test/bin \"lib/**/*.js\"",
     "lintfix": "npm run lint -- --fix",
     "prelint": "rimraf test/npm_cache*",
-    "resetdeps": "bash scripts/resetdeps.sh",
-    "prepublishOnly": "npm run lint && npm run linttest"
+    "resetdeps": "bash scripts/resetdeps.sh"
   },
   "//": [
     "XXX temporarily only run unit tests while v7 beta is in progress",