Merge branch 'dev' into typescript-eslint-require-await

.changeset/add-uimatch-handle.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Add second generic to `UIMatch` for `handle` field

.changeset/bump-web-fetch.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/node": patch
+---
+
+Update to latest version of `@remix-run/web-fetch`

.changeset/four-spies-draw.md

@@ -0,0 +1,7 @@
+---
+"@remix-run/serve": patch
+---
+
+Fix error caused by partially written server build
+
+Previously, it was possible to trigger a reimport of the app server code before the new server build had completely been written. Reimporting the partially written server build caused issues related to `build.assets` being undefined and crashing when reading `build.assets.version`.

.changeset/get-dependencies-from-esm-without-main.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Update `getDependenciesToBundle` to handle ESM packages without main exports. Note that these packages must expose `package.json` in their `exports` field so that their path can be resolved.

.changeset/node-web-crypto.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/node": patch
+---
+
+Switch from `crypto.randomBytes` to `crypto.webcrypto.getRandomValues` for file session storage ID generation

.changeset/use-native-blob.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/node": patch
+---
+
+Use native `Blob` cleass instead of polyfill

.changeset/wild-steaks-bathe.md

@@ -0,0 +1,7 @@
+---
+"@remix-run/dev": patch
+---
+
+Fix server builds where serverBuildPath extension is `.cjs`.
+
+Fix a bug that caused the server build file to be emitted into the assets directory if the value of `serverBuildPath` ended in `.cjs`.

.github/workflows/deployments.yml

@@ -22,15 +22,16 @@ on:
       TEST_FLY_TOKEN:
         required: true
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   arc_deploy:
     name: Architect Deploy
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 
@@ -65,9 +66,6 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 
@@ -103,9 +101,6 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 
@@ -142,9 +137,6 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 
@@ -184,9 +176,6 @@ jobs:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 

.github/workflows/format.yml

@@ -6,15 +6,16 @@ on:
       - main
       - dev
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   format:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
 
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
         with:

.github/workflows/lint.yml

@@ -7,14 +7,15 @@ on:
       - dev
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: ⬣ Lint
     runs-on: ubuntu-latest
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 

.github/workflows/nightly.yml

@@ -5,6 +5,10 @@ on:
   schedule:
     - cron: "0 7 * * *" # every day at 12AM PST
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   CI: true
 
@@ -22,9 +26,6 @@ jobs:
       # allows this to be used in the `comment` job below - will be undefined if there's no release necessary
       NEXT_VERSION: ${{ steps.version.outputs.NEXT_VERSION }}
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
         with:

.github/workflows/release.yml

@@ -24,9 +24,6 @@ jobs:
       published_packages: ${{ steps.changesets.outputs.publishedPackages }}
       published: ${{ steps.changesets.outputs.published }}
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
         with:
@@ -72,9 +69,6 @@ jobs:
     outputs:
       package_version: ${{ steps.find_package_version.outputs.package_version }}
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 

.github/workflows/stacks.yml

@@ -7,6 +7,10 @@ on:
         required: true
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   setup:
     name: Remix Stacks Test
@@ -23,9 +27,6 @@ jobs:
           - repo: "remix-run/grunge-stack"
             name: "grunge"
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: ⎔ Setup node
         uses: actions/setup-node@v3
         with:
@@ -80,9 +81,6 @@ jobs:
           - repo: "remix-run/grunge-stack"
             name: "grunge"
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: 🗄️ Restore ${{ matrix.stack.name }}
         uses: actions/download-artifact@v3
         with:
@@ -123,9 +121,6 @@ jobs:
           - repo: "remix-run/grunge-stack"
             name: "grunge"
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: 🗄️ Restore ${{ matrix.stack.name }}
         uses: actions/download-artifact@v3
         with:
@@ -166,9 +161,6 @@ jobs:
           - repo: "remix-run/grunge-stack"
             name: "grunge"
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: 🗄️ Restore ${{ matrix.stack.name }}
         uses: actions/download-artifact@v3
         with:
@@ -212,9 +204,6 @@ jobs:
             name: "grunge"
             cypress: "npm run dev"
     steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-
       - name: 🗄️ Restore ${{ matrix.stack.name }}
         uses: actions/download-artifact@v3
         with:

docs/file-conventions/entry.server.md

@@ -32,11 +32,15 @@ export function handleError(
   error: unknown,
   { request, params, context }: DataFunctionArgs
 ) {
-  sendErrorToErrorReportingService(error);
-  console.error(formatErrorForJsonLogging(error));
+  if (!request.signal.aborted) {
+    sendErrorToErrorReportingService(error);
+    console.error(formatErrorForJsonLogging(error));
+  }
 }
 ```
 
+_Note that you generally want to avoid logging when the request was aborted, since Remix's cancellation and race-condition handling can cause a lot of requests to be aborted._
+
 ### Streaming Rendering Errors
 
 When you are streaming your HTML responses via [`renderToPipeableStream`][rendertopipeablestream] or [`renderToReadableStream`][rendertoreadablestream], your own `handleError` implementation will only handle errors encountered during the initial shell render. If you encounter a rendering error during subsequent streamed rendering you will need handle these errors manually since the Remix server has already sent the Response by that point.

integration/compiler-mjs-cjs-output-test.ts

@@ -0,0 +1,35 @@
+import { test, expect } from "@playwright/test";
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+import { createFixtureProject, js } from "./helpers/create-fixture.js";
+
+test.describe("", () => {
+  for (let [serverModuleExt, serverModuleFormat, exportStatement] of [
+    ["mjs", "esm", "export {"],
+    ["cjs", "cjs", "module.exports ="],
+  ]) {
+    test(`can write .${serverModuleExt} server output module`, async () => {
+      let projectDir = await createFixtureProject({
+        files: {
+          // Ensure the config is valid ESM
+          "remix.config.js": js`
+            export default {
+              serverModuleFormat: "${serverModuleFormat}",
+              serverBuildPath: "build/index.${serverModuleExt}",
+            };
+          `,
+        },
+      });
+
+      let buildPath = path.resolve(
+        projectDir,
+        "build",
+        `index.${serverModuleExt}`
+      );
+      expect(fs.existsSync(buildPath), "doesn't exist").toBe(true);
+      let contents = fs.readFileSync(buildPath, "utf8");
+      expect(contents, "no export statement").toContain(exportStatement);
+    });
+  }
+});