[pull] master from nodejs:master

.github/workflows/authors.yml

@@ -16,7 +16,9 @@ jobs:
           fetch-depth: '0'  # This is required to actually get all the authors
           persist-credentials: false
       - run: tools/update-authors.mjs  # Run the AUTHORS tool
-      - uses: gr2m/create-or-update-pull-request-action@v1  # Create a PR or update the Action's existing PR
+      - uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
+        # Creates a PR or update the Action's existing PR, or
+        # no-op if the base branch is already up-to-date.
         env:
           GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
         with:

.github/workflows/coverage-linux.yml

@@ -60,6 +60,6 @@ jobs:
       - name: Clean tmp
         run: rm -rf coverage/tmp && rm -rf out
       - name: Upload
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           directory: ./coverage

.github/workflows/coverage-windows.yml

@@ -61,6 +61,6 @@ jobs:
       - name: Clean tmp
         run: npx rimraf ./coverage/tmp
       - name: Upload
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           directory: ./coverage

.github/workflows/find-inactive-collaborators.yml

@@ -30,7 +30,9 @@ jobs:
         run: tools/find-inactive-collaborators.mjs
 
       - name: Open pull request
-        uses: gr2m/create-or-update-pull-request-action@v1
+        uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
+        # Creates a PR or update the Action's existing PR, or
+        # no-op if the base branch is already up-to-date.
         env:
           GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
         with:

.github/workflows/find-inactive-tsc.yml

@@ -39,7 +39,9 @@ jobs:
         run: tools/find-inactive-tsc.mjs >> $GITHUB_ENV
 
       - name: Open pull request
-        uses: gr2m/create-or-update-pull-request-action@v1
+        uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
+        # Creates a PR or update the Action's existing PR, or
+        # no-op if the base branch is already up-to-date.
         env:
           GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
         with:

.github/workflows/license-builder.yml

@@ -15,7 +15,9 @@ jobs:
         with:
           persist-credentials: false
       - run: ./tools/license-builder.sh  # Run the license builder tool
-      - uses: gr2m/[email protected]  # Create a PR or update the Action's existing PR
+      - uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
+        # Creates a PR or update the Action's existing PR, or
+        # no-op if the base branch is already up-to-date.
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/linters.yml

@@ -164,7 +164,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           persist-credentials: false
-      - uses: mszostok/codeowners-validator@v0.6.0
+      - uses: mszostok/codeowners-validator@7f3f5e28c6d7b8dfae5731e54ce2272ca384592f
         with:
           checks: files,duppatterns
   lint-pr-url:

.github/workflows/notify-force-push.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Slack Notification
-        uses: rtCamp/action-slack-notify@master
+        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
         env:
           SLACK_COLOR: '#DE512A'
           SLACK_ICON: https://github.com/nodejs.png?size=48

.github/workflows/tools.yml

@@ -80,7 +80,9 @@ jobs:
         with:
           persist-credentials: false
       - run: ${{ matrix.run }}
-      - uses: gr2m/create-or-update-pull-request-action@v1  # Create a PR or update the Action's existing PR
+      - uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
+        # Creates a PR or update the Action's existing PR, or
+        # no-op if the base branch is already up-to-date.
         env:
           GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
         with:

.mailmap

@@ -378,14 +378,15 @@ Nitzan Uziely <[email protected]> <[email protected]>
 Nitzan Uziely <[email protected]> <[email protected]>
 Noah Rose Ledesma <[email protected]>
 npm team <[email protected]>
-npm team <[email protected]> <npm team>
 npm team <[email protected]> <npm CLI robot>
+npm team <[email protected]> <npm team>
 Oliver Chang <[email protected]>
 Oluwaseun Omoyajowo <[email protected]>
 OneNail <[email protected]> <[email protected]>
 Onne Gorter <[email protected]>
 Oscar Martinez <[email protected]> <[email protected]>
 Paolo Insogna <[email protected]>
+Paolo Insogna <[email protected]> <[email protected]>
 Paul Graham <[email protected]> <[email protected]>
 Paul Querna <[email protected]> <[email protected]>
 Pedro Lima <[email protected]>

AUTHORS

@@ -3459,5 +3459,10 @@ Sergey Nazaryev <[email protected]>
 William Marlow <[email protected]>
 Keyhan Vakil <[email protected]>
 Feng Yu <[email protected]>
+pupilTong <[email protected]>
+rikapo <[email protected]>
+Meek Simbule <[email protected]>
+Michael Ficarra <[email protected]>
+hiroki osame <[email protected]>
 
 # Generated by tools/update-authors.mjs

