v15.3.0 proposal

.editorconfig

@@ -7,6 +7,7 @@ indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+quote_type = single
 
 [vcbuild.bat]
 end_of_line = crlf

.github/workflows/linters.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Lint addon docs
-        run: NODE=$(which node) make lint-addon-docs
+        run: NODE=$(command -v node) make lint-addon-docs
   lint-cpp:
     runs-on: ubuntu-latest
     steps:
@@ -50,7 +50,7 @@ jobs:
       - name: Lint docs
         run: |
           echo "::add-matcher::.github/workflows/remark-lint-problem-matcher.json"
-          NODE=$(which node) make lint-md
+          NODE=$(command -v node) make lint-md
   lint-js:
     runs-on: ubuntu-latest
     steps:
@@ -62,7 +62,7 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Lint JavaScript files
-        run: NODE=$(which node) make lint-js
+        run: NODE=$(command -v node) make lint-js
   lint-py:
     runs-on: ubuntu-latest
     steps:
@@ -76,7 +76,7 @@ jobs:
       - name: Lint Python
         run: |
           make lint-py-build || true
-          NODE=$(which node) make lint-py
+          NODE=$(command -v node) make lint-py
 
   lint-codeowners:
     runs-on: ubuntu-latest

.github/workflows/misc.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Build
-        run: NODE=$(which node) make doc-only
+        run: NODE=$(command -v node) make doc-only
       - uses: actions/upload-artifact@v1
         with:
           name: docs

.github/workflows/test-macos.yml

@@ -25,6 +25,6 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Build
-        run: make build-ci -j8 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic"
+        run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic"
       - name: Test
-        run: make run-ci -j8 V=1 TEST_CI_ARGS="-p actions"
+        run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"

BSDmakefile

@@ -3,7 +3,7 @@ FLAGS=${.MAKEFLAGS:C/\-J ([0-9]+,?)+//W}
 
 all: .DEFAULT
 .DEFAULT:
-	@which gmake > /dev/null 2>&1 ||\
+	@command -v gmake > /dev/null 2>&1 ||\
 		(echo "GMake is required for node.js to build.\
 			Install and try again" && exit 1)
 	@gmake ${.FLAGS} ${.TARGETS}

BUILDING.md

@@ -113,6 +113,7 @@ platforms. This is true regardless of entries in the table below.
 | Windows          | x64, x86         | Windows Server 2012 (not R2)    | Experimental |                                   |
 | Windows          | arm64            | >= Windows 10                   | Tier 2 (compiling) / Experimental (running) |    |
 | macOS            | x64              | >= 10.13                        | Tier 1       |                                   |
+| macOS            | arm64            | >= 11                           | Experimental |                                   |
 | SmartOS          | x64              | >= 18                           | Tier 2       |                                   |
 | AIX              | ppc64be >=power7 | >= 7.2 TL02                     | Tier 2       |                                   |
 | FreeBSD          | x64              | >= 11                           | Experimental | Downgraded as of Node.js 12  <sup>[7](#fn7)</sup>     |

CHANGELOG.md

@@ -32,7 +32,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V15.md#15.2.1">15.2.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V15.md#15.3.0">15.3.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V15.md#15.2.1">15.2.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.2.0">15.2.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.1.0">15.1.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.0.1">15.0.1</a><br/>

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

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) -

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}')

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);
+}

benchmark/napi/function_args/binding.cc

@@ -123,7 +123,9 @@ void CallWithArguments(const FunctionCallbackInfo<Value>& args) {
   }
 }
 
-void Initialize(Local<Object> target) {
+void Initialize(Local<Object> target,
+                Local<Value> module,
+                void* data) {
   NODE_SET_METHOD(target, "callWithString", CallWithString);
   NODE_SET_METHOD(target, "callWithLongString", CallWithString);
 

benchmark/napi/function_call/binding.cc

@@ -7,7 +7,9 @@ void Hello(const v8::FunctionCallbackInfo<v8::Value>& args) {
   args.GetReturnValue().Set(c++);
 }
 
-void Initialize(v8::Local<v8::Object> target) {
+void Initialize(v8::Local<v8::Object> target,
+                v8::Local<v8::Value> module,
+                void* data) {
   NODE_SET_METHOD(target, "hello", Hello);
 }
 

common.gypi

@@ -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.17',
+    'v8_embedder_string': '-node.22',
 
     ##### V8 defaults for Node.js #####
 

configure

@@ -10,6 +10,7 @@ command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
 command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
 command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
 command -v python3.5 >/dev/null && exec python3.5 "$0" "$@"
+command -v python3 >/dev/null && exec python3 "$0" "$@"
 command -v python2.7 >/dev/null && exec python2.7 "$0" "$@"
 exec python "$0" "$@"
 ''' "$0" "$@"