@remix-run/router 0.2.0-pre.7 → 0.2.0-pre.8

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @remix-run/router
 
+## 0.2.0-pre.8
+
+### Patch Changes
+
+- fix: avoid uneccesary re-renders on `defer` resolution (#9155)
+- fix: pass `useMatches` objects to `ScrollRestoration` `getKey` (#9157)
+- fix: fetcher submission revalidating fetchers using wrong key (#9166)
+- fix: use a push navigation on submission errors (#9162)
+
 ## 0.2.0-pre.7
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { BrowserHistoryOptions, HashHistoryOptions, MemoryHistoryOptions } from "./history";
 import type { Router, RouterInit } from "./router";
 import { convertRoutesToDataRoutes } from "./utils";
-export type { ActionFunction, ActionFunctionArgs, DataRouteMatch, DataRouteObject, TrackedPromise, FormEncType, FormMethod, JsonFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, PathMatch, PathPattern, RedirectFunction, RouteMatch, RouteObject, ShouldRevalidateFunction, Submission, } from "./utils";
+export type { ActionFunction, ActionFunctionArgs, AgnosticDataRouteMatch, AgnosticDataRouteObject, AgnosticRouteMatch, AgnosticRouteObject, TrackedPromise, FormEncType, FormMethod, JsonFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, PathMatch, PathPattern, RedirectFunction, ShouldRevalidateFunction, Submission, } from "./utils";
 export { ErrorResponse, defer, generatePath, getToPathname, invariant, isRouteErrorResponse, joinPaths, json, matchPath, matchRoutes, normalizePathname, redirect, resolvePath, resolveTo, stripBasename, warning, } from "./utils";
 export type { BrowserHistory, HashHistory, History, InitialEntry, Location, MemoryHistory, Path, To, } from "./history";
 export { Action, createBrowserHistory, createPath, createHashHistory, createMemoryHistory, parsePath, } from "./history";

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.2.0-pre.7
+ * @remix-run/router v0.2.0-pre.8
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -890,10 +890,17 @@ function resolvePathname(relativePath, fromPathname) {
  */
 
 
-function resolveTo(toArg, routePathnames, locationPathname) {
+function resolveTo(toArg, routePathnames, locationPathname, isPathRelative) {
+  if (isPathRelative === void 0) {
+    isPathRelative = false;
+  }
+
   let to = typeof toArg === "string" ? parsePath(toArg) : _extends({}, toArg);
   let isEmptyPath = toArg === "" || to.pathname === "";
-  let toPathname = isEmptyPath ? "/" : to.pathname; // If a pathname is explicitly provided in `to`, it should be relative to the
+  let toPathname = isEmptyPath ? "/" : to.pathname;
+  let from; // Routing is relative to the current pathname if explicitly requested.
+  //
+  // If a pathname is explicitly provided in `to`, it should be relative to the
   // route context. This is explained in `Note on `<Link to>` values` in our
   // migration guide from v5 as a means of disambiguation between `to` values
   // that begin with `/` and those that do not. However, this is problematic for
@@ -901,9 +908,7 @@ function resolveTo(toArg, routePathnames, locationPathname) {
   // hash string, in which case we should assume that the navigation is relative
   // to the current location's pathname and *not* the route pathname.
 
-  let from;
-
-  if (toPathname == null) {
+  if (isPathRelative || toPathname == null) {
     from = locationPathname;
   } else {
     let routePathnameIndex = routePathnames.length - 1;
@@ -1212,7 +1217,7 @@ function createRouter(init) {
 
   if (initialMatches == null) {
     // If we do not match a user-provided-route, fall back to the root
-    // to allow the errorElement to take over
+    // to allow the error boundary to take over
     let {
       matches,
       route,
@@ -1400,7 +1405,7 @@ function createRouter(init) {
     return await startNavigation(historyAction, location, {
       submission,
       // Send through the formData serialization error if we have one so we can
-      // render at the right errorElement after we match routes
+      // render at the right error boundary after we match routes
       pendingError: error,
       resetScroll,
       replace: opts == null ? void 0 : opts.replace
@@ -1586,7 +1591,15 @@ function createRouter(init) {
     if (isErrorResult(result)) {
       // Store off the pending error - we use it to determine which loaders
       // to call and will commit it when we complete the navigation
-      let boundaryMatch = findNearestBoundary(matches, actionMatch.route.id);
+      let boundaryMatch = findNearestBoundary(matches, actionMatch.route.id); // By default, all submissions are REPLACE navigations, but if the
+      // action threw an error that'll be rendered in an errorElement, we fall
+      // back to PUSH so that the user can use the back button to get back to
+      // the pre-submission form location to try again
+
+      if ((opts == null ? void 0 : opts.replace) !== true) {
+        pendingAction = exports.Action.Push;
+      }
+
       return {
         pendingActionError: {
           [boundaryMatch.route.id]: result.error
@@ -1712,15 +1725,9 @@ function createRouter(init) {
 
     activeDeferreds.forEach((deferredData, routeId) => {
       deferredData.subscribe(aborted => {
-        if (!aborted) {
-          updateState({
-            loaderData: _extends({}, state.loaderData, {
-              [routeId]: deferredData.data
-            })
-          });
-        } // Remove this instance if we were aborted or if promises have settled
-
-
+        // Note: No need to updateState here since the TrackedPromise on
+        // loaderData is stable across resolve/reject
+        // Remove this instance if we were aborted or if promises have settled
         if (aborted || deferredData.done) {
           activeDeferreds.delete(routeId);
         }
@@ -1879,7 +1886,7 @@ function createRouter(init) {
       let [staleKey] = _ref6;
       let revalidatingFetcher = {
         state: "loading",
-        data: (_state$fetchers$get3 = state.fetchers.get(key)) == null ? void 0 : _state$fetchers$get3.data,
+        data: (_state$fetchers$get3 = state.fetchers.get(staleKey)) == null ? void 0 : _state$fetchers$get3.data,
         formMethod: undefined,
         formAction: undefined,
         formEncType: undefined,
@@ -2231,14 +2238,16 @@ function createRouter(init) {
 
   function saveScrollPosition(location, matches) {
     if (savedScrollPositions && getScrollRestorationKey && getScrollPosition) {
-      let key = getScrollRestorationKey(location, matches) || location.key;
+      let userMatches = matches.map(m => createUseMatchesMatch(m, state.loaderData));
+      let key = getScrollRestorationKey(location, userMatches) || location.key;
       savedScrollPositions[key] = getScrollPosition();
     }
   }
 
   function getSavedScrollPosition(location, matches) {
     if (savedScrollPositions && getScrollRestorationKey && getScrollPosition) {
-      let key = getScrollRestorationKey(location, matches) || location.key;
+      let userMatches = matches.map(m => createUseMatchesMatch(m, state.loaderData));
+      let key = getScrollRestorationKey(location, userMatches) || location.key;
       let y = savedScrollPositions[key];
 
       if (typeof y === "number") {
@@ -2869,7 +2878,7 @@ function processRouteLoaderData(matches, matchesToLoad, results, pendingError, a
 
     if (isErrorResult(result)) {
       // Look upwards from the matched route for the closest ancestor
-      // errorElement, defaulting to the root match
+      // error boundary, defaulting to the root match
       let boundaryMatch = findNearestBoundary(matches, id);
       let error = result.error; // If we have a pending action error, we report it at the highest-route
       // that throws a loader error, and then clear it out to indicate that
@@ -2981,13 +2990,13 @@ function mergeLoaderData(loaderData, newLoaderData, matches) {
   });
   return mergedLoaderData;
 } // Find the nearest error boundary, looking upwards from the leaf route (or the
-// route specified by routeId) for the closest ancestor errorElement, defaulting
-// to the root match
+// route specified by routeId) for the closest ancestor error boundary,
+// defaulting to the root match
 
 
 function findNearestBoundary(matches, routeId) {
   let eligibleMatches = routeId ? matches.slice(0, matches.findIndex(m => m.route.id === routeId) + 1) : [...matches];
-  return eligibleMatches.reverse().find(m => m.route.errorElement) || matches[0];
+  return eligibleMatches.reverse().find(m => m.route.hasErrorBoundary === true) || matches[0];
 }
 
 function getNotFoundMatches(routes) {
@@ -3100,6 +3109,23 @@ async function resolveDeferredData(result, signal, unwrap) {
 
 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) {