Skip to content

Commit

Permalink
Merge branch 'master' into actions/authors-update
Browse files Browse the repository at this point in the history
  • Loading branch information
Trott committed Sep 12, 2021
2 parents 52ceb80 + 5c1adda commit f42bbe9
Show file tree
Hide file tree
Showing 1,230 changed files with 15,901 additions and 18,654 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Expand Up @@ -18,6 +18,7 @@ const hacks = [
'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) => {
Expand All @@ -41,6 +42,7 @@ module.exports = {
babelOptions: {
plugins: [
Module._findPath('@babel/plugin-syntax-class-properties'),
Module._findPath('@babel/plugin-syntax-import-assertions'),
Module._findPath('@babel/plugin-syntax-top-level-await'),
],
},
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/authors.yml
@@ -1,5 +1,9 @@
name: "authors update"
on:
schedule:
# Run once a week at 00:05 AM UTC on Sunday.
- cron: '5 0 * * 0'

workflow_dispatch:

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build-windows.yml
Expand Up @@ -18,7 +18,11 @@ env:
jobs:
build-windows:
if: github.event.pull_request.draft == false
runs-on: windows-latest
strategy:
matrix:
windows: [windows-2019, windows-2022]
fail-fast: false
runs-on: ${{ matrix.windows }}
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ env.PYTHON_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment-labeled.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Post stalled comment
env:
COMMENTS_URL: ${{ github.event.issue.comments_url || github.event.pull_request.comments_url }}
COMMENTS_URL: ${{ github.event.issue.comments_url || github.event.pull_request.comments_url }}
run: |
curl -X POST $COMMENTS_URL \
-H "Content-Type: application/json" \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-linux.yml
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Report JS
run: npx c8 report --check-coverage
env:
NODE_OPTIONS: --max-old-space-size=8192
NODE_OPTIONS: --max-old-space-size=8192
- name: Report C++
run: cd out && gcovr --gcov-exclude='.*\b(deps|usr|out|obj|cctest|embedding)\b' -v -r Release/obj.target --xml -o ../coverage/coverage-cxx.xml --root=$(cd ../ && pwd)
# Clean temporary output from gcov and c8, so that it's not uploaded:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/find-inactive-collaborators.yml
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
find:

runs-on: ubuntu-latest

steps:
Expand Down
18 changes: 17 additions & 1 deletion .github/workflows/linters.yml
Expand Up @@ -90,7 +90,23 @@ jobs:
- name: Lint Python
run: |
make lint-py-build || true
NODE=$(command -v node) make lint-py
make lint-py
lint-yaml:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v2
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Environment Information
run: npx envinfo
- name: Lint YAML
run: |
make lint-yaml-build || true
make lint-yaml
lint-sh:
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/notify-force-push.yml
Expand Up @@ -11,16 +11,16 @@ jobs:
if: ${{ github.event.forced && github.repository == 'nodejs/node' }}
runs-on: ubuntu-latest
steps:
- name: Slack Notification
uses: rtCamp/action-slack-notify@master
env:
SLACK_COLOR: '#DE512A'
SLACK_ICON: https://github.com/nodejs.png?size=48
SLACK_TITLE: '${{ github.actor }} force-pushed to ${{ github.ref }}'
SLACK_MESSAGE: |
A commit was force-pushed to <https://github.com/${{ github.repository }}/tree/${{ github.repository.default_branch }}|${{ github.repository }}@${{ github.repository.default_branch }}> by <https://github.com/${{ github.actor }}|${{ github.actor }}>
- name: Slack Notification
uses: rtCamp/action-slack-notify@master
env:
SLACK_COLOR: '#DE512A'
SLACK_ICON: https://github.com/nodejs.png?size=48
SLACK_TITLE: '${{ github.actor }} force-pushed to ${{ github.ref }}'
SLACK_MESSAGE: |
A commit was force-pushed to <https://github.com/${{ github.repository }}/tree/${{ github.repository.default_branch }}|${{ github.repository }}@${{ github.repository.default_branch }}> by <https://github.com/${{ github.actor }}|${{ github.actor }}>
Before: <https://github.com/${{ github.repository }}/commit/${{ github.event.before }}|${{ github.event.before }}>
After: <https://github.com/${{ github.repository }}/commit/${{ github.event.after }}|${{ github.event.after }}>
SLACK_USERNAME: nodejs-bot
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
Before: <https://github.com/${{ github.repository }}/commit/${{ github.event.before }}|${{ github.event.before }}>
After: <https://github.com/${{ github.repository }}/commit/${{ github.event.after }}|${{ github.event.after }}>
SLACK_USERNAME: nodejs-bot
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -9,18 +9,19 @@
!deps/**/.*
!test/fixtures/**/.*
!.clang-format
!.cpplint
!.editorconfig
!.eslintignore
!.eslintrc.js
!.eslintrc.yaml
!.flake8
!.gitattributes
!.github
!.gitignore
!.gitkeep
!.mailmap
!.nycrc
!.eslintrc.yaml
!.cpplint
!.yamllint.yaml

# === Rules for root dir ===
/core
Expand Down
7 changes: 6 additions & 1 deletion .mailmap
Expand Up @@ -287,12 +287,16 @@ Micleusanu Nicu <micnic90@gmail.com>
Miguel Angel Asencio Hurtado <maasencioh@gmail.com>
Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
Mike Kaufman <mike.kaufman@microsoft.com> <mkaufman@microsoft.com>
Mike MacCana <mike.maccana@gmail.com> <mike@certsimple.com>
Minqi Pan <pmq2001@gmail.com>
Minuk Park <parkm86@gmail.com>
Minwoo Jung <nodecorelab@gmail.com> <jmwsoft@gmail.com>
Minwoo Jung <nodecorelab@gmail.com> <minwoo@nodesource.com>
Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
Miroslav Bajtoš <oss@bajtos.net> <mbajtoss@gmail.com>
Miroslav Bajtoš <oss@bajtos.net> <miro.bajtos@gmail.com>
Miroslav Bajtoš <oss@bajtos.net> <miroslav@strongloop.com>
Mitar Milutinovic <mitar.git@tnode.com>
Mithun Sasidharan <mithunsasidharan89@gmail.com> <msasidharan@paypal.com>
Myles Borins <myles.borins@gmail.com> <mborins@us.ibm.com>
Myles Borins <myles.borins@gmail.com> <mylesborins@github.com>
Myles Borins <myles.borins@gmail.com> <mylesborins@google.com>
Expand All @@ -301,6 +305,7 @@ Nebu Pookins <nebu@nebupookins.net>
Netto Farah <nettofarah@gmail.com>
Nicholas Kinsey <pyrotechnick@feistystudios.com>
Nick Soggin <nicksoggin@gmail.com> <iSkore@users.noreply.github.com>
Nigel Kibodeaux <nigelmail@gmail.com> <nigel@team.about.me>
Nikola Glavina <glavina.nikola5@gmail.com> <nikola.glavina@student.um.si>
Nikolai Vavilov <vvnicholas@gmail.com>
Nils Kuhnhenn <lain@volafile.io>
Expand Down
8 changes: 8 additions & 0 deletions .yamllint.yaml
@@ -0,0 +1,8 @@
extends: relaxed

rules:
line-length: disable

ignore: |
/deps/
node_modules/
10 changes: 3 additions & 7 deletions AUTHORS
Expand Up @@ -444,7 +444,7 @@ Ryan Graham <r.m.graham@gmail.com>
Kelly Gerber <kellygerber22@yahoo.com>
Ryan Doenges <rhdoenges@gmail.com>
Sean Silva <chisophugis@gmail.com>
Miroslav Bajtoš <miroslav@strongloop.com>
Miroslav Bajtoš <oss@bajtos.net>
Olof Johansson <olof@ethup.se>
Sam Roberts <vieuxtech@gmail.com>
Kevin Locke <kevin@kevinlocke.name>
Expand Down Expand Up @@ -744,7 +744,7 @@ Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
AQNOUCH Mohammed <aqnouch.mohammed@gmail.com>
Ivan Kozik <ivan@ludios.org>
Oleg Elifantiev <oleg@elifantiev.ru>
Mike MacCana <mike@certsimple.com>
Mike MacCana <mike.maccana@gmail.com>
Josh Gummersall <gumby@moz.com>
Sam Mikes <smikes@cubane.com>
Frederic Hemberger <mail@frederic-hemberger.de>
Expand Down Expand Up @@ -1242,7 +1242,7 @@ Dan Villa <danielavilla02@gmail.com>
CodeTheInternet <edlerner+github@protonmail.com>
Eric Gonzalez <ericxgonzalez@gmail.com>
rgoodwin <rjngoodwin@gmial.com>
Nigel Kibodeaux <nigel@team.about.me>
Nigel Kibodeaux <nigelmail@gmail.com>
fmizzell <fmizzell@1312210.no-reply.drupal.org>
cdnadmin <cdnadmin@collaborare.net>
Paul Lucas <pjl.paul@gmail.com>
Expand Down Expand Up @@ -1626,7 +1626,6 @@ Pini Houri <pinhasph@gmail.com>
Runite618 <matthew_mo@hotmail.co.uk>
phisixersai <phisixersai@gmail.com>
hsmtkk <hsmtkk@gmail.com>
Miroslav Bajtoš <mbajtoss@gmail.com>
Sebastian Murphy <sebastianmurphy@gmail.com>
陈刚 <chengang07@meituan.com>
Jon Moss <me@jonathanmoss.me>
Expand Down Expand Up @@ -1772,7 +1771,6 @@ Guilherme Akio Sakae <akio.xd@gmail.com>
Martin Michaelis <code@mgjm.de>
Christopher Sidebottom <chris@damouse.co.uk>
Edward Andrew Robinson <earobinson@gmail.com>
Nigel Kibodeaux <nigelmail@gmail.com>
Shakeel Mohamed <contact@shakeel.xyz>
Tobias Kieslich <tobias.kieslich@gmail.com>
Ruy Adorno <ruyadorno@hotmail.com>
Expand Down Expand Up @@ -2173,7 +2171,6 @@ Beni von Cheni <benjaminlchen@gmail.com>
Ilya Sotov <sotovilya@yandex.ru>
William Cohen <wcohen@redhat.com>
Ajido <ajido@me.com>
Mithun Sasidharan <msasidharan@paypal.com>
kailash k yogeshwar <kailashyogeshwar85@gmail.com>
Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Mark Tiedemann <www.marktiedemann@gmail.com>
Expand Down Expand Up @@ -2783,7 +2780,6 @@ Ivan Villa <trezeguet55@gmail.com>
Caleb ツ Everett <calebev@amazon.com>
Miken <omarlozano053@gmail.com>
Gabriela Niño <gabynr@gmail.com>
Mike MacCana <mike.maccana@gmail.com>
Tim Baverstock <tim.baverstock@corp.badoo.com>
Walle Cyril <cyril.walle@protonmail.com>
Xu Meng <dmabupt@gmail.com>
Expand Down
10 changes: 7 additions & 3 deletions CHANGELOG.md
Expand Up @@ -32,7 +32,9 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.8.0">16.8.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.9.1">16.9.1</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.9.0">16.9.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.8.0">16.8.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.7.0">16.7.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.6.2">16.6.2</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.6.1">16.6.1</a><br/>
Expand All @@ -47,7 +49,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V16.md#16.0.0">16.0.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.17.5">14.17.5</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.17.6">14.17.6</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.5">14.17.5</a><br/>
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.4">14.17.4</a><br/>
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.3">14.17.3</a><br/>
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.2">14.17.2</a><br/>
Expand Down Expand Up @@ -80,7 +83,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V14.md#14.0.0">14.0.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.22.5">12.22.5</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.22.6">12.22.6</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.22.5">12.22.5</a><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.22.4">12.22.4</a><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.22.3">12.22.3</a><br/>
<a href="doc/changelogs/CHANGELOG_V12.md#12.22.2">12.22.2</a><br/>
Expand Down
25 changes: 22 additions & 3 deletions Makefile
Expand Up @@ -1389,13 +1389,13 @@ cpplint: lint-cpp

.PHONY: lint-py-build
# python -m pip install flake8
# Try with '--system' is to overcome systems that blindly set '--user'
# Try with '--system' if it fails without; the system may have set '--user'
lint-py-build:
$(info Pip installing flake8 linter on $(shell $(PYTHON) --version)...)
$(PYTHON) -m pip install --upgrade -t tools/pip/site-packages flake8 || \
$(PYTHON) -m pip install --upgrade --system -t tools/pip/site-packages flake8

ifneq ("","$(wildcard tools/pip/site-packages)")
ifneq ("","$(wildcard tools/pip/site-packages/flake8)")
.PHONY: lint-py
# Lints the Python code with flake8.
# Flag the build if there are Python syntax errors or undefined names
Expand All @@ -1407,6 +1407,24 @@ lint-py:
$(warning Run 'make lint-py-build')
endif

.PHONY: lint-yaml-build
# python -m pip install yamllint
# Try with '--system' if it fails without; the system may have set '--user'
lint-yaml-build:
$(info Pip installing yamllint on $(shell $(PYTHON) --version)...)
$(PYTHON) -m pip install --upgrade -t tools/pip/site-packages yamllint || \
$(PYTHON) -m pip install --upgrade --system -t tools/pip/site-packages yamllint

.PHONY: lint-yaml
# Lints the YAML files with yamllint.
lint-yaml:
@if [ -d "tools/pip/site-packages/yamllint" ]; then \
PYTHONPATH=tools/pip $(PYTHON) -m yamllint .; \
else \
echo 'YAML linting with yamllint is not available'; \
echo "Run 'make lint-yaml-build'"; \
fi

.PHONY: lint
.PHONY: lint-ci
ifneq ("","$(wildcard tools/node_modules/eslint/)")
Expand All @@ -1416,11 +1434,12 @@ lint: ## Run JS, C++, MD and doc linters.
$(MAKE) lint-cpp || EXIT_STATUS=$$? ; \
$(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \
$(MAKE) lint-md || EXIT_STATUS=$$? ; \
$(MAKE) lint-yaml || EXIT_STATUS=$$? ; \
exit $$EXIT_STATUS
CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+

# Related CI job: node-test-linter
lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs
lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs lint-yaml-build lint-yaml
@if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" benchmark deps doc lib src test tools ) \
&& ! ( $(FIND) . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
exit 0 ; \
Expand Down
6 changes: 4 additions & 2 deletions README.md
Expand Up @@ -171,8 +171,6 @@ For information about the governance of the Node.js project, see
**Colin Ihrig** &lt;cjihrig@gmail.com&gt; (he/him)
* [codebytere](https://github.com/codebytere) -
**Shelley Vohr** &lt;shelley.vohr@gmail.com&gt; (she/her)
* [danbev](https://github.com/danbev) -
**Daniel Bevenius** &lt;daniel.bevenius@gmail.com&gt; (he/him)
* [danielleadams](https://github.com/danielleadams) -
**Danielle Adams** &lt;adamzdanielle@gmail.com&gt; (she/her)
* [fhinkel](https://github.com/fhinkel) -
Expand Down Expand Up @@ -214,6 +212,8 @@ For information about the governance of the Node.js project, see
**Ben Noordhuis** &lt;info@bnoordhuis.nl&gt;
* [chrisdickinson](https://github.com/chrisdickinson) -
**Chris Dickinson** &lt;christopher.s.dickinson@gmail.com&gt;
* [danbev](https://github.com/danbev) -
**Daniel Bevenius** &lt;daniel.bevenius@gmail.com&gt; (he/him)
* [evanlucas](https://github.com/evanlucas) -
**Evan Lucas** &lt;evanlucas@me.com&gt; (he/him)
* [Fishrock123](https://github.com/Fishrock123) -
Expand Down Expand Up @@ -268,6 +268,8 @@ For information about the governance of the Node.js project, see
**Anatoli Papirovski** &lt;apapirovski@mac.com&gt; (he/him)
* [AshCripps](https://github.com/AshCripps) -
**Ash Cripps** &lt;acripps@redhat.com&gt;
* [Ayase-252](https://github.com/Ayase-252) -
**Qingyu Deng** &lt;i@ayase-lab.com&gt;
* [bcoe](https://github.com/bcoe) -
**Ben Coe** &lt;bencoe@gmail.com&gt; (he/him)
* [bengl](https://github.com/bengl) -
Expand Down
21 changes: 21 additions & 0 deletions benchmark/async_hooks/async-local-storage-run.js
@@ -0,0 +1,21 @@
'use strict';
const common = require('../common.js');
const { AsyncLocalStorage } = require('async_hooks');

const bench = common.createBenchmark(main, {
n: [1e7]
});

async function run(store, n) {
for (let i = 0; i < n; i++) {
await new Promise((resolve) => store.run(i, resolve));
}
}

function main({ n }) {
const store = new AsyncLocalStorage();
bench.start();
run(store, n).then(() => {
bench.end(n);
});
}
3 changes: 2 additions & 1 deletion common.gypi
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.9',
'v8_embedder_string': '-node.12',

##### V8 defaults for Node.js #####

Expand Down Expand Up @@ -268,6 +268,7 @@
],
'msvs_settings': {
'VCCLCompilerTool': {
'AdditionalOptions': ['/Zc:__cplusplus'],
'BufferSecurityCheck': 'true',
'DebugInformationFormat': 1, # /Z7 embed info in .obj files
'ExceptionHandling': 0, # /EHsc
Expand Down

0 comments on commit f42bbe9

Please sign in to comment.