Skip to content

Commit 4a5ccc4

Browse files
authored
Merge branch 'main' into fix-junit-element
2 parents dc807aa + cc60845 commit 4a5ccc4

25,116 files changed

Lines changed: 4849764 additions & 2843831 deletions

File tree

Some content is hidden

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

.configurations/configuration.dsc.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ properties:
55
- resource: Microsoft.WinGet.DSC/WinGetPackage
66
id: pythonPackage
77
directives:
8-
description: Install Python 3.12
8+
description: Install Python 3.14
99
module: Microsoft.WinGet.DSC
1010
allowPrerelease: true
1111
settings:
12-
id: Python.Python.3.12
12+
id: Python.Python.3.14
1313
source: winget
1414
- resource: Microsoft.WinGet.DSC/WinGetPackage
1515
id: vsPackage
@@ -35,6 +35,13 @@ properties:
3535
- Microsoft.VisualStudio.Workload.NativeDesktop
3636
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
3737
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
3845
- resource: Microsoft.WinGet.DSC/WinGetPackage
3946
id: gitPackage
4047
directives:
@@ -51,4 +58,4 @@ properties:
5158
settings:
5259
id: Nasm.Nasm
5360
source: winget
54-
configurationVersion: 0.1.0
61+
configurationVersion: 0.2.0
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
2+
# Reference: https://github.com/nodejs/node/blob/main/BUILDING.md#windows
3+
properties:
4+
resources:
5+
- resource: Microsoft.WinGet.DSC/WinGetPackage
6+
id: pythonPackage
7+
directives:
8+
description: Install Python 3.14
9+
module: Microsoft.WinGet.DSC
10+
allowPrerelease: true
11+
settings:
12+
id: Python.Python.3.14
13+
source: winget
14+
- resource: Microsoft.WinGet.DSC/WinGetPackage
15+
id: vsPackage
16+
directives:
17+
description: Install Visual Studio 2022 Build Tools
18+
allowPrerelease: true
19+
settings:
20+
id: Microsoft.VisualStudio.2022.BuildTools
21+
source: winget
22+
useLatest: true
23+
- resource: Microsoft.VisualStudio.DSC/VSComponents
24+
id: vsComponents
25+
dependsOn:
26+
- vsPackage
27+
directives:
28+
description: Install required VS workloads and components
29+
allowPrerelease: true
30+
settings:
31+
productId: Microsoft.VisualStudio.Product.BuildTools
32+
channelId: VisualStudio.17.Release
33+
includeRecommended: true
34+
components:
35+
- Microsoft.VisualStudio.Workload.VCTools
36+
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
37+
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
45+
- resource: Microsoft.WinGet.DSC/WinGetPackage
46+
id: gitPackage
47+
directives:
48+
description: Install Git
49+
allowPrerelease: true
50+
settings:
51+
id: Git.Git
52+
source: winget
53+
- resource: Microsoft.WinGet.DSC/WinGetPackage
54+
id: nasmPackage
55+
directives:
56+
description: Install NetWide Assembler (NASM)
57+
allowPrerelease: true
58+
settings:
59+
id: Nasm.Nasm
60+
source: winget
61+
configurationVersion: 0.2.0

.configurations/configuration.vsEnterprise.dsc.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ properties:
55
- resource: Microsoft.WinGet.DSC/WinGetPackage
66
id: pythonPackage
77
directives:
8-
description: Install Python 3.12
8+
description: Install Python 3.14
99
module: Microsoft.WinGet.DSC
1010
allowPrerelease: true
1111
settings:
12-
id: Python.Python.3.12
12+
id: Python.Python.3.14
1313
source: winget
1414
- resource: Microsoft.WinGet.DSC/WinGetPackage
1515
id: vsPackage
@@ -35,6 +35,13 @@ properties:
3535
- Microsoft.VisualStudio.Workload.NativeDesktop
3636
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
3737
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
3845
- resource: Microsoft.WinGet.DSC/WinGetPackage
3946
id: gitPackage
4047
directives:
@@ -51,4 +58,4 @@ properties:
5158
settings:
5259
id: Nasm.Nasm
5360
source: winget
54-
configurationVersion: 0.1.0
61+
configurationVersion: 0.2.0

.configurations/configuration.vsProfessional.dsc.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ properties:
55
- resource: Microsoft.WinGet.DSC/WinGetPackage
66
id: pythonPackage
77
directives:
8-
description: Install Python 3.12
8+
description: Install Python 3.14
99
module: Microsoft.WinGet.DSC
1010
allowPrerelease: true
1111
settings:
12-
id: Python.Python.3.12
12+
id: Python.Python.3.14
1313
source: winget
1414
- resource: Microsoft.WinGet.DSC/WinGetPackage
1515
id: vsPackage
@@ -35,6 +35,13 @@ properties:
3535
- Microsoft.VisualStudio.Workload.NativeDesktop
3636
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
3737
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
3845
- resource: Microsoft.WinGet.DSC/WinGetPackage
3946
id: gitPackage
4047
directives:
@@ -51,4 +58,4 @@ properties:
5158
settings:
5259
id: Nasm.Nasm
5360
source: winget
54-
configurationVersion: 0.1.0
61+
configurationVersion: 0.2.0

