Merge branch 'nodejs:main' into fix-56692

Author: wooffie

.github/workflows/create-release-proposal.yml

@@ -71,9 +71,11 @@ jobs:
           git config --local user.name "Node.js GitHub Bot"
 
       - name: Start git node release prepare
+        # `git update-index` tells git to ignore future changes to the `.sh` file,
+        # `|| true` is there to ignore the error if such file doesn't exist yet.
         # The curl command is to make sure we run the version of the script corresponding to the current workflow.
         run: |
-          git update-index --assume-unchanged tools/actions/create-release-proposal.sh
+          git update-index --assume-unchanged tools/actions/create-release-proposal.sh || true
           curl -fsSLo tools/actions/create-release-proposal.sh https://github.com/${GITHUB_REPOSITORY}/raw/${GITHUB_SHA}/tools/actions/create-release-proposal.sh
           ./tools/actions/create-release-proposal.sh "${RELEASE_DATE}" "${RELEASE_LINE}" "${GITHUB_ACTOR}"
         env:

.github/workflows/tools.yml

@@ -284,6 +284,10 @@ jobs:
               tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
               rm temp-output
     steps:
+      - name: Setup Git config
+        run: |
+           git config --global user.name "Node.js GitHub Bot"
+           git config --global user.email "[email protected]"
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         if: github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id
         with:
@@ -301,17 +305,15 @@ jobs:
         if: env.COMMIT_MSG == '' && (github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id)
         run: |
           echo "COMMIT_MSG=${{ matrix.subsystem }}: update ${{ matrix.id }} to ${{ env.NEW_VERSION }}" >> "$GITHUB_ENV"
-      - uses: gr2m/create-or-update-pull-request-action@86ec1766034c8173518f61d2075cc2a173fb8c97  # v1.9.4
+      - uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f  # v7.0.5
         if: github.event_name == 'schedule' || inputs.id == 'all' || inputs.id == matrix.id
         # Creates a PR or update the Action's existing PR, or
         # no-op if the base branch is already up-to-date.
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}
         with:
-          author: Node.js GitHub Bot <[email protected]>
-          body: This is an automated update of ${{ matrix.id }} to ${{ env.NEW_VERSION }}.
+          token: ${{ secrets.GH_USER_TOKEN }}
           branch: actions/tools-update-${{ matrix.id }}  # Custom branch *just* for this Action.
+          delete-branch: true
           commit-message: ${{ env.COMMIT_MSG }}
           labels: ${{ matrix.label }}
           title: '${{ matrix.subsystem }}: update ${{ matrix.id }} to ${{ env.NEW_VERSION }}'
-          update-pull-request-title-and-body: true
+          body: This is an automated update of ${{ matrix.id }} to ${{ env.NEW_VERSION }}.

android-configure

@@ -9,7 +9,6 @@ command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
 command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
 command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
 command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
-command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
 command -v python3 >/dev/null && exec python3 "$0" "$@"
 exec python "$0" "$@"
 ''' "$0" "$@"
@@ -23,7 +22,7 @@ except ImportError:
   from distutils.spawn import find_executable as which
 
 print('Node.js android configure: Found Python {}.{}.{}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8))
+acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9))
 if sys.version_info[:2] in acceptable_pythons:
   import android_configure
 else:

benchmark/es/error-stack.js

@@ -2,13 +2,19 @@
 
 const common = require('../common.js');
 const modPath = require.resolve('../fixtures/simple-error-stack.js');
+const nodeModulePath = require.resolve('../fixtures/node_modules/error-stack/simple-error-stack.js');
+const Module = require('node:module');
 
 const bench = common.createBenchmark(main, {
-  method: ['without-sourcemap', 'sourcemap'],
+  method: [
+    'without-sourcemap',
+    'sourcemap',
+    'node-modules-without-sourcemap',
+    'node-module-sourcemap'],
   n: [1e5],
 });
 
-function runN(n) {
+function runN(n, modPath) {
   delete require.cache[modPath];
   const mod = require(modPath);
   bench.start();
@@ -22,11 +28,23 @@ function main({ n, method }) {
   switch (method) {
     case 'without-sourcemap':
       process.setSourceMapsEnabled(false);
-      runN(n);
+      runN(n, modPath);
       break;
     case 'sourcemap':
       process.setSourceMapsEnabled(true);
-      runN(n);
+      runN(n, modPath);
+      break;
+    case 'node-modules-without-sourcemap':
+      Module.setSourceMapsSupport(true, {
+        nodeModules: false,
+      });
+      runN(n, nodeModulePath);
+      break;
+    case 'node-modules-sourcemap':
+      Module.setSourceMapsSupport(true, {
+        nodeModules: true,
+      });
+      runN(n, nodeModulePath);
       break;
     default:
       throw new Error(`Unexpected method "${method}"`);

benchmark/fixtures/node_modules/error-stack/simple-error-stack.js

@@ -9,7 +9,6 @@ command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
 command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
 command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
 command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
-command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
 command -v python3 >/dev/null && exec python3 "$0" "$@"
 exec python "$0" "$@"
 ''' "$0" "$@"
