react-router 0.0.0-experimental-9ea41ead4 → 0.0.0-experimental-759a11a62

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-9ea41ead4
+ * react-router v0.0.0-experimental-759a11a62
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -154,13 +154,13 @@ function createHashHistory(options = {}) {
   }
   function createHashHref(window2, to) {
     let base = window2.document.querySelector("base");
-    let href = "";
+    let href2 = "";
     if (base && base.getAttribute("href")) {
       let url = window2.location.href;
       let hashIndex = url.indexOf("#");
-      href = hashIndex === -1 ? url : url.slice(0, hashIndex);
+      href2 = hashIndex === -1 ? url : url.slice(0, hashIndex);
     }
-    return href + "#" + (typeof to === "string" ? to : createPath(to));
+    return href2 + "#" + (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 href = typeof to === "string" ? to : createPath(to);
-    href = href.replace(/ $/, "%20");
+    let href2 = typeof to === "string" ? to : createPath(to);
+    href2 = href2.replace(/ $/, "%20");
     invariant(
       base,
-      `No window.location.(origin|href) available to create URL for href: ${href}`
+      `No window.location.(origin|href) available to create URL for href: ${href2}`
     );
-    return new URL(href, base);
+    return new URL(href2, base);
   }
   let history = {
     get action() {
@@ -840,6 +840,15 @@ 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 = [
@@ -1705,7 +1714,7 @@ function createRouter(init) {
     });
     return new Map(state.fetchers);
   }
-  async function fetch2(key, routeId, href, opts) {
+  async function fetch2(key, routeId, href2, opts) {
     abortFetcher(key);
     let flushSync = (opts && opts.flushSync) === true;
     let routesToUse = inFlightDataRoutes || dataRoutes;
@@ -1713,7 +1722,7 @@ function createRouter(init) {
       state.location,
       state.matches,
       basename,
-      href,
+      href2,
       routeId,
       opts?.relative
     );
@@ -5344,18 +5353,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((href) => ({ rel: "stylesheet", href })) : [],
+      route && route.css ? route.css.map((href2) => ({ rel: "stylesheet", href: href2 })) : [],
       module?.links?.() || []
     ];
   }).flat(2);
-  let preloads = getModuleLinkHrefs(matches, manifest);
+  let preloads = getCurrentPageModulePreloadHrefs(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((href) => ({ rel: "stylesheet", href })));
+    descriptors.push(...route.css.map((href2) => ({ rel: "stylesheet", href: href2 })));
   }
   if (routeModule.links) {
     descriptors.push(...routeModule.links());
@@ -5472,21 +5481,25 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
   }
   return [];
 }
