[pull] main from nodejs:main

.devcontainer/base/devcontainer.json

@@ -7,5 +7,6 @@
   "mounts": [
     "source=node-devcontainer-cache,target=/home/developer/nodejs/node/out,type=volume"
   ],
-  "postCreateCommand": "git restore-mtime"
+  "postCreateCommand": "git restore-mtime",
+  "postStartCommand": "cp /home/developer/envrc/static-libs.envrc /home/developer/nodejs/node/.envrc && direnv allow /home/developer/nodejs/node"
 }

.github/workflows/linters.yml

@@ -153,7 +153,7 @@ jobs:
       - name: Lint Nix files
         run: |
           nix-shell -I nixpkgs=./tools/nix/pkgs.nix -p 'nixfmt-tree' --run '
-            treefmt --quiet --fail-on-change
+            treefmt --quiet --ci
           ' || git --no-pager diff --exit-code
 
   lint-py:

CHANGELOG.md

@@ -41,7 +41,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V25.md#25.3.0">25.3.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V25.md#25.4.0">25.4.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V25.md#25.3.0">25.3.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V25.md#25.2.1">25.2.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V25.md#25.2.0">25.2.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V25.md#25.1.0">25.1.0</a><br/>

configure.py

@@ -1886,11 +1886,6 @@ def configure_library(lib, output, pkgname=None):
       output['libraries'] += pkg_libs.split()
 
 
-def configure_rust(o, configs):
-  set_configuration_variable(configs, 'cargo_build_mode', release='release', debug='debug')
-  set_configuration_variable(configs, 'cargo_build_flags', release=['--release'], debug=[])
-
-
 def configure_v8(o, configs):
   set_configuration_variable(configs, 'v8_enable_v8_checks', release=1, debug=0)
 
@@ -2491,7 +2486,6 @@ def make_bin_override():
 configure_static(output)
 configure_inspector(output)
 configure_section_file(output)
-configure_rust(output, configurations)
 
 # remove builtins that have been disabled
 if options.without_amaro:

deps/crates/crates.gyp

