Merge branch 'main' into renovate/npm-run-all2-8.x

serhalp · web-flow · commit 0daf3204f57b · 2026-02-25T10:02:44.000-05:00
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -7,6 +7,12 @@ on:
 jobs:
   e2e:
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: ['20.6.1', '24']
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -18,10 +24,10 @@ jobs:
           private-key: ${{ secrets.TOKENS_PRIVATE_KEY }}
           app-id: ${{ secrets.TOKENS_APP_ID }}
 
-      - name: Node
+      - name: Node ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: ${{ matrix.node-version }}
 
       - run: corepack enable
       - name: Install Deno
@@ -42,6 +48,6 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: blob-report
+          name: blob-report-${{ matrix.node-version }}
           path: blob-report/
           retention-days: 30
diff --git a/.github/workflows/publint.yml b/.github/workflows/publint.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: lts/*
+          node-version: 24
           cache: 'pnpm'
       - name: Install Deno
         uses: denoland/setup-deno@v2
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -24,7 +24,7 @@ jobs:
         if: ${{ steps.release.outputs.releases_created }}
       - uses: actions/setup-node@v4
         with:
-          check-latest: true
+          node-version: 24
           registry-url: 'https://registry.npmjs.org'
         if: ${{ steps.release.outputs.releases_created }}
       - name: Install Deno
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,16 +10,15 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test:
+  lint:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
       - name: Installing Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
-          check-latest: true
+          node-version: 24
       - run: corepack enable
       - name: Install Deno
         uses: denoland/setup-deno@v2
@@ -34,7 +33,30 @@ jobs:
         run: pnpm run format:check
       - name: Typecheck
         run: pnpm run typecheck
-        if: always()
+
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: ['20.6.1', '24']
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Installing Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: corepack enable
+      - name: Install Deno
+        uses: denoland/setup-deno@v2
+        with:
+          # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/8ff162649f76a9586dd7593198c0fa798dac3629/packages/edge-bundler/node/bridge.ts#L22
+          deno-version: v2.4.2
+      - name: Install
+        run: pnpm install
+      - name: Build
+        run: pnpm run build:packages
       - name: Unit Tests
         run: pnpm run test:unit
-        if: always()
diff --git a/demos/vite-edge/package.json b/demos/vite-edge/package.json
@@ -38,6 +38,6 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.6.1"
   }
 }
diff --git a/demos/vite-edge/tsconfig.json b/demos/vite-edge/tsconfig.json
@@ -1,14 +1,14 @@
 {
   "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "netlify-edge-plugin.ts"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
-    "target": "ES2022",
+    "target": "ES2023",
     "strict": true,
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/demos/vite-functions/package.json b/demos/vite-functions/package.json
@@ -36,6 +36,6 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.6.1"
   }
 }
diff --git a/demos/vite-functions/tsconfig.json b/demos/vite-functions/tsconfig.json
@@ -1,14 +1,14 @@
 {
   "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "netlify-edge-plugin.ts"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
-    "target": "ES2022",
+    "target": "ES2023",
     "strict": true,
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "isbot": "^5.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.6.1"
   },
   "packageManager": "pnpm@8.15.9+sha256.daa27a0b541bc635323ff96c2ded995467ff9fe6d69ff67021558aa9ad9dcc36"
 }
diff --git a/packages/remix-adapter/package.json b/packages/remix-adapter/package.json
@@ -40,7 +40,7 @@
   ],
   "scripts": {
     "prepack": "pnpm run build",
-    "build": "tsup-node src/index.ts src/plugin.ts --format esm,cjs --dts --target node16 --clean",
+    "build": "tsup-node src/index.ts src/plugin.ts --format esm,cjs --dts --target node20 --clean",
     "build:watch": "pnpm run build --watch",
     "publint": "publint --strict"
   },
@@ -77,7 +77,7 @@
     "vite": ">=5.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.6.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/remix-edge-adapter/package.json b/packages/remix-edge-adapter/package.json
@@ -41,7 +41,7 @@
   "scripts": {
     "prepack": "pnpm run build",
     "build": "pnpm run build:src && pnpm run build:types",
-    "build:src": "tsup-node src/index.ts src/plugin.ts --format esm,cjs --dts --target node16 --clean",
+    "build:src": "tsup-node src/index.ts src/plugin.ts --format esm,cjs --dts --target node20 --clean",
     "build:types": "deno types > deno.d.ts",
     "build:watch": "pnpm run build:src --watch",
     "publint": "publint --strict"
@@ -79,7 +79,7 @@
     "vite": ">=5.0.0"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.6.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/remix-runtime/package.json b/packages/remix-runtime/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "prepack": "pnpm run build",
-    "build": "tsup-node src/index.ts --format esm,cjs --dts --target node16 --clean",
+    "build": "tsup-node src/index.ts --format esm,cjs --dts --target node20 --clean",
     "build:watch": "pnpm run build --watch",
     "publint": "publint --strict"
   },
@@ -41,7 +41,7 @@
     "@remix-run/server-runtime": "^2.9.2"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.6.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/vite-plugin-react-router/package.json b/packages/vite-plugin-react-router/package.json
@@ -77,7 +77,7 @@
     "vite": ">=5.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.6.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/vite-plugin-react-router/tsup.config.ts b/packages/vite-plugin-react-router/tsup.config.ts
@@ -10,7 +10,7 @@ export default defineConfig([
     },
     format: ['esm'],
     dts: true,
-    target: 'node18',
+    target: 'node20',
     // Can't use `clean: true` because of this bug: https://github.com/egoist/tsup/issues/670.
     // TODO(serhalp): Switch to tsdown; tsup is no longer maintained anyway.
     clean: false,
@@ -20,7 +20,7 @@ export default defineConfig([
     entry: ['src/index.ts'],
     format: ['cjs'],
     dts: true,
-    target: 'node18',
+    target: 'node20',
     clean: false,
   },
 ])
diff --git a/tests/e2e/fixtures/edge-site/package.json b/tests/e2e/fixtures/edge-site/package.json
@@ -38,6 +38,6 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.6.1"
   }
 }
diff --git a/tests/e2e/fixtures/edge-site/tsconfig.json b/tests/e2e/fixtures/edge-site/tsconfig.json
@@ -1,14 +1,14 @@
 {
   "include": ["env.d.ts", "**/*.ts", "**/*.tsx", "netlify-edge-plugin.ts"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
     "module": "ESNext",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
-    "target": "ES2022",
+    "target": "ES2023",
     "strict": true,
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/tests/e2e/fixtures/hydrogen-vite-site-no-entrypoint/package.json b/tests/e2e/fixtures/hydrogen-vite-site-no-entrypoint/package.json
@@ -43,6 +43,6 @@
     "vite-tsconfig-paths": "^5.0.1"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.6.1"
   }
 }
diff --git a/tests/e2e/fixtures/hydrogen-vite-site-no-entrypoint/tsconfig.json b/tests/e2e/fixtures/hydrogen-vite-site-no-entrypoint/tsconfig.json
@@ -1,14 +1,14 @@
 {
   "include": ["./**/*.d.ts", "./**/*.ts", "./**/*.tsx"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "module": "ES2022",