-function getModuleLinkHrefs(matches, manifest, { includeHydrateFallback } = {}) {
+function getModuleLinkHrefs(matches, manifestPatch) {
   return dedupeHrefs(
     matches.map((match) => {
-      let route = manifest.routes[match.route.id];
+      let route = manifestPatch.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);
       }
+      return hrefs;
+    }).flat(1)
+  );
+}
+function getCurrentPageModulePreloadHrefs(matches, manifest) {
+  return dedupeHrefs(
+    matches.map((match) => {
+      let route = manifest.routes[match.route.id];
+      if (!route) return [];
+      let hrefs = [route.module];
       if (route.imports) {
         hrefs = hrefs.concat(route.imports);
       }
@@ -6162,21 +6175,6 @@ 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();
@@ -6273,22 +6271,6 @@ 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(() => {
@@ -6297,36 +6279,14 @@ 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 () => {
-        if (route.clientLoaderModule || route.clientActionModule) {
-          await new Promise((resolve) => setTimeout(resolve, 0));
-        }
-        let modPromise = loadRouteModuleWithBlockingLinks(
+        let mod = await loadRouteModuleWithBlockingLinks(
           route,
           routeModulesCache
         );
-        prefetchRouteModuleChunks(route);
-        let mod = await modPromise;
         let lazyRoute = { ...mod };
-        if (mod.clientLoader && !route.clientLoaderModule) {
+        if (mod.clientLoader) {
           let clientLoader = mod.clientLoader;
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
@@ -6336,7 +6296,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, isSpaMode
             }
           });
         }
-        if (mod.clientAction && !route.clientActionModule) {
+        if (mod.clientAction) {
           let clientAction = mod.clientAction;
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
@@ -6824,7 +6784,7 @@ function PrefetchPageLinksImpl({
     [newMatchesForAssets, manifest]
   );
   let keyedPrefetchLinks = useKeyedPrefetchLinks(newMatchesForAssets);
-  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 }) => (
+  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 }) => (
     // these don't spread `linkProps` because they are full link descriptors
     // already with their own props
     /* @__PURE__ */ React9.createElement("link", { key, ...link })
@@ -6948,44 +6908,11 @@ 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, 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")}
+${matches.map(
+      (match, index) => `import * as route${index} from ${JSON.stringify(
+        manifest.routes[match.route.id].module
+      )};`
+    ).join("\n")}
   ${enableFogOfWar ? (
       // Inline a minimal manifest with the SSR matches
       `window.__reactRouterManifest = ${JSON.stringify(
@@ -7016,11 +6943,11 @@ import(${JSON.stringify(manifest.entry.module)});`;
       }
     ));
   }, []);
-  let preloads = isHydrated ? [] : manifest.entry.imports.concat(
-    getModuleLinkHrefs(matches, manifest, {
-      includeHydrateFallback: true
-    })
-  );
+  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);
   return isHydrated ? null : /* @__PURE__ */ React9.createElement(React9.Fragment, null, !enableFogOfWar ? /* @__PURE__ */ React9.createElement(
     "link",
     {
@@ -7064,7 +6991,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-9ea41ead4";
+    window.__reactRouterVersion = "0.0.0-experimental-759a11a62";
   }
 } catch (e) {
 }
@@ -7267,7 +7194,7 @@ var Link = React10.forwardRef(
         }
       }
     }
-    let href = useHref(to, { relative });
+    let href2 = useHref(to, { relative });
     let [shouldPrefetch, prefetchRef, prefetchHandlers] = usePrefetchBehavior(
       prefetch,
       rest
@@ -7293,7 +7220,7 @@ var Link = React10.forwardRef(
         {
           ...rest,
           ...prefetchHandlers,
-          href: absoluteHref || href,
+          href: absoluteHref || href2,
           onClick: isExternal || reloadDocument ? onClick : handleClick,
           ref: mergeRefs(forwardedRef, prefetchRef),
           target,
@@ -7301,7 +7228,7 @@ var Link = React10.forwardRef(
         }
       )
     );
-    return shouldPrefetch && !isAbsolute ? /* @__PURE__ */ React10.createElement(React10.Fragment, null, link, /* @__PURE__ */ React10.createElement(PrefetchPageLinks, { page: href })) : link;
+    return shouldPrefetch && !isAbsolute ? /* @__PURE__ */ React10.createElement(React10.Fragment, null, link, /* @__PURE__ */ React10.createElement(PrefetchPageLinks, { page: href2 })) : link;
   }
 );
 Link.displayName = "Link";
@@ -7657,9 +7584,9 @@ function useFetcher({
     return () => router.deleteFetcher(fetcherKey);
   }, [router, fetcherKey]);
   let load = React10.useCallback(
-    async (href, opts) => {
+    async (href2, opts) => {
       invariant(routeId, "No routeId available for fetcher.load()");
-      await router.fetch(fetcherKey, routeId, href, opts);
+      await router.fetch(fetcherKey, routeId, href2, opts);
     },
     [fetcherKey, routeId, router]
   );
@@ -8116,9 +8043,9 @@ function createHref(to) {
   return typeof to === "string" ? to : createPath(to);
 }
 function encodeLocation(to) {
-  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");
+  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");
   return {
     pathname: encoded.pathname,
     search: encoded.search,
@@ -8273,11 +8200,8 @@ function processRoutes(routes, context, manifest, routeModules, parentId) {
       hasClientAction: false,
       hasClientLoader: false,
       hasErrorBoundary: route.ErrorBoundary != null,
-      // any need for these?
-      module: "build/stub-path-to-module.js",
-      clientActionModule: void 0,
-      clientLoaderModule: void 0,
-      hydrateFallbackModule: void 0
+      module: "build/stub-path-to-module.js"
+      // any need for this?
     };
     manifest.routes[newRoute.id] = entryRoute;
     routeModules[route.id] = {
@@ -9605,6 +9529,7 @@ export {
   replace,
   ErrorResponseImpl,
   isRouteErrorResponse,
+  href,
   IDLE_NAVIGATION,
   IDLE_FETCHER,
   IDLE_BLOCKER,

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-CTZ6x_bd.mjs';
-import './route-data-JFOfNyPS.mjs';
+import { R as RouterProviderProps$1 } from './fog-of-war-BCniP0AZ.mjs';
+import './router-BYH9f2xg.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-B3edLoNW.js';
-import './route-data-JFOfNyPS.js';
+import { R as RouterProviderProps$1 } from './fog-of-war-DFo9BKir.js';
+import './router-BYH9f2xg.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-9ea41ead4
+ * react-router v0.0.0-experimental-759a11a62
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -197,13 +197,13 @@ function getUrlBasedHistory(getLocation, createHref, validateLocation, options =
   }
   function createURL(to) {
     let base = window2.location.origin !== "null" ? window2.location.origin : window2.location.href;
-    let href = typeof to === "string" ? to : createPath(to);
-    href = href.replace(/ $/, "%20");
+    let href2 = typeof to === "string" ? to : createPath(to);
+    href2 = href2.replace(/ $/, "%20");
     invariant(
       base,
-      `No window.location.(origin|href) available to create URL for href: ${href}`
+      `No window.location.(origin|href) available to create URL for href: ${href2}`
     );
-    return new URL(href, base);
+    return new URL(href2, base);
   }
   let history = {
     get action() {
@@ -1562,7 +1562,7 @@ function createRouter(init) {
     });
     return new Map(state.fetchers);
   }
-  async function fetch2(key, routeId, href, opts) {
+  async function fetch2(key, routeId, href2, opts) {
     abortFetcher(key);
     let flushSync2 = (opts && opts.flushSync) === true;
     let routesToUse = inFlightDataRoutes || dataRoutes;
@@ -1570,7 +1570,7 @@ function createRouter(init) {
       state.location,
       state.matches,
       basename,
-      href,
+      href2,
       routeId,
       opts?.relative
     );
@@ -4218,7 +4218,7 @@ async function prefetchStyleLinks(route, routeModule) {
   if (!route.css && !routeModule.links || !isPreloadSupported()) return;
   let descriptors = [];
   if (route.css) {
-    descriptors.push(...route.css.map((href) => ({ rel: "stylesheet", href })));
+    descriptors.push(...route.css.map((href2) => ({ rel: "stylesheet", href: href2 })));
   }
   if (routeModule.links) {
     descriptors.push(...routeModule.links());
@@ -4262,31 +4262,6 @@ async function prefetchStyleLink(descriptor) {
 function isPageLinkDescriptor(object) {
   return object != null && typeof object.page === "string";
 }
-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);
-      }
-      return hrefs;
-    }).flat(1)
-  );
-}
-function dedupeHrefs(hrefs) {
-  return [...new Set(hrefs)];
-}
 var _isPreloadSupported;
 function isPreloadSupported() {
   if (_isPreloadSupported !== void 0) {
@@ -4811,21 +4786,6 @@ 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();
@@ -4922,22 +4882,6 @@ 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(() => {
@@ -4946,36 +4890,14 @@ 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 () => {
-        if (route.clientLoaderModule || route.clientActionModule) {
-          await new Promise((resolve) => setTimeout(resolve, 0));
-        }
-        let modPromise = loadRouteModuleWithBlockingLinks(
+        let mod = await loadRouteModuleWithBlockingLinks(
           route,
           routeModulesCache
         );
-        prefetchRouteModuleChunks(route);
-        let mod = await modPromise;
         let lazyRoute = { ...mod };
-        if (mod.clientLoader && !route.clientLoaderModule) {
+        if (mod.clientLoader) {
           let clientLoader = mod.clientLoader;
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
@@ -4985,7 +4907,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, isSpaMode
             }
           });
         }
-        if (mod.clientAction && !route.clientActionModule) {
+        if (mod.clientAction) {
           let clientAction = mod.clientAction;
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
@@ -5306,44 +5228,11 @@ 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, 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: module2
-      } = manifestEntry;
-      let chunks = [
-        ...clientActionModule ? [
-          {
-            module: clientActionModule,
-            varName: `${routeVarName}_clientAction`
-          }
-        ] : [],
-        ...clientLoaderModule ? [
-          {
-            module: clientLoaderModule,
-            varName: `${routeVarName}_clientLoader`
-          }
-        ] : [],
-        ...hydrateFallbackModule ? [
-          {
-            module: hydrateFallbackModule,
-            varName: `${routeVarName}_HydrateFallback`
-          }
-        ] : [],
-        { module: module2, varName: `${routeVarName}_main` }
-      ];
-      if (chunks.length === 1) {
-        return `import * as ${routeVarName} from ${JSON.stringify(module2)};`;
-      }
-      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")}
+${matches.map(
+      (match, index) => `import * as route${index} from ${JSON.stringify(
+        manifest.routes[match.route.id].module
+      )};`
+    ).join("\n")}
   ${enableFogOfWar ? (
       // Inline a minimal manifest with the SSR matches
       `window.__reactRouterManifest = ${JSON.stringify(
@@ -5374,11 +5263,11 @@ import(${JSON.stringify(manifest.entry.module)});`;
       }
     ));
   }, []);
-  let preloads = isHydrated ? [] : manifest.entry.imports.concat(
-    getModuleLinkHrefs(matches, manifest, {
-      includeHydrateFallback: true
-    })
-  );
+  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);
   return isHydrated ? null : /* @__PURE__ */ React9.createElement(React9.Fragment, null, !enableFogOfWar ? /* @__PURE__ */ React9.createElement(
     "link",
     {

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-9ea41ead4
+ * react-router v0.0.0-experimental-759a11a62
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-RSP5WONC.mjs";
+} from "./chunk-5WLC4F5Z.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";