react-router 0.0.0-experimental-cb0fdf114 → 0.0.0-experimental-689d76079

package/dist/development/{chunk-L7VOOA4V.mjs → chunk-RPWK4TB6.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-cb0fdf114
+ * react-router v0.0.0-experimental-689d76079
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -723,8 +723,7 @@ function generatePath(originalPath, params = {}) {
   const segments = path.split(/\/+/).map((segment, index, array) => {
     const isLastSegment = index === array.length - 1;
     if (isLastSegment && segment === "*") {
-      const star = "*";
-      return stringify2(params[star]);
+      return stringify2(params["*"]);
     }
     const keyMatch = segment.match(/^:([\w-]+)(\??)(.*)/);
     if (keyMatch) {
@@ -845,7 +844,7 @@ function resolvePath(to, fromPathname = "/") {
   } = typeof to === "string" ? parsePath(to) : to;
   let pathname;
   if (toPathname) {
-    toPathname = toPathname.replace(/\/\/+/g, "/");
+    toPathname = removeDoubleSlashes(toPathname);
     if (toPathname.startsWith("/")) {
       pathname = resolvePathname(toPathname.substring(1), "/");
     } else {
@@ -861,7 +860,7 @@ function resolvePath(to, fromPathname = "/") {
   };
 }
 function resolvePathname(relativePath, fromPathname) {
-  let segments = fromPathname.replace(/\/+$/, "").split("/");
+  let segments = removeTrailingSlash(fromPathname).split("/");
   let relativeSegments = relativePath.split("/");
   relativeSegments.forEach((segment) => {
     if (segment === "..") {
@@ -932,8 +931,10 @@ function resolveTo(toArg, routePathnames, locationPathname, isPathRelative = fal
   }
   return path;
 }
-var joinPaths = (paths) => paths.join("/").replace(/\/\/+/g, "/");
-var normalizePathname = (pathname) => pathname.replace(/\/+$/, "").replace(/^\/*/, "/");
+var removeDoubleSlashes = (path) => path.replace(/\/\/+/g, "/");
+var joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
+var removeTrailingSlash = (path) => path.replace(/\/+$/, "");
+var normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
 var normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
 var normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
 var DataWithResponseInit = class {
@@ -987,7 +988,8 @@ function isRouteErrorResponse(error) {
   return error != null && typeof error.status === "number" && typeof error.statusText === "string" && typeof error.internal === "boolean" && "data" in error;
 }
 function getRoutePattern(matches) {
-  return matches.map((m) => m.route.path).filter(Boolean).join("/").replace(/\/\/*/g, "/") || "/";
+  let parts = matches.map((m) => m.route.path).filter(Boolean);
+  return joinPaths(parts) || "/";
 }
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 function parseToInfo(_to, basename) {
@@ -2656,6 +2658,14 @@ function createRouter(init) {
       key
     );
     let result = results[match.route.id];
+    if (!result) {
+      for (let match2 of matches) {
+        if (results[match2.route.id]) {
+          result = results[match2.route.id];
+          break;
+        }
+      }
+    }
     if (fetchControllers.get(key) === abortController) {
       fetchControllers.delete(key);
     }
@@ -5022,7 +5032,7 @@ function normalizeRedirectLocation(location, currentUrl, basename, historyInstan
     }
     let isSameBasename = stripBasename(url.pathname, basename) != null;
     if (url.origin === currentUrl.origin && isSameBasename) {
-      return url.pathname + url.search + url.hash;
+      return removeDoubleSlashes(url.pathname) + url.search + url.hash;
     }
   }
   try {
@@ -5732,7 +5742,7 @@ function useOutlet(context) {
 function useParams() {
   let { matches } = React2.useContext(RouteContext);
   let routeMatch = matches[matches.length - 1];
-  return routeMatch ? routeMatch.params : {};
+  return routeMatch?.params ?? {};
 }
 function useResolvedPath(to, { relative } = {}) {
   let { matches } = React2.useContext(RouteContext);
@@ -6503,6 +6513,16 @@ function RouterProvider({
     ]
   );
   React3.useLayoutEffect(() => router.subscribe(setState), [router, setState]);
+  let initialized = state.initialized;
+  React3.useLayoutEffect(() => {
+    if (!initialized && router.state.initialized) {
+      setState(router.state, {
+        deletedFetchers: [],
+        flushSync: false,
+        newErrors: null
+      });
+    }
+  }, [initialized, setState, router.state]);
   React3.useEffect(() => {
     if (vtContext.isTransitioning && !vtContext.flushSync) {
       setRenderDfd(new Deferred());
@@ -7302,9 +7322,6 @@ async function stringify(stack) {
             deferred[index] = input;
           } else if (input instanceof Error) {
             str[index] = `["${TYPE_ERROR}",${JSON.stringify(input.message)}`;
-            if (input.name !== "Error") {
-              str[index] += `,${JSON.stringify(input.name)}`;
-            }
             str[index] += "]";
           } else if (Object.getPrototypeOf(input) === null) {
             str[index] = `["${TYPE_NULL_OBJECT}",{${partsForObj(input)}}]`;
@@ -7369,7 +7386,6 @@ function isPlainObject2(thing) {
 }
 
 // vendor/turbo-stream-v2/unflatten.ts
-var globalObj = typeof window !== "undefined" ? window : typeof globalThis !== "undefined" ? globalThis : void 0;
 function unflatten(parsed) {
   const { hydrated, values } = this;
   if (typeof parsed === "number") return hydrate.call(this, parsed);
@@ -7512,8 +7528,8 @@ function hydrate(index) {
             }
             continue;
           case TYPE_ERROR:
-            const [, message, errorType] = value;
-            let error = errorType && globalObj && globalObj[errorType] ? new globalObj[errorType](message) : new Error(message);
+            const [, message] = value;
+            let error = new Error(message);
             hydrated[index2] = error;
             set(error);
             continue;
@@ -8219,9 +8235,9 @@ function singleFetchUrl(reqUrl, basename, trailingSlashAware, extension) {
     if (url.pathname === "/") {
       url.pathname = `_root.${extension}`;
     } else if (basename && stripBasename(url.pathname, basename) === "/") {
-      url.pathname = `${basename.replace(/\/$/, "")}/_root.${extension}`;
+      url.pathname = `${removeTrailingSlash(basename)}/_root.${extension}`;
     } else {
-      url.pathname = `${url.pathname.replace(/\/$/, "")}.${extension}`;
+      url.pathname = `${removeTrailingSlash(url.pathname)}.${extension}`;
     }
   }
   return url;
@@ -9177,10 +9193,7 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
 }
 function getManifestPath(_manifestPath, basename) {
   let manifestPath = _manifestPath || "/__manifest";
-  if (basename == null) {
-    return manifestPath;
-  }
-  return `${basename}${manifestPath}`.replace(/\/+/g, "/");
+  return basename == null ? manifestPath : joinPaths([basename, manifestPath]);
 }
 var MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
 async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
@@ -9970,7 +9983,7 @@ var isBrowser2 = typeof window !== "undefined" && typeof window.document !== "un
 try {
   if (isBrowser2) {
     window.__reactRouterVersion = // @ts-expect-error
-    "0.0.0-experimental-cb0fdf114";
+    "0.0.0-experimental-689d76079";
   }
 } catch (e) {
 }