Skip to content

Commit a226e5a

Browse files
author
Bar Admoni
committed
Merge branch 'master' of github.com:nodejs/node
2 parents be257c3 + a35b32e commit a226e5a

File tree

1,078 files changed

+48043
-27656
lines changed

Some content is hidden

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

1,078 files changed

+48043
-27656
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node_modules
2-
lib/internal/v8_prof_polyfill.js
32
lib/punycode.js
43
test/addons/??_*
54
test/fixtures

‎.eslintrc.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const hacks = [
1818
'eslint-plugin-markdown',
1919
'@babel/eslint-parser',
2020
'@babel/plugin-syntax-class-properties',
21+
'@babel/plugin-syntax-top-level-await',
2122
];
2223
Module._findPath = (request, paths, isMain) => {
2324
const r = ModuleFindPath(request, paths, isMain);
@@ -41,7 +42,10 @@ module.exports = {
4142
parser: '@babel/eslint-parser',
4243
parserOptions: {
4344
babelOptions: {
44-
plugins: [Module._findPath('@babel/plugin-syntax-class-properties')],
45+
plugins: [
46+
Module._findPath('@babel/plugin-syntax-class-properties'),
47+
Module._findPath('@babel/plugin-syntax-top-level-await'),
48+
],
4549
},
4650
requireConfigFile: false,
4751
sourceType: 'script',
@@ -53,6 +57,7 @@ module.exports = {
5357
'doc/api/module.md',
5458
'doc/api/modules.md',
5559
'doc/api/packages.md',
60+
'doc/api/wasi.md',
5661
'test/es-module/test-esm-type-flag.js',
5762
'test/es-module/test-esm-type-flag-alias.js',
5863
'*.mjs',

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
<!--
2-
Thank you for your pull request. Please provide a description above and review
3-
the requirements below.
2+
Before submitting a pull request, please read
3+
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md.
44
5-
Bug fixes and new features should include tests and possibly benchmarks.
5+
Commit message formatting guidelines:
6+
https://github.com/nodejs/node/blob/master/doc/guides/contributing/pull-requests.md#commit-message-guidelines
67
7-
Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
8-
-->
9-
10-
##### Checklist
11-
<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
8+
For code changes:
9+
1. Include tests for any bug fixes or new features.
10+
2. Update documentation if relevant.
11+
3. Ensure that `make -j4 test` (UNIX), or `vcbuild test` (Windows) passes.
1212
13-
- [ ] `make -j4 test` (UNIX), or `vcbuild test` (Windows) passes
14-
- [ ] tests and/or benchmarks are included
15-
- [ ] documentation is changed or added
16-
- [ ] commit message follows [commit guidelines](https://github.com/nodejs/node/blob/master/doc/guides/contributing/pull-requests.md#commit-message-guidelines)
17-
18-
<!--
1913
Developer's Certificate of Origin 1.1
2014
2115
By making a contribution to this project, I certify that:

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
6+
name: Notify on Force Push
7+
jobs:
8+
slackNotification:
9+
name: Slack Notification
10+
if: ${{ github.event.forced && github.repository == 'nodejs/node' }}
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Slack Notification
14+
uses: rtCamp/action-slack-notify@master
15+
env:
16+
SLACK_COLOR: '#DE512A'
17+
SLACK_ICON: https://github.com/nodejs.png?size=48
18+
SLACK_TITLE: '${{ github.actor }} force-pushed to ${{ github.ref }}'
19+
SLACK_MESSAGE: |
20+
A commit was force-pushed to <https://github.com/${{ github.repository }}/tree/master|${{ github.repository }}@master> by <https://github.com/${{ github.actor }}|${{ github.actor }}>
21+
22+
Before: <https://github.com/${{ github.repository }}/commit/${{ github.event.before }}|${{ github.event.before }}>
23+
After: <https://github.com/${{ github.repository }}/commit/${{ github.event.after }}|${{ github.event.after }}>
24+
SLACK_USERNAME: nodejs-bot
25+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

‎CHANGELOG.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ release.
3232
</tr>
3333
<tr>
3434
<td valign="top">
35-
<b><a href="doc/changelogs/CHANGELOG_V15.md#15.5.0">15.5.0</a></b><br/>
35+
<b><a href="doc/changelogs/CHANGELOG_V15.md#15.6.0">15.6.0</a></b><br/>
36+
<a href="doc/changelogs/CHANGELOG_V15.md#15.5.1">15.5.1</a><br/>
37+
<a href="doc/changelogs/CHANGELOG_V15.md#15.5.0">15.5.0</a><br/>
3638
<a href="doc/changelogs/CHANGELOG_V15.md#15.4.0">15.4.0</a><br/>
3739
<a href="doc/changelogs/CHANGELOG_V15.md#15.3.0">15.3.0</a><br/>
3840
<a href="doc/changelogs/CHANGELOG_V15.md#15.2.1">15.2.1</a><br/>
@@ -42,7 +44,8 @@ release.
4244
<a href="doc/changelogs/CHANGELOG_V15.md#15.0.0">15.0.0</a><br/>
4345
</td>
4446
<td valign="top">
45-
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.15.3">14.15.3</a></b><br/>
47+
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.15.4">14.15.4</a></b><br/>
48+
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.3">14.15.3</a><br/>
4649
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.2">14.15.2</a><br/>
4750
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.1">14.15.1</a><br/>
4851
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.0">14.15.0</a><br/>
@@ -65,7 +68,8 @@ release.
6568
<a href="doc/changelogs/CHANGELOG_V14.md#14.0.0">14.0.0</a><br/>
6669
</td>
6770
<td valign="top">
68-
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.20.0">12.20.0</a></b><br/>
71+
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.20.1">12.20.1</a></b><br/>
72+
<a href="doc/changelogs/CHANGELOG_V12.md#12.20.0">12.20.0</a><br/>
6973
<a href="doc/changelogs/CHANGELOG_V12.md#12.19.1">12.19.1</a><br/>
7074
<a href="doc/changelogs/CHANGELOG_V12.md#12.19.0">12.19.0</a><br/>
7175
<a href="doc/changelogs/CHANGELOG_V12.md#12.18.4">12.18.4</a><br/>
@@ -102,7 +106,8 @@ release.
102106
<a href="doc/changelogs/CHANGELOG_V12.md#12.0.0">12.0.0</a><br/>
103107
</td>
104108
<td valign="top">
105-
<b><a href="doc/changelogs/CHANGELOG_V10.md#10.23.0">10.23.0</a></b><br/>
109+
<b><a href="doc/changelogs/CHANGELOG_V10.md#10.23.1">10.23.1</a></b><br/>
110+
<a href="doc/changelogs/CHANGELOG_V10.md#10.23.0">10.23.0</a><br/>
106111
<a href="doc/changelogs/CHANGELOG_V10.md#10.22.1">10.22.1</a><br/>
107112
<a href="doc/changelogs/CHANGELOG_V10.md#10.22.0">10.22.0</a><br/>
108113
<a href="doc/changelogs/CHANGELOG_V10.md#10.21.0">10.21.0</a><br/>

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ See [details on our policy on Code of Conduct](./doc/guides/contributing/code-of
1515

1616
## [Issues](./doc/guides/contributing/issues.md)
1717

18-
* [How to Contribute in Issues](./doc/guides/contributing/issues.md#how-to-contribute-in-issues)
1918
* [Asking for General Help](./doc/guides/contributing/issues.md#asking-for-general-help)
2019
* [Discussing non-technical topics](./doc/guides/contributing/issues.md#discussing-non-technical-topics)
2120
* [Submitting a Bug Report](./doc/guides/contributing/issues.md#submitting-a-bug-report)
2221
* [Triaging a Bug Report](./doc/guides/contributing/issues.md#triaging-a-bug-report)
23-
* [Resolving a Bug Report](./doc/guides/contributing/issues.md#resolving-a-bug-report)
2422

2523
## [Pull Requests](./doc/guides/contributing/pull-requests.md)
2624

‎Makefile‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FLAKY_TESTS ?= run
99
TEST_CI_ARGS ?=
1010
STAGINGSERVER ?= node-www
1111
LOGLEVEL ?= silent
12-
OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
12+
OSTYPE := $(shell uname -s | tr '[:upper:]' '[:lower:]')
1313
COVTESTS ?= test-cov
1414
COV_SKIP_TESTS ?= core_line_numbers.js,testFinalizer.js,test_function/test.js
1515
GTEST_FILTER ?= "*"
@@ -40,7 +40,7 @@ ifeq ($(OSTYPE), darwin)
4040
GCOV = xcrun llvm-cov gcov
4141
endif
4242

43-
BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[A-Z]' '[a-z]')
43+
BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[:upper:]' '[:lower:]')
4444

4545
# Determine EXEEXT
4646
EXEEXT := $(shell $(PYTHON) -c \
@@ -85,7 +85,7 @@ endif
8585
# To add a target to the help, add a double comment (##) on the target line.
8686
help: ## Print help for targets with comments.
8787
@printf "For more targets and info see the comments in the Makefile.\n\n"
88-
@grep -E '^[a-zA-Z0-9._-]+:.*?## .*$$' Makefile | sort | \
88+
@grep -E '^[[:alnum:]._-]+:.*?## .*$$' Makefile | sort | \
8989
awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}'
9090

9191
# The .PHONY is needed to ensure that we recursively use the out/Makefile
@@ -243,10 +243,10 @@ coverage-test: coverage-build
243243
--gcov-exclude='.*\b(deps|usr|out|cctest|embedding)\b' -v \
244244
-r Release/obj.target --html --html-detail -o ../coverage/cxxcoverage.html \
245245
--gcov-executable="$(GCOV)")
246-
@echo -n "Javascript coverage %: "
246+
@printf "Javascript coverage %%: "
247247
@grep -B1 Lines coverage/index.html | head -n1 \
248248
| sed 's/<[^>]*>//g'| sed 's/ //g'
249-
@echo -n "C++ coverage %: "
249+
@printf "C++ coverage %%: "
250250
@grep -A3 Lines coverage/cxxcoverage.html | grep style \
251251
| sed 's/<[^>]*>//g'| sed 's/ //g'
252252

@@ -696,7 +696,7 @@ doc-only: tools/doc/node_modules \
696696
@if [ "$(shell $(node_use_openssl))" != "true" ]; then \
697697
echo "Skipping doc-only (no crypto)"; \
698698
else \
699-
$(MAKE) out/doc/api/all.html out/doc/api/all.json; \
699+
$(MAKE) out/doc/api/all.html out/doc/api/all.json out/doc/api/stability; \
700700
fi
701701

702702
.PHONY: doc
@@ -749,6 +749,10 @@ out/doc/api/all.html: $(apidocs_html) tools/doc/allhtml.js \
749749
out/doc/api/all.json: $(apidocs_json) tools/doc/alljson.js | out/doc/api
750750
$(call available-node, tools/doc/alljson.js)
751751

752+
.PHONY: out/doc/api/stability
753+
out/doc/api/stability: out/doc/api/all.json tools/doc/stability.js | out/doc/api
754+
$(call available-node, tools/doc/stability.js)
755+
752756
.PHONY: docopen
753757
docopen: out/doc/api/all.html
754758
@$(PYTHON) -mwebbrowser file://$(abspath $<)
@@ -1360,7 +1364,7 @@ lint: ## Run JS, C++, MD and doc linters.
13601364
$(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \
13611365
$(MAKE) lint-md || EXIT_STATUS=$$? ; \
13621366
exit $$EXIT_STATUS
1363-
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
1367+
CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+
13641368

13651369
# Related CI job: node-test-linter
13661370
lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs

‎README.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ For information about the governance of the Node.js project, see
289289
**David Carlier** &lt;[email protected]&gt;
290290
* [devsnek](https://github.com/devsnek) -
291291
**Gus Caplan** &lt;[email protected]&gt; (they/them)
292+
* [dnlup](https://github.com/dnlup)
293+
**Daniele Belardi** &lt;[email protected]&gt; (he/him)
292294
* [edsadr](https://github.com/edsadr) -
293295
**Adrian Estrada** &lt;[email protected]&gt; (he/him)
294296
* [eugeneo](https://github.com/eugeneo) -
@@ -323,6 +325,8 @@ For information about the governance of the Node.js project, see
323325
**Zeyu Yang** &lt;[email protected]&gt; (he/him)
324326
* [hiroppy](https://github.com/hiroppy) -
325327
**Yuta Hiroto** &lt;[email protected]&gt; (he/him)
328+
* [iansu](https://github.com/iansu) -
329+
**Ian Sutherland** &lt;[email protected]&gt;
326330
* [indutny](https://github.com/indutny) -
327331
**Fedor Indutny** &lt;[email protected]&gt;
328332
* [JacksonTian](https://github.com/JacksonTian) -
@@ -357,6 +361,8 @@ For information about the governance of the Node.js project, see
357361
**Matteo Collina** &lt;[email protected]&gt; (he/him)
358362
* [mhdawson](https://github.com/mhdawson) -
359363
**Michael Dawson** &lt;[email protected]&gt; (he/him)
364+
* [miladfarca](https://github.com/miladfarca) -
365+
**Milad Fa** &lt;[email protected]&gt; (he/him)
360366
* [mildsunrise](https://github.com/mildsunrise) -
361367
**Alba Mendez** &lt;[email protected]&gt; (she/her)
362368
* [misterdjules](https://github.com/misterdjules) -
@@ -371,6 +377,8 @@ For information about the governance of the Node.js project, see
371377
**Ali Ijaz Sheikh** &lt;[email protected]&gt; (he/him)
372378
* [oyyd](https://github.com/oyyd) -
373379
**Ouyang Yadong** &lt;[email protected]&gt; (he/him)
380+
* [panva](https://github.com/panva) -
381+
**Filip Skokan** &lt;[email protected]&gt;
374382
* [PoojaDurgad](https://github.com/PoojaDurgad) -
375383
**Pooja D P** &lt;[email protected]&gt; (she/her)
376384
* [psmarshall](https://github.com/psmarshall) -
@@ -379,6 +387,8 @@ For information about the governance of the Node.js project, see
379387
**Andrey Pechkurov** &lt;[email protected]&gt; (he/him)
380388
* [Qard](https://github.com/Qard) -
381389
**Stephen Belanger** &lt;[email protected]&gt; (he/him)
390+
* [RaisinTen](https://github.com/RaisinTen) -
391+
**Darshan Sen** &lt;[email protected]&gt; (he/him)
382392
* [refack](https://github.com/refack) -
383393
**Refael Ackermann (רפאל פלחי)** &lt;[email protected]&gt; (he/him/הוא/אתה)
384394
* [rexagod](https://github.com/rexagod) -
@@ -591,7 +601,7 @@ Primary GPG keys for Node.js Releasers (some Releasers sign with subkeys):
591601
* **Colin Ihrig** &lt;[email protected]&gt;
592602
`94AE36675C464D64BAFA68DD7434390BDBE9B9C5`
593603
* **Danielle Adams** &lt;[email protected]&gt;
594-
`1C050899334244A8AF75E53792EF661D867B9DFA`
604+
`74F12602B6F1C4E913FAA37AD3A89613643B6201`
595605
* **James M Snell** &lt;[email protected]&gt;
596606
`71DCFD284A79C3B38668286BC97EC7A07EDE3FC1`
597607
* **Michaël Zasso** &lt;[email protected]&gt;
@@ -615,7 +625,7 @@ to sign releases):
615625
```bash
616626
gpg --keyserver pool.sks-keyservers.net --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C
617627
gpg --keyserver pool.sks-keyservers.net --recv-keys 94AE36675C464D64BAFA68DD7434390BDBE9B9C5
618-
gpg --keyserver pool.sks-keyservers.net --recv-keys 1C050899334244A8AF75E53792EF661D867B9DFA
628+
gpg --keyserver pool.sks-keyservers.net --recv-keys 74F12602B6F1C4E913FAA37AD3A89613643B6201
619629
gpg --keyserver pool.sks-keyservers.net --recv-keys 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1
620630
gpg --keyserver pool.sks-keyservers.net --recv-keys 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600
621631
gpg --keyserver pool.sks-keyservers.net --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8
@@ -633,6 +643,8 @@ Other keys used to sign some previous releases:
633643

634644
* **Chris Dickinson** &lt;[email protected]&gt;
635645
`9554F04D7259F04124DE6B476D5A82AC7E37093B`
646+
* **Danielle Adams** &lt;[email protected]&gt;
647+
`1C050899334244A8AF75E53792EF661D867B9DFA`
636648
* **Evan Lucas** &lt;[email protected]&gt;
637649
`B9AE9905FFD7803F25714661B63B535A4C206CA9`
638650
* **Gibson Fahnestock** &lt;[email protected]&gt;

‎benchmark/_test-double-benchmarker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function run() {
4646
}
4747
} else { // HTTP/2
4848
const client = http.connect(url);
49-
client.on('error', (e) => { throw e; });
49+
client.on('error', () => {});
5050
request(client.request(), client);
5151
}
5252
}

‎benchmark/crypto/randomUUID.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
const common = require('../common.js');
4+
const { randomUUID } = require('crypto');
5+
6+
const bench = common.createBenchmark(main, {
7+
n: [1e7],
8+
disableEntropyCache: [0, 1],
9+
});
10+
11+
function main({ n, disableEntropyCache }) {
12+
disableEntropyCache = !!disableEntropyCache;
13+
bench.start();
14+
for (let i = 0; i < n; ++i)
15+
randomUUID({ disableEntropyCache });
16+
bench.end(n);
17+
}

0 commit comments

Comments
 (0)