Skip to content

Commit d1decd6

Browse files
reggireggi
committed
Merge branch 'latest' into oidc
2 parents 4ed14ce + 4673e9c commit d1decd6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2594
-911
lines changed

‎.release-please-manifest.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
".": "11.4.1",
3-
"workspaces/arborist": "9.1.1",
2+
".": "11.4.2",
3+
"workspaces/arborist": "9.1.2",
44
"workspaces/libnpmaccess": "10.0.1",
5-
"workspaces/libnpmdiff": "8.0.4",
6-
"workspaces/libnpmexec": "10.1.3",
7-
"workspaces/libnpmfund": "7.0.4",
5+
"workspaces/libnpmdiff": "8.0.5",
6+
"workspaces/libnpmexec": "10.1.4",
7+
"workspaces/libnpmfund": "7.0.5",
88
"workspaces/libnpmorg": "8.0.0",
9-
"workspaces/libnpmpack": "9.0.4",
10-
"workspaces/libnpmpublish": "11.0.0",
9+
"workspaces/libnpmpack": "9.0.5",
10+
"workspaces/libnpmpublish": "11.0.1",
1111
"workspaces/libnpmsearch": "9.0.0",
1212
"workspaces/libnpmteam": "8.0.1",
1313
"workspaces/libnpmversion": "8.0.1",

‎AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,4 @@ xaos7991 <44319098+xaos7991@users.noreply.github.com>
969969
Tom Mrazauskas <tom@mrazauskas.de>
970970
sam crochet <shmam@github.com>
971971
tarekwfa0110 <109884541+tarekwfa0110@users.noreply.github.com>
972+
Marc Bernard <marc@marcbernardtools.com>

‎CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# Changelog
22