.cpplint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
set noparent
2-
filter=-build/include_alpha,-build/include_subdir,-build/include_what_you_use,-legal/copyright,-readability/nolint,-readability/braces
2+
filter=-build/c++17,-build/include_alpha,-build/include_subdir,-build/include_what_you_use,-legal/copyright,-readability/nolint,-readability/braces,-whitespace/indent_namespace
33
linelength=80

.devcontainer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "Node.js Dev Container",
3+
"image": "nodejs/devcontainer:nightly",
4+
"workspaceMount": "source=${localWorkspaceFolder},target=/home/developer/nodejs/node,type=bind,consistency=cached",
5+
"workspaceFolder": "/home/developer/nodejs/node",
6+
"remoteUser": "developer",
7+
"mounts": [
8+
"source=node-devcontainer-cache,target=/home/developer/nodejs/node/out,type=volume"
9+
],
10+
"postCreateCommand": "git restore-mtime",
11+
"postStartCommand": "cp /home/developer/envrc/static-libs.envrc /home/developer/nodejs/node/.envrc && direnv allow /home/developer/nodejs/node"
12+
}

.editorconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ end_of_line = crlf
1616
indent_size = 8
1717
indent_style = tab
1818

19-
[{deps}/**]
19+
[deps/**]
2020
charset = unset
2121
end_of_line = unset
2222
indent_size = unset
2323
indent_style = unset
24+
insert_final_newline = unset
2425
trim_trailing_whitespace = unset
2526

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

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
test/fixtures/* -text
22
vcbuild.bat text eol=crlf
3+
# disable eol conversion in vendored files.
4+
deps/crates/vendor/**/* -text
35
deps/npm/bin/npm text eol=lf
46
deps/npm/bin/npx text eol=lf
57
deps/corepack/shims/corepack text eol=lf

.github/CODEOWNERS

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,10 @@
2323
/onboarding.md @nodejs/tsc
2424

2525
# nodejs.org website
26-
/doc/api_assets @nodejs/nodejs-website
27-
/doc/template.html @nodejs/nodejs-website
2826
/tools/doc @nodejs/web-infra
2927

3028
# streams
3129

32-
/lib/_stream* @nodejs/streams
3330
/lib/internal/streams/* @nodejs/streams
3431
/lib/stream.js @nodejs/streams
3532
/lib/stream/* @nodejs/streams
@@ -86,6 +83,15 @@
8683
/src/node_http2* @nodejs/http2 @nodejs/net
8784
/src/node_mem* @nodejs/http2
8885

86+
# quic
87+
88+
/deps/ngtcp2/* @nodejs/quic
89+
/doc/api/quic.md @nodejs/quic
90+
/lib/quic.js @nodejs/quic
91+
/lib/internal/quic/* @nodejs/quic
92+
/src/quic/* @nodejs/quic
93+
/test/parallel/test-quic-* @nodejs/quic
94+
8995
# modules, including loaders
9096

9197
/doc/api/esm.md @nodejs/loaders
@@ -153,14 +159,15 @@
153159
/test/parallel/test-runner-* @nodejs/test_runner
154160

155161
# Single Executable Applications
162+
/deps/LIEF @nodejs/single-executable
156163
/deps/postject @nodejs/single-executable
157164
/doc/api/single-executable-applications.md @nodejs/single-executable
158165
/doc/contributing/maintaining/maintaining-single-executable-application-support.md @nodejs/single-executable
159166
/src/node_sea* @nodejs/single-executable
160167
/test/fixtures/postject-copy @nodejs/single-executable
161-
/test/parallel/test-single-executable-* @nodejs/single-executable
162-
/test/sequential/test-single-executable-* @nodejs/single-executable
168+
/test/sea @nodejs/single-executable
163169
/tools/dep_updaters/update-postject.sh @nodejs/single-executable
170+
/tools/dep_updaters/update-lief.sh @nodejs/single-executable
164171

165172
# Permission Model
166173
/doc/api/permissions.md @nodejs/security-wg
@@ -199,6 +206,7 @@
199206
/deps/ada @nodejs/url
200207
/lib/internal/url.js @nodejs/url
201208
/lib/url.js @nodejs/url
209+
/src/node_url_pattern.* @nodejs/url
202210
/src/node_url.* @nodejs/url
203211
/test/fixtures/wpt/url @nodejs/url
204212

@@ -229,3 +237,18 @@
229237
/lib/path.js @nodejs/path
230238
/lib/path/* @nodejs/path
231239
/test/parallel/test-path-* @nodejs/path
240+
241+
# userland-migrations
242+
/doc/api/deprecations.md @nodejs/userland-migrations
243+
244+
# dev container
245+
/.devcontainer/* @nodejs/devcontainer
246+
/doc/contributing/using-devcontainer.md @nodejs/devcontainer
247+
248+
# FFI
249+
/deps/libffi/ @nodejs/ffi
250+
/doc/api/ffi.md @nodejs/ffi
251+
/lib/ffi.js @nodejs/ffi
252+
/src/ffi/ @nodejs/ffi
253+
/src/node_ffi.* @nodejs/ffi
254+
/test/ffi/ @nodejs/ffi

0 commit comments

Comments
 (0)