Skip to content

Commit bef9eb6

Browse files
authored
Merge branch 'nodejs:main' into fix-duration-ms
2 parents bc76d98 + beb0520 commit bef9eb6

File tree

243 files changed

+3086
-1479
lines changed

Some content is hidden

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

243 files changed

+3086
-1479
lines changed

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3512,5 +3512,7 @@ Wing <[email protected]>
35123512
35133513
Jeff Dickey <[email protected]>
35143514
Matías Zúñiga <[email protected]>
3515+
3516+
Brian Evans <[email protected]>
35153517

35163518
# Generated by tools/update-authors.mjs

deps/corepack/CHANGELOG.md

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

3+
## [0.14.0](https://github.com/nodejs/corepack/compare/v0.13.0...v0.14.0) (2022-09-02)
4+
5+
6+
### Features
7+
8+
* add `COREPACK_ENABLE_STRICT` env variable ([#167](https://github.com/nodejs/corepack/issues/167)) ([92b52f6](https://github.com/nodejs/corepack/commit/92b52f6b4918aff968c0942b89fc722ebf57bce2))
9+
* update package manager versions ([#170](https://github.com/nodejs/corepack/issues/170)) ([6f70bfc](https://github.com/nodejs/corepack/commit/6f70bfc4b6a8a57cccb1ff9cbf2f49240648f1ed))
10+
11+
12+
### Bug Fixes
13+
14+
* handle tags including numbers in `prepare` command ([#165](https://github.com/nodejs/corepack/issues/165)) ([5a0727b](https://github.com/nodejs/corepack/commit/5a0727b43976e0dc299151876c0dde2c4a85174d))
15+
316
## [0.13.0](https://github.com/nodejs/corepack/compare/v0.12.3...v0.13.0) (2022-08-19)
417

518

deps/corepack/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,18 @@ This command will retrieve the given package manager from the specified archive
111111

112112
## Environment Variables
113113

114-
- `COREPACK_ENABLE_NETWORK` can be set to `0` to prevent Corepack from accessing the network (in which case you'll be responsible for hydrating the package manager versions that will be required for the projects you'll run, using `corepack hydrate`).
115-
116114
- `COREPACK_DEFAULT_TO_LATEST` can be set to `0` in order to instruct Corepack
117115
not to lookup on the remote registry for the latest version of the selected
118116
package manager.
119117

118+
- `COREPACK_ENABLE_NETWORK` can be set to `0` to prevent Corepack from accessing
119+
the network (in which case you'll be responsible for hydrating the package
120+
manager versions that will be required for the projects you'll run, using
121+
`corepack hydrate`).
122+
123+
- `COREPACK_ENABLE_STRICT` can be set to `0` to prevent Corepack from checking
124+
if the package manager corresponds to the one defined for the current project.
125+
120126
- `COREPACK_HOME` can be set in order to define where Corepack should install
121127
the package managers. By default it is set to `%LOCALAPPDATA%\node\corepack`
122128
on Windows, and to `$HOME/.cache/node/corepack` everywhere else.

deps/corepack/dist/corepack.js

Lines changed: 59 additions & 36 deletions
Large diffs are not rendered by default.

deps/corepack/dist/vendors-_yarn_berry_cache_proxy-agent-npm-5_0_0-41772f4b01-9_zip_node_modules_proxy-agent_index_js.js

Lines changed: 24 additions & 24 deletions
Large diffs are not rendered by default.

deps/corepack/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "corepack",
3-
"version": "0.13.0",
3+
"version": "0.14.0",
44
"homepage": "https://github.com/nodejs/corepack#readme",
55
"bugs": {
66
"url": "https://github.com/nodejs/corepack/issues"
@@ -10,13 +10,13 @@
1010
"url": "https://github.com/nodejs/corepack.git"
1111
},
1212
"license": "MIT",
13-
"packageManager": "[email protected].14+sha224.d3bee29dce07417588d640327d44f1e0b8182c240bc2beb0b81ccf6e",
13+
"packageManager": "[email protected].15+sha224.7fa5c1d1875b041cea8fcbf9a364667e398825364bf5c5c8cd5f6601",
1414
"devDependencies": {
1515
"@babel/core": "^7.14.3",
1616
"@babel/plugin-transform-modules-commonjs": "^7.14.0",
1717
"@babel/preset-typescript": "^7.13.0",
1818
"@types/debug": "^4.1.5",
19-
"@types/jest": "^28.0.0",
19+
"@types/jest": "^29.0.0",
2020
"@types/node": "^18.0.0",
2121
"@types/semver": "^7.1.0",
2222
"@types/tar": "^6.0.0",
@@ -31,7 +31,7 @@
3131
"debug": "^4.1.1",
3232
"eslint": "^8.0.0",
3333
"eslint-plugin-arca": "^0.15.0",
34-
"jest": "^28.0.0",
34+
"jest": "^29.0.0",
3535
"nock": "^13.0.4",
3636
"proxy-agent": "^5.0.0",
3737
"semver": "^7.1.3",

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,28 @@ For all of the subcommands, `npm access` will perform actions on the packages
3535
in the current working directory if no package name is passed to the
3636
subcommand.
3737
38-
* public / restricted:
38+
* public / restricted (deprecated):
3939
Set a package to be either publicly accessible or restricted.
4040
41-
* grant / revoke:
41+
* grant / revoke (deprecated):
4242
Add or remove the ability of users and teams to have read-only or read-write
4343
access to a package.
4444
45-
* 2fa-required / 2fa-not-required:
45+
* 2fa-required / 2fa-not-required (deprecated):
4646
Configure whether a package requires that anyone publishing it have two-factor
4747
authentication enabled on their account.
4848
49-
* ls-packages:
49+
* ls-packages (deprecated):
5050
Show all of the packages a user or a team is able to access, along with the
5151
access level, except for read-only public packages (it won't print the whole
5252
registry listing)
5353
54-
* ls-collaborators:
54+
* ls-collaborators (deprecated):
5555
Show all of the access privileges for a package. Will only show permissions
5656
for packages to which you have at least read access. If `<user>` is passed in,
5757
the list is filtered only to teams _that_ user happens to belong to.
5858
59-
* edit:
60-
Set the access privileges for a package at once using `$EDITOR`.
59+
* edit (not implemented)
6160
6261
### Details
6362

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,4 @@ This value is not exported to the environment for child processes.
232232
<!-- AUTOGENERATED CONFIG DESCRIPTIONS END -->
233233
## See Also
234234

235-
* [dependency selector](/using-npm/dependency-selector)
235+
* [dependency selectors](/using-npm/dependency-selectors)

deps/npm/docs/content/configuring-npm/npmrc.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,34 @@ consistent across updates. Set fields in here using the `./configure`
9191
script that comes with npm. This is primarily for distribution maintainers
9292
to override default configs in a standard and consistent manner.
9393

94+
### Auth related configuration
95+
96+
The settings `_auth`, `_authToken`, `username` and `_password` must all be
97+
scoped to a specific registry. This ensures that `npm` will never send
98+
credentials to the wrong host.
99+
100+
In order to scope these values, they must be prefixed by a URI fragment.
101+
If the credential is meant for any request to a registry on a single host,
102+
the scope may look like `//registry.npmjs.org/:`. If it must be scoped to a
103+
specific path on the host that path may also be provided, such as
104+
`//my-custom-registry.org/unique/path:`.
105+
106+
```
107+
; bad config
108+
_authToken=MYTOKEN
109+
110+
; good config
111+
@myorg:registry=https://somewhere-else.com/myorg
112+
@another:registry=https://somewhere-else.com/another
113+
//registry.npmjs.org/:_authToken=MYTOKEN
114+
; would apply to both @myorg and @another
115+
; //somewhere-else.com/:_authToken=MYTOKEN
116+
; would apply only to @myorg
117+
//somewhere-else.com/myorg/:_authToken=MYTOKEN1
118+
; would apply only to @another
119+
//somewhere-else.com/another/:_authToken=MYTOKEN2
120+
```
121+
94122
### See also
95123

96124
* [npm folders](/configuring-npm/folders)

deps/npm/docs/content/using-npm/dependency-selectors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ const arb = new Arborist({})
144144

145145
```js
146146
// root-level
147-
arb.loadActual((tree) => {
147+
arb.loadActual().then(async (tree) => {
148148
// query all production dependencies
149149
const results = await tree.querySelectorAll('.prod')
150150
console.log(results)
@@ -153,7 +153,7 @@ arb.loadActual((tree) => {
153153

154154
```js
155155
// iterative
156-
arb.loadActual((tree) => {
156+
arb.loadActual().then(async (tree) => {
157157
// query for the deduped version of react
158158
const results = await tree.querySelectorAll('#react:not(:deduped)')
159159
// query the deduped react for git deps

0 commit comments

Comments
 (0)