@@ -23,7 +22,7 @@ except ImportError:
   from distutils.spawn import find_executable as which
 
 print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8))
+acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9))
 if sys.version_info[:2] in acceptable_pythons:
   import configure
 else:

benchmark/fixtures/node_modules/error-stack/simple-error-stack.ts

@@ -2143,7 +2143,7 @@ def make_bin_override():
   if sys.platform == 'win32':
     raise Exception('make_bin_override should not be called on win32.')
   # If the system python is not the python we are running (which should be
-  # python 3.8+), then create a directory with a symlink called `python` to our
+  # python 3.9+), then create a directory with a symlink called `python` to our
   # sys.executable. This directory will be prefixed to the PATH, so that
   # other tools that shell out to `python` will use the appropriate python
 

configure

@@ -909,11 +909,12 @@ weakSet2.add(obj);
 
 // Comparing different instances fails, even with same contents
 assert.deepStrictEqual(weakSet1, weakSet2);
-// AssertionError: Expected inputs to be strictly deep-equal:
+// AssertionError: Values have same structure but are not reference-equal:
 // + actual - expected
 //
-// + WeakSet { <items unknown> }
-// - WeakSet { <items unknown> }
+// WeakSet {
+//   <items unknown>
+// }
 
 // Comparing the same instance to itself succeeds
 assert.deepStrictEqual(weakSet1, weakSet1);
@@ -1018,11 +1019,12 @@ weakSet2.add(obj);
 
 // Comparing different instances fails, even with same contents
 assert.deepStrictEqual(weakSet1, weakSet2);
-// AssertionError: Expected inputs to be strictly deep-equal:
+// AssertionError: Values have same structure but are not reference-equal:
 // + actual - expected
 //
-// + WeakSet { <items unknown> }
-// - WeakSet { <items unknown> }
+// WeakSet {
+//   <items unknown>
+// }
 
 // Comparing the same instance to itself succeeds
 assert.deepStrictEqual(weakSet1, weakSet1);

configure.py

@@ -943,6 +943,13 @@ Previously gated the entire `import.meta.resolve` feature.
 <!-- YAML
 added: v8.8.0
 changes:
+  - version:
+    - v23.6.1
+    - v22.13.1
+    - v20.18.2
+    pr-url: https://github.com/nodejs-private/node-private/pull/629
+    description: Using this feature with the permission model enabled requires
+                 passing `--allow-worker`.
   - version: v12.11.1
     pr-url: https://github.com/nodejs/node/pull/29752
     description: This flag was renamed from `--loader` to
@@ -956,6 +963,8 @@ changes:
 Specify the `module` containing exported [module customization hooks][].
 `module` may be any string accepted as an [`import` specifier][].
 
+This feature requires `--allow-worker` if used with the [Permission Model][].
+
 ### `--experimental-network-inspection`
 
 <!-- YAML
@@ -1055,6 +1064,14 @@ report is not generated. See the documentation on
 added:
   - v22.3.0
   - v20.18.0
+changes:
+  - version:
+    - v23.6.1
+    - v22.13.1
+    - v20.18.2
+    pr-url: https://github.com/nodejs-private/node-private/pull/629
+    description: Using this feature with the permission model enabled requires
+                 passing `--allow-worker`.
 -->
 
 > Stability: 1.0 - Early development