3+
## [11.4.2](https://github.com/npm/cli/compare/v11.4.1...v11.4.2) (2025-06-11)
4+
### Bug Fixes
5+
* [`f2d6947`](https://github.com/npm/cli/commit/f2d69478923b919c77bbb8bdb70c30ddeb59ffe7) [#8345](https://github.com/npm/cli/pull/8345) move warning to new line when `npm init` is canceled (@mbtools)
6+
* [`e758dd7`](https://github.com/npm/cli/commit/e758dd7bec58efed2cc865a6d360b0432ccc9f57) [#8318](https://github.com/npm/cli/pull/8318) powershell: multiple Invoke-Expression fixes (#8318) (@alexsch01)
7+
### Documentation
8+
* [`7233cb3`](https://github.com/npm/cli/commit/7233cb3a159872236338b97bcb9d3797864abb33) [#8355](https://github.com/npm/cli/pull/8355) remove deprecated section related temp files (#8355) (@milaninfy)
9+
* [`fb7a498`](https://github.com/npm/cli/commit/fb7a498d557abdd0c1a6945522d47878cf930a27) [#8351](https://github.com/npm/cli/pull/8351) clarify shell used for script (#8351) (@milaninfy)
10+
* [`8b55d38`](https://github.com/npm/cli/commit/8b55d38cd2815a9503aed664c85eb678203dc4d4) [#8329](https://github.com/npm/cli/pull/8329) Rename "command" to "script" (#8329) (@DanKaplanSES)
11+
### Dependencies
12+
* [`7b05420`](https://github.com/npm/cli/commit/7b0542028f9c3cc326c26a1986c34cec7eb04931) [#8358](https://github.com/npm/cli/pull/8358) `fdir@6.4.6`
13+
* [`e1a3b23`](https://github.com/npm/cli/commit/e1a3b23ebca0cb9b42c62a8c7b506ae9c2cc1a03) [#8358](https://github.com/npm/cli/pull/8358) `tinyglobby@0.2.14`
14+
* [`522efa2`](https://github.com/npm/cli/commit/522efa2641780e1703d3578baeb94d3e57bcc8af) [#8358](https://github.com/npm/cli/pull/8358) `socks@2.8.5`
15+
* [`7a0723f`](https://github.com/npm/cli/commit/7a0723f142b29065efec602e9e7d6585175e87a1) [#8358](https://github.com/npm/cli/pull/8358) `debug@4.4.1`
16+
* [`9a342a4`](https://github.com/npm/cli/commit/9a342a4afb40d0668ab6a2c3820be7cacb4b79f7) [#8358](https://github.com/npm/cli/pull/8358) `brace-expansion@2.0.2`
17+
* [`e691ba0`](https://github.com/npm/cli/commit/e691ba0918ea8526be9655f4c4c51e0887f7c623) [#8358](https://github.com/npm/cli/pull/8358) `@sigstore/protobuf-specs@0.4.3`
18+
* [`42ef765`](https://github.com/npm/cli/commit/42ef765008ed76e5cc2521a92ba2d329933524b7) [#8358](https://github.com/npm/cli/pull/8358) `validate-npm-package-name@6.0.1`
19+
* [`774c0b1`](https://github.com/npm/cli/commit/774c0b1e9c5704ffa24196fdcc44ba9575b04ca0) [#8358](https://github.com/npm/cli/pull/8358) `@npmcli/redact@3.2.2`
20+
* [`dda6f87`](https://github.com/npm/cli/commit/dda6f871331280eeb37493a4ccc57361a27949eb) [#8317](https://github.com/npm/cli/pull/8317) `@npmcli/package-json@6.2.0`
21+
* [`bc08ac7`](https://github.com/npm/cli/commit/bc08ac7a82f047485885d9c41a8b6fc48e8981b0) [#8317](https://github.com/npm/cli/pull/8317) remove normalize-package-data
22+
### Chores
23+
* [`0ad1444`](https://github.com/npm/cli/commit/0ad1444d76b0b68e4a4d48d7f22ebd4cd0d0e850) [#8358](https://github.com/npm/cli/pull/8358) dev dependency updates (@wraithgar)
24+
* [workspace](https://github.com/npm/cli/releases/tag/arborist-v9.1.2): `@npmcli/arborist@9.1.2`
25+
* [workspace](https://github.com/npm/cli/releases/tag/libnpmdiff-v8.0.5): `libnpmdiff@8.0.5`
26+
* [workspace](https://github.com/npm/cli/releases/tag/libnpmexec-v10.1.4): `libnpmexec@10.1.4`
27+
* [workspace](https://github.com/npm/cli/releases/tag/libnpmfund-v7.0.5): `libnpmfund@7.0.5`
28+
* [workspace](https://github.com/npm/cli/releases/tag/libnpmpack-v9.0.5): `libnpmpack@9.0.5`
29+
* [workspace](https://github.com/npm/cli/releases/tag/libnpmpublish-v11.0.1): `libnpmpublish@11.0.1`
30+
331
## [11.4.1](https://github.com/npm/cli/compare/v11.4.0...v11.4.1) (2025-05-21)
432
### Documentation
533
* [`3ed764a`](https://github.com/npm/cli/commit/3ed764aa08f2087fa1d1bd7391a646ba47565294) [#8308](https://github.com/npm/cli/pull/8308) Clarify script working directory behavior (fixes #8305) (#8308) (@tarekwfa0110, @owlstronaut)

‎DEPENDENCIES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ graph LR;
5353
libnpmpack-->npmcli-run-script["@npmcli/run-script"];
5454
libnpmpack-->npmcli-template-oss["@npmcli/template-oss"];
5555
libnpmpack-->pacote;
56-
libnpmpublish-->normalize-package-data;
5756
libnpmpublish-->npm-package-arg;
5857
libnpmpublish-->npm-registry-fetch;
5958
libnpmpublish-->npmcli-eslint-config["@npmcli/eslint-config"];
6059
libnpmpublish-->npmcli-mock-globals["@npmcli/mock-globals"];
6160
libnpmpublish-->npmcli-mock-registry["@npmcli/mock-registry"];
61+
libnpmpublish-->npmcli-package-json["@npmcli/package-json"];
6262
libnpmpublish-->npmcli-template-oss["@npmcli/template-oss"];
6363
libnpmpublish-->proc-log;
6464
libnpmpublish-->semver;
@@ -375,12 +375,12 @@ graph LR;
375375
libnpmpack-->spawk;
376376
libnpmpack-->tap;
377377
libnpmpublish-->ci-info;
378-
libnpmpublish-->normalize-package-data;
379378
libnpmpublish-->npm-package-arg;
380379
libnpmpublish-->npm-registry-fetch;
381380
libnpmpublish-->npmcli-eslint-config["@npmcli/eslint-config"];
382381
libnpmpublish-->npmcli-mock-globals["@npmcli/mock-globals"];
383382
libnpmpublish-->npmcli-mock-registry["@npmcli/mock-registry"];
383+
libnpmpublish-->npmcli-package-json["@npmcli/package-json"];
384384
libnpmpublish-->npmcli-template-oss["@npmcli/template-oss"];
385385
libnpmpublish-->proc-log;
386386
libnpmpublish-->semver;

‎docs/lib/content/configuring-npm/folders.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,6 @@ See [`npm cache`](/commands/npm-cache). Cache files are stored in `~/.npm` on P
7676

7777
This is controlled by the [`cache` config](/using-npm/config#cache) param.
7878

79-
#### Temp Files
80-
81-
Temporary files are stored by default in the folder specified by the
82-
[`tmp` config](/using-npm/config#tmp), which defaults to the TMPDIR, TMP, or
83-
TEMP environment variables, or `/tmp` on Unix and `c:\windows\temp` on Windows.
84-
85-
Temp files are given a unique folder under this root for each run of the
86-
program, and are deleted upon successful exit.
87-
8879
### More Information
8980

9081
When installing locally, npm first tries to find an appropriate

‎docs/lib/content/configuring-npm/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ installer to install both Node.js and npm on your system.
5050
* [NodeSource installer](https://github.com/nodesource/distributions). If
5151
you use Linux, we recommend that you use a NodeSource installer.
5252

53-
#### OS X or Windows Node installers
53+
#### macOS or Windows Node installers
5454

55-
If you're using OS X or Windows, use one of the installers from the
55+
If you're using macOS or Windows, use one of the installers from the
5656
[Node.js download page](https://nodejs.org/en/download/). Be sure to
5757
install the version labeled **LTS**. Other versions have not yet been
5858
tested with npm.

‎docs/lib/content/using-npm/scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ fine:
334334

335335
### Exiting
336336

337-
Scripts are run by passing the line as a script argument to `sh`.
337+
Scripts are run by passing the line as a script argument to `/bin/sh` on POSIX systems or `cmd.exe` on Windows. You can control which shell is used by setting the [`script-shell`](/using-npm/config#script-shell) configuration option.
338338

339339
If the script exits with a code other than 0, then this will abort the
340340
process.

‎lib/commands/init.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ class Init extends BaseCommand {
177177
return data
178178
} catch (er) {
179179
if (er.message === 'canceled') {
180+
output.flush()
180181
log.warn('init', 'canceled')
181182
} else {
182183
throw er

‎node_modules/@npmcli/redact/lib/deep-map.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const deepMap = (input, handler = v => v, path = ['$'], seen = new Set([input]))
88
if (input instanceof Error) {
99
return deepMap(serializeError(input), handler, path, seen)
1010
}
11-
if (input instanceof Buffer) {
11+
// allows for non-node js environments, sush as workers
12+
if (typeof Buffer !== 'undefined' && input instanceof Buffer) {
1213
return `[unable to log instanceof buffer]`
1314
}
1415
if (input instanceof Uint8Array) {

‎node_modules/@npmcli/redact/lib/matchers.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ const DEEP_HEADER_SET_COOKIE = {
4444
replacement: '[REDACTED_HEADER_SET_COOKIE]',
4545
}
4646

47+
const DEEP_HEADER_COOKIE = {
48+
type: TYPE_PATH,
49+
predicate: ({ path }) => path.endsWith('.headers.cookie'),
50+
replacement: '[REDACTED_HEADER_COOKIE]',
51+
}
52+
4753
const REWRITE_REQUEST = {
4854
type: TYPE_PATH,
4955
predicate: ({ path }) => path.endsWith('.request'),
@@ -76,6 +82,7 @@ module.exports = {
7682
URL_MATCHER,
7783
DEEP_HEADER_AUTHORIZATION,
7884
DEEP_HEADER_SET_COOKIE,
85+
DEEP_HEADER_COOKIE,
7986
REWRITE_REQUEST,
8087
REWRITE_RESPONSE,
8188
}

0 commit comments

Comments
 (0)