@remix-run/router 0.0.0-experimental-abead7ae1 → 0.0.0-experimental-e157216e3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export type { ActionFunction, ActionFunctionArgs, AgnosticDataIndexRouteObject, AgnosticDataNonIndexRouteObject, AgnosticDataRouteMatch, AgnosticDataRouteObject, AgnosticIndexRouteObject, AgnosticNonIndexRouteObject, AgnosticRouteMatch, AgnosticRouteObject, DataStrategyFunction as unstable_DataStrategyFunction, DataStrategyFunctionArgs as unstable_DataStrategyFunctionArgs, DataStrategyMatch as unstable_DataStrategyMatch, ErrorResponse, FormEncType, FormMethod, HandlerResult as unstable_HandlerResult, HTMLFormMethod, JsonFunction, LazyRouteFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, PathMatch, PathParam, PathPattern, RedirectFunction, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, TrackedPromise, UIMatch, V7_FormMethod, } from "./utils";
+export type { ActionFunction, ActionFunctionArgs, AgnosticDataIndexRouteObject, AgnosticDataNonIndexRouteObject, AgnosticDataRouteMatch, AgnosticDataRouteObject, AgnosticIndexRouteObject, AgnosticNonIndexRouteObject, AgnosticRouteMatch, AgnosticRouteObject, DataStrategyFunction as unstable_DataStrategyFunction, DataStrategyFunctionArgs as unstable_DataStrategyFunctionArgs, DataStrategyMatch as unstable_DataStrategyMatch, ErrorResponse, FormEncType, FormMethod, HandlerResult as unstable_HandlerResult, HTMLFormMethod, JsonFunction, LazyRouteFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, AgnosticPatchRoutesOnMissFunction as unstable_AgnosticPatchRoutesOnMissFunction, PathMatch, PathParam, PathPattern, RedirectFunction, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, TrackedPromise, UIMatch, V7_FormMethod, } from "./utils";
 export { AbortedDeferredError, defer, generatePath, getToPathname, isRouteErrorResponse, joinPaths, json, matchPath, matchRoutes, normalizePathname, redirect, redirectDocument, resolvePath, resolveTo, stripBasename, } from "./utils";
 export type { BrowserHistory, BrowserHistoryOptions, HashHistory, HashHistoryOptions, History, InitialEntry, Location, MemoryHistory, MemoryHistoryOptions, Path, To, } from "./history";
 export { Action, createBrowserHistory, createHashHistory, createMemoryHistory, createPath, parsePath, } from "./history";

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-abead7ae1
+ * @remix-run/router v0.0.0-experimental-e157216e3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -751,15 +751,9 @@ function matchRoutes(routes, locationArg, basename) {
   if (basename === void 0) {
     basename = "/";
   }
-  return matchRoutesImpl(routes, locationArg, false, basename);
+  return matchRoutesImpl(routes, locationArg, basename, false);
 }
-function matchRoutesImpl(routes, locationArg, allowPartial, basename) {
-  if (allowPartial === void 0) {
-    allowPartial = false;
-  }
-  if (basename === void 0) {
-    basename = "/";
-  }
+function matchRoutesImpl(routes, locationArg, basename, allowPartial) {
   let location = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
   let pathname = stripBasename(location.pathname || "/", basename);
   if (pathname == null) {
@@ -1690,7 +1684,7 @@ function createRouter(init) {
   let inFlightDataRoutes;
   let basename = init.basename || "/";
   let dataStrategyImpl = init.unstable_dataStrategy || defaultDataStrategy;
-  let patchRoutesOnMissImpl = init.unstable_patchRoutesOnMiss || (() => Promise.resolve(null));
+  let patchRoutesOnMissImpl = init.unstable_patchRoutesOnMiss;
 
   // Config driven behavior flags
   let future = _extends({
@@ -1720,7 +1714,7 @@ function createRouter(init) {
   let initialScrollRestored = init.hydrationData != null;
   let initialMatches = matchRoutes(dataRoutes, init.history.location, basename);
   let initialErrors = null;
-  if (initialMatches == null) {
+  if (initialMatches == null && !patchRoutesOnMissImpl) {
     // If we do not match a user-provided-route, fall back to the root
     // to allow the error boundary to take over
     let error = getInternalRouterError(404, {
@@ -1736,13 +1730,15 @@ function createRouter(init) {
     };
   }
   let initialized;
-  let hasLazyRoutes = initialMatches.some(m => m.route.lazy);
-  let hasLoaders = initialMatches.some(m => m.route.loader);
-  if (hasLazyRoutes) {
+  if (!initialMatches) {
+    // We need to run patchRoutesOnMiss in initialize()
+    initialized = false;
+    initialMatches = [];
+  } else if (initialMatches.some(m => m.route.lazy)) {
     // All initialMatches need to be loaded before we're ready.  If we have lazy
     // functions around still then we'll need to run them in initialize()
     initialized = false;
-  } else if (!hasLoaders) {
+  } else if (!initialMatches.some(m => m.route.loader)) {
     // If we've got no loaders to run, then we're good to go
     initialized = true;
   } else if (future.v7_partialHydration) {
@@ -3498,25 +3494,25 @@ function createRouter(init) {
     return null;
   }
   function checkFogOfWar(matches, routesToUse, pathname) {
-    if (!matches) {
-      let fogMatches = matchRoutesImpl(routesToUse, pathname, true, basename);
-      if (fogMatches) {
-        return {
-          active: true,
-          matches: fogMatches
-        };
-      }
-    } else {
-      let leafRoute = matches[matches.length - 1].route;
-      if (leafRoute.path === "*") {
-        // If we matched a splat, it might only be because we haven't yet fetched
-        // the children that would match with a higher score, so let's fetch
-        // around and find out
-        let partialMatches = matchRoutesImpl(routesToUse, pathname, true, basename);
+    if (patchRoutesOnMissImpl) {
+      if (!matches) {
+        let fogMatches = matchRoutesImpl(routesToUse, pathname, basename, true);
         return {
           active: true,
-          matches: partialMatches
+          matches: fogMatches || []
         };
+      } else {
+        let leafRoute = matches[matches.length - 1].route;
+        if (leafRoute.path === "*") {
+          // If we matched a splat, it might only be because we haven't yet fetched
+          // the children that would match with a higher score, so let's fetch
+          // around and find out
+          let partialMatches = matchRoutesImpl(routesToUse, pathname, basename, true);
+          return {
+            active: true,
+            matches: partialMatches
+          };
+        }
       }
     }
     return {
@@ -3526,10 +3522,10 @@ function createRouter(init) {
   }
   async function discoverRoutes(matches, pathname, signal) {
     let partialMatches = matches;
-    let route = partialMatches[partialMatches.length - 1].route;
+    let route = partialMatches.length > 0 ? partialMatches[partialMatches.length - 1].route : null;
     while (true) {
       try {
-        await loadLazyRouteChildren(route, patchRoutesOnMissImpl, pathname, partialMatches, manifest, mapRouteProperties, pendingPatchRoutes, signal);
+        await loadLazyRouteChildren(route, patchRoutesOnMissImpl, pathname, partialMatches, dataRoutes || inFlightDataRoutes, manifest, mapRouteProperties, pendingPatchRoutes, signal);
         if (signal.aborted) {
           return {
             type: "aborted"
@@ -3569,7 +3565,7 @@ function createRouter(init) {
           }
         }
       }
-      let newPartialMatches = matchRoutesImpl(routesToUse, pathname, true, basename);
+      let newPartialMatches = matchRoutesImpl(routesToUse, pathname, basename, true);
 
       // Loop detection if we find the same partials after a run through patchRoutesOnMiss
       if (!newPartialMatches || partialMatches.map(m => m.route.id).join("-") === newPartialMatches.map(m => m.route.id).join("-")) {
@@ -3634,7 +3630,7 @@ function createRouter(init) {
     getBlocker,
     deleteBlocker,
     patchRoutes(routeId, children) {
-      return patchRoutes(routeId, children, manifest, mapRouteProperties);
+      return patchRoutes(routeId, children, dataRoutes || inFlightDataRoutes, manifest, mapRouteProperties);
     },
     _internalFetchControllers: fetchControllers,
     _internalActiveDeferreds: activeDeferreds,
@@ -4456,12 +4452,12 @@ function shouldRevalidateLoader(loaderMatch, arg) {
  * Idempotent utility to execute route.children() method to lazily load route
  * definitions and update the routes/routeManifest
  */
-async function loadLazyRouteChildren(route, patchRoutesOnMissImpl, path, matches, manifest, mapRouteProperties, pendingRouteChildren, signal) {
+async function loadLazyRouteChildren(route, patchRoutesOnMissImpl, path, matches, routes, manifest, mapRouteProperties, pendingRouteChildren, signal) {
   let key = [path, ...matches.map(m => m.route.id)].join("-");
   let pending = pendingRouteChildren.get(key);
   let children = null;
   if (!pending) {
-    let maybePromise = patchRoutesOnMissImpl(path, matches);
+    let maybePromise = patchRoutesOnMissImpl(path, matches, (r, c) => patchRoutes(r, c, routes, manifest, mapRouteProperties));
     if (isPromise(maybePromise)) {
       pending = maybePromise;
       pendingRouteChildren.set(key, pending);
@@ -4474,20 +4470,30 @@ async function loadLazyRouteChildren(route, patchRoutesOnMissImpl, path, matches
       children = await pending;
     }
     if (children && !signal.aborted) {
-      patchRoutes(route.id, children, manifest, mapRouteProperties);
+      if (route) {
+        patchRoutes(route.id, children, routes, manifest, mapRouteProperties);
+      } else {
+        warning(false, "You cannot return routes from `patchRoutesOnMiss` when there were no " + "partial matches, since React Router doesn't know where to patch the " + "routes.  Please use `patch(routeId, children)` instead.");
+      }
     }
   } finally {
     pendingRouteChildren.delete(key);
   }
 }
-function patchRoutes(routeId, children, manifest, mapRouteProperties) {
-  let route = manifest[routeId];
-  invariant(route, "No route found to patch children into: routeId = " + routeId);
-  let dataChildren = convertRoutesToDataRoutes(children, mapRouteProperties, [routeId, "patch"], manifest);
-  if (route.children) {
-    route.children.push(...dataChildren);
+function patchRoutes(routeId, children, routes, manifest, mapRouteProperties) {
+  if (routeId) {
+    var _route$children;
+    let route = manifest[routeId];
+    invariant(route, "No route found to patch children into: routeId = " + routeId);
+    let dataChildren = convertRoutesToDataRoutes(children, mapRouteProperties, [routeId, "patch", String(((_route$children = route.children) == null ? void 0 : _route$children.length) || "0")], manifest);
+    if (route.children) {
+      route.children.push(...dataChildren);
+    } else {
+      route.children = dataChildren;
+    }
   } else {
-    route.children = dataChildren;
+    let dataChildren = convertRoutesToDataRoutes(children, mapRouteProperties, ["patch", String(routes.length || "0")], manifest);
+    routes.push(...dataChildren);
   }
 }