Skip to content

Commit

Permalink
Merge branch 'main' into fix-atob
Browse files Browse the repository at this point in the history
  • Loading branch information
XadillaX authored Aug 30, 2022
2 parents 8e11b14 + 4f4d394 commit d95c986
Show file tree
Hide file tree
Showing 2,182 changed files with 227,472 additions and 14,593 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@

/benchmark/misc/startup.js @nodejs/startup
/src/node.cc @nodejs/startup
/src/node_native_module* @nodejs/startup
/src/node_builtins* @nodejs/startup
/src/node_snapshot* @nodejs/startup
/lib/internal/bootstrap/* @nodejs/startup
/tools/snapshot/* @nodejs/startup

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1-bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ body:
label: Platform
description: |
UNIX: output of `uname -a`
Windows: output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in PowerShell console
Windows: output of `"$([Environment]::OSVersion.VersionString) $(('x86', 'x64')[[Environment]::Is64BitOperatingSystem])"` in PowerShell console
- type: input
attributes:
label: Subsystem
Expand Down
2 changes: 2 additions & 0 deletions .github/label-pr-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ subSystemLabels:
/^lib\/worker_threads.js$/: worker
/^lib\/internal\/url\.js$/: whatwg-url
/^lib\/internal\/modules\/esm/: esm
/^lib\/internal\/webstreams/: web streams

# All other lib/ files map directly
/^lib\/_(\w+)_\w+\.js?$/: $1 # e.g. _(stream)_wrap
Expand All @@ -123,6 +124,7 @@ exlusiveLabels:
/^test\/report\//: test, report
/^test\/fixtures\/es-module/: test, esm
/^test\/es-module\//: test, esm
/^test\/fixtures\/wpt\/streams//: test, web streams

/^test\//: test

Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/label-flaky-test-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Label Flaky Test Issues

on:
issues:
types: [opened, labeled]

jobs:
label:
if: github.event.label.name == 'flaky-test'
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Extract labels
id: extract-labels
env:
BODY: ${{ github.event.issue.body }}
run: |
BODY="${BODY//$'\n'/'\n'}"
declare -A platform2label
platform2label["AIX"]="aix";
platform2label["FreeBSD"]="freebsd";
platform2label["Linux ARM64"]="linux";
platform2label["Linux ARMv7"]="arm";
platform2label["Linux PPC64LE"]="ppc";
platform2label["Linux s390x"]="s390";
platform2label["Linux x64"]="linux";
platform2label["macOS ARM64"]="macos";
platform2label["macOS x64"]="macos";
platform2label["SmartOS"]="smartos";
platform2label["Windows"]="windows";
# sed is cleaning up the edges
PLATFORMS=$(echo $BODY | sed 's/^.*Platform\\n\\n//' | sed 's/\(, Other\)\?\\n\\n.*$//') 2> /dev/null
readarray -d , -t list <<< "$PLATFORMS"
labels=
for row in "${list[@]}"; do \
platform=$(echo $row | xargs); \
labels="${labels}${platform2label[$platform]},"; \
done;
echo "::set-output name=LABELS::${labels::-1}"
- name: Add labels
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NUMBER: ${{ github.event.issue.number }}
run: gh issue edit "$NUMBER" --repo ${{ github.repository }} --add-label "${{ steps.extract-labels.outputs.LABELS }}"
1 change: 1 addition & 0 deletions .github/workflows/test-internet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ permissions:

jobs:
test-internet:
if: github.repository == 'nodejs/node' || github.event_name != 'schedule'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
5 changes: 5 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ Hannes Magnusson <hannes.magnusson@gmail.com> <hannes.magnusson@creditkarma.com>
Hassaan Pasha <pasha.hassaan@gmail.com> <hassaan.pasha@teamo.io>
Hendrik Schwalm <mail@hendrikschwalm.de>
Henry Chin <hheennrryy@gmail.com>
Nick Sia <nicholas.sia@vgw.co> <31839263+nicksia-vgw@users.noreply.github.com>
Herbert Vojčík <herby@mailbox.sk>
Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
Expand Down Expand Up @@ -287,6 +288,8 @@ Ke Ding <dingkework@hotmail.com>
Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
Kevin Millikin <kmillikin@chromium.org>
Keyhan Vakil <kvakil@sylph.kvakil.me> <60900335+airtable-keyhanvakil@users.noreply.github.com>
Keyhan Vakil <kvakil@sylph.kvakil.me> <kvakil@github.kvakil.me>
Khaidi Chu <i@2333.moe>
Khaidi Chu <i@2333.moe> <admin@xcoder.in>
Kimberly Wilber <gcr@sneakygcr.net>
Expand Down Expand Up @@ -429,6 +432,8 @@ Ron Korving <ron@ronkorving.nl> <rkorving@wizcorp.jp>
Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@fintura.de>
Ruben Bridgewater <ruben@bridgewater.de> <ruben.bridgewater@maibornwolff.de>
Russell Dempsey <sgtpooki@gmail.com> <SgtPooki@gmail.com>
Ruy Adorno <ruyadorno@google.com> <ruyadorno@github.com>
Ruy Adorno <ruyadorno@google.com> <ruyadorno@hotmail.com>
Ryan Dahl <ry@tinyclouds.org>
Ryan Emery <seebees@gmail.com>
Ryan Mahan <ryanmahan97@gmail.com>
Expand Down
28 changes: 25 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ Joran Siu <joransiu@ca.ibm.com>
Vitaly Tomilov <vitaly-t@users.noreply.github.com>
Ratikesh Misra <ratikesh92@gmail.com>
Alex Perkins <aperkin@rei.com>
Beth Griggs <bgriggs@redhat.com>
Beth Griggs <bethanyngriggs@gmail.com>
Joe Esposito <joe@joeyespo.com>
Erin Spiceland <yes@erin.codes>
Ravindra Barthwal <ravindrabarthwal@users.noreply.github.com>
Expand Down Expand Up @@ -1784,7 +1784,7 @@ Christopher Sidebottom <chris@damouse.co.uk>
Edward Andrew Robinson <earobinson@gmail.com>
Shakeel Mohamed <contact@shakeel.xyz>
Tobias Kieslich <tobias.kieslich@gmail.com>
Ruy Adorno <ruyadorno@hotmail.com>
Ruy Adorno <ruyadorno@google.com>
Stefania Sharp <stefaniasharp@gmail.com>
Pawel Golda <pawelgolda@gmail.com>
Steven Scott <Contact@TheDgtl.net>
Expand Down Expand Up @@ -3457,7 +3457,7 @@ Yagiz Nizipli <yagiz@nizipli.com>
liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com>
Sergey Nazaryev <sergey@nazaryev.com>
William Marlow <william.marlow@ibm.com>
Keyhan Vakil <60900335+airtable-keyhanvakil@users.noreply.github.com>
Keyhan Vakil <kvakil@sylph.kvakil.me>
Feng Yu <F3n67u@outlook.com>
pupilTong <pupiltong@outlook.com>
rikapo <rikaporori@gmail.com>
Expand Down Expand Up @@ -3490,5 +3490,27 @@ John Gee <john@ruru.gen.nz>
Hrishikesh Kadam <hrkadam.92@gmail.com>
KrayzeeKev <github@lentinfamily.com>
Airing <airing@ursb.me>
jiahao.si <sijiahao0839@gmail.com>
Rhys <Anemy@users.noreply.github.com>
Mark S. Miller <erights@users.noreply.github.com>
Jianru Lin <jianru.lin@gmail.com>
Lenvin Gonsalves <41874033+98lenvi@users.noreply.github.com>
Andreu Botella <andreu@andreubotella.com>
shhh7612 <82669765+shhh7612@users.noreply.github.com>
Dominic Saadi <dominiceliassaadi@gmail.com>
ywave620 <60539365+ywave620@users.noreply.github.com>
NicoNekoru <66227158+NicoNekoru@users.noreply.github.com>
SADIK KUZU <sadikkuzu@hotmail.com>
flakey5 <73616808+flakey5@users.noreply.github.com>
Saurabh Daware <saurabhdaware99@gmail.com>
BuShe <bushe.cn@icloud.com>
Nick Sia <nicholas.sia@vgw.co>
Basit Chonka <baasit121@icloud.com>
Jeremiah Gowdy <jgowdy@godaddy.com>
Matthew Peveler <matt.peveler@gmail.com>
Wing <damianleung@gmail.com>
Hana <andywangsy@gmail.com>
Jeff Dickey <216188+jdxcode@users.noreply.github.com>
Matías Zúñiga <matias.nicolas.zc@gmail.com>

# Generated by tools/update-authors.mjs
13 changes: 8 additions & 5 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ file a new issue.
* [Option 1: Manual install](#option-1-manual-install)
* [Option 2: Automated install with Boxstarter](#option-2-automated-install-with-boxstarter)
* [Building Node.js](#building-nodejs-2)
* [Android/Android-based devices (e.g. Firefox OS)](#androidandroid-based-devices-eg-firefox-os)
* [Android](#android)
* [`Intl` (ECMA-402) support](#intl-ecma-402-support)
* [Build with full ICU support (all locales supported by ICU)](#build-with-full-icu-support-all-locales-supported-by-icu)
* [Unix/macOS](#unixmacos)
Expand Down Expand Up @@ -647,22 +647,25 @@ To test if Node.js was built correctly:
> Release\node -e "console.log('Hello from Node.js', process.version)"
```

### Android/Android-based devices (e.g. Firefox OS)
### Android

Android is not a supported platform. Patches to improve the Android build are
welcome. There is no testing on Android in the current continuous integration
environment. The participation of people dedicated and determined to improve
Android building, testing, and support is encouraged.

Be sure you have downloaded and extracted
[Android NDK](https://developer.android.com/tools/sdk/ndk/index.html) before in
[Android NDK](https://developer.android.com/ndk) before in
a folder. Then run:

```console
$ ./android-configure /path/to/your/android-ndk
$ make
$ source ./android-configure /path/to/your/android-ndk target_arch android_sdk_version
$ make -j4
```

The Android SDK version should be at least 24 (Android 7.0) and the target
architecture supports \[arm, arm64/aarch64, x86, x86\_64].

## `Intl` (ECMA-402) support

[Intl](https://github.com/nodejs/node/blob/HEAD/doc/api/intl.md) support is
Expand Down
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V18.md#18.7.0">18.7.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V18.md#18.8.0">18.8.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V18.md#18.7.0">18.7.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V18.md#18.6.0">18.6.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V18.md#18.5.0">18.5.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V18.md#18.4.0">18.4.0</a><br/>
Expand All @@ -62,7 +63,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V17.md#17.0.0">17.0.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.16.0">16.16.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.17.0">16.17.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.16.0">16.16.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.15.1">16.15.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.15.0">16.15.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.14.2">16.14.2</a><br/>
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ $(NODE_EXE) $(NODE_G_EXE): config.gypi out/Makefile
ln -fs out/${build_type}/$(NODE_EXE) $@; fi
else
ifeq ($(BUILD_WITH), ninja)
NINJA ?= ninja
ifeq ($(V),1)
NINJA_ARGS := $(NINJA_ARGS) -v
endif
Expand All @@ -124,11 +125,11 @@ else
NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
endif
$(NODE_EXE): config.gypi out/Release/build.ninja
ninja -C out/Release $(NINJA_ARGS)
$(NINJA) -C out/Release $(NINJA_ARGS)
if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Release/$(NODE_EXE) $@; fi

$(NODE_G_EXE): config.gypi out/Debug/build.ninja
ninja -C out/Debug $(NINJA_ARGS)
$(NINJA) -C out/Debug $(NINJA_ARGS)
if [ ! -r $@ ] || [ ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
else
$(NODE_EXE) $(NODE_G_EXE):
Expand Down
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ For information about the governance of the Node.js project, see
**Colin Ihrig** <<cjihrig@gmail.com>> (he/him)
* [codebytere](https://github.com/codebytere) -
**Shelley Vohr** <<shelley.vohr@gmail.com>> (she/her)
* [cola119](https://github.com/cola119) -
**Kohei Ueno** <<kohei.ueno119@gmail.com>> (he/him)
* [daeyeon](https://github.com/daeyeon) -
**Daeyeon Jeong** <<daeyeon.dev@gmail.com>> (he/him)
* [danbev](https://github.com/danbev) -
**Daniel Bevenius** <<daniel.bevenius@gmail.com>> (he/him)
* [danielleadams](https://github.com/danielleadams) -
Expand All @@ -310,6 +314,8 @@ For information about the governance of the Node.js project, see
**Daniele Belardi** <<dwon.dnl@gmail.com>> (he/him)
* [edsadr](https://github.com/edsadr) -
**Adrian Estrada** <<edsadr@gmail.com>> (he/him)
* [erickwendel](https://github.com/erickwendel) -
**Erick Wendel** <<erick.workspace@gmail.com>> (he/him)
* [evanlucas](https://github.com/evanlucas) -
**Evan Lucas** <<evanlucas@me.com>> (he/him)
* [fhinkel](https://github.com/fhinkel) -
Expand Down Expand Up @@ -380,6 +386,8 @@ For information about the governance of the Node.js project, see
**Milad Fa** <<mfarazma@redhat.com>> (he/him)
* [mildsunrise](https://github.com/mildsunrise) -
**Alba Mendez** <<me@alba.sh>> (she/her)
* [MoLow](https://github.com/MoLow) -
**Moshe Atlow** <<moshe@atlow.co.il>> (he/him)
* [mscdex](https://github.com/mscdex) -
**Brian White** <<mscdex@mscdex.net>>
* [MylesBorins](https://github.com/MylesBorins) -
Expand All @@ -405,7 +413,7 @@ For information about the governance of the Node.js project, see
* [ronag](https://github.com/ronag) -
**Robert Nagy** <<ronagy@icloud.com>>
* [ruyadorno](https://github.com/ruyadorno) -
**Ruy Adorno** <<ruyadorno@github.com>> (he/him)
**Ruy Adorno** <<ruyadorno@google.com>> (he/him)
* [rvagg](https://github.com/rvagg) -
**Rod Vagg** <<rod@vagg.org>>
* [ryzokuken](https://github.com/ryzokuken) -
Expand All @@ -424,6 +432,8 @@ For information about the governance of the Node.js project, see
**Stewart X Addison** <<sxa@redhat.com>> (he/him)
* [targos](https://github.com/targos) -
**Michaël Zasso** <<targos@protonmail.com>> (he/him)
* [theanarkh](https://github.com/theanarkh) -
**theanarkh** <<theratliter@gmail.com>> (he/him)
* [TimothyGu](https://github.com/TimothyGu) -
**Tiancheng "Timothy" Gu** <<timothygu99@gmail.com>> (he/him)
* [tniessen](https://github.com/tniessen) -
Expand Down Expand Up @@ -658,6 +668,8 @@ maintaining the Node.js project.
**Himadri Ganguly** <<himadri.tech@gmail.com>> (he/him)
* [iam-frankqiu](https://github.com/iam-frankqiu) -
**Frank Qiu** <<iam.frankqiu@gmail.com>> (he/him)
* [kvakil](https://github.com/kvakil) -
**Keyhan Vakil** <<kvakil@sylph.kvakil.me>> (they/them)
* [marsonya](https://github.com/marsonya) -
**Akhil Marsonya** <<akhil.marsonya27@gmail.com>> (he/him)
* [meixg](https://github.com/meixg) -
Expand Down
8 changes: 3 additions & 5 deletions android-configure
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ NDK_PATH=$1
ARCH="$2"
ANDROID_SDK_VERSION=$3

if [ $ANDROID_SDK_VERSION -lt 23 ]; then
echo "$ANDROID_SDK_VERSION should equal or later than 23(Android 6.0)"
if [ $ANDROID_SDK_VERSION -lt 24 ]; then
echo "$ANDROID_SDK_VERSION should equal or later than 24 (Android 7.0)"
fi

CC_VER="4.9"

case $ARCH in
arm)
DEST_CPU="arm"
TOOLCHAIN_NAME="armv7-linux-androideabi"
TOOLCHAIN_NAME="armv7a-linux-androideabi"
;;
x86)
DEST_CPU="ia32"
Expand Down
9 changes: 5 additions & 4 deletions benchmark/fs/readfile-partitioned.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ const zlib = require('zlib');
const assert = require('assert');

const bench = common.createBenchmark(main, {
dur: [5],
duration: [5],
encoding: ['', 'utf-8'],
len: [1024, 16 * 1024 * 1024],
concurrent: [1, 10]
});

function main({ len, dur, concurrent }) {
function main({ len, duration, concurrent, encoding }) {
try {
fs.unlinkSync(filename);
} catch {
Expand All @@ -47,10 +48,10 @@ function main({ len, dur, concurrent }) {
} catch {
// Continue regardless of error.
}
}, dur * 1000);
}, duration * 1000);

function read() {
fs.readFile(filename, afterRead);
fs.readFile(filename, encoding, afterRead);
}

function afterRead(er, data) {
Expand Down
5 changes: 3 additions & 2 deletions benchmark/fs/readfile-promises.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ const filename = path.resolve(tmpdir.path,

const bench = common.createBenchmark(main, {
duration: [5],
encoding: ['', 'utf-8'],
len: [1024, 16 * 1024 * 1024],
concurrent: [1, 10]
});

function main({ len, duration, concurrent }) {
function main({ len, duration, concurrent, encoding }) {
try {
fs.unlinkSync(filename);
} catch {
Expand All @@ -44,7 +45,7 @@ function main({ len, duration, concurrent }) {
}, duration * 1000);

function read() {
fs.promises.readFile(filename)
fs.promises.readFile(filename, encoding)
.then((res) => afterRead(undefined, res))
.catch((err) => afterRead(err));
}
Expand Down
Loading

0 comments on commit d95c986

Please sign in to comment.