Skip to content

Commit 38bb9f5

Browse files
authored
Merge branch 'nodejs:master' into olivierodo-doc-deepStrictEqual
2 parents 82d5b54 + 8068f40 commit 38bb9f5

File tree

796 files changed

+5376
-98104
lines changed

Some content is hidden

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

796 files changed

+5376
-98104
lines changed

β€Ž.github/label-pr-config.ymlβ€Ž

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,11 @@ subSystemLabels:
100100
/^lib\/worker_threads.js$/: worker
101101
/^lib\/internal\/url\.js$/: whatwg-url
102102
/^lib\/internal\/modules\/esm/: esm
103-
/^lib\/internal\/quic\/*/: quic, dont-land-on-v14.x, dont-land-on-v12.x
104103

105104
# All other lib/ files map directly
106105
/^lib\/_(\w+)_\w+\.js?$/: $1 # e.g. _(stream)_wrap
107-
/^lib(\/internal)?\/(\w+)\.js?$/: $2 # Other .js files
108-
/^lib\/internal\/(\w+)(?:\/|$)/: $1 # internal subfolders
106+
/^lib(?:\/internal)?\/(\w+)\.js?$/: $1 # Other .js files
107+
/^lib(?:\/internal)?\/(\w+)(?:\/|$)/: $1 # Subfolders
109108

110109
exlusiveLabels:
111110
# more specific tests

β€Ž.mailmapβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ Jackson Tian <shyvo1987@gmail.com> <puling.tyq@alibaba-inc.com>
186186
Jake Verbaten <raynos2@gmail.com>
187187
Jamen Marzonie <jamenmarz@gmail.com> <jamenmarz+gh@gmail.com>
188188
James Beavers <jamesjbeavers@gmail.com>
189+
James Bromwell <james.bromwell@gdit.com> <943160+thw0rted@users.noreply.github.com>
189190
James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
191+
James Ide <ide@jameside.com> <ide@expo.io>
190192
James M Snell <jasnell@gmail.com>
191193
James Nimlos <james@nimlos.com>
192194
Jan Krems <jan.krems@gmail.com> <jan.krems@groupon.com>

β€ŽAUTHORSβ€Ž

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,6 @@ sagulati <sagulati@adobe.com>
22662266
conectado <gabrielalejandro7@gmail.com>
22672267
Vitor Bruno de Oliveira Barth <vbob@vbob.com.br>
22682268
Christian Clauss <cclauss@me.com>
2269-
James Ide <ide@expo.io>
22702269
bhavayAnand9 <bhavayanandcse@gmail.com>
22712270
Brandon Lee <40652534+brandonlwt@users.noreply.github.com>
22722271
Oryan Moshe <iamoryanmoshe@gmail.com>
@@ -2281,7 +2280,6 @@ Musa Hamwala <musahamwala@icloud.com>
22812280
James Bromwell <james.bromwell@gdit.com>
22822281
Jeremy Apthorp <nornagon@nornagon.net>
22832282
Eugen Cazacu <32613393+oygen87@users.noreply.github.com>
2284-
James Bromwell <943160+thw0rted@users.noreply.github.com>
22852283
Csaba Palfi <csaba@palfi.me>
22862284
Ryan Petrich <rpetrich@gmail.com>
22872285
Andreas Girgensohn <andreasg@fxpal.com>

β€ŽCHANGELOG.mdβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ release.
3333
</tr>
3434
<tr>
3535
<td valign="top">
36-
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.10.0">16.10.0</a></b><br/>
36+
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.11.0">16.11.0</a></b><br/>
37+
<a href="doc/changelogs/CHANGELOG_V16.md#16.10.0">16.10.0</a><br/>
3738
<a href="doc/changelogs/CHANGELOG_V16.md#16.9.1">16.9.1</a><br/>
3839
<a href="doc/changelogs/CHANGELOG_V16.md#16.9.0">16.9.0</a><br/>
3940
<a href="doc/changelogs/CHANGELOG_V16.md#16.8.0">16.8.0</a><br/>

β€Ždeps/npm/docs/content/configuring-npm/package-lock-json.mdβ€Ž

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ Package descriptors have the following fields:
138138
the case of packages fetched from the registry, this will be a url to a
139139
tarball. In the case of git dependencies, this will be the full git url
140140
with commit sha. In the case of link dependencies, this will be the
141-
location of the link target.
141+
location of the link target. `registry.npmjs.org` is a magic value meaning
142+
"the currently configured registry".
142143

143144
* integrity: A `sha512` or `sha1` [Standard Subresource
144145
Integrity](https://w3c.github.io/webappsec/specs/subresourceintegrity/)
@@ -201,7 +202,8 @@ Dependency objects have the following fields:
201202

202203
* resolved: For registry sources this is path of the tarball relative to
203204
the registry URL. If the tarball URL isn't on the same server as the
204-
registry URL then this is a complete URL.
205+
registry URL then this is a complete URL. `registry.npmjs.org` is a magic
206+
value meaning "the currently configured registry".
205207

206208
* bundled: If true, this is the bundled dependency and will be installed
207209
by the parent module. When installing, this module will be extracted

β€Ždeps/npm/docs/content/using-npm/registry.mdβ€Ž

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ The registry URL used is determined by the scope of the package (see
3030
supplied by the `registry` config parameter. See [`npm config`](/commands/npm-config),
3131
[`npmrc`](/configuring-npm/npmrc), and [`config`](/using-npm/config) for more on managing npm's configuration.
3232

33+
When the default registry is used in a package-lock or shrinkwrap is has the
34+
special meaning of "the currently configured registry". If you create a lock
35+
file while using the default registry you can switch to another registry and
36+
npm will install packages from the new registry, but if you create a lock
37+
file while using a custom registry packages will be installed from that
38+
registry even after you change to another registry.
39+
3340
### Does npm send any information about me back to the registry?
3441

3542
Yes.

β€Ždeps/npm/docs/content/using-npm/scope.mdβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ desired, with `npm access` or on the npmjs.com website.
9898

9999
Scopes can be associated with a separate registry. This allows you to
100100
seamlessly use a mix of packages from the primary npm registry and one or more
101-
private registries, such as npm Enterprise.
101+
private registries, such as [GitHub Packages](https://github.com/features/packages) or the open source [Verdaccio](https://verdaccio.org)
102+
project.
102103

103104
You can associate a scope with a registry at login, e.g.
104105

β€Ždeps/npm/docs/content/using-npm/workspaces.mdβ€Ž

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,22 @@ npm run test --workspaces
176176

177177
Will run the `test` script in both `./packages/a` and `./packages/b`.
178178

179+
Commands will be run in each workspace in the order they appear in your `package.json`
180+
181+
```
182+
{
183+
"workspaces": [ "packages/a", "packages/b" ]
184+
}
185+
```
186+
187+
Order of run is different with:
188+
189+
```
190+
{
191+
"workspaces": [ "packages/b", "packages/a" ]
192+
}
193+
```
194+
179195
### Ignoring missing scripts
180196

181197
It is not required for all of the workspaces to implement scripts run with the `npm run` command.

β€Ždeps/npm/docs/output/commands/npm-ls.htmlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ <h3 id="description">Description</h3>
159159
the results to only the paths to the packages named. Note that nested
160160
packages will <em>also</em> show the paths to the specified packages. For
161161
example, running <code>npm ls promzard</code> in npm’s source tree will show:</p>
162-
<pre lang="bash"><code>npm@7.24.0 /path/to/npm
162+
<pre lang="bash"><code>npm@8.0.0 /path/to/npm
163163
└─┬ init-package-json@0.0.4
164164
└── promzard@0.1.5
165165
</code></pre>

β€Ždeps/npm/docs/output/commands/npm.htmlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ <h2 id="table-of-contents">Table of contents</h2>
148148
<pre lang="bash"><code>npm &lt;command&gt; [args]
149149
</code></pre>
150150
<h3 id="version">Version</h3>
151-
<p>7.24.0</p>
151+
<p>8.0.0</p>
152152
<h3 id="description">Description</h3>
153153
<p>npm is the package manager for the Node JavaScript platform. It puts
154154
modules in place so that node can find them, and manages dependency

0 commit comments

Comments
Β (0)