-    "target": "ES2022",
+    "target": "ES2023",
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
diff --git a/tests/e2e/fixtures/hydrogen-vite-site/package.json b/tests/e2e/fixtures/hydrogen-vite-site/package.json
@@ -43,6 +43,6 @@
     "vite-tsconfig-paths": "^5.0.1"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.6.1"
   }
 }
diff --git a/tests/e2e/fixtures/hydrogen-vite-site/tsconfig.json b/tests/e2e/fixtures/hydrogen-vite-site/tsconfig.json
@@ -1,14 +1,14 @@
 {
   "include": ["./**/*.d.ts", "./**/*.ts", "./**/*.tsx"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "module": "ES2022",
-    "target": "ES2022",
+    "target": "ES2023",
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
diff --git a/tests/e2e/fixtures/react-router-edge-basepath/tsconfig.json b/tests/e2e/fixtures/react-router-edge-basepath/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "include": ["**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "types": ["node", "vite/client"],
-    "target": "ES2022",
+    "target": "ES2023",
     "module": "ES2022",
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
diff --git a/tests/e2e/fixtures/react-router-edge-site/tsconfig.json b/tests/e2e/fixtures/react-router-edge-site/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "include": ["**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "types": ["node", "vite/client"],
-    "target": "ES2022",
+    "target": "ES2023",
     "module": "ES2022",
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
diff --git a/tests/e2e/fixtures/react-router-edge-v8-middleware/tsconfig.json b/tests/e2e/fixtures/react-router-edge-v8-middleware/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "include": ["**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "types": ["node", "vite/client"],
-    "target": "ES2022",
+    "target": "ES2023",
     "module": "ES2022",
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
diff --git a/tests/e2e/fixtures/react-router-serverless-site/tsconfig.json b/tests/e2e/fixtures/react-router-serverless-site/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "include": ["**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "types": ["node", "vite/client"],
-    "target": "ES2022",
+    "target": "ES2023",
     "module": "ES2022",
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
diff --git a/tests/e2e/fixtures/react-router-serverless-v8-middleware/tsconfig.json b/tests/e2e/fixtures/react-router-serverless-v8-middleware/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "include": ["**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2023"],
     "types": ["node", "vite/client"],
-    "target": "ES2022",
+    "target": "ES2023",
     "module": "ES2022",
     "moduleResolution": "bundler",
     "jsx": "react-jsx",
diff --git a/tests/e2e/fixtures/serverless-site/package.json b/tests/e2e/fixtures/serverless-site/package.json
@@ -38,6 +38,6 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.6.1"
   }
 }
diff --git a/tests/e2e/fixtures/serverless-site/tsconfig.json b/tests/e2e/fixtures/serverless-site/tsconfig.json
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@`
`38`	`38`	`"vite-tsconfig-paths": "^5.1.4"`
`39`	`39`	`},`
`40`	`40`	`"engines": {`
`41`		`- "node": ">=18.0.0"`
	`41`	`+ "node": ">=20.6.1"`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@`
`36`	`36`	`"vite-tsconfig-paths": "^5.1.4"`
`37`	`37`	`},`
`38`	`38`	`"engines": {`
`39`		`- "node": ">=18.0.0"`
	`39`	`+ "node": ">=20.6.1"`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@`
`60`	`60`	`"isbot": "^5.0.0"`
`61`	`61`	`},`
`62`	`62`	`"engines": {`
`63`		`- "node": ">=18"`
	`63`	`+ "node": ">=20.6.1"`
`64`	`64`	`},`
`65`	`65`	`"packageManager": "pnpm@8.15.9+sha256.daa27a0b541bc635323ff96c2ded995467ff9fe6d69ff67021558aa9ad9dcc36"`
`66`	`66`	`}`