Merge branch 'nodejs:main' into deps-version

Author: fasenderos

BUILDING.md

@@ -98,15 +98,15 @@ files.
 
 To download `SHASUMS256.txt` using `curl`:
 
-```console
-$ curl -O https://nodejs.org/dist/vx.y.z/SHASUMS256.txt
+```bash
+curl -O https://nodejs.org/dist/vx.y.z/SHASUMS256.txt
 ```
 
 To check that a downloaded file matches the checksum, run
 it through `sha256sum` with a command such as:
 
-```console
-$ grep node-vx.y.z.tar.gz SHASUMS256.txt | sha256sum -c -
+```bash
+grep node-vx.y.z.tar.gz SHASUMS256.txt | sha256sum -c -
 ```
 
 For Current and LTS, the GPG detached signature of `SHASUMS256.txt` is in
@@ -115,16 +115,16 @@ For Current and LTS, the GPG detached signature of `SHASUMS256.txt` is in
 [the GPG keys of individuals authorized to create releases](#release-keys). To
 import the keys:
 
-```console
-$ gpg --keyserver hkps://keys.openpgp.org --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C
+```bash
+gpg --keyserver hkps://keys.openpgp.org --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C
 ```
 
 See [Release keys](#release-keys) for a script to import active release keys.
 
 Next, download the `SHASUMS256.txt.sig` for the release:
 
-```console
-$ curl -O https://nodejs.org/dist/vx.y.z/SHASUMS256.txt.sig
+```bash
+curl -O https://nodejs.org/dist/vx.y.z/SHASUMS256.txt.sig
 ```
 
 Then use `gpg --verify SHASUMS256.txt.sig SHASUMS256.txt` to verify

README.md

@@ -10,7 +10,7 @@ extern "C" {
 
 #define UVWASI_VERSION_MAJOR 0
 #define UVWASI_VERSION_MINOR 0
-#define UVWASI_VERSION_PATCH 16
+#define UVWASI_VERSION_PATCH 18
 #define UVWASI_VERSION_HEX ((UVWASI_VERSION_MAJOR << 16) | \
  (UVWASI_VERSION_MINOR << 8) | \
  (UVWASI_VERSION_PATCH))

deps/uvwasi/include/uvwasi.h

@@ -24,6 +24,10 @@
 # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #endif
 
+#if !defined(S_ISFIFO) && defined(S_IFMT) && defined(S_IFIFO)
+# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+#endif
+
 
 uvwasi_errno_t uvwasi__translate_uv_error(int err) {
  switch (err) {

deps/uvwasi/src/uv_mapping.c

@@ -1122,7 +1122,7 @@ uvwasi_errno_t uvwasi_fd_prestat_get(uvwasi_t* uvwasi,
  }
 
  buf->pr_type = UVWASI_PREOPENTYPE_DIR;
- buf->u.dir.pr_name_len = strlen(wrap->path) + 1;
+ buf->u.dir.pr_name_len = strlen(wrap->path);
  err = UVWASI_ESUCCESS;
 exit:
  uv_mutex_unlock(&wrap->mutex);
@@ -1156,7 +1156,7 @@ uvwasi_errno_t uvwasi_fd_prestat_dir_name(uvwasi_t* uvwasi,
  goto exit;
  }
 
- size = strlen(wrap->path) + 1;
+ size = strlen(wrap->path);
  if (size > (size_t) path_len) {
  err = UVWASI_ENOBUFS;
  goto exit;

deps/uvwasi/src/uvwasi.c

@@ -532,8 +532,8 @@ filename to the `sources` array:
 Once the `binding.gyp` file is ready, the example addons can be configured and
 built using `node-gyp`:
 
-```console
-$ node-gyp configure build
+```bash
+node-gyp configure build
 ```
 
 ### Function arguments

doc/api/addons.md

@@ -184,8 +184,8 @@ Error: Access to this API has been restricted
 
 The process needs to have access to the `index.js` module:
 
-```console
-$ node --experimental-permission --allow-fs-read=/path/to/index.js index.js
+```bash
+node --experimental-permission --allow-fs-read=/path/to/index.js index.js
 ```
 
 ### `--allow-fs-write`
@@ -314,9 +314,9 @@ added: v10.12.0
 
 Print source-able bash completion script for Node.js.
 
-```console
-$ node --completion-bash > node_bash_completion
-$ source node_bash_completion
+```bash
+node --completion-bash > node_bash_completion
+source node_bash_completion
 ```
 
 ### `-C condition`, `--conditions=condition`
@@ -339,8 +339,8 @@ The default Node.js conditions of `"node"`, `"default"`, `"import"`, and
 
 For example, to run a module with "development" resolutions:
 
-```console
-$ node -C development app.js
+```bash
+node -C development app.js
 ```
 
 ### `--cpu-prof`
@@ -1854,8 +1854,8 @@ Use `--watch-path` to specify what paths to watch.
 This flag cannot be combined with
 `--check`, `--eval`, `--interactive`, or the REPL.
 
-```console
-$ node --watch index.js
+```bash
+node --watch index.js
 ```
 
 ### `--watch-path`
@@ -1877,8 +1877,8 @@ combination with `--watch`.
 This flag cannot be combined with
 `--check`, `--eval`, `--interactive`, `--test`, or the REPL.
 
-```console
-$ node --watch-path=./src --watch-path=./tests index.js
+```bash
+node --watch-path=./src --watch-path=./tests index.js
 ```
 
 This option is only supported on macOS and Windows.
@@ -1889,8 +1889,8 @@ when the option is used on a platform that does not support it.
 
 Disable the clearing of the console when watch mode restarts the process.
 
-```console
-$ node --watch --watch-preserve-output test.js
+```bash
+node --watch --watch-preserve-output test.js
 ```
 
 ### `--zero-fill-buffers`
@@ -2525,8 +2525,8 @@ garbage collection in an effort to free unused memory.
 On a machine with 2 GiB of memory, consider setting this to
 1536 (1.5 GiB) to leave some memory for other uses and avoid swapping.
 
-```console
-$ node --max-old-space-size=1536 index.js
+```bash
+node --max-old-space-size=1536 index.js
 ```
 
 ### `--max-semi-space-size=SIZE` (in megabytes)

doc/api/cli.md

@@ -3648,7 +3648,7 @@ const {
  generateKey,
 } = await import('node:crypto');
 
-generateKey('hmac', { length: 64 }, (err, key) => {
+generateKey('hmac', { length: 512 }, (err, key) => {
  if (err) throw err;
  console.log(key.export().toString('hex')); // 46e..........620
 });
@@ -3659,7 +3659,7 @@ const {
  generateKey,
 } = require('node:crypto');
 
-generateKey('hmac', { length: 64 }, (err, key) => {
+generateKey('hmac', { length: 512 }, (err, key) => {
  if (err) throw err;
  console.log(key.export().toString('hex')); // 46e..........620
 });
@@ -3922,7 +3922,7 @@ const {
  generateKeySync,
 } = await import('node:crypto');
 
-const key = generateKeySync('hmac', { length: 64 });
+const key = generateKeySync('hmac', { length: 512 });
 console.log(key.export().toString('hex')); // e89..........41e
 ```
 
@@ -3931,7 +3931,7 @@ const {
  generateKeySync,
 } = require('node:crypto');
 
-const key = generateKeySync('hmac', { length: 64 });
+const key = generateKeySync('hmac', { length: 512 });
 console.log(key.export().toString('hex')); // e89..........41e
 ```
 

doc/api/crypto.md

@@ -711,7 +711,7 @@ all `import` calls. They won't apply to `require` calls; those still follow
 
 Loaders follow the pattern of `--require`:
 
-```console
+```bash
 node \
  --experimental-loader unpkg \
  --experimental-loader http-to-https \

doc/api/esm.md

@@ -580,7 +580,8 @@ typedef enum {
  napi_arraybuffer_expected,
  napi_detachable_arraybuffer_expected,
  napi_would_deadlock, /* unused */
- napi_no_external_buffers_allowed
+ napi_no_external_buffers_allowed,
+ napi_cannot_run_js
 } napi_status;
 ```
 
@@ -814,6 +815,18 @@ typedef void (*napi_finalize)(napi_env env,
 Unless for reasons discussed in [Object Lifetime Management][], creating a
 handle and/or callback scope inside the function body is not necessary.
 
+Since these functions may be called while the JavaScript engine is in a state
+where it cannot execute JavaScript code, some Node-API calls may return
+`napi_pending_exception` even when there is no exception pending.
+
+Change History:
+
+* experimental (`NAPI_EXPERIMENTAL` is defined):
+
+ Node-API calls made from a finalizer will return `napi_cannot_run_js` when
+ the JavaScript engine is unable to execute JavaScript, and will return
+ `napi_exception_pending` if there is a pending exception.
+
 #### `napi_async_execute_callback`
 
 <!-- YAML
@@ -1952,11 +1965,11 @@ from [`napi_add_async_cleanup_hook`][].
 The Node.js environment may be torn down at an arbitrary time as soon as
 possible with JavaScript execution disallowed, like on the request of
 [`worker.terminate()`][]. When the environment is being torn down, the
-registered `napi_finalize` callbacks of JavaScript objects, Thread-safe
+registered `napi_finalize` callbacks of JavaScript objects, thread-safe
 functions and environment instance data are invoked immediately and
 independently.
 
-The invocation of `napi_finalize` callbacks are scheduled after the manually
+The invocation of `napi_finalize` callbacks is scheduled after the manually
 registered cleanup hooks. In order to ensure a proper order of addon
 finalization during environment shutdown to avoid use-after-free in the
 `napi_finalize` callback, addons should register a cleanup hook with