Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: upgrade npm to 8.17.0 #44205

Merged
merged 1 commit into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/npm/docs/content/using-npm/dependency-selectors.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,4 @@ arb.loadActual((tree) => {
## See Also

* [npm query](/commands/npm-query)
* [@npmcli/arborist](https://npm.im/@npmcli/arborist]
* [@npmcli/arborist](https://npm.im/@npmcli/arborist)
2 changes: 1 addition & 1 deletion deps/npm/docs/output/commands/npm-ls.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,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@8.16.0 /path/to/npm
<pre lang="bash"><code>npm@8.17.0 /path/to/npm
└─┬ init-package-json@0.0.4
└── promzard@0.1.5
</code></pre>
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/docs/output/commands/npm.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ <h2 id="table-of-contents">Table of contents</h2>
<!-- raw HTML omitted -->
<!-- raw HTML omitted -->
<h3 id="version">Version</h3>
<p>8.16.0</p>
<p>8.17.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
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/docs/output/using-npm/dependency-selectors.html
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ <h3 id="programmatic-usage">Programmatic Usage</h3>
<h2 id="see-also">See Also</h2>
<ul>
<li><a href="../commands/npm-query.html">npm query</a></li>
<li>[@npmcli/arborist](<a href="https://npm.im/@npmcli/arborist%5D">https://npm.im/@npmcli/arborist]</a></li>
<li><a href="https://npm.im/@npmcli/arborist">@npmcli/arborist</a></li>
</ul>
</div>

Expand Down
9 changes: 8 additions & 1 deletion deps/npm/lib/commands/exec.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Exec extends BaseCommand {

const args = [..._args]
const call = this.npm.config.get('call')
let globalPath
const {
flatOptions,
localBin,
Expand All @@ -44,6 +45,12 @@ class Exec extends BaseCommand {
const scriptShell = this.npm.config.get('script-shell') || undefined
const packages = this.npm.config.get('package')
const yes = this.npm.config.get('yes')
// --prefix sets both of these to the same thing, meaning the global prefix
// is invalid (i.e. no lib/node_modules). This is not a trivial thing to
// untangle and fix so we work around it here.
if (this.npm.localPrefix !== this.npm.globalPrefix) {
globalPath = path.resolve(globalDir, '..')
}

if (call && _args.length) {
throw this.usageError()
Expand All @@ -59,7 +66,7 @@ class Exec extends BaseCommand {
localBin,
locationMsg,
globalBin,
globalPath: path.resolve(globalDir, '..'),
globalPath,
output,
packages,
path: localPrefix,
Expand Down
1 change: 1 addition & 0 deletions deps/npm/lib/commands/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class Query extends BaseCommand {
const opts = {
...this.npm.flatOptions,
path: where,
forceActual: true,
}
const arb = new Arborist(opts)
const tree = await arb.loadActual(opts)
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm-ls.1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ example, running \fBnpm ls promzard\fP in npm's source tree will show:
.P
.RS 2
.nf
npm@8\.16\.0 /path/to/npm
npm@8\.17\.0 /path/to/npm
└─┬ init\-package\-json@0\.0\.4
└── promzard@0\.1\.5
.fi
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man1/npm.1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.SS Synopsis
.SS Version
.P
8\.16\.0
8\.17\.0
.SS Description
.P
npm is the package manager for the Node JavaScript platform\. It puts
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/man/man7/dependency-selectors.7
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,6 @@ arb\.loadActual((tree) => {
.IP \(bu 2
npm help query
.IP \(bu 2
[@npmcli/arborist](https://npm\.im/@npmcli/arborist]
@npmcli/arborist \fIhttps://npm\.im/@npmcli/arborist\fR

.RE
35 changes: 20 additions & 15 deletions deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions deps/npm/node_modules/@npmcli/arborist/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions deps/npm/node_modules/@npmcli/config/lib/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions deps/npm/node_modules/@npmcli/config/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion deps/npm/node_modules/@npmcli/map-workspaces/lib/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions deps/npm/node_modules/@npmcli/map-workspaces/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions deps/npm/node_modules/@npmcli/run-script/lib/escape.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 11 additions & 40 deletions deps/npm/node_modules/@npmcli/run-script/lib/make-spawn-args.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading