Skip to content

Commit

Permalink
Merge branch 'nodejs:master' into repl-fix-require-import-auto-complete
Browse files Browse the repository at this point in the history
  • Loading branch information
Mesteery authored Nov 4, 2021
2 parents 9100646 + 0a62026 commit 96b02bb
Show file tree
Hide file tree
Showing 13,611 changed files with 4,336,617 additions and 1,758,403 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ test/addons/??_*
test/fixtures
test/message/esm_display_syntax_error.mjs
tools/icu
tools/lint-md.mjs
tools/node-lint-md-cli-rollup/dist
tools/lint-md/lint-md.mjs
benchmark/tmp
doc/**/*.js
!.eslintrc.js
4 changes: 0 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ const hacks = [
'eslint-plugin-node-core',
'eslint-plugin-markdown',
'@babel/eslint-parser',
'@babel/plugin-syntax-class-properties',
'@babel/plugin-syntax-import-assertions',
'@babel/plugin-syntax-top-level-await',
];
Module._findPath = (request, paths, isMain) => {
const r = ModuleFindPath(request, paths, isMain);
Expand All @@ -41,9 +39,7 @@ module.exports = {
parserOptions: {
babelOptions: {
plugins: [
Module._findPath('@babel/plugin-syntax-class-properties'),
Module._findPath('@babel/plugin-syntax-import-assertions'),
Module._findPath('@babel/plugin-syntax-top-level-await'),
],
},
requireConfigFile: false,
Expand Down
7 changes: 4 additions & 3 deletions .github/label-pr-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ subSystemLabels:
# all other tool changes should be marked as such
/^tools\//: tools
/^\.eslint|\.remark|\.editorconfig/: tools
/^typings\//: typings

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

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

exlusiveLabels:
# more specific tests
Expand Down Expand Up @@ -187,6 +187,7 @@ allJsSubSystems:
- timers
- tls
- tty
- typings
- url
- util
- v8
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:

jobs:
authors_update:
if: github.repository == 'nodejs/node'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -19,7 +20,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
with:
author: Node.js GitHub Bot <[email protected]>
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."
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`."
branch: "actions/authors-update" # Custom branch *just* for this Action.
commit-message: "meta: update AUTHORS"
labels: meta
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-tarball.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
build-tarball:
if: github.event.pull_request.draft == false
env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -52,7 +52,7 @@ jobs:
path: tarballs
test-tarball-linux:
env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
needs: build-tarball
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: build-windows

on:
pull_request:
paths-ignore:
- "README.md"
types: [opened, synchronize, reopened, ready_for_review]
push:
branches:
Expand All @@ -10,9 +12,11 @@ on:
- canary
- v[0-9]+.x-staging
- v[0-9]+.x
paths-ignore:
- "README.md"

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/commit-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ jobs:
lint-commit-message:
runs-on: ubuntu-latest
steps:
- name: Compute number of commits in the PR
id: nb-of-commits
run: echo "::set-output name=nb::$((${{ github.event.pull_request.commits }} + 1))"
- uses: actions/checkout@v2
with:
# Last 100 commits should be enough for a PR
fetch-depth: 100
fetch-depth: ${{ steps.nb-of-commits.outputs.nb }}
- name: Install Node.js
uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
- name: Validate commit messages
run: |
echo "::add-matcher::.github/workflows/commit-lint-problem-matcher.json"
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
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
2 changes: 1 addition & 1 deletion .github/workflows/coverage-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- 'doc/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- 'tools/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/find-inactive-collaborators.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
find:

if: github.repository == 'nodejs/node'
runs-on: ubuntu-latest

steps:
Expand All @@ -35,6 +35,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
with:
author: Node.js GitHub Bot <[email protected]>
branch: actions/inactive-collaborators
body: This PR was generated by tools/find-inactive-collaborators.yml.
commit-message: "meta: move one or more collaborators to emeritus"
labels: meta
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/license-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
author: Node.js GitHub Bot <[email protected]>
branch: actions/license-builder
title: "doc: run license-builder"
body: "License is likely out of date. This is an automatically generated PR by the `license-builder.yml` GitHub Action, which runs `license-builder.sh` and submits a new PR or updates an existing PR."
commit-message: 'doc: run license-builder'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- v[0-9]+.x

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
NODE_VERSION: lts/*

jobs:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Get release version numbers
if: ${{ github.event.pull_request && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch }}
id: get-released-versions
run: ./tools/node-lint-md-cli-rollup/src/list-released-versions-from-changelogs.mjs
run: ./tools/lint-md/list-released-versions-from-changelogs.mjs
- name: Lint docs
run: |
echo "::add-matcher::.github/workflows/remark-lint-problem-matcher.json"
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: mszostok/codeowners-validator@v0.4.0
- uses: mszostok/codeowners-validator@v0.6.0
with:
checks: "files,duppatterns"
lint-pr-url:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- 'doc/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-internet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- test/internet/**

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: test-linux

on:
pull_request:
paths-ignore:
- "README.md"
types: [opened, synchronize, reopened, ready_for_review]
push:
branches:
Expand All @@ -10,9 +12,11 @@ on:
- canary
- v[0-9]+.x-staging
- v[0-9]+.x
paths-ignore:
- "README.md"

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- 'doc/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
Loading

0 comments on commit 96b02bb

Please sign in to comment.