react-router 0.0.0-experimental-e960cf1a → 0.0.0-experimental-a0888892

package/dist/umd/react-router.development.js

@@ -1,5 +1,5 @@
 /**
- * React Router v0.0.0-experimental-e960cf1a
+ * React Router v0.0.0-experimental-a0888892
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -394,13 +394,32 @@
       location = locationFromContext;
     }
     let pathname = location.pathname || "/";
-    let remainingPathname = parentPathnameBase === "/" ? pathname : pathname.slice(parentPathnameBase.length) || "/";
+    let remainingPathname = pathname;
+    if (parentPathnameBase !== "/") {
+      // Determine the remaining pathname by removing the # of URL segments the
+      // parentPathnameBase has, instead of removing based on character count.
+      // This is because we can't guarantee that incoming/outgoing encodings/
+      // decodings will match exactly.
+      // We decode paths before matching on a per-segment basis with
+      // decodeURIComponent(), but we re-encode pathnames via `new URL()` so they
+      // match what `window.location.pathname` would reflect.  Those don't 100%
+      // align when it comes to encoded URI characters such as % and &.
+      //
+      // So we may end up with:
+      //   pathname:           "/descendant/a%25b/match"
+      //   parentPathnameBase: "/descendant/a%b"
+      //
+      // And the direct substring removal approach won't work :/
+      let parentSegments = parentPathnameBase.replace(/^\//, "").split("/");
+      let segments = pathname.replace(/^\//, "").split("/");
+      remainingPathname = "/" + segments.slice(parentSegments.length).join("/");
+    }
     let matches = router.matchRoutes(routes, {
       pathname: remainingPathname
     });
     {
       router.UNSAFE_warning(parentRoute || matches != null, "No routes matched location \"" + location.pathname + location.search + location.hash + "\" ") ;
-      router.UNSAFE_warning(matches == null || matches[matches.length - 1].route.element !== undefined || matches[matches.length - 1].route.Component !== undefined, "Matched leaf route at location \"" + location.pathname + location.search + location.hash + "\" " + "does not have an element or Component. This means it will render an <Outlet /> with a " + "null value by default resulting in an \"empty\" page.") ;
+      router.UNSAFE_warning(matches == null || matches[matches.length - 1].route.element !== undefined || matches[matches.length - 1].route.Component !== undefined || matches[matches.length - 1].route.lazy !== undefined, "Matched leaf route at location \"" + location.pathname + location.search + location.hash + "\" " + "does not have an element or Component. This means it will render an <Outlet /> with a " + "null value by default resulting in an \"empty\" page.") ;
     }
     let renderedMatches = _renderMatches(matches && matches.map(match => Object.assign({}, match, {
       params: Object.assign({}, parentParams, match.params),
@@ -574,17 +593,24 @@
         if (match.route.HydrateFallback || match.route.hydrateFallbackElement) {
           fallbackIndex = i;
         }
-        if (match.route.loader && match.route.id && dataRouterState.loaderData[match.route.id] === undefined && (!dataRouterState.errors || dataRouterState.errors[match.route.id] === undefined)) {
-          // We found the first route without data/errors which means it's loader
-          // still needs to run.  Flag that we need to render a fallback and
-          // render up until the appropriate fallback
-          renderFallback = true;
-          if (fallbackIndex >= 0) {
-            renderedMatches = renderedMatches.slice(0, fallbackIndex + 1);
-          } else {
-            renderedMatches = [renderedMatches[0]];
+        if (match.route.id) {
+          let {
+            loaderData,
+            errors
+          } = dataRouterState;
+          let needsToRunLoader = match.route.loader && loaderData[match.route.id] === undefined && (!errors || errors[match.route.id] === undefined);
+          if (match.route.lazy || needsToRunLoader) {
+            // We found the first route that's not ready to render (waiting on
+            // lazy, or has a loader that hasn't run yet).  Flag that we need to
+            // render a fallback and render up until the appropriate fallback
+            renderFallback = true;
+            if (fallbackIndex >= 0) {
+              renderedMatches = renderedMatches.slice(0, fallbackIndex + 1);
+            } else {
+              renderedMatches = [renderedMatches[0]];
+            }
+            break;
           }
-          break;
         }
       }
     }
@@ -962,7 +988,7 @@
     // pick up on any render-driven redirects/navigations (useEffect/<Navigate>)
     React__namespace.useLayoutEffect(() => router$1.subscribe(setState), [router$1, setState]);
     React__namespace.useEffect(() => {
-      router.UNSAFE_warning(fallbackElement == null || !router$1.future.v7_partialHydration, "`<RouterProvider fallbackElement>` is deprecated when using `v7_partialHydration`") ;
+      router.UNSAFE_warning(fallbackElement == null || !router$1.future.v7_partialHydration, "`<RouterProvider fallbackElement>` is deprecated when using " + "`v7_partialHydration`, use a `HydrateFallback` component instead") ;
       // Only log this once on initial mount
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -987,10 +1013,7 @@
       router: router$1,
       navigator,
       static: false,
-      basename,
-      future: {
-        v7_relativeSplatPath: router$1.future.v7_relativeSplatPath
-      }
+      basename
     }), [router$1, navigator, basename]);
 
     // The fragment and {null} here are important!  We need them to keep React 18's
@@ -1007,8 +1030,11 @@
       basename: basename,
       location: state.location,
       navigationType: state.historyAction,
-      navigator: navigator
-    }, state.initialized ? /*#__PURE__*/React__namespace.createElement(DataRoutes, {
+      navigator: navigator,
+      future: {
+        v7_relativeSplatPath: router$1.future.v7_relativeSplatPath
+      }
+    }, state.initialized || router$1.future.v7_partialHydration ? /*#__PURE__*/React__namespace.createElement(DataRoutes, {
       routes: router$1.routes,
       future: router$1.future,
       state: state