Skip to content

Commit 3f11cb9

Browse files
mcollinamcollina
authored
Merge branch 'v22.x-staging' into update-undici-22
2 parents 18a0220 + 27cf259 commit 3f11cb9

File tree

7,306 files changed

+2219770
-170516
lines changed

Some content is hidden

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

7,306 files changed

+2219770
-170516
lines changed

‎.devcontainer.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "Node.js Core Developer Environment",
3+
"runArgs": [
4+
"--platform=linux/amd64"
5+
],
6+
"customizations": {
7+
"vscode": {
8+
"extensions": [
9+
"github.vscode-pull-request-github",
10+
"ms-vsliveshare.vsliveshare",
11+
"vscode-icons-team.vscode-icons",
12+
"visualstudioexptteam.vscodeintellicode"
13+
],
14+
"settings": {
15+
"terminal.integrated.profiles.linux": {
16+
"zsh (login)": {
17+
"path": "zsh",
18+
"args": ["-l"]
19+
}
20+
}
21+
}
22+
}
23+
},
24+
"image": "nodejs/devcontainer:nightly"
25+
}

‎.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/CODEOWNERS‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/doc/contributing/**/* @nodejs/tsc
1919
/GOVERNANCE.md @nodejs/tsc
2020
/SECURITY.md @nodejs/tsc
21+
/BUILDING.md @nodejs/build @nodejs/tsc
2122
/LICENSE @nodejs/tsc
2223
/onboarding.md @nodejs/tsc
2324

@@ -35,7 +36,6 @@
3536

3637
# net
3738

38-
/deps/ada @nodejs/url
3939
/deps/cares @nodejs/net
4040
/doc/api/dgram.md @nodejs/net
4141
/doc/api/dns.md @nodejs/net
@@ -47,14 +47,11 @@
4747
/lib/internal/js_stream_socket.js @nodejs/net
4848
/lib/internal/net.js @nodejs/net
4949
/lib/internal/socket_list.js @nodejs/net
50-
/lib/internal/url.js @nodejs/url
5150
/lib/net.js @nodejs/net
52-
/lib/url.js @nodejs/url
5351
/src/cares_wrap.cc @nodejs/net
5452
/src/connect_wrap.* @nodejs/net
5553
/src/connection_wrap.* @nodejs/net
5654
/src/node_sockaddr* @nodejs/net
57-
/src/node_url.* @nodejs/url
5855
/src/tcp_wrap.* @nodejs/net
5956
/src/udp_wrap.* @nodejs/net
6057

@@ -197,3 +194,38 @@
197194

