Skip to content

Commit 96b02bb

Browse files
authored
Merge branch 'nodejs:master' into repl-fix-require-import-auto-complete
2 parents 9100646 + 0a62026 commit 96b02bb

File tree

13,611 files changed

+4336617
-1758403
lines changed

Some content is hidden

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

13,611 files changed

+4336617
-1758403
lines changed

.eslintignore

Lines changed: 1 addition & 2 deletions
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

.eslintrc.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ const hacks = [
1717
'eslint-plugin-node-core',
1818
'eslint-plugin-markdown',
1919
'@babel/eslint-parser',
20-
'@babel/plugin-syntax-class-properties',
2120
'@babel/plugin-syntax-import-assertions',
22-
'@babel/plugin-syntax-top-level-await',
2321
];
2422
Module._findPath = (request, paths, isMain) => {
2523
const r = ModuleFindPath(request, paths, isMain);
@@ -41,9 +39,7 @@ module.exports = {
4139
parserOptions: {
4240
babelOptions: {
4341
plugins: [
44-
Module._findPath('@babel/plugin-syntax-class-properties'),
4542
Module._findPath('@babel/plugin-syntax-import-assertions'),
46-
Module._findPath('@babel/plugin-syntax-top-level-await'),
4743
],
4844
},
4945
requireConfigFile: false,

.github/label-pr-config.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ subSystemLabels:
7171
# all other tool changes should be marked as such
7272
/^tools\//: tools
7373
/^\.eslint|\.remark|\.editorconfig/: tools
74+
/^typings\//: typings
7475

7576
## Dependencies
7677
# libuv needs an explicit mapping, as the ordinary /deps/ mapping below would
@@ -100,12 +101,11 @@ subSystemLabels:
100101
/^lib\/worker_threads.js$/: worker
101102
/^lib\/internal\/url\.js$/: whatwg-url
102103
/^lib\/internal\/modules\/esm/: esm
103-
/^lib\/internal\/quic\/*/: quic, dont-land-on-v14.x, dont-land-on-v12.x
104104

105105
# All other lib/ files map directly
106106
/^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
107+
/^lib(?:\/internal)?\/(\w+)\.js?$/: $1 # Other .js files
108+
/^lib(?:\/internal)?\/(\w+)(?:\/|$)/: $1 # Subfolders
109109

110110
exlusiveLabels:
111111
# more specific tests
@@ -187,6 +187,7 @@ allJsSubSystems:
187187
- timers
188188
- tls
189189
- tty
190+
- typings
190191
- url
191192
- util
192193
- v8

.github/workflows/authors.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ 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
@@ -19,7 +20,7 @@ jobs:
1920
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
2021
with:
2122
author: Node.js GitHub Bot <[email protected]>
22-
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+
body: "Here are some new additions to the AUTHORS file. This is an automatically generated PR by the `authors.yml` GitHub Action, which runs `tools/update-authors.js`."
2324
branch: "actions/authors-update" # Custom branch *just* for this Action.
2425
commit-message: "meta: update AUTHORS"
2526
labels: meta

.github/workflows/build-tarball.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
build-tarball:
2828
if: github.event.pull_request.draft == false
2929
env:
30-
PYTHON_VERSION: 3.9
30+
PYTHON_VERSION: '3.10'
3131
runs-on: ubuntu-latest
3232
steps:
3333
- uses: actions/checkout@v2
@@ -52,7 +52,7 @@ jobs:
5252
path: tarballs
5353
test-tarball-linux:
5454
env:
55-
PYTHON_VERSION: 3.9
55+
PYTHON_VERSION: '3.10'
5656
needs: build-tarball
5757
runs-on: ubuntu-latest
5858
steps:

.github/workflows/build-windows.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: build-windows
22

33
on:
44
pull_request:
5+
paths-ignore:
6+
- "README.md"
57
types: [opened, synchronize, reopened, ready_for_review]
68
push:
79
branches:
@@ -10,9 +12,11 @@ on:
1012
- canary
1113
- v[0-9]+.x-staging
1214
- v[0-9]+.x
15+
paths-ignore:
16+
- "README.md"
1317

1418
env:
15-
PYTHON_VERSION: 3.9
19+
PYTHON_VERSION: '3.10'
1620
FLAKY_TESTS: dontcare
1721

1822
jobs:

.github/workflows/commit-lint.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ jobs:
99
lint-commit-message:
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: Compute number of commits in the PR
13+
id: nb-of-commits
14+
run: echo "::set-output name=nb::$((${{ github.event.pull_request.commits }} + 1))"
1215
- uses: actions/checkout@v2
1316
with:
14-
# Last 100 commits should be enough for a PR
15-
fetch-depth: 100
17+
fetch-depth: ${{ steps.nb-of-commits.outputs.nb }}
1618
- name: Install Node.js
1719
uses: actions/setup-node@v2
1820
with:
1921
node-version: ${{ env.NODE_VERSION }}
2022
- name: Validate commit messages
2123
run: |
2224
echo "::add-matcher::.github/workflows/commit-lint-problem-matcher.json"
23-
git log --oneline ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} | grep -v -e fixup -e squash | awk '{ print $1 }' | xargs npx -q core-validate-commit --no-validate-metadata --tap
25+
git log --oneline -${{ github.event.pull_request.commits }} HEAD^ | awk '{ if ($2 != "fixup!" && $2 != "squash!") { print $1 } }' | xargs npx -q core-validate-commit --no-validate-metadata --tap

.github/workflows/coverage-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
- 'doc/**'
2020

2121
env:
22-
PYTHON_VERSION: 3.9
22+
PYTHON_VERSION: '3.10'
2323
FLAKY_TESTS: dontcare
2424

2525
jobs:

.github/workflows/coverage-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- 'tools/**'
2222

2323
env:
24-
PYTHON_VERSION: 3.9
24+
PYTHON_VERSION: '3.10'
2525
FLAKY_TESTS: dontcare
2626

2727
jobs:

.github/workflows/find-inactive-collaborators.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
find:
16-
16+
if: github.repository == 'nodejs/node'
1717
runs-on: ubuntu-latest
1818

1919
steps:
@@ -35,6 +35,7 @@ jobs:
3535
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
3636
with:
3737
author: Node.js GitHub Bot <[email protected]>
38+
branch: actions/inactive-collaborators
3839
body: This PR was generated by tools/find-inactive-collaborators.yml.
3940
commit-message: "meta: move one or more collaborators to emeritus"
4041
labels: meta

0 commit comments

Comments
 (0)