deps: upgrade npm to 7.13.0

PR-URL: #38682
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Danielle Adams <[email protected]>
Reviewed-By: Trivikram Kamat <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>

Author: ruyadorno

deps/npm/CHANGELOG.md

@@ -1,3 +1,21 @@
+## v7.13.0 (2021-05-13)
+
+* [`076420c14`](https://github.com/npm/cli/commit/076420c149d097056f687e44e21744b743b86e4e)
+  [#3231](https://github.com/npm/cli/issues/3231)
+  feat(publish): add workspace support
+  ([@wraithgar](https://github.com/wraithgar))
+* [`370b36a36`](https://github.com/npm/cli/commit/370b36a36ca226840761e4214cbccaf2a1a90e3c)
+  [#3241](https://github.com/npm/cli/issues/3241)
+  feat(fund): add workspaces support
+  ([@ruyadorno](https://github.com/ruyadorno))
+
+### DEPENDENCIES
+
+* [`0c18e4f77`](https://github.com/npm/cli/commit/0c18e4f774562fa054fedf323bea25805ebf39b3)
+  `@npmcli/[email protected]`
+* [`b551c6811`](https://github.com/npm/cli/commit/b551c6811251dbc901f47fea3c137f93e205a9e4)
+  `[email protected]`
+
 ## v7.12.1 (2021-05-10)
 
 ### BUG FIXES

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

@@ -8,6 +8,7 @@ description: Retrieve funding information
 
 ```bash
 npm fund [<pkg>]
+npm fund [-w <workspace-name>]
 ```
 
 ### Description
@@ -24,6 +25,43 @@ The list will avoid duplicated entries and will stack all packages that
 share the same url as a single entry. Thus, the list does not have the same
 shape of the output from `npm ls`.
 
+#### Example
+
+### Workspaces support
+
+It's possible to filter the results to only include a single workspace and its
+dependencies using the `workspace` config option.
+
+#### Example:
+
+Here's an example running `npm fund` in a project with a configured
+workspace `a`:
+
+```bash
+$ npm fund
+[email protected]
++-- https://example.com/a
+| | `-- [email protected]
+| `-- https://example.com/maintainer
+|     `-- [email protected]
++-- https://example.com/npmcli-funding
+|   `-- @npmcli/test-funding
+`-- https://example.com/org
+    `-- [email protected]
+```
+
+And here is an example of the expected result when filtering only by
+a specific workspace `a` in the same project:
+
+```bash
+$ npm fund -w a
+[email protected]
+`-- https://example.com/a
+  | `-- [email protected]
+  `-- https://example.com/maintainer
+      `-- [email protected]
+```
+
 ### Configuration
 
 #### browser
@@ -48,6 +86,23 @@ Show information in JSON format.
 Whether to represent the tree structure using unicode characters.
 Set it to `false` in order to use all-ansi output.
 
+#### `workspace`
+
+* Default:
+* Type: String (can be set multiple times)
+
+Enable running a command in the context of the configured workspaces of the
+current project while filtering by running only the workspaces defined by
+this configuration option.
+
+Valid values for the `workspace` config are either:
+* Workspace names
+* Path to a workspace directory
+* Path to a parent workspace directory (will result to selecting all of the
+nested workspaces)
+
+This value is not exported to the environment for child processes.
+
 #### which
 
 * Type: Number
@@ -61,3 +116,4 @@ If there are multiple funding sources, which 1-indexed source URL to open.
 * [npm docs](/commands/npm-docs)
 * [npm ls](/commands/npm-ls)
 * [npm config](/commands/npm-config)
+* [npm workspaces](/using-npm/workspaces)

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

@@ -47,6 +47,13 @@ by specifying a different default registry or using a
   actually publishing to the registry. Reports the details of what would
   have been published.
 
+* `[--workspaces]`: Enables workspace context while publishing. All
+  workspace packages will be published.
+
+* `[--workspace]`: Enables workspaces context and limits results to only
+  those specified by this config item.  Only the packages in the
+  workspaces given will be published.
+
 The publish will fail if the package name and version combination already
 exists in the specified registry.
 

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

@@ -146,6 +146,7 @@ <h2 id="table-of-contents">Table of contents</h2>
 
 <div id="_content"><h3 id="synopsis">Synopsis</h3>
 <pre lang="bash"><code>npm fund [&lt;pkg&gt;]
+npm fund [-w &lt;workspace-name&gt;]
 </code></pre>
 <h3 id="description">Description</h3>
 <p>This command retrieves information on how to fund the dependencies of a
@@ -158,6 +159,33 @@ <h3 id="description">Description</h3>
 <p>The list will avoid duplicated entries and will stack all packages that
 share the same url as a single entry. Thus, the list does not have the same
 shape of the output from <code>npm ls</code>.</p>
+<h4 id="example">Example</h4>
+<h3 id="workspaces-support">Workspaces support</h3>
+<p>It’s possible to filter the results to only include a single workspace and its
+dependencies using the <code>workspace</code> config option.</p>
+<h4 id="example2">Example:</h4>
+<p>Here’s an example running <code>npm fund</code> in a project with a configured
+workspace <code>a</code>:</p>
+<pre lang="bash"><code>$ npm fund
+[email protected]
++-- https://example.com/a
+| | `-- [email protected]
+| `-- https://example.com/maintainer
+|     `-- [email protected]
++-- https://example.com/npmcli-funding
+|   `-- @npmcli/test-funding
+`-- https://example.com/org
+    `-- [email protected]
+</code></pre>
+<p>And here is an example of the expected result when filtering only by
+a specific workspace <code>a</code> in the same project:</p>
+<pre lang="bash"><code>$ npm fund -w a
+[email protected]
+`-- https://example.com/a
+  | `-- [email protected]
+  `-- https://example.com/maintainer
+      `-- [email protected]
+</code></pre>
 <h3 id="configuration">Configuration</h3>
 <h4 id="browser">browser</h4>
 <ul>
@@ -178,6 +206,22 @@ <h4 id="unicode">unicode</h4>
 </ul>
 <p>Whether to represent the tree structure using unicode characters.
 Set it to <code>false</code> in order to use all-ansi output.</p>
+<h4 id="workspace"><code>workspace</code></h4>
+<ul>
+<li>Default:</li>
+<li>Type: String (can be set multiple times)</li>
+</ul>
+<p>Enable running a command in the context of the configured workspaces of the
+current project while filtering by running only the workspaces defined by
+this configuration option.</p>
+<p>Valid values for the <code>workspace</code> config are either:</p>
+<ul>
+<li>Workspace names</li>
+<li>Path to a workspace directory</li>
+<li>Path to a parent workspace directory (will result to selecting all of the
+nested workspaces)</li>
+</ul>
+<p>This value is not exported to the environment for child processes.</p>
 <h4 id="which">which</h4>
 <ul>
 <li>Type: Number</li>
@@ -190,6 +234,7 @@ <h2 id="see-also">See Also</h2>
 <li><a href="../commands/npm-docs.html">npm docs</a></li>
 <li><a href="../commands/npm-ls.html">npm ls</a></li>
 <li><a href="../commands/npm-config.html">npm config</a></li>
+<li><a href="../using-npm/workspaces.html">npm workspaces</a></li>
 </ul>
 </div>
 

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

@@ -159,7 +159,7 @@ <h3 id="description">Description</h3>
 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.12.1 /path/to/npm
+<pre lang="bash"><code>npm@7.13.0 /path/to/npm
 └─┬ [email protected]
   └── [email protected]
 </code></pre>

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

@@ -188,6 +188,15 @@ <h3 id="description">Description</h3>
 actually publishing to the registry. Reports the details of what would
 have been published.</p>
 </li>
+<li>
+<p><code>[--workspaces]</code>: Enables workspace context while publishing. All
+workspace packages will be published.</p>
+</li>
+<li>
+<p><code>[--workspace]</code>: Enables workspaces context and limits results to only
+those specified by this config item.  Only the packages in the
+workspaces given will be published.</p>
+</li>
 </ul>
 <p>The publish will fail if the package name and version combination already
 exists in the specified registry.</p>

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.12.1</p>
+<p>7.13.0</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/fund.js

@@ -13,15 +13,14 @@ const {
 
 const completion = require('./utils/completion/installed-deep.js')
 const openUrl = require('./utils/open-url.js')
+const ArboristWorkspaceCmd = require('./workspaces/arborist-cmd.js')
 
 const getPrintableName = ({ name, version }) => {
   const printableVersion = version ? `@${version}` : ''
   return `${name}${printableVersion}`
 }
 
-const BaseCommand = require('./base-command.js')
-
-class Fund extends BaseCommand {
+class Fund extends ArboristWorkspaceCmd {
   /* istanbul ignore next - see test/lib/load-all-commands.js */
   static get description () {
     return 'Retrieve funding information'
@@ -38,6 +37,7 @@ class Fund extends BaseCommand {
       'json',
       'browser',
       'unicode',
+      'workspace',
       'which',
     ]
   }
@@ -92,10 +92,16 @@ class Fund extends BaseCommand {
       return
     }
 
+    const fundingInfo = getFundingInfo(tree, {
+      ...this.flatOptions,
+      log: this.npm.log,
+      workspaces: this.workspaces,
+    })
+
     if (this.npm.config.get('json'))
-      this.npm.output(this.printJSON(getFundingInfo(tree)))
+      this.npm.output(this.printJSON(fundingInfo))
     else
-      this.npm.output(this.printHuman(getFundingInfo(tree)))
+      this.npm.output(this.printHuman(fundingInfo))
   }
 
   printJSON (fundingInfo) {