198195
# Performance
199196
/benchmark/* @nodejs/performance
197+
198+
# URL
199+
/deps/ada @nodejs/url
200+
/lib/internal/url.js @nodejs/url
201+
/lib/url.js @nodejs/url
202+
/src/node_url.* @nodejs/url
203+
/test/fixtures/wpt/url @nodejs/url
204+
205+
# SQLite
206+
/deps/sqlite/ @nodejs/sqlite
207+
/doc/api/sqlite.md @nodejs/sqlite
208+
/src/node_sqlite.* @nodejs/sqlite
209+
/test/parallel/test-sqlite* @nodejs/sqlite
210+
/test/sqlite/ @nodejs/sqlite
211+
/tools/dep_updaters/update-sqlite.sh @nodejs/sqlite
212+
213+
# Config
214+
/doc/node-config-schema.json @nodejs/config
215+
/src/node_config.* @nodejs/config
216+
/src/node_dotenv.* @nodejs/config
217+
/src/node_options.* @nodejs/config
218+
/test/parallel/test-config-* @nodejs/config
219+
/test/parallel/test-dotenv-* @nodejs/config
220+
221+
# Inspector
222+
/src/inspector/* @nodejs/inspector
223+
/src/inspector_* @nodejs/inspector
224+
/lib/internal/inspector/* @nodejs/inspector
225+
/lib/internal/inspector_* @nodejs/inspector
226+
/lib/inspector.js @nodejs/inspector
227+
228+
# path
229+
/lib/path.js @nodejs/path
230+
/lib/path/* @nodejs/path
231+
/test/parallel/test-path-* @nodejs/path

‎.github/SUPPORT.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Node.js](https://github.com/nodejs/Release#release-schedule).
77
When looking for support, please first search for your question in these venues:
88

99
* [Node.js Website](https://nodejs.org/en/), especially the
10-
[API docs](https://nodejs.org/api/)
11-
* [Node.js Help](https://github.com/nodejs/help)
10+
[API docs](https://nodejs.org/api/) or the [Learn material](https://nodejs.org/en/learn)
11+
* [Node.js's GitHub Help repository](https://github.com/nodejs/help)
1212
* [Open or closed issues in the Node.js GitHub organization](https://github.com/issues?utf8=%E2%9C%93&q=sort%3Aupdated-desc+org%3Anodejs+is%3Aissue)
13+
* [Ask for support on Node.js's Discord server](https://nodejs.org/discord)
1314

1415
If you didn't find an answer in the resources above, try these unofficial
1516
resources:
@@ -19,7 +20,7 @@ resources:
1920
* [Node.js Slack Community](https://node-js.slack.com/)
2021
* To register: [nodeslackers.com](https://www.nodeslackers.com/)
2122

22-
GitHub issues are for tracking enhancements and bugs, not general support.
23+
**GitHub issues are for tracking enhancements and bugs, not general support.**
2324

2425
The open source license grants you the freedom to use Node.js. It does not
2526
guarantee commitments of other people's time. Please be respectful and manage

‎.github/codeql-config.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: CodeQL config
2+
3+
paths-ignore:
4+
- test
5+
- deps
6+
- benchmark

‎.github/label-pr-config.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ subSystemLabels:
3434
/^src\/node_bob*/: c++, quic
3535
/^src\/node_sea/: single-executable
3636
/^src\/node_sqlite.*/: c++, sqlite
37+
/^src\/node_config_file.*/: c++, config
38+
/^src\/node_dotenv.*/: c++, config
39+
/^src\/node_options.*/: c++, config
3740

3841
# Properly label changes to V8 inspector integration-related files
3942
/^src\/inspector_/: c++, inspector, needs-ci
@@ -125,6 +128,8 @@ exlusiveLabels:
125128
/^test\/es-module\//: test, esm
126129
/^test\/fixtures\/wpt\/streams\//: test, web streams
127130
/^test\/fixtures\/typescript/: test, strip-types
131+
/^test\/module-hooks\//: test, module, loaders
132+
/^test\/fixtures/module-hooks\//: test, module, loaders
128133

129134
/^test\//: test
130135

@@ -147,6 +152,8 @@ exlusiveLabels:
147152
# Specific map for typescript.md as it should be labeled 'strip-types'
148153
/^doc\/api\/typescript.md$/: doc, strip-types
149154

155+
/^doc\/node-config-schema.json$/: doc, config
156+
150157
/^doc\//: doc
151158

152159
# More specific benchmarks
@@ -166,6 +173,7 @@ allJsSubSystems:
166173
- buffer
167174
- child_process
168175
- cluster
176+
- config
169177
- console
170178
- crypto
171179
- debugger

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

Lines changed: 2 additions & 2 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
48+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4949
with:
5050
persist-credentials: false
5151

5252
- name: Install Node.js
53-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
53+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
5454
with:
5555
node-version: ${{ env.NODE_VERSION }}
5656

‎.github/workflows/build-tarball.yml‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ 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'
3633

