remix-run · jacob-ebey · Jun 16, 2025 · Jun 13, 2025 · Jun 13, 2025 · Jun 14, 2025
diff --git a/.github/workflows/integration-full.yml b/.github/workflows/integration-full.yml
@@ -31,7 +31,7 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: "[20, 22]"
+      node_version: "[22, 24]"
       browser: '["chromium", "firefox"]'
 
   integration-windows:
@@ -40,7 +40,7 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "windows-latest"
-      node_version: "[20, 22]"
+      node_version: "[22, 24]"
       browser: '["msedge"]'
 
   integration-macos:
@@ -49,5 +49,5 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "macos-latest"
-      node_version: "[20, 22]"
+      node_version: "[22, 24]"
       browser: '["webkit"]'
diff --git a/.github/workflows/integration-pr-ubuntu.yml b/.github/workflows/integration-pr-ubuntu.yml
@@ -31,5 +31,5 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: "[22]"
+      node_version: "[24]"
       browser: '["chromium"]'
diff --git a/.github/workflows/integration-pr-windows-macos.yml b/.github/workflows/integration-pr-windows-macos.yml
@@ -21,24 +21,24 @@ jobs:
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: "[22]"
+      node_version: "[24]"
       browser: '["firefox"]'
 
   integration-msedge:
     name: "👀 Integration Test"
     if: github.repository == 'remix-run/react-router'
     uses: ./.github/workflows/shared-integration.yml
     with:
-      os: "windows-latest"
-      node_version: "[22]"
+      os: "windows-2025"
+      node_version: "[24]"
       browser: '["msedge"]'
-      timeout: 60
+      timeout: 120
 
   integration-webkit:
     name: "👀 Integration Test"
     if: github.repository == 'remix-run/react-router'
     uses: ./.github/workflows/shared-integration.yml
     with:
       os: "macos-latest"
-      node_version: "[22]"
+      node_version: "[24]"
       browser: '["webkit"]'
diff --git a/.github/workflows/shared-integration.yml b/.github/workflows/shared-integration.yml
@@ -9,7 +9,7 @@ on:
       node_version:
         required: true
         # this is limited to string | boolean | number (https://github.community/t/can-action-inputs-be-arrays/16457)
-        # but we want to pass an array (node_version: "[20, 22]"),
+        # but we want to pass an array (node_version: "[22, 24]"),
         # so we'll need to manually stringify it for now
         type: string
       browser:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,8 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 20
           - 22
+          - 24
 
     runs-on: ubuntu-latest
 

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20
+22
diff --git a/integration/fetcher-test.ts b/integration/fetcher-test.ts
@@ -247,7 +247,7 @@ test.describe("useFetcher", () => {
       // a <pre> but Edge puts it in some weird code editor markup:
       // <body data-code-mirror="Readonly code editor.">
       //   <div hidden="true">"LUNCH"</div>
-      expect(await app.getHtml()).toContain(LUNCH);
+      await page.getByText(LUNCH);
     });
 
     test("Form can hit an action", async ({ page }) => {
@@ -264,7 +264,7 @@ test.describe("useFetcher", () => {
       // a <pre> but Edge puts it in some weird code editor markup:
       // <body data-code-mirror="Readonly code editor.">
       //   <div hidden="true">"LUNCH"</div>
-      expect(await app.getHtml()).toContain(CHEESESTEAK);
+      await page.getByText(CHEESESTEAK);
     });
   });
 
