Merge branch 'main' into android-configure

.github/label-pr-config.yml

@@ -21,7 +21,7 @@ subSystemLabels:
   /^src\/tty_/: c++, tty
   /^src\/node_url/: c++, whatwg-url
   /^src\/node_util/: c++, util
-  /^src\/(?:node_v8|v8abbr)/: c++, v8 engine
+  /^src\/node_v8/: c++, v8 engine
   /^src\/node_contextify/: c++, vm
   /^src\/.*win32.*/: c++, windows
   /^src\/node_zlib/: c++, zlib
@@ -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
@@ -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
 

.mailmap

@@ -200,6 +200,7 @@ Hannes Magnusson <[email protected]> <[email protected]>
 Hassaan Pasha <[email protected]> <[email protected]>
 Hendrik Schwalm <[email protected]>
 Henry Chin <[email protected]>
+Nick Sia <[email protected]> <[email protected]>
 Herbert Vojčík <[email protected]>
 Hitesh Kanwathirtha <[email protected]> <[email protected]>
 Icer Liang <[email protected]> <[email protected]>

AUTHORS

@@ -3503,5 +3503,16 @@ NicoNekoru <[email protected]>
 SADIK KUZU <[email protected]>
 flakey5 <[email protected]>
 Saurabh Daware <[email protected]>
+BuShe <[email protected]>
+Nick Sia <[email protected]>
+Basit Chonka <[email protected]>
+Jeremiah Gowdy <[email protected]>
+Matthew Peveler <[email protected]>
+Wing <[email protected]>
+Hana <[email protected]>
+Jeff Dickey <[email protected]>
+Matías Zúñiga <[email protected]>
+metonym <[email protected]>
+Brian Evans <[email protected]>
 
 # Generated by tools/update-authors.mjs

CHANGELOG.md

@@ -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/>
@@ -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/>

LICENSE