3734
permissions:
3835
contents: read
@@ -42,17 +39,13 @@ jobs:
4239
if: github.event.pull_request.draft == false
4340
runs-on: ubuntu-24.04
4441
steps:
45-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
42+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4643
with:
4744
persist-credentials: false
4845
- name: Set up Python ${{ env.PYTHON_VERSION }}
49-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
46+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
5047
with:
5148
python-version: ${{ env.PYTHON_VERSION }}
52-
- name: Set up sccache
53-
uses: mozilla-actions/sccache-action@9e326ebed976843c9932b3aa0e021c6f50310eb4 # v0.0.6
54-
with:
55-
version: v0.8.1
5649
- name: Environment Information
5750
run: npx envinfo
5851
- name: Make tarball
@@ -64,45 +57,56 @@ jobs:
6457
mkdir tarballs
6558
mv *.tar.gz tarballs
6659
- name: Upload tarball artifact
67-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
60+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6861
with:
6962
name: tarballs
7063
path: tarballs
64+
compression-level: 0
7165
test-tarball-linux:
7266
needs: build-tarball
7367
runs-on: ubuntu-24.04
68+
env:
69+
CC: sccache clang
70+
CXX: sccache clang++
71+
SCCACHE_GHA_ENABLED: 'true'
7472
steps:
75-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
73+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7674
with:
7775
persist-credentials: false
76+
sparse-checkout: .github/actions/install-clang
77+
sparse-checkout-cone-mode: false
7878
- name: Set up Python ${{ env.PYTHON_VERSION }}
79-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
79+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
8080
with:
8181
python-version: ${{ env.PYTHON_VERSION }}
8282
- name: Set up sccache
83-
uses: mozilla-actions/sccache-action@9e326ebed976843c9932b3aa0e021c6f50310eb4 # v0.0.6
83+
uses: Mozilla-Actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
8484
with:
85-
version: v0.8.1
85+
version: v0.10.0
8686
- name: Environment Information
8787
run: npx envinfo
8888
- name: Download tarball
89-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
89+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
9090
with:
9191
name: tarballs
9292
path: tarballs
9393
- name: Extract tarball
9494
run: |
9595
tar xzf tarballs/*.tar.gz -C $RUNNER_TEMP
9696
echo "TAR_DIR=$RUNNER_TEMP/`basename tarballs/*.tar.gz .tar.gz`" >> $GITHUB_ENV
97-
- name: Copy directories needed for testing
98-
run: |
99-
cp -r tools/eslint $TAR_DIR/tools
100-
cp -r tools/eslint-rules $TAR_DIR/tools
10197
- name: Build
10298
run: |
103-
cd $TAR_DIR
104-
make build-ci -j4 V=1
99+
make -C "$TAR_DIR" build-ci -j4 V=1
100+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
101+
with:
102+
persist-credentials: false
103+
sparse-checkout: |
104+
tools/eslint
105+
tools/eslint-rules
106+
- name: Move directories needed for testing
107+
run: |
108+
mv tools/eslint "$TAR_DIR/tools"
109+
mv tools/eslint-rules "$TAR_DIR/tools"
105110
- name: Test
106111
run: |
107-
cd $TAR_DIR
108-
make run-ci -j4 V=1 TEST_CI_ARGS="-p dots --node-args='--test-reporter=./test/common/test-error-reporter.js' --measure-flakiness 9"
112+
make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p dots --measure-flakiness 9"

‎.github/workflows/close-stale-feature-requests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: github.repository == 'nodejs/node'
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
44+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
4545
with:
4646
repo-token: ${{ secrets.GITHUB_TOKEN }}
4747
days-before-stale: 180

‎.github/workflows/close-stalled.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository == 'nodejs/node'
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
23+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
2424
with:
2525
repo-token: ${{ secrets.GITHUB_TOKEN }}
2626
days-before-close: 30
@@ -32,7 +32,5 @@ jobs:
3232
only-labels: stalled
3333
# max requests it will send per run to the GitHub API before it deliberately exits to avoid hitting API rate limits
3434
operations-per-run: 500
35-
# deactivates automatic removal of stalled label if issue gets any activity
36-
remove-stale-when-updated: false
3735
# deactivates automatic stale labelling as we prefer to do that manually
3836
days-before-stale: -1

0 commit comments

Comments
 (0)