Skip to content

Commit 9ef3f10

Browse files
authored
Merge branch 'main' into util/error-msg-include-color-alias
2 parents ec2207a + c9d0ef8 commit 9ef3f10

18,418 files changed

Lines changed: 2129946 additions & 860122 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: 3 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
@@ -51,4 +51,4 @@ properties:
5151
settings:
5252
id: Nasm.Nasm
5353
source: winget
54-
configurationVersion: 0.1.0
54+
configurationVersion: 0.1.1
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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: gitPackage
40+
directives:
41+
description: Install Git
42+
allowPrerelease: true
43+
settings:
44+
id: Git.Git
45+
source: winget
46+
- resource: Microsoft.WinGet.DSC/WinGetPackage
47+
id: nasmPackage
48+
directives:
49+
description: Install NetWide Assembler (NASM)
50+
allowPrerelease: true
51+
settings:
52+
id: Nasm.Nasm
53+
source: winget
54+
configurationVersion: 0.1.1

β€Ž.configurations/configuration.vsEnterprise.dsc.yamlβ€Ž

Lines changed: 3 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
@@ -51,4 +51,4 @@ properties:
5151
settings:
5252
id: Nasm.Nasm
5353
source: winget
54-
configurationVersion: 0.1.0
54+
configurationVersion: 0.1.1

β€Ž.configurations/configuration.vsProfessional.dsc.yamlβ€Ž

Lines changed: 3 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
@@ -51,4 +51,4 @@ properties:
5151
settings:
5252
id: Nasm.Nasm
5353
source: winget
54-
configurationVersion: 0.1.0
54+
configurationVersion: 0.1.1

β€Ž.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
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+
}

β€Ž.devcontainer/devcontainer.jsonβ€Ž

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

β€Ž.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: 10 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
@@ -153,14 +150,15 @@
153150
/test/parallel/test-runner-* @nodejs/test_runner
154151

155152
# Single Executable Applications
153+
/deps/LIEF @nodejs/single-executable
156154
/deps/postject @nodejs/single-executable
157155
/doc/api/single-executable-applications.md @nodejs/single-executable
158156
/doc/contributing/maintaining/maintaining-single-executable-application-support.md @nodejs/single-executable
159157
/src/node_sea* @nodejs/single-executable
160158
/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
159+
/test/sea @nodejs/single-executable
163160
/tools/dep_updaters/update-postject.sh @nodejs/single-executable
161+
/tools/dep_updaters/update-lief.sh @nodejs/single-executable
164162

165163
# Permission Model
166164
/doc/api/permissions.md @nodejs/security-wg
@@ -229,3 +227,10 @@
229227
/lib/path.js @nodejs/path
230228
/lib/path/* @nodejs/path
231229
/test/parallel/test-path-* @nodejs/path
230+
231+
# userland-migrations
232+
/doc/api/deprecations.md @nodejs/userland-migrations
233+
234+
# dev container
235+
/.devcontainer/* @nodejs/devcontainer
236+
/doc/contributing/using-devcontainer.md @nodejs/devcontainer

β€Ž.github/ISSUE_TEMPLATE/config.ymlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ contact_links:
55
about: Please file an issue in our help repo.
66
- name: πŸ“¦ Have an issue with npm?
77
url: https://github.com/npm/cli/issues
8-
about: npm has a seperate issue tracker.
8+
about: npm has a separate issue tracker.
99
- name: πŸ“‘ Have an issue with undici? (`WebSocket`, `fetch`, etc.)
1010
url: https://github.com/nodejs/undici/issues
11-
about: Undici has a seperate issue tracker.
11+
about: Undici has a separate issue tracker.
1212
- name: 🌐 Found a problem with nodejs.org beyond the API reference docs?
1313
url: https://github.com/nodejs/nodejs.org/issues/new/choose
1414
about: Please file an issue in the Node.js website repo.

0 commit comments

Comments
Β (0)