Merge branch 'dev' into link-meta-short-circuit

.changeset/cjs-esm-warning.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+add warning for v2 "cjs"->"esm" serverModuleFormat default change

.changeset/dev-server.md

@@ -0,0 +1,157 @@
+---
+"@remix-run/dev": minor
+"@remix-run/server-runtime": minor
+---
+
+Dev server improvements
+
+- Push-based app server syncing that doesn't rely on polling
+- App server as a managed subprocess
+- Gracefully handle new files and routes without crashing
+- Statically serve static assets to avoid fetch errors during app server reboots
+
+# Guide
+
+## 1. Enable new dev server
+
+Enable `unstable_dev` in `remix.config.js`:
+
+```js
+{
+  future: {
+    "unstable_dev": true
+  }
+}
+```
+
+## 2. Update `package.json` scripts
+
+Specify the command to run your app server with the `-c`/`--command` flag:
+
+For Remix app server:
+
+```json
+{
+  "scripts": {
+    "dev": "NODE_ENV=development remix dev -c 'node_modules/.bin/remix-serve build'"
+  }
+}
+```
+
+For any other servers, specify the command you use to run your production server.
+
+```json
+{
+  "scripts": {
+    "dev": "NODE_ENV=development remix dev -c 'node ./server.js'"
+  }
+}
+```
+
+## 3. Call `devReady` in your app server
+
+For example, in an Express server:
+
+```js
+// server.mjs
+import path from "node:path";
+
+import express from "express";
+import { createRequestHandler } from "@remix-run/express";
+import { devReady } from "@remix-run/node";
+
+let BUILD_DIR = path.join(process.cwd(), "build"); // path to Remix's server build directory (`build/` by default)
+
+let app = express();
+
+app.all(
+  "*",
+  createRequestHandler({
+    build: require(BUILD_DIR),
+    mode: process.env.NODE_ENV,
+  })
+);
+
+app.listen(3000, () => {
+  let build = require(BUILD_DIR);
+  console.log("Ready: http://localhost:" + port);
+
+  // in development, call `devReady` _after_ your server is ready
+  if (process.env.NODE_ENV === "development") {
+    devReady(build);
+  }
+});
+```
+
+## 4. That's it!
+
+You should now be able to run the Remix Dev server:
+
+```sh
+$ npm run dev
+# Ready: http://localhost:3000
+```
+
+Make sure you navigate to your app server's URL in the browser, not the dev server's URL.
+In this example, that would be `http://localhost:3000`.
+
+# Configuration
+
+Most users won't need to configure the dev server, but you might need to if:
+
+- You are setting up custom origins for SSL support or for Docker networking
+- You want to handle server updates yourself (e.g. via require cache purging)
+
+Example:
+
+```js
+{
+  future: {
+    unstable_dev: {
+      // HTTP(S) scheme used when sending `devReady` messages to the dev server
+      httpScheme: "https", // default: `"http"`
+      // HTTP(S) host used when sending `devReady` messages to the dev server
+      httpHost: "mycustomhost", // default: `"localhost"`
+      // HTTP(S) port internally used by the dev server to statically serve built assets and to receive app server `devReady` messages
+      httpPort: 8001, // default: Remix chooses an open port in the range 3001-3099
+      // Websocket port internally used by the dev server for sending updates to the browser (Live reload, HMR, HDR)
+      websocketPort: 8002, // default: Remix chooses an open port in the range 3001-3099
+      // Whether the app server should be restarted when app is rebuilt
+      // See `Advanced > restart` for more
+      restart: false, // default: `true`
+    }
+  }
+}
+```
+
+You can also configure via flags. For example:
+
+```sh
+remix dev -c 'node ./server.mjs' --http-port=3001 --websocket-port=3002 --no-restart
+```
+
+See `remix dev --help` for more details.
+
+### restart
+
+If you want to manage app server updates yourself, you can use the `--no-restart` flag so that the Remix dev server doesn't restart the app server subprocess when a rebuild succeeds.
+
+For example, if you rely on require cache purging to keep your app server running while server changes are pulled in, then you'll want to use `--no-restart`.
+
+🚨 It is then your responsibility to call `devReady` whenever server changes are incorporated in your app server. 🚨
+
+So for require cache purging, you'd want to:
+
+1. Purge the require cache
+2. `require` your server build
+3. Call `devReady` within a `if (process.env.NODE_ENV === 'development')`
+
+([Looking at you, Kent](https://github.com/kentcdodds/kentcdodds.com/blob/main/server/index.ts#L298) 😆)
+
+---
+
+The ultimate solution for `--no-restart` would be for you to implement _server-side_ HMR for your app server.
+Note: server-side HMR is not to be confused with the client-side HMR provided by Remix.
+Then your app server could continuously update itself with new build with 0 downtime and without losing in-memory data that wasn't affected by the server changes.
+
+This is left as an exercise to the reader.

.changeset/hdr-revalidate-only-when-needed.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Revalidate loaders only when a change to one is detected.

.changeset/install-globals.md

@@ -0,0 +1,6 @@
+---
+"@remix-run/node": patch
+"@remix-run/serve": patch
+---
+
+add `@remix-run/node/install` side-effect to allow `node --require @remix-run/node/install`

.changeset/resource-route-boundary.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Fix false-positive resource route identification if a route only exports a boundary

.changeset/splat-index-matching.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Fix a bug in route matching that wass preventing a single splat (`$.jsx`) route from matching a root `/` path

.github/workflows/lint.yml

@@ -24,14 +24,15 @@ jobs:
           node-version-file: ".nvmrc"
           cache: "yarn"
 
-      - name: 📥 Install deps
-        run: yarn --frozen-lockfile
-
-      - name: Disable Eslint GitHub Actions Annotations
+      - name: Disable GitHub Actions Annotations
         run: |
+          echo "::remove-matcher owner=tsc::"
           echo "::remove-matcher owner=eslint-compact::"
           echo "::remove-matcher owner=eslint-stylish::"
 
+      - name: 📥 Install deps
+        run: yarn --frozen-lockfile
+
       - name: 🔬 Lint
         run: yarn lint
 

.github/workflows/reusable-test.yml

@@ -31,6 +31,12 @@ jobs:
           node-version-file: ".nvmrc"
           cache: "yarn"
 
+      - name: Disable GitHub Actions Annotations
+        run: |
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 
@@ -61,6 +67,12 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: "yarn"
 
+      - name: Disable GitHub Actions Annotations
+        run: |
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 
@@ -93,6 +105,12 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: "yarn"
 
+      - name: Disable GitHub Actions Annotations
+        run: |
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 
@@ -124,6 +142,12 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: "yarn"
 
+      - name: Disable GitHub Actions Annotations
+        run: |
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 
@@ -155,6 +179,12 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: "yarn"
 
+      - name: Disable GitHub Actions Annotations
+        run: |
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 

.github/workflows/test.yml

@@ -22,4 +22,4 @@ jobs:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/reusable-test.yml
     with:
-      node_version: '["19"]'
+      node_version: '["latest"]'

contributors.yml

@@ -45,6 +45,7 @@
 - ascorbic
 - ashleyryan
 - ashocean
+- atesgoral
 - athongsavath
 - AustinGil
 - awthwathje
@@ -513,3 +514,4 @@
 - zhe
 - arifqys
 - iamzee
+- TimonVS

docs/pages/v2.md

@@ -689,6 +689,12 @@ module.exports = {
 };
 ```
 
+## `serverModuleFormat`
+
+The default server module output format will be changing from `cjs` to `esm`.
+
+In your `remix.config.js`, you should specify either `serverModuleFormat: "cjs"` to retain existing behavior, or `serverModuleFormat: "esm"`, to opt into the future behavior.
+
 ## Dev Server
 
 We are still stabilizing the new dev server that enables HMR, several CSS libraries (CSS Modules, Vanilla Extract, Tailwind, PostCSS) and simplifies integration with various servers.

integration/error-data-request-test.ts

@@ -129,17 +129,13 @@ test.describe("ErrorBoundary", () => {
   });
 
   test("returns a 405 x-remix-error on a data fetch with a bad method", async () => {
-    let response = await fixture.requestData(
-      `/loader-return-json`,
-      "routes/loader-return-json",
-      {
+    expect(() =>
+      fixture.requestData("/loader-return-json", "routes/loader-return-json", {
         method: "TRACE",
-      }
+      })
+    ).rejects.toThrowError(
+      `Failed to construct 'Request': 'TRACE' HTTP method is unsupported.`
     );
-    expect(response.status).toBe(405);
-    expect(response.headers.get("X-Remix-Error")).toBe("yes");
-    expect(await response.text()).toMatch("Unexpected Server Error");
-    assertConsoleError('Error: Invalid request method "TRACE"');
   });
 
   test("returns a 403 x-remix-error on a data fetch GET to a bad path", async () => {