@@ -1,8 +1,20 @@
 {
   'variables': {
     'cargo_vendor_dir': './vendor',
-    'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/>(cargo_build_mode)/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)',
   },
+  'conditions': [
+    ['build_type == "Release"', {
+      'variables': {
+        'cargo_build_flags': ['--release'],
+        'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/release/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)',
+      },
+    }, {
+      'variables': {
+        'cargo_build_flags': [],
+        'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/debug/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)',
+      },
+    }]
+  ],
   'targets': [
     {
       'target_name': 'node_crates',
@@ -38,7 +50,7 @@
           'action': [
             'cargo',
             'rustc',
-            '>@(cargo_build_flags)',
+            '<@(cargo_build_flags)',
             '--frozen',
             '--target-dir',
             '<(SHARED_INTERMEDIATE_DIR)'

doc/api/cli.md

@@ -407,7 +407,7 @@ Error: Access to this API has been restricted
 added: v18.8.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60954
     description: The snapshot building process is no longer experimental.
 -->
@@ -475,7 +475,7 @@ added:
   - v20.12.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60954
     description: The snapshot building process is no longer experimental.
 -->
@@ -1495,7 +1495,7 @@ added:
   - v14.18.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60956
     description: The flag is no longer experimental.
 -->
@@ -1906,7 +1906,7 @@ added:
   - v20.17.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60959
     description: The flag was renamed from `--no-experimental-require-module` to
                  `--no-require-module`, with the former marked as legacy.
@@ -2009,11 +2009,11 @@ added:
   - v20.17.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60959
     description: This flag is no longer experimental.
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60959
     description: This flag was renamed from `--no-experimental-require-module`
                  to `--no-require-module`.
@@ -3420,7 +3420,7 @@ Any other value will result in colorized output being disabled.
 <!-- YAML
 added: v22.1.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60971
     description: This feature is no longer experimental.
 -->

doc/api/crypto.md

@@ -4531,7 +4531,7 @@ added:
  - v21.7.0
  - v20.12.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60994
     description: This API is no longer experimental.
   - version: v24.4.0

doc/api/deprecations.md

@@ -786,7 +786,7 @@ The [`domain`][] module is deprecated and should not be used.
 
 <!-- YAML
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60214
     description: Deprecation revoked.
   - version:

doc/api/events.md

@@ -1627,10 +1627,10 @@ See how to write a custom [rejection handler][rejection].
 <!-- YAML
 added: v0.9.12
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60214
     description: Now accepts EventTarget arguments.
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60214
     description: Deprecation revoked.
   - version: v3.2.0

doc/api/http.md

@@ -4367,7 +4367,7 @@ Set the maximum number of idle HTTP parsers.
 
 <!-- YAML
 added:
-  - REPLACEME
+  - v25.4.0
 -->
 
 * `proxyEnv` {Object} An object containing proxy configuration. This accepts the

doc/api/module.md

@@ -224,7 +224,7 @@ added:
   - v22.15.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60960
     description: Synchronous and in-thread hooks are now release candidate.
 -->
@@ -460,7 +460,7 @@ separately if the same base directory is used to persist the cache, so they can
 <!-- YAML
 added: v22.8.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60971
     description: This feature is no longer experimental.
 -->
@@ -515,7 +515,7 @@ The following constants are returned as the `status` field in the object returne
 <!-- YAML
 added: v22.8.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60971
     description: This feature is no longer experimental.
   - version:
@@ -575,7 +575,7 @@ added:
  - v23.0.0
  - v22.10.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60971
     description: This feature is no longer experimental.
 -->
@@ -591,7 +591,7 @@ interfere with the actual operation of the application.
 <!-- YAML
 added: v22.8.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60971
     description: This feature is no longer experimental.
 -->
@@ -607,7 +607,7 @@ changes:
 added: v8.8.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60960
     description: Synchronous and in-thread hooks are now release candidate.
   - version:

doc/api/modules.md

@@ -176,7 +176,7 @@ added:
   - v20.17.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60959
     description: This feature is no longer experimental.
   - version:

doc/api/n-api.md

@@ -2288,7 +2288,7 @@ object such that no properties can be set on it, and no prototype.
 
 <!-- YAML
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/58879
     description: Added `napi_float16_array` for Float16Array support.
 -->
@@ -2817,7 +2817,7 @@ exceeds the size of the `ArrayBuffer`, a `RangeError` exception is raised.
 added: v8.3.0
 napiVersion: 1
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60473
     description: Added support for `SharedArrayBuffer`.
 -->
@@ -5062,7 +5062,7 @@ of the ECMA-262 specification.
 #### `node_api_set_prototype`
 
 <!-- YAML
-added: REPLACEME
+added: v25.4.0
 -->
 
 > Stability: 1 - Experimental

doc/api/packages.md

@@ -528,7 +528,7 @@ added:
   - v14.6.0
   - v12.19.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60864
     description: Allow subpath imports that start with `#/`.
 -->

doc/api/sqlite.md

@@ -453,13 +453,23 @@ Opens the database specified in the `path` argument of the `DatabaseSync`
 constructor. This method should only be used when the database is not opened via
 the constructor. An exception is thrown if the database is already open.
 
-### `database.prepare(sql)`
+### `database.prepare(sql[, options])`
 
 <!-- YAML
 added: v22.5.0
 -->
 
 * `sql` {string} A SQL string to compile to a prepared statement.
+* `options` {Object} Optional configuration for the prepared statement.
+  * `readBigInts` {boolean} If `true`, integer fields are read as `BigInt`s.
+    **Default:** inherited from database options or `false`.
+  * `returnArrays` {boolean} If `true`, results are returned as arrays.
+    **Default:** inherited from database options or `false`.
+  * `allowBareNamedParameters` {boolean} If `true`, allows binding named
+    parameters without the prefix character. **Default:** inherited from
+    database options or `true`.
+  * `allowUnknownNamedParameters` {boolean} If `true`, unknown named parameters
+    are ignored. **Default:** inherited from database options or `false`.
 * Returns: {StatementSync} The prepared statement.
 
 Compiles a SQL statement into a [prepared statement][]. This method is a wrapper
@@ -1089,7 +1099,7 @@ called directly.
 <!-- YAML
 added: v24.9.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60246
     description: Changed from a method to a getter.
 -->

doc/api/stream.md

@@ -3194,7 +3194,7 @@ Returns whether the stream has been read from or cancelled.
 <!-- YAML
 added: v17.0.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/58664
     description: Add 'type' option to specify 'bytes'.
   - version:
@@ -3398,7 +3398,7 @@ duplex.once('readable', () => console.log('readable', duplex.read()));
 <!-- YAML
 added: v17.0.0
 changes:
-  - version: REPLACEME
+  - version: v25.4.0
     pr-url: https://github.com/nodejs/node/pull/58664
     description: Add 'type' option to specify 'bytes'.
   - version:

doc/api/util.md

@@ -92,7 +92,7 @@ callbackFunction((err, ret) => {
 ## `util.convertProcessSignalToExitCode(signalCode)`
 
 <!-- YAML
-added: REPLACEME
+added: v25.4.0
 -->
 
 * `signalCode` {string} A signal name (e.g., `'SIGTERM'`, `'SIGKILL'`).

doc/api/v8.md

@@ -382,7 +382,7 @@ added:
   - v20.13.0
 changes:
   - version:
-    - REPLACEME
+    - v25.4.0
     pr-url: https://github.com/nodejs/node/pull/60957
     description: This API is no longer experimental.
 -->