Skip to content

Commit a22944d

Browse files
authored
Merge branch 'master' into create-or-update-pull-request-action
2 parents 7466fdf + 5607de8 commit a22944d

File tree

194 files changed

+33203
-60778
lines changed

Some content is hidden

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

194 files changed

+33203
-60778
lines changed

.eslintignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ test/addons/??_*
44
test/fixtures
55
test/message/esm_display_syntax_error.mjs
66
tools/icu
7-
tools/lint-md.mjs
8-
tools/node-lint-md-cli-rollup/dist
7+
tools/lint-md/lint-md.mjs
98
benchmark/tmp
109
doc/**/*.js
1110
!.eslintrc.js

.github/label-pr-config.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ subSystemLabels:
103103
/^lib\/internal\/quic\/*/: quic, dont-land-on-v14.x, dont-land-on-v12.x
104104

105105
# All other lib/ files map directly
106-
/^lib\/_(\w+)_\w+\.js?$/: $1 # e.g. _(stream)_wrap
107-
/^lib(\/internal)?\/(\w+)\.js?$/: $2 # other .js files
108-
/^lib\/internal\/(\w+)(?:\/|$)/: $1 # internal subfolders
106+
/^lib\/_(\w+)_\w+\.js?$/: $1 # e.g. _(stream)_wrap
107+
/^lib(\/internal)?\/(\w+)\.js?$/: $2 # Other .js files
108+
/^lib\/internal\/(\w+)(?:\/|$)/: $1 # internal subfolders
109109

110110
exlusiveLabels:
111111
# more specific tests
@@ -125,26 +125,26 @@ exlusiveLabels:
125125

126126
/^test\//: test
127127

128-
# specific map for webcrypto.md as it should be labeled 'crypto'
128+
# Specific map for webcrypto.md as it should be labeled 'crypto'
129129
/^doc\/api\/webcrypto.md$/: doc, crypto
130-
# specific map for modules.md as it should be labeled 'module' not 'modules'
130+
# Specific map for modules.md as it should be labeled 'module' not 'modules'
131131
/^doc\/api\/modules.md$/: doc, module
132-
# node-api is treated separately since it is not a JS core module but is still
133-
# considered a subsystem of sorts
132+
# node-api is treated separately since it is not a JS core module but is still
133+
# considered a subsystem of sorts
134134
/^doc\/api\/n-api.md$/: doc, node-api
135-
# quic
135+
# quic
136136
/^doc\/api\/quic.md$/: doc, quic, dont-land-on-v14.x, dont-land-on-v12.x
137-
# add worker label to PRs that affect doc/api/worker_threads.md
137+
# Add worker label to PRs that affect doc/api/worker_threads.md
138138
/^doc\/api\/worker_threads.md$/: doc, worker
139-
# automatically tag JS subsystem-specific API doc changes
139+
# Automatically tag JS subsystem-specific API doc changes
140140
/^doc\/api\/(\w+)\.md$/: doc, $1
141-
# add deprecations label to PRs that affect doc/api/deprecations.md
141+
# Add deprecations label to PRs that affect doc/api/deprecations.md
142142
/^doc\/api\/deprecations.md$/: doc, deprecations
143143
/^doc\/changelogs\//: release
144144

145145
/^doc\//: doc
146146

147-
# more specific benchmarks
147+
# More specific benchmarks
148148
/^benchmark\/buffers\//: benchmark, buffer
149149
/^benchmark\/(?:arrays|es)\//: benchmark, v8 engine
150150
/^benchmark\/_http/: benchmark, http

.github/workflows/authors.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@ on:
88

99
jobs:
1010
authors_update:
11+
if: github.repository == 'nodejs/node'
1112
runs-on: ubuntu-latest
1213
steps:
1314
- uses: actions/checkout@v2
1415
with:
15-
fetch-depth: '0' # this is required to actually get all the authors
16-
- run: "tools/update-authors.js" # run the AUTHORS tool
17-
- uses: gr2m/create-or-update-pull-request-action@v1 # create a PR or update the Action's existing PR
16+
fetch-depth: '0' # This is required to actually get all the authors
17+
- run: "tools/update-authors.js" # Run the AUTHORS tool
18+
- uses: gr2m/create-or-update-pull-request-action@v1 # Create a PR or update the Action's existing PR
1819
env:
1920
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
2021
with:
2122
author: Node.js GitHub Bot <[email protected]>
2223
body: "If this PR exists, there's presumably new additions to the AUTHORS file. This is an automatically generated PR by the `authors.yml` GitHub Action, which runs `tools/update-authors.js` and submits a new PR or updates an existing PR.\n\nPlease note that there might be duplicate entries. If there are, please remove them and add the duplicate emails to .mailmap directly to this PR."
23-
branch: "actions/authors-update" # custom branch *just* for this Action.
24+
branch: "actions/authors-update" # Custom branch *just* for this Action.
2425
commit-message: "meta: update AUTHORS"
2526
labels: meta
2627
title: "meta: update AUTHORS"

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
name: Auto Start CI
32

43
on:

.github/workflows/close-stalled.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
name: Close stalled issues and PRs
22
on:
33
schedule:
4-
- cron: "0 0 * * *"
4+
- cron: "0 0 * * *"
55

66
jobs:
77
stale:
88
if: github.repository == 'nodejs/node'
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/stale@v3
12-
with:
13-
repo-token: ${{ secrets.GITHUB_TOKEN }}
14-
days-before-close: 30
15-
stale-pr-label: stalled
16-
stale-issue-label: stalled
17-
close-issue-message: Closing this because it has stalled. Feel free to reopen if this issue is still relevant, or to ping the collaborator who labelled it stalled if you have any questions.
18-
close-pr-message: Closing this because it has stalled. Feel free to reopen if this PR is still relevant, or to ping the collaborator who labelled it stalled if you have any questions.
19-
# used to filter issues to check whether or not should be closed, avoids hitting maximum operations allowed if needing to paginate through all open issues
20-
only-labels: stalled
21-
# max requests it will send per run to the GitHub API before it deliberately exits to avoid hitting API rate limits
22-
operations-per-run: 500
23-
# deactivates automatic removal of stalled label if issue gets any activity
24-
remove-stale-when-updated: false
25-
# deactivates automatic stale labelling as we prefer to do that manually
26-
days-before-stale: -1
11+
- uses: actions/stale@v3
12+
with:
13+
repo-token: ${{ secrets.GITHUB_TOKEN }}
14+
days-before-close: 30
15+
stale-pr-label: stalled
16+
stale-issue-label: stalled
17+
close-issue-message: Closing this because it has stalled. Feel free to reopen if this issue is still relevant, or to ping the collaborator who labelled it stalled if you have any questions.
18+
close-pr-message: Closing this because it has stalled. Feel free to reopen if this PR is still relevant, or to ping the collaborator who labelled it stalled if you have any questions.
19+
# used to filter issues to check whether or not should be closed, avoids hitting maximum operations allowed if needing to paginate through all open issues
20+
only-labels: stalled
21+
# max requests it will send per run to the GitHub API before it deliberately exits to avoid hitting API rate limits
22+
operations-per-run: 500
23+
# deactivates automatic removal of stalled label if issue gets any activity
24+
remove-stale-when-updated: false
25+
# deactivates automatic stale labelling as we prefer to do that manually
26+
days-before-stale: -1

.github/workflows/commit-queue.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# This action requires the following secrets to be set on the repository:
32
# GH_USER_NAME: GitHub user whose Jenkins and GitHub token are defined below
43
# GH_USER_TOKEN: GitHub user token, to be used by ncu and to push changes

.github/workflows/license-builder.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v2
15-
- run: "./tools/license-builder.sh" # run the license builder tool
16-
- uses: gr2m/[email protected] # create a PR or update the Action's existing PR
15+
- run: "./tools/license-builder.sh" # Run the license builder tool
16+
- uses: gr2m/[email protected] # Create a PR or update the Action's existing PR
1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1919
with:

.github/workflows/linters.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Get release version numbers
5656
if: ${{ github.event.pull_request && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch }}
5757
id: get-released-versions
58-
run: ./tools/node-lint-md-cli-rollup/src/list-released-versions-from-changelogs.mjs
58+
run: ./tools/lint-md/list-released-versions-from-changelogs.mjs
5959
- name: Lint docs
6060
run: |
6161
echo "::add-matcher::.github/workflows/remark-lint-problem-matcher.json"

.github/workflows/test-internet.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55
schedule:
66
- cron: 5 0 * * *
77

8-
pull_request:
9-
types: [opened, synchronize, reopened, ready_for_review]
10-
paths:
11-
- test/internet/**
8+
pull_request:
9+
types: [opened, synchronize, reopened, ready_for_review]
10+
paths:
11+
- test/internet/**
1212
push:
1313
branches:
1414
- master

.mailmap

+4
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ garygsc <[email protected]> <[email protected]>
153153
154154
155155
Geoffrey Bugaisky <[email protected]>
156+
156157
Gerhard Stöbich <[email protected]>
157158
158159
@@ -246,8 +247,11 @@ Kiyoshi Nomo <[email protected]>
246247
Koichi Kobayashi <[email protected]>
247248
Kostiantyn Wandalen <[email protected]>
248249
Kris Kowal <[email protected]>
250+
249251
Kyle Robinson Young <[email protected]>
252+
Lakshmi Swetha Gopireddy <[email protected]> <[email protected]>
250253
Lakshmi Swetha Gopireddy <[email protected]> <[email protected]>
254+
251255
Leeseean Chiu <[email protected]>
252256
253257
Luke Bayes <[email protected]>

.yamllint.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
extends: relaxed
1+
extends: default
22

33
rules:
4+
document-start:
5+
present: false
46
line-length: disable
7+
truthy:
8+
allowed-values: ['true', 'false', 'on', 'off']
59

610
ignore: |
711
/deps/
812
node_modules/
13+
/test/fixtures/wpt/
14+
/tools/gyp/
15+
/tools/pip/

AUTHORS

+5-5
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ Arianit Uka <[email protected]>
419419
Andrei Sedoi <[email protected]>
420420
Eugene Girshov <[email protected]>
421421
Evan Oxfeld <[email protected]>
422-
Lars-Magnus Skog <[email protected]>
422+
Lars-Magnus Skog <[email protected]>
423423
Raymond Feng <[email protected]>
424424
Aaron Cannon <[email protected]>
425425
Xidorn Quan <[email protected]>
@@ -1328,7 +1328,7 @@ Nate <[email protected]>
13281328
Chris Story <[email protected]>
13291329
Matthew Garrett <[email protected]>
13301330
David Goussev <[email protected]>
1331-
George Adams <[email protected].com>
1331+
George Adams <gadams@microsoft.com>
13321332
Benedikt Meurer <[email protected]>
13331333
Kai Cataldo <[email protected]>
13341334
Victor Felder <[email protected]>
@@ -1600,7 +1600,6 @@ rockcoder23 <[email protected]>
16001600
Anton Paras <[email protected]>
16011601
Pratik Jain <[email protected]>
16021602
Shivanth MP <[email protected]>
1603-
Kunal Pathak <[email protected]>
16041603
16051604
Jiajie Hu <[email protected]>
16061605
Matt Woicik <[email protected]>
@@ -2297,7 +2296,6 @@ Yongsheng Zhang <[email protected]>
22972296
Neeraj Laad <[email protected]>
22982297
Scott Van Gilder <[email protected]>
22992298
Yaniv Friedensohn <[email protected]>
2300-
Lars-Magnus Skog <[email protected]>
23012299
Lucas Woo <[email protected]>
23022300
Troels Liebe Bentsen <[email protected]>
23032301
pranshuchittora <[email protected]>
@@ -2644,7 +2642,6 @@ James Bunton <[email protected]>
26442642
Kevin Smith <[email protected]>
26452643
26462644
Julian Alimin <[email protected]>
2647-
Lakshmi Swetha Gopireddy <[email protected]>
26482645
Manusaporn Treerungroj <[email protected]>
26492646
Richard Chamberlain <[email protected]>
26502647
Daniel George Holz <[email protected]>
@@ -3316,5 +3313,8 @@ Christian Boehlke <[email protected]>
33163313
33173314
Dominic Elm <[email protected]>
33183315
3316+
shfshanyue <[email protected]>
3317+
Nikita Galkin <[email protected]>
3318+
vipul kumar <[email protected]>
33193319

33203320
# Generated by tools/update-authors.js

0 commit comments

Comments
 (0)