-15.2.1
+15.3.0
+15.2.1
15.2.0
15.1.0
15.0.1
diff --git a/Makefile b/Makefile
index 7db5b3320f6181..6379f06a2e0b6d 100644
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,8 @@ V ?= 0
available-node = \
if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
$(PWD)/$(NODE) $(1); \
- elif [ -x `which node` ] && [ -e `which node` ] && [ `which node` ]; then \
- `which node` $(1); \
+ elif [ -x `command -v node` ] && [ -e `command -v node` ] && [ `command -v node` ]; then \
+ `command -v node` $(1); \
else \
echo "No available node, cannot run \"node $(1)\""; \
exit 1; \
@@ -898,7 +898,7 @@ BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
endif
BINARYTAR=$(BINARYNAME).tar
# OSX doesn't have xz installed by default, http://macpkg.sourceforge.net/
-HAS_XZ ?= $(shell which xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
+HAS_XZ ?= $(shell command -v xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
# Supply SKIP_XZ=1 to explicitly skip .tar.xz creation
SKIP_XZ ?= 0
XZ = $(shell [ $(HAS_XZ) -eq 1 -a $(SKIP_XZ) -eq 0 ] && echo 1 || echo 0)
@@ -1383,7 +1383,7 @@ lint-clean:
$(RM) tools/.*lintstamp
$(RM) .eslintcache
-HAS_DOCKER ?= $(shell which docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
+HAS_DOCKER ?= $(shell command -v docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
ifeq ($(HAS_DOCKER), 1)
DOCKER_COMMAND ?= docker run -it -v $(PWD):/node
diff --git a/README.md b/README.md
index 2d0e58655810a9..b8d5c4c09d2ec9 100644
--- a/README.md
+++ b/README.md
@@ -402,8 +402,6 @@ For information about the governance of the Node.js project, see
**Santiago Gimeno** <santiago.gimeno@gmail.com>
* [seishun](https://github.com/seishun) -
**Nikolai Vavilov** <vvnicholas@gmail.com>
-* [shigeki](https://github.com/shigeki) -
-**Shigeki Ohtsu** <ohtsu@ohtsu.org> (he/him)
* [shisama](https://github.com/shisama) -
**Masashi Hirano** <shisama07@gmail.com> (he/him)
* [silverwind](https://github.com/silverwind) -
@@ -547,6 +545,8 @@ For information about the governance of the Node.js project, see
**Sam Roberts** <vieuxtech@gmail.com>
* [sebdeckers](https://github.com/sebdeckers) -
**Sebastiaan Deckers** <sebdeckers83@gmail.com>
+* [shigeki](https://github.com/shigeki) -
+**Shigeki Ohtsu** <ohtsu@ohtsu.org> (he/him)
* [stefanmb](https://github.com/stefanmb) -
**Stefan Budeanu** <stefan@budeanu.com>
* [tellnes](https://github.com/tellnes) -
diff --git a/android-configure b/android-configure
index a7cb2b9c8b4a78..e3f4a721827e84 100755
--- a/android-configure
+++ b/android-configure
@@ -50,8 +50,8 @@ esac
HOST_OS="linux"
HOST_ARCH="x86_64"
-export CC_host=$(which gcc)
-export CXX_host=$(which g++)
+export CC_host=$(command -v gcc)
+export CXX_host=$(command -v g++)
host_gcc_version=$($CC_host --version | grep gcc | awk '{print $NF}')
major=$(echo $host_gcc_version | awk -F . '{print $1}')
diff --git a/benchmark/fs/bench-statSync-failure.js b/benchmark/fs/bench-statSync-failure.js
new file mode 100644
index 00000000000000..82cb24c09f4af2
--- /dev/null
+++ b/benchmark/fs/bench-statSync-failure.js
@@ -0,0 +1,28 @@
+'use strict';
+
+const common = require('../common');
+const fs = require('fs');
+const path = require('path');
+
+const bench = common.createBenchmark(main, {
+ n: [1e6],
+ statSyncType: ['throw', 'noThrow']
+});
+
+
+function main({ n, statSyncType }) {
+ const arg = path.join(__dirname, 'non.existent');
+
+ bench.start();
+ for (let i = 0; i < n; i++) {
+ if (statSyncType === 'noThrow') {
+ fs.statSync(arg, { throwIfNoEntry: false });
+ } else {
+ try {
+ fs.statSync(arg);
+ } catch {
+ }
+ }
+ }
+ bench.end(n);
+}
diff --git a/benchmark/napi/function_args/binding.cc b/benchmark/napi/function_args/binding.cc
index 2c54dd424d405d..078fe0ee3ea767 100644
--- a/benchmark/napi/function_args/binding.cc
+++ b/benchmark/napi/function_args/binding.cc
@@ -123,7 +123,9 @@ void CallWithArguments(const FunctionCallbackInfo& args) {
}
}
-void Initialize(Local |