Skip to content

Commit e9a3296

Browse files
authored
Merge branch 'main' into patch-55
2 parents 4375433 + 4f1c27a commit e9a3296

File tree

9,262 files changed

+599423
-200357
lines changed

Some content is hidden

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

9,262 files changed

+599423
-200357
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ indent_size = unset
2323
indent_style = unset
2424
trim_trailing_whitespace = unset
2525

26-
[{test/fixtures,deps,tools/node_modules,tools/gyp,tools/icu,tools/msvs}/**]
26+
[{test/fixtures,deps,tools/eslint/node_modules,tools/gyp,tools/icu,tools/msvs}/**]
2727
insert_final_newline = false

.github/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
/doc/api/permissions.md @nodejs/security-wg
168168
/lib/internal/process/permission.js @nodejs/security-wg
169169
/src/permission/* @nodejs/security-wg
170+
/test/parallel/test-permission-* @nodejs/security-wg
170171

171172
# Dependency Update Tools
172173

@@ -181,3 +182,10 @@
181182
/lib/internal/navigator.js @nodejs/web-standards
182183
/test/fixtures/wpt/ @nodejs/web-standards
183184
/test/wpt/ @nodejs/web-standards
185+
186+
# TypeScript
187+
188+
/deps/amaro/ @nodejs/typescript
189+
/doc/api/typescript.md @nodejs/typescript
190+
/test/fixtures/typescript/ @nodejs/typescript
191+
/tools/dep_updaters/update-amaro.sh @nodejs/typescript

.github/ISSUE_TEMPLATE/1-bug-report.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ body:
1313
- type: input
1414
attributes:
1515
label: Version
16-
description: Output of `node -v`
17-
- type: input
16+
description: |
17+
Output of `node -v`.
18+
Please verify that you are reproducing the issue in a [currently-supported version](https://github.com/nodejs/Release/blob/HEAD/README.md#release-schedule) of Node.js.
19+
- type: textarea
1820
attributes:
1921
label: Platform
22+
render: text
2023
description: |
2124
UNIX: output of `uname -a`
2225
Windows: output of `"$([Environment]::OSVersion.VersionString) $(('x86', 'x64')[[Environment]::Is64BitOperatingSystem])"` in PowerShell console
@@ -32,13 +35,19 @@ body:
3235
be run using `node` directly without installing third-party dependencies
3336
or downloading code from the internet (i.e. no ZIP archive, no GitHub
3437
repository, etc.).
38+
validations:
39+
required: true
3540
- type: textarea
3641
attributes:
3742
label: How often does it reproduce? Is there a required condition?
43+
validations:
44+
required: true
3845
- type: textarea
3946
attributes:
4047
label: What is the expected behavior? Why is that the expected behavior?
4148
description: If possible please provide textual output instead of screenshots.
49+
validations:
50+
required: true
4251
- type: textarea
4352
attributes:
4453
label: What do you see instead?

.github/label-pr-config.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ subSystemLabels:
3333
/^src\/quic\/*/: c++, quic
3434
/^src\/node_bob*/: c++, quic
3535
/^src\/node_sea/: single-executable
36+
/^src\/node_sqlite.*/: c++, sqlite
3637

3738
# Properly label changes to V8 inspector integration-related files
3839
/^src\/inspector_/: c++, inspector, needs-ci
@@ -80,6 +81,7 @@ subSystemLabels:
8081
/^deps\/nghttp2\/nghttp2\.gyp/: build, http2
8182
/^deps\/nghttp2\//: http2
8283
/^deps\/ngtcp2\//: quic
84+
/^deps\/amaro\//: strip-types
8385
/^deps\/([^/]+)/: dependencies, $1
8486

8587
## JS subsystems
@@ -91,12 +93,13 @@ subSystemLabels:
9193
/^lib\/internal\/bootstrap/: lib / src
9294
/^lib\/internal\/v8_prof_/: tools
9395
/^lib\/internal\/socket(?:_list|address)\.js$/: net
94-
/^lib\/\w+\/streams$/: stream
96+
/^lib\/(_stream.*|internal\/streams\/.*|stream\.js|stream\/.*)$/: stream
9597
/^lib\/.*http2/: http2
9698
/^lib\/worker_threads.js$/: worker
9799
/^lib\/test.js$/: test_runner
98100
/^lib\/internal\/url\.js$/: whatwg-url
99101
/^lib\/internal\/modules\/esm/: esm
102+
/^lib\/internal\/modules/: module
100103
/^lib\/internal\/webstreams/: web streams
101104
/^lib\/internal\/test_runner/: test_runner
102105

@@ -121,6 +124,7 @@ exlusiveLabels:
121124
/^test\/fixtures\/es-module/: test, esm
122125
/^test\/es-module\//: test, esm
123126
/^test\/fixtures\/wpt\/streams\//: test, web streams
127+
/^test\/fixtures\/typescript/: test, strip-types
124128

125129
/^test\//: test
126130

@@ -140,6 +144,8 @@ exlusiveLabels:
140144
# Add deprecations label to PRs that affect doc/api/deprecations.md
141145
/^doc\/api\/deprecations.md$/: doc, deprecations
142146
/^doc\/changelogs\//: release
147+
# Specific map for typescript.md as it should be labeled 'strip-types'
148+
/^doc\/api\/typescript.md$/: doc, strip-types
143149

144150
/^doc\//: doc
145151

@@ -186,8 +192,10 @@ allJsSubSystems:
186192
- readline
187193
- repl
188194
- report
195+
- sqlite
189196
- stream
190197
- string_decoder
198+
- strip-types
191199
- timers
192200
- tls
193201
- trace_events

.github/workflows/auto-start-ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
if: needs.get-prs-for-ci.outputs.numbers != ''
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
48+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4949
with:
5050
persist-credentials: false
5151

5252
- name: Install Node.js
53-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
53+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
5454
with:
5555
node-version: ${{ env.NODE_VERSION }}
5656

@@ -59,11 +59,15 @@ jobs:
5959

6060
- name: Setup @node-core/utils
6161
run: |
62-
ncu-config set username ${{ secrets.JENKINS_USER }}
63-
ncu-config set token "${{ secrets.GH_USER_TOKEN }}"
64-
ncu-config set jenkins_token ${{ secrets.JENKINS_TOKEN }}
62+
ncu-config set username "$USERNAME"
63+
ncu-config set token "$GH_TOKEN"
64+
ncu-config set jenkins_token "$JENKINS_TOKEN"
6565
ncu-config set owner "${{ github.repository_owner }}"
6666
ncu-config set repo "$(echo ${{ github.repository }} | cut -d/ -f2)"
67+
env:
68+
USERNAME: ${{ secrets.JENKINS_USER }}
69+
GH_TOKEN: ${{ secrets.GH_USER_TOKEN }}
70+
JENKINS_TOKEN: ${{ secrets.JENKINS_TOKEN }}
6771

6872
- name: Start the CI
6973
run: ./tools/actions/start-ci.sh ${{ needs.get-prs-for-ci.outputs.numbers }}

.github/workflows/build-tarball.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,29 @@ concurrency:
3030
env:
3131
PYTHON_VERSION: '3.12'
3232
FLAKY_TESTS: keep_retrying
33+
CC: sccache clang
34+
CXX: sccache clang++
35+
SCCACHE_GHA_ENABLED: 'true'
3336

3437
permissions:
3538
contents: read
3639

3740
jobs:
3841
build-tarball:
3942
if: github.event.pull_request.draft == false
40-
runs-on: ubuntu-latest
43+
runs-on: ubuntu-24.04
4144
steps:
42-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
45+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4346
with:
4447
persist-credentials: false
4548
- name: Set up Python ${{ env.PYTHON_VERSION }}
46-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
49+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
4750
with:
4851
python-version: ${{ env.PYTHON_VERSION }}
52+
- name: Set up sccache
53+
uses: mozilla-actions/sccache-action@89e9040de88b577a072e3760aaf59f585da083af # v0.0.5
54+
with:
55+
version: v0.8.0
4956
- name: Environment Information
5057
run: npx envinfo
5158
- name: Make tarball
@@ -57,25 +64,29 @@ jobs:
5764
mkdir tarballs
5865
mv *.tar.gz tarballs
5966
- name: Upload tarball artifact
60-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
67+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
6168
with:
6269
name: tarballs
6370
path: tarballs
6471
test-tarball-linux:
6572
needs: build-tarball
66-
runs-on: ubuntu-latest
73+
runs-on: ubuntu-24.04
6774
steps:
68-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
75+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
6976
with:
7077
persist-credentials: false
7178
- name: Set up Python ${{ env.PYTHON_VERSION }}
72-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
79+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
7380
with:
7481
python-version: ${{ env.PYTHON_VERSION }}
82+
- name: Set up sccache
83+
uses: mozilla-actions/sccache-action@89e9040de88b577a072e3760aaf59f585da083af # v0.0.5
84+
with:
85+
version: v0.8.0
7586
- name: Environment Information
7687
run: npx envinfo
7788
- name: Download tarball
78-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
89+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
7990
with:
8091
name: tarballs
8192
path: tarballs
@@ -85,7 +96,7 @@ jobs:
8596
echo "TAR_DIR=$RUNNER_TEMP/`basename tarballs/*.tar.gz .tar.gz`" >> $GITHUB_ENV
8697
- name: Copy directories needed for testing
8798
run: |
88-
cp -r tools/node_modules $TAR_DIR/tools
99+
cp -r tools/eslint $TAR_DIR/tools
89100
cp -r tools/eslint-rules $TAR_DIR/tools
90101
- name: Build
91102
run: |

.github/workflows/build-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
fail-fast: false
3939
runs-on: ${{ matrix.windows }}
4040
steps:
41-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
41+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4242
with:
4343
persist-credentials: false
4444
- name: Set up Python ${{ env.PYTHON_VERSION }}
45-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
45+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
4646
with:
4747
python-version: ${{ env.PYTHON_VERSION }}
4848
- name: Install deps

.github/workflows/commit-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
run: |
1818
echo "plusOne=$((${{ github.event.pull_request.commits }} + 1))" >> $GITHUB_OUTPUT
1919
echo "minusOne=$((${{ github.event.pull_request.commits }} - 1))" >> $GITHUB_OUTPUT
20-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
20+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2121
with:
2222
fetch-depth: ${{ steps.nb-of-commits.outputs.plusOne }}
2323
persist-credentials: false
2424
- run: git reset HEAD^2
2525
- name: Install Node.js
26-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
26+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
2727
with:
2828
node-version: ${{ env.NODE_VERSION }}
2929
- name: Validate commit message

.github/workflows/commit-queue.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
if: needs.get_mergeable_prs.outputs.numbers != ''
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
61+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
6262
with:
6363
# Needs the whole git history for ncu to work
6464
# See https://github.com/nodejs/node-core-utils/pull/486
@@ -71,7 +71,7 @@ jobs:
7171

7272
# Install dependencies
7373
- name: Install Node.js
74-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
74+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
7575
with:
7676
node-version: ${{ env.NODE_VERSION }}
7777
- name: Install @node-core/utils
@@ -86,11 +86,15 @@ jobs:
8686
run: |
8787
ncu-config set branch ${GITHUB_REF_NAME}
8888
ncu-config set upstream origin
89-
ncu-config set username "${{ secrets.GH_USER_NAME }}"
90-
ncu-config set token "${{ secrets.GH_USER_TOKEN }}"
91-
ncu-config set jenkins_token "${{ secrets.JENKINS_TOKEN }}"
89+
ncu-config set username "$USERNAME"
90+
ncu-config set token "$GH_TOKEN"
91+
ncu-config set jenkins_token "$JENKINS_TOKEN"
9292
ncu-config set repo "${REPOSITORY}"
9393
ncu-config set owner "${OWNER}"
94+
env:
95+
USERNAME: ${{ secrets.JENKINS_USER }}
96+
GH_TOKEN: ${{ secrets.GH_USER_TOKEN }}
97+
JENKINS_TOKEN: ${{ secrets.JENKINS_TOKEN }}
9498

9599
- name: Start the Commit Queue
96100
run: ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ needs.get_mergeable_prs.outputs.numbers }}

