Merge branch 'master' into darrenbutts/PLA-1580/ignore-scripts-npmrc

Author: dbutts29

.github/workflows/ci.yml

@@ -13,8 +13,14 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-22.04
+    timeout-minutes: 20
+    # `latest` is a floating, non-LTS target used as a forward-compat canary;
+    # let it warn without blocking PRs or (with fail-fast off) cancelling the
+    # supported legs.
+    continue-on-error: ${{ matrix.node == 'latest' }}
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           - node: 18
@@ -62,10 +68,22 @@ jobs:
       - name: Run server tests
         run: npm run test:server
 
+      # Browser tests launch chromium; the harness Node version is irrelevant to
+      # browser coverage, so run them only on stable Node. The chromium download
+      # in `playwright install` stalls indefinitely on Node 24/latest.
       - name: Install Playwright browsers
-        run: npx playwright install chromium
+        if: matrix.node != 24 && matrix.node != 'latest'
+        # The chromium download can stall; cap each attempt and retry so a
+        # transient stall doesn't hang the job until the timeout.
+        run: |
+          for i in 1 2 3; do
+            timeout 300 npx playwright install chromium && exit 0
+            echo "playwright install attempt $i stalled or failed; retrying"
+          done
+          exit 1
 
       - name: Run browser tests (Web Test Runner)
+        if: matrix.node != 24 && matrix.node != 'latest'
         run: npm run test:wtr
 
       - name: Validate examples

package-lock.json

@@ -125,7 +125,8 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.46.4",
-    "undici": "^6.23.0",
+    "undici": "^7.27.2",
+    "undici-v6": "npm:undici@^6.23.0",
     "webpack": "^5.98.0",
     "webpack-cli": "^6.0.1",
     "webpack-node-externals": "^3.0.0"

package.json

@@ -6,7 +6,16 @@ import { URL } from 'url';
 import { expect } from 'chai';
 import nock from 'nock';
 import sinon from 'sinon';
-import { MockAgent, getGlobalDispatcher, setGlobalDispatcher } from 'undici';
+// MockAgent only intercepts the built-in `fetch` when its global-dispatcher
+// symbol matches the running Node's bundled undici: undici 6 (symbol `.1`) for
+// Node 18-24, undici 7 (symbol `.2`) for the undici-7-bundled `latest` leg.
+// undici 7 also requires Node 20+ (it references the global `File`), so Node 18
+// must stay on undici 6 (the `undici-v6` alias). Dynamic import so only the
+// selected major is loaded (statically importing undici 7 on Node 18 would
+// crash at load time).
+const nodeMajor = parseInt(process.versions.node.split('.')[0], 10);
+const { MockAgent, getGlobalDispatcher, setGlobalDispatcher } =
+  nodeMajor >= 20 ? await import('undici') : await import('undici-v6');
 
 import Rollbar from '../src/server/rollbar.js';
 import { mergeOptions } from '../src/server/telemetry/urlHelpers.js';