Merge branch 'dev' into markdalgleish/routes-mode

Author: markdalgleish

packages/react-router/__tests__/server-runtime/handle-error-test.ts

@@ -1,7 +1,10 @@
 import { createRequestHandler } from "../../lib/server-runtime/server";
 import { ErrorResponseImpl } from "../../lib/router/utils";
 import { mockServerBuild } from "./utils";
-import type { HandleDocumentRequestFunction } from "../../lib/server-runtime/build";
+import type {
+  HandleDocumentRequestFunction,
+  ServerBuild,
+} from "../../lib/server-runtime/build";
 
 function getHandler(
   routeModule = {},
@@ -180,6 +183,10 @@ describe("handleError", () => {
             },
           },
         },
+        routeDiscovery: {
+          mode: "lazy",
+          manifestPath: "/__manifest",
+        },
         future: {
           // Fill in the required values
           unstable_middleware: false,