Skip to content

Commit 8cb2d32

Browse files
authored
Merge branch 'nodejs:main' into test-readline-interface-coverage
2 parents 2eb903f + f5ce6b1 commit 8cb2d32

File tree

5,626 files changed

+253479
-223595
lines changed

Some content is hidden

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

5,626 files changed

+253479
-223595
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ module.exports = {
337337
TextEncoderStream: 'readable',
338338
TransformStream: 'readable',
339339
TransformStreamDefaultController: 'readable',
340+
ShadowRealm: 'readable',
340341
SubtleCrypto: 'readable',
341342
WritableStream: 'readable',
342343
WritableStreamDefaultWriter: 'readable',

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@
107107

108108
/benchmark/misc/startup.js @nodejs/startup
109109
/src/node.cc @nodejs/startup
110-
/src/node_code_cache_stub.cc @nodejs/startup
111110
/src/node_native_module* @nodejs/startup
112111
/lib/internal/bootstrap/* @nodejs/startup
113-
/tools/code_cache/* @nodejs/startup
114112
/tools/snapshot/* @nodejs/startup
115113

116114
# V8

.github/label-pr-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ subSystemLabels:
6767
/^tools\/make-v8/: tools, v8 engine, needs-ci
6868
/^tools\/v8_gypfiles/: tools, v8 engine, needs-ci
6969
/^tools\/(code_cache|snapshot)/: needs-ci
70-
/^tools\/build-addons.js/: needs-ci
70+
/^tools\/build-addons.mjs/: needs-ci
7171
# all other tool changes should be marked as such
7272
/^tools\//: tools
7373
/^\.eslint|\.remark|\.editorconfig/: tools

.github/workflows/authors.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@ jobs:
1515
with:
1616
fetch-depth: '0' # This is required to actually get all the authors
1717
persist-credentials: false
18-
- run: tools/update-authors.js # Run the AUTHORS tool
19-
- uses: gr2m/create-or-update-pull-request-action@v1 # Create a PR or update the Action's existing PR
18+
- run: tools/update-authors.mjs # Run the AUTHORS tool
19+
- uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
20+
# Creates a PR or update the Action's existing PR, or
21+
# no-op if the base branch is already up-to-date.
2022
env:
2123
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
2224
with:
2325
author: Node.js GitHub Bot <[email protected]>
2426
body: >
2527
Here are some new additions to the AUTHORS file.
2628
This is an automatically generated PR by the
27-
`authors.yml` GitHub Action, which runs `tools/update-authors.js`.
29+
`authors.yml` GitHub Action, which runs `tools/update-authors.mjs`.
2830
branch: actions/authors-update # Custom branch *just* for this Action.
2931
commit-message: 'meta: update AUTHORS'
3032
labels: meta

.github/workflows/build-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: github.event.pull_request.draft == false
3333
strategy:
3434
matrix:
35-
windows: [windows-2019, windows-2022]
35+
windows: [windows-2019]
3636
fail-fast: false
3737
runs-on: ${{ matrix.windows }}
3838
steps:

.github/workflows/coverage-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ jobs:
6060
- name: Clean tmp
6161
run: rm -rf coverage/tmp && rm -rf out
6262
- name: Upload
63-
uses: codecov/codecov-action@v1
63+
uses: codecov/codecov-action@v3
6464
with:
6565
directory: ./coverage

.github/workflows/coverage-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
jobs:
3434
coverage-windows:
3535
if: github.event.pull_request.draft == false
36-
runs-on: windows-latest
36+
runs-on: windows-2019
3737
steps:
3838
- uses: actions/checkout@v3
3939
with:
@@ -61,6 +61,6 @@ jobs:
6161
- name: Clean tmp
6262
run: npx rimraf ./coverage/tmp
6363
- name: Upload
64-
uses: codecov/codecov-action@v1
64+
uses: codecov/codecov-action@v3
6565
with:
6666
directory: ./coverage

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
run: tools/find-inactive-collaborators.mjs
3131

3232
- name: Open pull request
33-
uses: gr2m/create-or-update-pull-request-action@v1
33+
uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
34+
# Creates a PR or update the Action's existing PR, or
35+
# no-op if the base branch is already up-to-date.
3436
env:
3537
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
3638
with:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ jobs:
3939
run: tools/find-inactive-tsc.mjs >> $GITHUB_ENV
4040

4141
- name: Open pull request
42-
uses: gr2m/create-or-update-pull-request-action@v1
42+
uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
43+
# Creates a PR or update the Action's existing PR, or
44+
# no-op if the base branch is already up-to-date.
4345
env:
4446
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
4547
with:

.github/workflows/license-builder.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ jobs:
1515
with:
1616
persist-credentials: false
1717
- run: ./tools/license-builder.sh # Run the license builder tool
18-
- uses: gr2m/[email protected] # Create a PR or update the Action's existing PR
18+
- uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
19+
# Creates a PR or update the Action's existing PR, or
20+
# no-op if the base branch is already up-to-date.
1921
env:
2022
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2123
with:

.github/workflows/linters.yml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,44 @@ jobs:
4949
run: npx envinfo
5050
- name: Lint C/C++ files
5151
run: make lint-cpp
52+
format-cpp:
53+
if: ${{ github.event.pull_request.draft == false && github.base_ref == 'master' }}
54+
runs-on: ubuntu-latest
55+
steps:
56+
- uses: actions/checkout@v3
57+
with:
58+
fetch-depth: 0
59+
persist-credentials: false
60+
- name: Use Node.js ${{ env.NODE_VERSION }}
61+
uses: actions/setup-node@v3
62+
with:
63+
node-version: ${{ env.NODE_VERSION }}
64+
- name: Set up Python ${{ env.PYTHON_VERSION }}
65+
uses: actions/setup-python@v3
66+
with:
67+
python-version: ${{ env.PYTHON_VERSION }}
68+
- name: Environment Information
69+
run: npx envinfo
70+
- name: Format C/C++ files
71+
run: |
72+
make format-cpp-build
73+
# The `make format-cpp` error code is intentionally ignored here
74+
# because it is irrelevant. We already check if the formatter produced
75+
# a diff in the next line.
76+
# Refs: https://github.com/nodejs/node/pull/42764
77+
CLANG_FORMAT_START="$(git merge-base HEAD refs/remotes/origin/$GITHUB_BASE_REF)" \
78+
make format-cpp || true
79+
git --no-pager diff --exit-code && EXIT_CODE="$?" || EXIT_CODE="$?"
80+
if [ "$EXIT_CODE" != "0" ]
81+
then
82+
echo
83+
echo 'ERROR: Please run:'
84+
echo
85+
echo " CLANG_FORMAT_START="$\(git merge-base HEAD ${GITHUB_BASE_REF}\)" make format-cpp"
86+
echo
87+
echo 'to format the commits in your branch.'
88+
exit "$EXIT_CODE"
89+
fi
5290
lint-js-and-md:
5391
if: github.event.pull_request.draft == false
5492
runs-on: ubuntu-latest
@@ -118,15 +156,15 @@ jobs:
118156
persist-credentials: false
119157
- run: shellcheck -V
120158
- name: Lint Shell scripts
121-
run: tools/lint-sh.js .
159+
run: tools/lint-sh.mjs .
122160
lint-codeowners:
123161
if: github.event.pull_request.draft == false
124162
runs-on: ubuntu-latest
125163
steps:
126164
- uses: actions/checkout@v3
127165
with:
128166
persist-credentials: false
129-
- uses: mszostok/codeowners-validator@v0.6.0
167+
- uses: mszostok/codeowners-validator@7f3f5e28c6d7b8dfae5731e54ce2272ca384592f
130168
with:
131169
checks: files,duppatterns
132170
lint-pr-url:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Slack Notification
15-
uses: rtCamp/action-slack-notify@master
15+
uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
1616
env:
1717
SLACK_COLOR: '#DE512A'
1818
SLACK_ICON: https://github.com/nodejs.png?size=48

.github/workflows/test-asan.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ concurrency:
3030
cancel-in-progress: true
3131

3232
env:
33+
ASAN_OPTIONS: intercept_tls_get_addr=0
3334
PYTHON_VERSION: '3.10'
3435
FLAKY_TESTS: dontcare
3536

.github/workflows/tools.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ jobs:
8080
with:
8181
persist-credentials: false
8282
- run: ${{ matrix.run }}
83-
- uses: gr2m/create-or-update-pull-request-action@v1 # Create a PR or update the Action's existing PR
83+
- uses: gr2m/create-or-update-pull-request-action@6720400cad8e74d7adc64640e4e6ea6748b83d8f
84+
# Creates a PR or update the Action's existing PR, or
85+
# no-op if the base branch is already up-to-date.
8486
env:
8587
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
8688
with:

.mailmap

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Ashley Maceli <[email protected]>
5050
Ashok Suthar <[email protected]>
5151
Ashutosh Kumar Singh <[email protected]>
5252
Atsuo Fukaya <[email protected]>
53+
5354
5455
Ben Lugavere <[email protected]>
5556
@@ -82,11 +83,14 @@ Brian White <[email protected]> <[email protected]>
8283
Caleb Boyd <[email protected]>
8384
8485
86+
8587
Caralyn Reisle <[email protected]>
8688
8789
Charles Rudolph <[email protected]>
8890
Chen Gang <[email protected]>
8991
92+
Chengzhong Wu <[email protected]>
93+
9094
Chew Choon Keat <[email protected]>
9195
Chris Andrews <[email protected]>
9296
Chris Johnson <[email protected]>
@@ -196,8 +200,6 @@ Hassaan Pasha <[email protected]> <[email protected]>
196200
Hendrik Schwalm <[email protected]>
197201
Henry Chin <[email protected]>
198202
Herbert Vojčík <[email protected]>
199-
200-
201203
Hitesh Kanwathirtha <[email protected]> <[email protected]>
202204
203205
Igor Savin <[email protected]>
@@ -298,6 +300,7 @@ Lakshmi Swetha Gopireddy <[email protected]> <[email protected]
298300
299301
Lasse R.H. Nielsen <[email protected]>
300302
Leeseean Chiu <[email protected]>
303+
301304
302305
Luke Bayes <[email protected]>
303306
Lydia Kats <[email protected]>
@@ -356,6 +359,8 @@ Mitar Milutinovic <[email protected]>
356359
357360
Mohammed Keyvanzadeh <[email protected]>
358361
Mohammed Keyvanzadeh <[email protected]> <[email protected]>
362+
Morgan Roderick <[email protected]>
363+
359364
360365
361366
@@ -372,10 +377,17 @@ Nils Kuhnhenn <[email protected]>
372377
373378
374379
Noah Rose Ledesma <[email protected]>
380+
381+
npm team <[email protected]> <npm CLI robot>
382+
npm team <[email protected]> <npm team>
383+
375384
Oliver Chang <[email protected]>
376385
Oluwaseun Omoyajowo <[email protected]>
386+
377387
Onne Gorter <[email protected]>
378388
389+
Paolo Insogna <[email protected]>
390+
379391
380392
381393
Pedro Lima <[email protected]>
@@ -558,6 +570,8 @@ Yuta Hiroto <[email protected]>
558570
559571
560572
Zachary Vacura <[email protected]>
573+
574+
561575
Zoran Tomicic <[email protected]>
562576
Сковорода Никита Андреевич <[email protected]>
563577
隋鑫磊 <[email protected]>

AUTHORS

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2310,12 +2310,12 @@ Dzmitry_Prudnikau <[email protected]>
23102310
Ian McKellar <[email protected]>
23112311
Jennifer Bland <[email protected]>
23122312
Kyle Fuller <[email protected]>
2313-
Camillo Bruni <[email protected]>
2313+
Camillo Bruni <[email protected]>
23142314
Yongsheng Zhang <[email protected]>
23152315
Neeraj Laad <[email protected]>
23162316
Scott Van Gilder <[email protected]>
23172317
Yaniv Friedensohn <[email protected]>
2318-
Lucas Woo <[email protected]>
2318+
Chengzhong Wu <[email protected]>
23192319
Troels Liebe Bentsen <[email protected]>
23202320
pranshuchittora <[email protected]>
23212321
lakamsani <[email protected]>
@@ -2686,7 +2686,7 @@ Alexander Sattelmaier <[email protected]>
26862686
26872687
26882688
Aymen Naghmouchi <[email protected]>
2689-
himself65 <[email protected]>
2689+
Zeyu "Alex" Yang <[email protected]>
26902690
Patrick Gansterer <[email protected]>
26912691
Nicolas Moteau <[email protected]>
26922692
Anthony Tuininga <[email protected]>
@@ -3260,7 +3260,6 @@ Siddharth <[email protected]>
32603260
Cactysman <[email protected]>
32613261
David Brownman <[email protected]>
32623262
Michael Rommel <[email protected]>
3263-
Chengzhong Wu <[email protected]>
32643263
32653264
Jayden Seric <[email protected]>
32663265
@@ -3288,7 +3287,7 @@ pengjie <[email protected]>
32883287
32893288
julianjany <[email protected]>
32903289
3291-
npm-robot <[email protected]>
3290+
32923291
Shaun Keys <[email protected]>
32933292
Simone Busoli <[email protected]>
32943293
Derevianchenko Maksym <[email protected]>
@@ -3430,9 +3429,8 @@ Derek Wolpert <[email protected]>
34303429
34313430
Alexandru Comanescu <[email protected]>
34323431
3433-
Austin Kelleher <austin.kell47@gmail.com>
3432+
Austin Kelleher <austinlkelleher@gmail.com>
34343433
3435-
Livia Medeiros <[email protected]>
34363434
Nikolaos Papaspyrou <[email protected]>
34373435
Matt Probert <[email protected]>
34383436
Roch Devost <[email protected]>
@@ -3452,5 +3450,23 @@ Daeyeon Jeong <[email protected]>
34523450
Daniel Roe <[email protected]>
34533451
Niyas Sait <[email protected]>
34543452
K.C.Ashish Kumar <[email protected]>
3453+
Niklas Mischkulnig <[email protected]>
3454+
Liviu Ionescu <[email protected]>
3455+
HE Shi-Jun <[email protected]>
3456+
Yagiz Nizipli <[email protected]>
3457+
liuxingbaoyu <[email protected]>
3458+
Sergey Nazaryev <[email protected]>
3459+
William Marlow <[email protected]>
3460+
Keyhan Vakil <[email protected]>
3461+
3462+
pupilTong <[email protected]>
3463+
3464+
Meek Simbule <[email protected]>
3465+
Michael Ficarra <[email protected]>
3466+
hiroki osame <[email protected]>
3467+
Eugene Chapko <[email protected]>
3468+
Sergey Petushkov <[email protected]>
3469+
Caleb Everett <[email protected]>
3470+
JialuZhang-intel <[email protected]>
34553471

3456-
# Generated by tools/update-authors.js
3472+
# Generated by tools/update-authors.mjs

0 commit comments

Comments
 (0)