@remix-run/router 1.9.0-pre.0 → 1.9.0-pre.1

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.9.0-pre.0
+ * @remix-run/router v1.9.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -47,25 +47,23 @@
    * The pathname, search, and hash values of a URL.
    */
 
+  // TODO: (v7) Change the Location generic default from `any` to `unknown` and
+  // remove Remix `useLocation` wrapper.
   /**
    * An entry in a history stack. A location contains information about the
    * URL path, as well as possibly some arbitrary state and a key.
    */
-
   /**
    * A change to the current location.
    */
-
   /**
    * A function that receives notifications about location changes.
    */
-
   /**
    * Describes a location that is the destination of some navigation, either via
    * `history.push` or `history.replace`. May be either a URL or the pieces of a
    * URL path.
    */
-
   /**
    * A history is an interface to the navigation stack. The history serves as the
    * source of truth for the current location, as well as provides a set of
@@ -74,7 +72,6 @@
    * It is similar to the DOM's `window.history` object, but with a smaller, more
    * focused API.
    */
-
   const PopStateEventType = "popstate";
   //#endregion
 
@@ -607,32 +604,28 @@
    * this as a private implementation detail in case they diverge in the future.
    */
 
+  // TODO: (v7) Change the defaults from any to unknown in and remove Remix wrappers:
+  //   ActionFunction, ActionFunctionArgs, LoaderFunction, LoaderFunctionArgs
   /**
    * Arguments passed to loader functions
    */
-
   /**
    * Arguments passed to action functions
    */
-
   /**
    * Loaders and actions can return anything except `undefined` (`null` is a
    * valid return value if there is no data to return).  Responses are preferred
    * and will ease any future migration to Remix
    */
-
   /**
    * Route loader function signature
    */
-
   /**
    * Route action function signature
    */
-
   /**
    * Arguments passed to shouldRevalidate function
    */
-
   /**
    * Route shouldRevalidate function signature.  This runs after any submission
    * (navigation or fetcher), so we flatten the navigation/fetcher submission
@@ -640,25 +633,21 @@
    * or a fetcher, what really matters is the URLs and the formData since loaders
    * have to re-run based on the data models that were potentially mutated.
    */
-
   /**
    * Function provided by the framework-aware layers to set `hasErrorBoundary`
    * from the framework-aware `errorElement` prop
    *
    * @deprecated Use `mapRouteProperties` instead
    */
-
   /**
    * Function provided by the framework-aware layers to set any framework-specific
    * properties from framework-agnostic properties
    */
-
   /**
    * Keys we cannot change from within a lazy() function. We spread all other keys
    * onto the route. Either they're meaningful to the router, or they'll get
    * ignored.
    */
-
   const immutableRouteKeys = new Set(["lazy", "caseSensitive", "path", "id", "index", "children"]);
 
   /**
@@ -775,6 +764,20 @@
     }
     return matches;
   }
+  function convertRouteMatchToUiMatch(match, loaderData) {
+    let {
+      route,
+      pathname,
+      params
+    } = match;
+    return {
+      id: route.id,
+      pathname,
+      params,
+      data: loaderData[route.id],
+      handle: route.handle
+    };
+  }
   function flattenRoutes(routes, branches, parentsMeta, parentPath) {
     if (branches === void 0) {
       branches = [];
@@ -2974,7 +2977,7 @@
     }
     function getScrollKey(location, matches) {
       if (getScrollRestorationKey) {
-        let key = getScrollRestorationKey(location, matches.map(m => createUseMatchesMatch(m, state.loaderData)));
+        let key = getScrollRestorationKey(location, matches.map(m => convertRouteMatchToUiMatch(m, state.loaderData)));
         return key || location.key;
       }
       return location.key;
@@ -4379,23 +4382,6 @@
   function hasNakedIndexQuery(search) {
     return new URLSearchParams(search).getAll("index").some(v => v === "");
   }
-
-  // Note: This should match the format exported by useMatches, so if you change
-  // this please also change that :)  Eventually we'll DRY this up
-  function createUseMatchesMatch(match, loaderData) {
-    let {
-      route,
-      pathname,
-      params
-    } = match;
-    return {
-      id: route.id,
-      pathname,
-      params,
-      data: loaderData[route.id],
-      handle: route.handle
-    };
-  }
   function getTargetMatch(matches, location) {
     let search = typeof location === "string" ? parsePath(location).search : location.search;
     if (matches[matches.length - 1].route.index && hasNakedIndexQuery(search || "")) {
@@ -4551,6 +4537,7 @@
   exports.UNSAFE_DEFERRED_SYMBOL = UNSAFE_DEFERRED_SYMBOL;
   exports.UNSAFE_DeferredData = DeferredData;
   exports.UNSAFE_ErrorResponseImpl = ErrorResponseImpl;
+  exports.UNSAFE_convertRouteMatchToUiMatch = convertRouteMatchToUiMatch;
   exports.UNSAFE_convertRoutesToDataRoutes = convertRoutesToDataRoutes;
   exports.UNSAFE_getPathContributingMatches = getPathContributingMatches;
   exports.UNSAFE_invariant = invariant;