react-router 0.0.0-experimental-759a11a62 → 0.0.0-experimental-df0f1dfda

package/CHANGELOG.md

@@ -1,7 +1,28 @@
 # `react-router`
 
+## 7.1.3
+
+_No changes_
+
+## 7.1.2
+
+### Patch Changes
+
+- Fix issue with fetcher data cleanup in the data layer on fetcher unmount ([#12681](https://github.com/remix-run/react-router/pull/12681))
+- Do not rely on `symbol` for filtering out `redirect` responses from loader data ([#12694](https://github.com/remix-run/react-router/pull/12694))
+
+  Previously, some projects were getting type checking errors like:
+
+  ```ts
+  error TS4058: Return type of exported function has or is using name 'redirectSymbol' from external module "node_modules/..." but cannot be named.
+  ```
+
+  Now that `symbol`s are not used for the `redirect` response type, these errors should no longer be present.
+
 ## 7.1.1
 
+_No changes_
+
 ## 7.1.0
 
 ### Patch Changes
@@ -23,6 +44,8 @@
 
 ## 7.0.1
 
+_No changes_
+
 ## 7.0.0
 
 ### Major Changes

package/dist/development/{chunk-5WLC4F5Z.mjs → chunk-O5WSUTKP.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-759a11a62
+ * react-router v0.0.0-experimental-df0f1dfda
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -154,13 +154,13 @@ function createHashHistory(options = {}) {
   }
   function createHashHref(window2, to) {
     let base = window2.document.querySelector("base");
-    let href2 = "";
+    let href = "";
     if (base && base.getAttribute("href")) {
       let url = window2.location.href;
       let hashIndex = url.indexOf("#");
-      href2 = hashIndex === -1 ? url : url.slice(0, hashIndex);
+      href = hashIndex === -1 ? url : url.slice(0, hashIndex);
     }
-    return href2 + "#" + (typeof to === "string" ? to : createPath(to));
+    return href + "#" + (typeof to === "string" ? to : createPath(to));
   }
   function validateHashLocation(location, to) {
     warning(
@@ -302,13 +302,13 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
   }
   function createURL(to) {
     let base = window2.location.origin !== "null" ? window2.location.origin : window2.location.href;
-    let href2 = typeof to === "string" ? to : createPath(to);
-    href2 = href2.replace(/ $/, "%20");
+    let href = typeof to === "string" ? to : createPath(to);
+    href = href.replace(/ $/, "%20");
     invariant(
       base,
-      `No window.location.(origin|href) available to create URL for href: ${href2}`
+      `No window.location.(origin|href) available to create URL for href: ${href}`
     );
-    return new URL(href2, base);
+    return new URL(href, base);
   }
   let history = {
     get action() {
@@ -684,7 +684,7 @@ function decodePath(value) {
   } catch (error) {
     warning(
       false,
-      `The URL path "${value}" could not be decoded because it is is a malformed URL segment. This is probably due to a bad percent encoding (${error}).`
+      `The URL path "${value}" could not be decoded because it is a malformed URL segment. This is probably due to a bad percent encoding (${error}).`
     );
     return value;
   }
@@ -840,15 +840,6 @@ var ErrorResponseImpl = class {
 function isRouteErrorResponse(error) {
   return error != null && typeof error.status === "number" && typeof error.statusText === "string" && typeof error.internal === "boolean" && "data" in error;
 }
-function href(path, ...args) {
-  let params = args[0];
-  return path.split("/").map((segment) => {
-    const match = segment.match(/^:([\w-]+)(\?)?/);
-    if (!match) return segment;
-    const param = match[1];
-    return params[param];
-  }).join("/");
-}
 
 // lib/router/router.ts
 var validMutationMethodsArr = [
@@ -928,6 +919,7 @@ function createRouter(init) {
   let getScrollPosition = null;
   let initialScrollRestored = init.hydrationData != null;
   let initialMatches = matchRoutes(dataRoutes, init.history.location, basename);
+  let initialMatchesIsFOW = false;
   let initialErrors = null;
   if (initialMatches == null && !patchRoutesOnNavigationImpl) {
     let error = getInternalRouterError(404, {
@@ -957,6 +949,7 @@ function createRouter(init) {
       init.history.location.pathname
     );
     if (fogOfWar.active && fogOfWar.matches) {
+      initialMatchesIsFOW = true;
       initialMatches = fogOfWar.matches;
     }
   } else if (initialMatches.some((m) => m.route.lazy)) {
@@ -1322,7 +1315,10 @@ function createRouter(init) {
     pendingViewTransitionEnabled = (opts && opts.enableViewTransition) === true;
     let routesToUse = inFlightDataRoutes || dataRoutes;
     let loadingNavigation = opts && opts.overrideNavigation;
-    let matches = matchRoutes(routesToUse, location, basename);
+    let matches = opts?.initialHydration && state.matches && state.matches.length > 0 && !initialMatchesIsFOW ? (
+      // `matchRoutes()` has already been called if we're in here via `router.initialize()`
+      state.matches
+    ) : matchRoutes(routesToUse, location, basename);
     let flushSync = (opts && opts.flushSync) === true;
     let fogOfWar = checkFogOfWar(matches, routesToUse, location.pathname);
     if (fogOfWar.active && fogOfWar.matches) {
@@ -1714,7 +1710,7 @@ function createRouter(init) {
     });
     return new Map(state.fetchers);
   }
-  async function fetch2(key, routeId, href2, opts) {
+  async function fetch2(key, routeId, href, opts) {
     abortFetcher(key);
     let flushSync = (opts && opts.flushSync) === true;
     let routesToUse = inFlightDataRoutes || dataRoutes;
@@ -1722,7 +1718,7 @@ function createRouter(init) {
       state.location,
       state.matches,
       basename,
-      href2,
+      href,
       routeId,
       opts?.relative
     );
@@ -3506,14 +3502,20 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
         return {
           type: "error" /* error */,
           error: result.data,
-          statusCode: result.init?.status
+          statusCode: result.init?.status,
+          headers: result.init?.headers ? new Headers(result.init.headers) : void 0
         };
       }
-      result = new ErrorResponseImpl(
-        result.init?.status || 500,
-        void 0,
-        result.data
-      );
+      return {
+        type: "error" /* error */,
+        error: new ErrorResponseImpl(
+          result.init?.status || 500,
+          void 0,
+          result.data
+        ),
+        statusCode: isRouteErrorResponse(result) ? result.status : void 0,
+        headers: result.init?.headers ? new Headers(result.init.headers) : void 0
+      };
     }
     return {
       type: "error" /* error */,
@@ -4250,7 +4252,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     let segments = pathname.replace(/^\//, "").split("/");
     remainingPathname = "/" + segments.slice(parentSegments.length).join("/");
   }
-  let matches = matchRoutes(routes, { pathname: remainingPathname });
+  let matches = dataRouterState && dataRouterState.matches && dataRouterState.matches.length > 0 ? dataRouterState.matches : matchRoutes(routes, { pathname: remainingPathname });
   if (ENABLE_DEV_WARNINGS) {
     warning(
       parentRoute || matches != null,
@@ -5353,18 +5355,18 @@ function getKeyedLinksForMatches(matches, routeModules, manifest) {
     let module = routeModules[match.route.id];
     let route = manifest.routes[match.route.id];
     return [
-      route && route.css ? route.css.map((href2) => ({ rel: "stylesheet", href: href2 })) : [],
+      route && route.css ? route.css.map((href) => ({ rel: "stylesheet", href })) : [],
       module?.links?.() || []
     ];
   }).flat(2);
-  let preloads = getCurrentPageModulePreloadHrefs(matches, manifest);
+  let preloads = getModuleLinkHrefs(matches, manifest);
   return dedupeLinkDescriptors(descriptors, preloads);
 }
 async function prefetchStyleLinks(route, routeModule) {
   if (!route.css && !routeModule.links || !isPreloadSupported()) return;
   let descriptors = [];
   if (route.css) {
-    descriptors.push(...route.css.map((href2) => ({ rel: "stylesheet", href: href2 })));
+    descriptors.push(...route.css.map((href) => ({ rel: "stylesheet", href })));
   }
   if (routeModule.links) {
     descriptors.push(...routeModule.links());
@@ -5481,25 +5483,21 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
   }
   return [];
 }
-function getModuleLinkHrefs(matches, manifestPatch) {
-  return dedupeHrefs(
-    matches.map((match) => {
-      let route = manifestPatch.routes[match.route.id];
-      if (!route) return [];
-      let hrefs = [route.module];
-      if (route.imports) {
-        hrefs = hrefs.concat(route.imports);
-      }
-      return hrefs;
-    }).flat(1)
-  );
-}
-function getCurrentPageModulePreloadHrefs(matches, manifest) {
+function getModuleLinkHrefs(matches, manifest, { includeHydrateFallback } = {}) {
   return dedupeHrefs(
     matches.map((match) => {
       let route = manifest.routes[match.route.id];
       if (!route) return [];
       let hrefs = [route.module];
+      if (route.clientActionModule) {
+        hrefs = hrefs.concat(route.clientActionModule);
+      }
+      if (route.clientLoaderModule) {
+        hrefs = hrefs.concat(route.clientLoaderModule);
+      }
+      if (includeHydrateFallback && route.hydrateFallbackModule) {
+        hrefs = hrefs.concat(route.hydrateFallbackModule);
+      }
       if (route.imports) {
         hrefs = hrefs.concat(route.imports);
       }
@@ -5830,6 +5828,14 @@ async function fetchAndDecode(url, init) {
   if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
     throw new ErrorResponseImpl(404, "Not Found", true);
   }
+  const NO_BODY_STATUS_CODES2 = /* @__PURE__ */ new Set([100, 101, 204, 205]);
+  if (NO_BODY_STATUS_CODES2.has(res.status)) {
+    if (!init.method || init.method === "GET") {
+      return { status: res.status, data: {} };
+    } else {
+      return { status: res.status, data: { data: void 0 } };
+    }
+  }
   invariant2(res.body, "No response body to decode");
   try {
     let decoded = await decodeViaTurboStream(res.body, window);
@@ -6175,6 +6181,21 @@ function createClientRoutes(manifest, routeModulesCache, initialState, isSpaMode
       }
       return fetchServerHandler(singleFetch);
     }
+    function prefetchModule(modulePath) {
+      import(
+        /* @vite-ignore */
+        /* webpackIgnore: true */
+        modulePath
+      );
+    }
+    function prefetchRouteModuleChunks(route2) {
+      if (route2.clientActionModule) {
+        prefetchModule(route2.clientActionModule);
+      }
+      if (route2.clientLoaderModule) {
+        prefetchModule(route2.clientLoaderModule);
+      }
+    }
     async function prefetchStylesAndCallHandler(handler) {
       let cachedModule = routeModulesCache[route.id];
       let linkPrefetchPromise = cachedModule ? prefetchStyleLinks(route, cachedModule) : Promise.resolve();
@@ -6271,6 +6292,22 @@ function createClientRoutes(manifest, routeModulesCache, initialState, isSpaMode
           if (isSpaMode) return Promise.resolve(null);
           return fetchServerLoader(singleFetch);
         });
+      } else if (route.clientLoaderModule) {
+        dataRoute.loader = async (args, singleFetch) => {
+          invariant2(route.clientLoaderModule);
+          let { clientLoader } = await import(
+            /* @vite-ignore */
+            /* webpackIgnore: true */
+            route.clientLoaderModule
+          );
+          return clientLoader({
+            ...args,
+            async serverLoader() {
+              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              return fetchServerLoader(singleFetch);
+            }
+          });
+        };
       }
       if (!route.hasClientAction) {
         dataRoute.action = ({ request }, singleFetch) => prefetchStylesAndCallHandler(() => {
@@ -6279,14 +6316,36 @@ function createClientRoutes(manifest, routeModulesCache, initialState, isSpaMode
           }
           return fetchServerAction(singleFetch);
         });
+      } else if (route.clientActionModule) {
+        dataRoute.action = async (args, singleFetch) => {
+          invariant2(route.clientActionModule);
+          prefetchRouteModuleChunks(route);
+          let { clientAction } = await import(
+            /* @vite-ignore */
+            /* webpackIgnore: true */
+            route.clientActionModule
+          );
+          return clientAction({
+            ...args,
+            async serverAction() {
+              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              return fetchServerAction(singleFetch);
+            }
+          });
+        };
       }
       dataRoute.lazy = async () => {
-        let mod = await loadRouteModuleWithBlockingLinks(
+        if (route.clientLoaderModule || route.clientActionModule) {
+          await new Promise((resolve) => setTimeout(resolve, 0));
+        }
+        let modPromise = loadRouteModuleWithBlockingLinks(
           route,
           routeModulesCache
         );
+        prefetchRouteModuleChunks(route);
+        let mod = await modPromise;
         let lazyRoute = { ...mod };
-        if (mod.clientLoader) {
+        if (mod.clientLoader && !route.clientLoaderModule) {
           let clientLoader = mod.clientLoader;
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
@@ -6296,7 +6355,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, isSpaMode
             }
           });
         }
-        if (mod.clientAction) {
+        if (mod.clientAction && !route.clientActionModule) {
           let clientAction = mod.clientAction;
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
@@ -6445,12 +6504,13 @@ function useFogOFWarDiscovery(router, manifest, routeModules, isSpaMode) {
       if (!path) {
         return;
       }
-      let url = new URL(path, window.location.origin);
-      if (!discoveredPaths.has(url.pathname)) {
-        nextPaths.add(url.pathname);
+      let pathname = el.tagName === "A" ? el.pathname : new URL(path, window.location.origin).pathname;
+      if (!discoveredPaths.has(pathname)) {
+        nextPaths.add(pathname);
       }
     }
     async function fetchPatches() {
+      document.querySelectorAll("a[data-discover], form[data-discover]").forEach(registerElement);
       let lazyPaths = Array.from(nextPaths.keys()).filter((path) => {
         if (discoveredPaths.has(path)) {
           nextPaths.delete(path);
@@ -6474,30 +6534,9 @@ function useFogOFWarDiscovery(router, manifest, routeModules, isSpaMode) {
         console.error("Failed to fetch manifest patches", e);
       }
     }
-    document.body.querySelectorAll("a[data-discover], form[data-discover]").forEach((el) => registerElement(el));
-    fetchPatches();
     let debouncedFetchPatches = debounce(fetchPatches, 100);
-    function isElement(node) {
-      return node.nodeType === Node.ELEMENT_NODE;
-    }
-    let observer = new MutationObserver((records) => {
-      let elements = /* @__PURE__ */ new Set();
-      records.forEach((r) => {
-        [r.target, ...r.addedNodes].forEach((node) => {
-          if (!isElement(node)) return;
-          if (node.tagName === "A" && node.getAttribute("data-discover")) {
-            elements.add(node);
-          } else if (node.tagName === "FORM" && node.getAttribute("data-discover")) {
-            elements.add(node);
-          }
-          if (node.tagName !== "A") {
-            node.querySelectorAll("a[data-discover], form[data-discover]").forEach((el) => elements.add(el));
-          }
-        });
-      });
-      elements.forEach((el) => registerElement(el));
-      debouncedFetchPatches();
-    });
+    fetchPatches();
+    let observer = new MutationObserver(() => debouncedFetchPatches());
     observer.observe(document.documentElement, {
       subtree: true,
       childList: true,
@@ -6784,7 +6823,7 @@ function PrefetchPageLinksImpl({
     [newMatchesForAssets, manifest]
   );
   let keyedPrefetchLinks = useKeyedPrefetchLinks(newMatchesForAssets);
-  return /* @__PURE__ */ React9.createElement(React9.Fragment, null, dataHrefs.map((href2) => /* @__PURE__ */ React9.createElement("link", { key: href2, rel: "prefetch", as: "fetch", href: href2, ...linkProps })), moduleHrefs.map((href2) => /* @__PURE__ */ React9.createElement("link", { key: href2, rel: "modulepreload", href: href2, ...linkProps })), keyedPrefetchLinks.map(({ key, link }) => (
+  return /* @__PURE__ */ React9.createElement(React9.Fragment, null, dataHrefs.map((href) => /* @__PURE__ */ React9.createElement("link", { key: href, rel: "prefetch", as: "fetch", href, ...linkProps })), moduleHrefs.map((href) => /* @__PURE__ */ React9.createElement("link", { key: href, rel: "modulepreload", href, ...linkProps })), keyedPrefetchLinks.map(({ key, link }) => (
     // these don't spread `linkProps` because they are full link descriptors
     // already with their own props
     /* @__PURE__ */ React9.createElement("link", { key, ...link })
@@ -6908,11 +6947,44 @@ function Scripts(props) {
     let streamScript = "window.__reactRouterContext.stream = new ReadableStream({start(controller){window.__reactRouterContext.streamController = controller;}}).pipeThrough(new TextEncoderStream());";
     let contextScript = staticContext ? `window.__reactRouterContext = ${serverHandoffString};${streamScript}` : " ";
     let routeModulesScript = !isStatic ? " " : `${manifest.hmr?.runtime ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
-${matches.map(
-      (match, index) => `import * as route${index} from ${JSON.stringify(
-        manifest.routes[match.route.id].module
-      )};`
-    ).join("\n")}
+${matches.map((match, routeIndex) => {
+      let routeVarName = `route${routeIndex}`;
+      let manifestEntry = manifest.routes[match.route.id];
+      invariant2(manifestEntry, `Route ${match.route.id} not found in manifest`);
+      let {
+        clientActionModule,
+        clientLoaderModule,
+        hydrateFallbackModule,
+        module
+      } = manifestEntry;
+      let chunks = [
+        ...clientActionModule ? [
+          {
+            module: clientActionModule,
+            varName: `${routeVarName}_clientAction`
+          }
+        ] : [],
+        ...clientLoaderModule ? [
+          {
+            module: clientLoaderModule,
+            varName: `${routeVarName}_clientLoader`
+          }
+        ] : [],
+        ...hydrateFallbackModule ? [
+          {
+            module: hydrateFallbackModule,
+            varName: `${routeVarName}_HydrateFallback`
+          }
+        ] : [],
+        { module, varName: `${routeVarName}_main` }
+      ];
+      if (chunks.length === 1) {
+        return `import * as ${routeVarName} from ${JSON.stringify(module)};`;
+      }
+      let chunkImportsSnippet = chunks.map((chunk) => `import * as ${chunk.varName} from "${chunk.module}";`).join("\n");
+      let mergedChunksSnippet = `const ${routeVarName} = {${chunks.map((chunk) => `...${chunk.varName}`).join(",")}};`;
+      return [chunkImportsSnippet, mergedChunksSnippet].join("\n");
+    }).join("\n")}
   ${enableFogOfWar ? (
       // Inline a minimal manifest with the SSR matches
       `window.__reactRouterManifest = ${JSON.stringify(
@@ -6943,11 +7015,11 @@ import(${JSON.stringify(manifest.entry.module)});`;
       }
     ));
   }, []);
-  let routePreloads = matches.map((match) => {
-    let route = manifest.routes[match.route.id];
-    return route ? (route.imports || []).concat([route.module]) : [];
-  }).flat(1);
-  let preloads = isHydrated ? [] : manifest.entry.imports.concat(routePreloads);
+  let preloads = isHydrated ? [] : manifest.entry.imports.concat(
+    getModuleLinkHrefs(matches, manifest, {
+      includeHydrateFallback: true
+    })
+  );
   return isHydrated ? null : /* @__PURE__ */ React9.createElement(React9.Fragment, null, !enableFogOfWar ? /* @__PURE__ */ React9.createElement(
     "link",
     {
@@ -6991,7 +7063,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-759a11a62";
+    window.__reactRouterVersion = "0.0.0-experimental-df0f1dfda";
   }
 } catch (e) {
 }
@@ -7194,7 +7266,7 @@ var Link = React10.forwardRef(
         }
       }
     }
-    let href2 = useHref(to, { relative });
+    let href = useHref(to, { relative });
     let [shouldPrefetch, prefetchRef, prefetchHandlers] = usePrefetchBehavior(
       prefetch,
       rest
@@ -7220,7 +7292,7 @@ var Link = React10.forwardRef(
         {
           ...rest,
           ...prefetchHandlers,
-          href: absoluteHref || href2,
+          href: absoluteHref || href,
           onClick: isExternal || reloadDocument ? onClick : handleClick,
           ref: mergeRefs(forwardedRef, prefetchRef),
           target,
@@ -7228,7 +7300,7 @@ var Link = React10.forwardRef(
         }
       )
     );
-    return shouldPrefetch && !isAbsolute ? /* @__PURE__ */ React10.createElement(React10.Fragment, null, link, /* @__PURE__ */ React10.createElement(PrefetchPageLinks, { page: href2 })) : link;
+    return shouldPrefetch && !isAbsolute ? /* @__PURE__ */ React10.createElement(React10.Fragment, null, link, /* @__PURE__ */ React10.createElement(PrefetchPageLinks, { page: href })) : link;
   }
 );
 Link.displayName = "Link";
@@ -7584,9 +7656,9 @@ function useFetcher({
     return () => router.deleteFetcher(fetcherKey);
   }, [router, fetcherKey]);
   let load = React10.useCallback(
-    async (href2, opts) => {
+    async (href, opts) => {
       invariant(routeId, "No routeId available for fetcher.load()");
-      await router.fetch(fetcherKey, routeId, href2, opts);
+      await router.fetch(fetcherKey, routeId, href, opts);
     },
     [fetcherKey, routeId, router]
   );
@@ -8043,9 +8115,9 @@ function createHref(to) {
   return typeof to === "string" ? to : createPath(to);
 }
 function encodeLocation(to) {
-  let href2 = typeof to === "string" ? to : createPath(to);
-  href2 = href2.replace(/ $/, "%20");
-  let encoded = ABSOLUTE_URL_REGEX3.test(href2) ? new URL(href2) : new URL(href2, "http://localhost");
+  let href = typeof to === "string" ? to : createPath(to);
+  href = href.replace(/ $/, "%20");
+  let encoded = ABSOLUTE_URL_REGEX3.test(href) ? new URL(href) : new URL(href, "http://localhost");
   return {
     pathname: encoded.pathname,
     search: encoded.search,
@@ -8200,8 +8272,11 @@ function processRoutes(routes, context, manifest, routeModules, parentId) {
       hasClientAction: false,
       hasClientLoader: false,
       hasErrorBoundary: route.ErrorBoundary != null,
-      module: "build/stub-path-to-module.js"
-      // any need for this?
+      // any need for these?
+      module: "build/stub-path-to-module.js",
+      clientActionModule: void 0,
+      clientLoaderModule: void 0,
+      hydrateFallbackModule: void 0
     };
     manifest.routes[newRoute.id] = entryRoute;
     routeModules[route.id] = {
@@ -8711,8 +8786,11 @@ function prependCookies(parentHeaders, childHeaders) {
   let parentSetCookieString = parentHeaders.get("Set-Cookie");
   if (parentSetCookieString) {
     let cookies = splitCookiesString(parentSetCookieString);
+    let childCookies = new Set(childHeaders.getSetCookie());
     cookies.forEach((cookie) => {
-      childHeaders.append("Set-Cookie", cookie);
+      if (!childCookies.has(cookie)) {
+        childHeaders.append("Set-Cookie", cookie);
+      }
     });
   }
 }
@@ -8942,6 +9020,7 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
 }
 
 // lib/server-runtime/server.ts
+var NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([100, 101, 204, 205, 304]);
 function derive(build, mode) {
   let routes = createRoutes(build.routes);
   let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
@@ -9140,8 +9219,8 @@ async function handleSingleFetchRequest(serverMode, build, staticHandler, reques
   );
   let resultHeaders = new Headers(headers);
   resultHeaders.set("X-Remix-Response", "yes");
-  if (status === 304) {
-    return new Response(null, { status: 304, headers: resultHeaders });
+  if (NO_BODY_STATUS_CODES.has(status)) {
+    return new Response(null, { status, headers: resultHeaders });
   }
   resultHeaders.set("Content-Type", "text/x-script");
   return new Response(
@@ -9171,8 +9250,8 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     return context;
   }
   let headers = getDocumentHeaders(build, context);
-  if (context.statusCode === 304) {
-    return new Response(null, { status: 304, headers });
+  if (NO_BODY_STATUS_CODES.has(context.statusCode)) {
+    return new Response(null, { status: context.statusCode, headers });
   }
   if (context.errors) {
     Object.values(context.errors).forEach((err) => {
@@ -9281,11 +9360,13 @@ async function handleResourceRequest(serverMode, staticHandler, routeId, request
       routeId,
       requestContext: loadContext
     });
-    invariant3(
-      isResponse(response),
-      "Expected a Response to be returned from resource route handler"
-    );
-    return response;
+    if (isResponse(response)) {
+      return response;
+    }
+    if (typeof response === "string") {
+      return new Response(response);
+    }
+    return Response.json(response);
   } catch (error) {
     if (isResponse(error)) {
       error.headers.set("X-Remix-Catch", "yes");
@@ -9529,7 +9610,6 @@ export {
   replace,
   ErrorResponseImpl,
   isRouteErrorResponse,
-  href,
   IDLE_NAVIGATION,
   IDLE_FETCHER,
   IDLE_BLOCKER,

package/dist/development/data-CQbyyGzl.d.mts

@@ -0,0 +1,11 @@
+/**
+ * An object of unknown type for route loaders and actions provided by the
+ * server's `getLoadContext()` function.  This is defined as an empty interface
+ * specifically so apps can leverage declaration merging to augment this type
+ * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
+ */
+interface AppLoadContext {
+    [key: string]: unknown;
+}
+
+export type { AppLoadContext as A };

package/dist/development/data-CQbyyGzl.d.ts

@@ -0,0 +1,11 @@
+/**
+ * An object of unknown type for route loaders and actions provided by the
+ * server's `getLoadContext()` function.  This is defined as an empty interface
+ * specifically so apps can leverage declaration merging to augment this type
+ * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
+ */
+interface AppLoadContext {
+    [key: string]: unknown;
+}
+
+export type { AppLoadContext as A };

package/dist/development/dom-export.d.mts

@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-BCniP0AZ.mjs';
-import './router-BYH9f2xg.mjs';
+import { R as RouterProviderProps$1 } from './fog-of-war-D3ny56dR.mjs';
+import './route-data-Cq_b5feC.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;
 
 /**
- * @category Router Components
+ * @category Component Routers
  */
 declare function HydratedRouter(): React.JSX.Element;
 

package/dist/development/dom-export.d.ts

@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-DFo9BKir.js';
-import './router-BYH9f2xg.js';
+import { R as RouterProviderProps$1 } from './fog-of-war-L5G-Cw9x.js';
+import './route-data-Cq_b5feC.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;
 
 /**
- * @category Router Components
+ * @category Component Routers
  */
 declare function HydratedRouter(): React.JSX.Element;