.github/workflows/coverage-linux-without-intl.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- tools/gyp/**
1313
- tools/test.py
1414
- .github/workflows/coverage-linux-without-intl.yml
15+
- codecov.yml
1516
push:
1617
branches:
1718
- main
@@ -24,6 +25,7 @@ on:
2425
- tools/gyp/**
2526
- tools/test.py
2627
- .github/workflows/coverage-linux-without-intl.yml
28+
- codecov.yml
2729

2830
concurrency:
2931
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -32,34 +34,33 @@ concurrency:
3234
env:
3335
PYTHON_VERSION: '3.12'
3436
FLAKY_TESTS: keep_retrying
37+
CC: sccache clang
38+
CXX: sccache clang++
39+
SCCACHE_GHA_ENABLED: 'true'
3540

3641
permissions:
3742
contents: read
3843

3944
jobs:
4045
coverage-linux-without-intl:
4146
if: github.event.pull_request.draft == false
42-
runs-on: ubuntu-latest
43-
env:
44-
CC: sccache gcc
45-
CXX: sccache g++
46-
SCCACHE_GHA_ENABLED: 'true'
47+
runs-on: ubuntu-24.04
4748
steps:
48-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
49+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4950
with:
5051
persist-credentials: false
5152
- name: Set up Python ${{ env.PYTHON_VERSION }}
52-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
53+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
5354
with:
5455
python-version: ${{ env.PYTHON_VERSION }}
5556
- name: Set up sccache
56-
uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd # v0.0.4
57+
uses: mozilla-actions/sccache-action@89e9040de88b577a072e3760aaf59f585da083af # v0.0.5
5758
with:
5859
version: v0.8.0
5960
- name: Environment Information
6061
run: npx envinfo
6162
- name: Install gcovr
62-
run: pip install gcovr==4.2
63+
run: pip install gcovr==7.2
6364
- name: Build
6465
run: make build-ci -j4 V=1 CONFIG_FLAGS="--error-on-warn --coverage --without-intl"
6566
# TODO(bcoe): fix the couple tests that fail with the inspector enabled.
@@ -71,12 +72,12 @@ jobs:
7172
env:
7273
NODE_OPTIONS: --max-old-space-size=8192
7374
- name: Report C++
74-
run: cd out && gcovr --gcov-exclude='.*\b(deps|usr|out|obj|cctest|embedding)\b' -v -r Release/obj.target --xml -o ../coverage/coverage-cxx.xml --root=$(cd ../ && pwd)
75+
run: gcovr --object-directory=out -v --filter src --xml -o ./coverage/coverage-cxx.xml --root=./ --gcov-executable="llvm-cov-18 gcov"
7576
# Clean temporary output from gcov and c8, so that it's not uploaded:
7677
- name: Clean tmp
7778
run: rm -rf coverage/tmp && rm -rf out
7879
- name: Upload
79-
uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
80+
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
8081
with:
8182
directory: ./coverage
8283
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)