@@ -288,9 +288,7 @@ test.describe("useFetcher", () => {
     await page.fill("#fetcher-input", "input value");
     await app.clickElement("#fetcher-submit-json");
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch(
-      'ACTION (application/json) input value"'
-    );
+    await page.getByText('ACTION (application/json) input value"');
   });
 
   test("submit can hit an action with null json", async ({ page }) => {
@@ -299,7 +297,7 @@ test.describe("useFetcher", () => {
     await app.clickElement("#fetcher-submit-json-null");
     await new Promise((r) => setTimeout(r, 1000));
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch('ACTION (application/json) null"');
+    await page.getByText('ACTION (application/json) null"');
   });
 
   test("submit can hit an action with text", async ({ page }) => {
@@ -308,9 +306,7 @@ test.describe("useFetcher", () => {
     await page.fill("#fetcher-input", "input value");
     await app.clickElement("#fetcher-submit-text");
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch(
-      'ACTION (text/plain;charset=UTF-8) input value"'
-    );
+    await page.getByText('ACTION (text/plain;charset=UTF-8) input value"');
   });
 
   test("submit can hit an action with empty text", async ({ page }) => {
@@ -319,7 +315,7 @@ test.describe("useFetcher", () => {
     await app.clickElement("#fetcher-submit-text-empty");
     await new Promise((r) => setTimeout(r, 1000));
     await page.waitForSelector(`#fetcher-idle`);
-    expect(await app.getHtml()).toMatch('ACTION (text/plain;charset=UTF-8) "');
+    await page.getByText('ACTION (text/plain;charset=UTF-8) "');
   });
 
   test("submit can hit an action only route", async ({ page }) => {
@@ -360,21 +356,19 @@ test.describe("useFetcher", () => {
     let app = new PlaywrightFixture(appFixture, page);
 
     await app.goto("/fetcher-echo", true);
-    expect(await app.getHtml("pre")).toMatch(
-      JSON.stringify(["idle/undefined"])
-    );
+    await page.getByText(JSON.stringify(["idle/undefined"]));
 
     await page.fill("#fetcher-input", "1");
     await app.clickElement("#fetcher-load");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify(["idle/undefined", "loading/undefined", "idle/LOADER 1"])
     );
 
     await page.fill("#fetcher-input", "2");
     await app.clickElement("#fetcher-load");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify([
         "idle/undefined",
         "loading/undefined",
@@ -391,14 +385,12 @@ test.describe("useFetcher", () => {
     let app = new PlaywrightFixture(appFixture, page);
 
     await app.goto("/fetcher-echo", true);
-    expect(await app.getHtml("pre")).toMatch(
-      JSON.stringify(["idle/undefined"])
-    );
+    await page.getByText(JSON.stringify(["idle/undefined"]));
 
     await page.fill("#fetcher-input", "1");
     await app.clickElement("#fetcher-submit");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify([
         "idle/undefined",
         "submitting/undefined",
@@ -410,7 +402,7 @@ test.describe("useFetcher", () => {
     await page.fill("#fetcher-input", "2");
     await app.clickElement("#fetcher-submit");
     await page.waitForSelector("#fetcher-idle");
-    expect(await app.getHtml("pre")).toMatch(
+    await page.getByText(
       JSON.stringify([
         "idle/undefined",
         "submitting/undefined",

diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts
@@ -337,6 +337,7 @@ export async function createAppFixture(fixture: Fixture, mode?: ServerMode) {
       return new Promise(async (accept) => {
         let port = await getPort();
         let app = express();
+        app.use(express.static(path.join(fixture.projectDir, "public")));
         app.use(
           "/client",
           express.static(path.join(fixture.projectDir, "build/client"))
@@ -460,7 +461,7 @@ function parcelBuild(
 ) {
   let parcelBin = "node_modules/parcel/lib/bin.js";
 
-  let buildArgs: string[] = [parcelBin, "build"];
+  let buildArgs: string[] = [parcelBin, "build", "--no-cache"];
 
   let buildSpawn = spawnSync("node", buildArgs, {
     cwd: projectDir,

diff --git a/integration/helpers/rsc-parcel-framework/public/favicon.ico b/integration/helpers/rsc-parcel-framework/public/favicon.ico
diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
@@ -1,4 +1,5 @@
-import { spawn, spawnSync, type ChildProcess } from "node:child_process";
+import type { ChildProcess } from "node:child_process";
+import { sync as spawnSync, spawn } from "cross-spawn";
 import { cp, mkdir, readFile, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { platform } from "node:os";

diff --git a/integration/playwright.config.ts b/integration/playwright.config.ts
@@ -18,7 +18,8 @@ const config: PlaywrightTestConfig = {
   },
   /* Maximum time one test can run for. */
   timeout: isWindows ? 60_000 : 30_000,
-  fullyParallel: true,
+  fullyParallel: !(isWindows && process.env.CI),
+  workers: isWindows && process.env.CI ? 1 : undefined,
   expect: {
     /* Maximum time expect() should wait for the condition to be met. */
     timeout: isWindows ? 10_000 : 5_000,
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,8 +26,8 @@ jobs: @@
           fail-fast: false
           matrix:
             node:
-              - 20
               - 22
+              - 24
         runs-on: ubuntu-latest
@@ Expand Down @@