@@ -55,7 +55,7 @@ The externally maintained libraries used by Node.js are:
   """
     MIT License
 
-    Copyright (C) 2012-2020 by various contributors (see AUTHORS)
+    Copyright (C) 2012-2022 by various contributors (see AUTHORS)
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

Makefile

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

README.md

@@ -296,6 +296,10 @@ For information about the governance of the Node.js project, see
   **Colin Ihrig** <<[email protected]>> (he/him)
 * [codebytere](https://github.com/codebytere) -
   **Shelley Vohr** <<[email protected]>> (she/her)
+* [cola119](https://github.com/cola119) -
+  **Kohei Ueno** <<[email protected]>> (he/him)
+* [daeyeon](https://github.com/daeyeon) -
+  **Daeyeon Jeong** <<[email protected]>> (he/him)
 * [danbev](https://github.com/danbev) -
   **Daniel Bevenius** <<[email protected]>> (he/him)
 * [danielleadams](https://github.com/danielleadams) -
@@ -382,6 +386,8 @@ For information about the governance of the Node.js project, see
   **Milad Fa** <<[email protected]>> (he/him)
 * [mildsunrise](https://github.com/mildsunrise) -
   **Alba Mendez** <<[email protected]>> (she/her)
+* [MoLow](https://github.com/MoLow) -
+  **Moshe Atlow** <<[email protected]>> (he/him)
 * [mscdex](https://github.com/mscdex) -
   **Brian White** <<[email protected]>>
 * [MylesBorins](https://github.com/MylesBorins) -

benchmark/fs/readfile-partitioned.js

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

benchmark/fs/readfile-promises.js

@@ -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 {
@@ -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));
   }

benchmark/fs/readfile.js

@@ -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 {
@@ -44,7 +45,7 @@ function main({ len, duration, concurrent }) {
   }, duration * 1000);
 
   function read() {
-    fs.readFile(filename, afterRead);
+    fs.readFile(filename, encoding, afterRead);
   }
 
   function afterRead(er, data) {

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.11',
+    'v8_embedder_string': '-node.12',
 
     ##### V8 defaults for Node.js #####
 
@@ -204,16 +204,14 @@
             ],
           }],
           ['OS=="solaris"', {
+           'cflags': [ '-fno-omit-frame-pointer' ],
             # pull in V8's postmortem metadata
             'ldflags': [ '-Wl,-z,allextract' ]
           }],
           ['OS=="zos"', {
             # increase performance, number from experimentation
             'cflags': [ '-qINLINE=::150:100000' ]
           }],
-          ['OS!="mac" and OS!="win" and OS!="zos"', {
-            'cflags': [ '-fno-omit-frame-pointer' ],
-          }],
           ['OS=="linux"', {
             'conditions': [
               ['enable_pgo_generate=="true"', {

configure.py

@@ -706,6 +706,14 @@
     help='compile shared library for embedding node in another project. ' +
          '(This mode is not officially supported for regular applications)')
 
+parser.add_argument('--libdir',
+    action='store',
+    dest='libdir',
+    default='lib',
+    help='a directory to install the shared library into relative to the '
+         'prefix. This is a no-op if --shared is not specified. ' +
+         '(This mode is not officially supported for regular applications)')
+
 parser.add_argument('--without-v8-platform',
     action='store_true',
     dest='without_v8_platform',
@@ -1208,6 +1216,10 @@ def configure_node(o):
 
   o['variables']['want_separate_host_toolset'] = int(cross_compiling)
 
+  # Enable branch protection for arm64
+  if target_arch == 'arm64':
+    o['cflags']+=['-msign-return-address=all']
+
   if options.node_snapshot_main is not None:
     if options.shared:
       # This should be possible to fix, but we will need to refactor the
@@ -1319,6 +1331,7 @@ def configure_node(o):
   o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
 
   o['variables']['node_shared'] = b(options.shared)
+  o['variables']['libdir'] = options.libdir
   node_module_version = getmoduleversion.get_version()
 
   if options.dest_os == 'android':

deps/acorn/acorn/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 8.8.0 (2022-07-21)
+
+### Bug fixes
+
+Allow parentheses around spread args in destructuring object assignment.
+
+Fix an issue where the tree contained `directive` properties in when parsing with a language version that doesn't support them.
+
+### New features
+
+Support hashbang comments by default in ECMAScript 2023 and later.
+
+## 8.7.1 (2021-04-26)
+
+### Bug fixes
+
+Stop handling `"use strict"` directives in ECMAScript versions before 5.
+
+Fix an issue where duplicate quoted export names in `export *` syntax were incorrectly checked.
+
+Add missing type for `tokTypes`.
+
 ## 8.7.0 (2021-12-27)
 
 ### New features

deps/acorn/acorn/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2012-2020 by various contributors (see AUTHORS)
+Copyright (C) 2012-2022 by various contributors (see AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

deps/acorn/acorn/README.md

@@ -54,10 +54,10 @@ required):
 
 - **ecmaVersion**: Indicates the ECMAScript version to parse. Must be
   either 3, 5, 6 (or 2015), 7 (2016), 8 (2017), 9 (2018), 10 (2019),
-  11 (2020), 12 (2021), 13 (2022, partial support)
-  or `"latest"` (the latest the library supports). This influences
-  support for strict mode, the set of reserved words, and support
-  for new syntax features.
+  11 (2020), 12 (2021), 13 (2022), 14 (2023), or `"latest"` (the
+  latest the library supports). This influences support for strict
+  mode, the set of reserved words, and support for new syntax
+  features.
 
   **NOTE**: Only 'stage 4' (finalized) ECMAScript features are being
   implemented by Acorn. Other proposed new features must be
@@ -104,9 +104,9 @@ required):
 - **allowSuperOutsideMethod**: By default, `super` outside a method
   raises an error. Set this to `true` to accept such code.
 
-- **allowHashBang**: When this is enabled (off by default), if the
-  code starts with the characters `#!` (as in a shellscript), the
-  first line will be treated as a comment.
+- **allowHashBang**: When this is enabled, if the code starts with the
+  characters `#!` (as in a shellscript), the first line will be
+  treated as a comment. Defaults to true when `ecmaVersion` >= 2023.
 
 - **locations**: When `true`, each node has a `loc` object attached
   with `start` and `end` subobjects, each of which contains the
@@ -271,10 +271,3 @@ The utility spits out the syntax tree as JSON data.
 ## Existing plugins
 
  - [`acorn-jsx`](https://github.com/RReverser/acorn-jsx): Parse [Facebook JSX syntax extensions](https://github.com/facebook/jsx)
-
-Plugins for ECMAScript proposals:
-
- - [`acorn-stage3`](https://github.com/acornjs/acorn-stage3): Parse most stage 3 proposals, bundling:
-   - [`acorn-class-fields`](https://github.com/acornjs/acorn-class-fields): Parse [class fields proposal](https://github.com/tc39/proposal-class-fields)
-   - [`acorn-import-meta`](https://github.com/acornjs/acorn-import-meta): Parse [import.meta proposal](https://github.com/tc39/proposal-import-meta)
-   - [`acorn-private-methods`](https://github.com/acornjs/acorn-private-methods): parse [private methods, getters and setters proposal](https://github.com/tc39/proposal-private-methods)n

deps/acorn/acorn/bin/acorn

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-'use strict';
+"use strict"
 
-require('../dist/bin.js');
+require("../dist/bin.js")