BUILDING.md

@@ -52,6 +52,7 @@ file a new issue.
   * [Build with a specific ICU](#build-with-a-specific-icu)
     * [Unix/macOS](#unixmacos-3)
     * [Windows](#windows-4)
+* [Configuring OpenSSL config appname](#configure-openssl-appname)
 * [Building Node.js with FIPS-compliant OpenSSL](#building-nodejs-with-fips-compliant-openssl)
 * [Building Node.js with external core modules](#building-nodejs-with-external-core-modules)
   * [Unix/macOS](#unixmacos-4)
@@ -539,7 +540,7 @@ When modifying only the JS layer in `lib`, it is possible to externally load it
 without modifying the executable:
 
 ```console
-$ ./configure --node-builtin-modules-path $(pwd)
+$ ./configure --node-builtin-modules-path "$(pwd)"
 ```
 
 The resulting binary won't include any JS files and will try to load them from
@@ -608,7 +609,7 @@ packages:
 * [NetWide Assembler](https://chocolatey.org/packages/nasm)
 
 To install Node.js prerequisites using
-[Boxstarter WebLauncher](https://boxstarter.org/WebLauncher), open
+[Boxstarter WebLauncher](https://boxstarter.org/weblauncher), open
 <https://boxstarter.org/package/nr/url?https://raw.githubusercontent.com/nodejs/node/HEAD/tools/bootstrap/windows_boxstarter>
 with Internet Explorer or Edge browser on the target machine.
 
@@ -768,6 +769,19 @@ as `deps/icu` (You'll have: `deps/icu/source/...`)
 > .\vcbuild full-icu
 ```
 
+### Configure OpenSSL appname
+
+Node.js can use an OpenSSL configuration file by specifying the environment
+variable `OPENSSL_CONF`, or using the command line option `--openssl-conf`, and
+if none of those are specified will default to reading the default OpenSSL
+configuration file `openssl.cnf`. Node.js will only read a section that is by
+default named `nodejs_conf`, but this name can be overridden using the following
+configure option:
+
+```console
+$ ./configure --openssl-conf-name=<some_conf_name>
+```
+
 ## Building Node.js with FIPS-compliant OpenSSL
 
 The current version of Node.js supports FIPS when statically and
@@ -819,6 +833,9 @@ $ ls out/Release/obj.target/deps/openssl/lib/openssl-modules/
 fips.so
 ```
 
+Running `configure` without `--openssl-is-fips` flag and rebuilding will reset
+the FIPS configuration.
+
 ### FIPS support when dynamically linking OpenSSL
 
 For quictls/openssl 3.0 it is possible to enable FIPS when dynamically linking.

CHANGELOG.md

@@ -35,12 +35,15 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V18.md#18.2.0">18.2.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V18.md#18.3.0">18.3.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V18.md#18.2.0">18.2.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.1.0">18.1.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.0.0">18.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V17.md#17.8.0">17.8.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V17.md#17.9.1">17.9.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V17.md#17.9.0">17.9.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V17.md#17.8.0">17.8.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V17.md#17.7.2">17.7.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V17.md#17.7.1">17.7.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V17.md#17.7.0">17.7.0</a><br/>
@@ -55,7 +58,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V17.md#17.0.0">17.0.0</a><br/>
     </td>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V16.md#16.15.0">16.15.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V16.md#16.15.1">16.15.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V16.md#16.15.0">16.15.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V16.md#16.14.2">16.14.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V16.md#16.14.1">16.14.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V16.md#16.14.0">16.14.0</a><br/>

README.md

@@ -286,8 +286,6 @@ For information about the governance of the Node.js project, see
   **Ben Noordhuis** <<[email protected]>>
 * [BridgeAR](https://github.com/BridgeAR) -
   **Ruben Bridgewater** <<[email protected]>> (he/him)
-* [bzoz](https://github.com/bzoz) -
-  **Bartosz Sosnowski** <<[email protected]>>
 * [cclauss](https://github.com/cclauss) -
   **Christian Clauss** <<[email protected]>> (he/him)
 * [ChALkeR](https://github.com/ChALkeR) -
@@ -330,8 +328,6 @@ For information about the governance of the Node.js project, see
   **Harshitha K P** <<[email protected]>> (she/her)
 * [himself65](https://github.com/himself65) -
   **Zeyu "Alex" Yang** <<[email protected]>> (he/him)
-* [hiroppy](https://github.com/hiroppy) -
-  **Yuta Hiroto** <<[email protected]>> (he/him)
 * [iansu](https://github.com/iansu) -
   **Ian Sutherland** <<[email protected]>>
 * [indutny](https://github.com/indutny) -
@@ -364,8 +360,6 @@ For information about the governance of the Node.js project, see
   **LiviaMedeiros** <<[email protected]>>
 * [lpinca](https://github.com/lpinca) -
   **Luigi Pinca** <<[email protected]>> (he/him)
-* [lundibundi](https://github.com/lundibundi) -
-  **Denys Otrishko** <<[email protected]>> (he/him)
 * [Lxxyx](https://github.com/Lxxyx) -
   **Zijian Liu** <<[email protected]>> (he/him)
 * [marsonya](https://github.com/marsonya) -
@@ -474,6 +468,8 @@ For information about the governance of the Node.js project, see
   **Christopher Hiller** <<[email protected]>> (he/him)
 * [brendanashworth](https://github.com/brendanashworth) -
   **Brendan Ashworth** <<[email protected]>>
+* [bzoz](https://github.com/bzoz) -
+  **Bartosz Sosnowski** <<[email protected]>>
 * [calvinmetcalf](https://github.com/calvinmetcalf) -
   **Calvin Metcalf** <<[email protected]>>
 * [chrisdickinson](https://github.com/chrisdickinson) -
@@ -506,6 +502,8 @@ For information about the governance of the Node.js project, see
   **Glen Keane** <<[email protected]>> (he/him)
 * [hashseed](https://github.com/hashseed) -
   **Yang Guo** <<[email protected]>> (he/him)
+* [hiroppy](https://github.com/hiroppy) -
+  **Yuta Hiroto** <<[email protected]>> (he/him)
 * [iarna](https://github.com/iarna) -
   **Rebecca Turner** <<[email protected]>>
 * [imran-iq](https://github.com/imran-iq) -
@@ -538,6 +536,8 @@ For information about the governance of the Node.js project, see
   **Lance Ball** <<[email protected]>> (he/him)
 * [lucamaraschi](https://github.com/lucamaraschi) -
   **Luca Maraschi** <<[email protected]>> (he/him)
+* [lundibundi](https://github.com/lundibundi) -
+  **Denys Otrishko** <<[email protected]>> (he/him)
 * [lxe](https://github.com/lxe) -
   **Aleksey Smolenchuk** <<[email protected]>>
 * [maclover7](https://github.com/maclover7) -
@@ -646,6 +646,8 @@ maintaining the Node.js project.
 
 * [Ayase-252](https://github.com/Ayase-252) -
   **Qingyu Deng** <<[email protected]>>
+* [F3n67u](https://github.com/F3n67u) -
+  **Feng Yu** <<[email protected]>> (he/him)
 * [himadriganguly](https://github.com/himadriganguly) -
   **Himadri Ganguly** <<[email protected]>> (he/him)
 * [iam-frankqiu](https://github.com/iam-frankqiu) -

benchmark/error/error.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const common = require('../common.js');
+
+const bench = common.createBenchmark(main, {
+  n: [1e7],
+});
+
+function main({ n }) {
+  bench.start();
+  for (let i = 0; i < n; ++i)
+    new Error('test');
+  bench.end(n);
+}

benchmark/error/node-error.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const common = require('../common');
+
+const bench = common.createBenchmark(main, {
+  n: [1e7],
+}, {
+  flags: ['--expose-internals']
+});
+
+function main({ n }) {
+  const {
+    codes: {
+      ERR_INVALID_STATE,
+    }
+  } = require('internal/errors');
+  bench.start();
+  for (let i = 0; i < n; ++i)
+    new ERR_INVALID_STATE.TypeError('test');
+  bench.end(n);
+}

configure.py

@@ -181,6 +181,12 @@
          "e.g. /root/x/y.js will be referenced via require('root/x/y'). "
          "Can be used multiple times")
 
+parser.add_argument("--openssl-conf-name",
+    action="store",
+    dest="openssl_conf_name",
+    default='nodejs_conf',
+    help="The OpenSSL config appname (config section name) used by Node.js")
+
 parser.add_argument('--openssl-default-cipher-list',
     action='store',
     dest='openssl_default_cipher_list',
@@ -1488,6 +1494,8 @@ def configure_openssl(o):
   if options.openssl_no_asm:
     variables['openssl_no_asm'] = 1
 
+  o['defines'] += ['NODE_OPENSSL_CONF_NAME=' + options.openssl_conf_name]
+
   if options.without_ssl:
     def without_ssl_error(option):
       error('--without-ssl is incompatible with %s' % option)

deps/corepack/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+## [0.11.2](https://github.com/nodejs/corepack/compare/v0.11.1...v0.11.2) (2022-06-13)
+
+### Bug Fixes
+
+* only set bins on pack ([#127](https://github.com/nodejs/corepack/issues/127)) ([7ae489a](https://github.com/nodejs/corepack/commit/7ae489a86c3fe584b9915f4ec57deb7c316c1a25))
+
+## [0.11.1](https://github.com/nodejs/corepack/compare/v0.11.0...v0.11.1) (2022-06-12)
+
+
+### Bug Fixes
+
+* **ci:** YAML formatting in publish workflow ([#124](https://github.com/nodejs/corepack/issues/124)) ([01c7d63](https://github.com/nodejs/corepack/commit/01c7d638b04a1340b3939a7985e24b586e344995))
+
+## 0.11.0 (2022-06-12)
+
+
+### Features
+
+* auto setup proxy for http requests ([#69](https://github.com/nodejs/corepack/issues/69)) ([876ce02](https://github.com/nodejs/corepack/commit/876ce02fe7385ea5bc896b2dc93d1fb320361c64))
+
+
+### Bug Fixes
+
+* avoid symlinks to work on Windows ([#13](https://github.com/nodejs/corepack/issues/13)) ([b56df30](https://github.com/nodejs/corepack/commit/b56df30796da9c7cb0ba5e1bb7152c81582abba6))
+* avoid using eval to get the corepack version ([#45](https://github.com/nodejs/corepack/issues/45)) ([78d94eb](https://github.com/nodejs/corepack/commit/78d94eb297444d7558e8b4395f0108c97117f8ab))
+* bin file name for pnpm >=6.0 ([#35](https://github.com/nodejs/corepack/issues/35)) ([8ff2499](https://github.com/nodejs/corepack/commit/8ff2499e831c8cf2dea604ea985d830afc8a479e))
+* generate cmd shim files ([a900b4d](https://github.com/nodejs/corepack/commit/a900b4db12fcd4d99c0a4d011b426cdc6485d323))
+* handle package managers with a bin array correctly ([#20](https://github.com/nodejs/corepack/issues/20)) ([1836d17](https://github.com/nodejs/corepack/commit/1836d17b4fc4c0164df2fe1ccaca4d2f16f6f2d1))
+* handle parallel installs ([#84](https://github.com/nodejs/corepack/issues/84)) ([5cfc6c9](https://github.com/nodejs/corepack/commit/5cfc6c9df0dbec8e4de4324be37aa0a54a300552))
+* handle prereleases ([#32](https://github.com/nodejs/corepack/issues/32)) ([2a46b6d](https://github.com/nodejs/corepack/commit/2a46b6d13adae139141012254ef670d6ddcb5d11))
+
+
+### Performance Improvements
+
+* load binaries in the same process ([#97](https://github.com/nodejs/corepack/issues/97)) ([5ff6e82](https://github.com/nodejs/corepack/commit/5ff6e82028e58448ba5ba986854b61ecdc69885b))

deps/corepack/README.md

@@ -8,7 +8,7 @@ Corepack is a zero-runtime-dependency Node.js script that acts as a bridge betwe
 
 ### Default Installs
 
-Corepack is distributed by default with Node.js 16.9, but is opt-in for the time being. Run `corepack enable` to install the required shims.
+Corepack is distributed by default with Node.js 14.19.0 and 16.9.0, but is opt-in for the time being. Run `corepack enable` to install the required shims.
 
 ### Manual Installs
 
@@ -104,8 +104,14 @@ This command will retrieve the given package manager from the specified archive
 
 ## Environment Variables
 
+- `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`).
+
+- `COREPACK_HOME` can be set in order to define where Corepack should install the package managers. By default it is set to `$HOME/.node/corepack`.
+
 - `COREPACK_ROOT` has no functional impact on Corepack itself; it's automatically being set in your environment by Corepack when it shells out to the underlying package managers, so that they can feature-detect its presence (useful for commands like `yarn init`).
 
+- `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` are supported through [`node-proxy-agent`](https://github.com/TooTallNate/node-proxy-agent).
+
 ## Contributing
 
 If you want to build corepack yourself, you can build the project like this: