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

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-e157216e3
+ * @remix-run/router v0.0.0-experimental-c5cae38f3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3525,7 +3525,7 @@ function createRouter(init) {
     let route = partialMatches.length > 0 ? partialMatches[partialMatches.length - 1].route : null;
     while (true) {
       try {
-        await loadLazyRouteChildren(route, patchRoutesOnMissImpl, pathname, partialMatches, dataRoutes || inFlightDataRoutes, manifest, mapRouteProperties, pendingPatchRoutes, signal);
+        await loadLazyRouteChildren(patchRoutesOnMissImpl, pathname, partialMatches, dataRoutes || inFlightDataRoutes, manifest, mapRouteProperties, pendingPatchRoutes, signal);
         if (signal.aborted) {
           return {
             type: "aborted"
@@ -4452,29 +4452,24 @@ 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, routes, manifest, mapRouteProperties, pendingRouteChildren, signal) {
+async function loadLazyRouteChildren(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, (r, c) => patchRoutes(r, c, routes, manifest, mapRouteProperties));
-    if (isPromise(maybePromise)) {
-      pending = maybePromise;
-      pendingRouteChildren.set(key, pending);
-    } else {
-      children = maybePromise;
-    }
-  }
   try {
-    if (pending) {
-      children = await pending;
+    let pending = pendingRouteChildren.get(key);
+    if (!pending) {
+      pending = patchRoutesOnMissImpl({
+        path,
+        matches,
+        patch: (routeId, children) => {
+          if (!signal.aborted) {
+            patchRoutes(routeId, children, routes, manifest, mapRouteProperties);
+          }
+        }
+      });
+      pendingRouteChildren.set(key, pending);
     }
-    if (children && !signal.aborted) {
-      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.");
-      }
+    if (pending && isPromise(pending)) {
+      await pending;
     }
   } finally {
     pendingRouteChildren.delete(key);