@remix-run/router 0.0.0-experimental-4a8a492a → 0.0.0-experimental-e0f088aa

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # `@remix-run/router`
 
+## 1.10.0
+
+### Minor Changes
+
+- Add experimental support for the [View Transitions API](https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition) by allowing users to opt-into view transitions on navigations via the new `unstable_viewTransition` option to `router.navigate` ([#10916](https://github.com/remix-run/react-router/pull/10916))
+
+### Patch Changes
+
+- Allow 404 detection to leverage root route error boundary if path contains a URL segment ([#10852](https://github.com/remix-run/react-router/pull/10852))
+- Fix `ErrorResponse` type to avoid leaking internal field ([#10876](https://github.com/remix-run/react-router/pull/10876))
+
 ## 1.9.0
 
 ### Minor Changes

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-4a8a492a
+ * @remix-run/router v0.0.0-experimental-e0f088aa
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1881,8 +1881,17 @@ function createRouter(init) {
   function updateState(newState, viewTransitionOpts) {
     state = _extends({}, state, newState);
     subscribers.forEach(subscriber => subscriber(state, {
-      viewTransitionOpts
+      unstable_viewTransitionOpts: viewTransitionOpts
     }));
+
+    // Remove idle fetchers from state since we only care about in-flight fetchers.
+    // We keep fetchLoadeMatches around for revalidations purposes.
+    // The React layer persists the data for completed fetchers.
+    state.fetchers.forEach((fetcher, key) => {
+      if (fetcher.state === "idle") {
+        state.fetchers.delete(key);
+      }
+    });
   }
 
   // Complete a navigation returning the state.navigation back to the IDLE_NAVIGATION
@@ -2434,9 +2443,6 @@ function createRouter(init) {
       fetchers: new Map(state.fetchers)
     } : {});
   }
-  function getFetcher(key) {
-    return state.fetchers.get(key) || IDLE_FETCHER;
-  }
 
   // Trigger a fetcher load/submit for the given fetcher key
   function fetch(key, routeId, href, opts) {
@@ -2624,7 +2630,7 @@ function createRouter(init) {
       let doneFetcher = getDoneFetcher(actionResult.data);
       state.fetchers.set(key, doneFetcher);
     }
-    let didAbortFetchLoads = abortStaleFetchLoads(loadId);
+    abortStaleFetchLoads(loadId);
 
     // If we are currently in a navigation loading state and this fetcher is
     // more recent than the navigation, we want the newer data so abort the
@@ -2642,12 +2648,11 @@ function createRouter(init) {
       // otherwise just update with the fetcher data, preserving any existing
       // loaderData for loaders that did not need to reload.  We have to
       // manually merge here since we aren't going through completeNavigation
-      updateState(_extends({
+      updateState({
         errors,
-        loaderData: mergeLoaderData(state.loaderData, loaderData, matches, errors)
-      }, didAbortFetchLoads || revalidatingFetchers.length > 0 ? {
+        loaderData: mergeLoaderData(state.loaderData, loaderData, matches, errors),
         fetchers: new Map(state.fetchers)
-      } : {}));
+      });
       isRevalidationRequired = false;
     }
   }
@@ -2879,6 +2884,7 @@ function createRouter(init) {
   }
   function deleteFetcher(key) {
     let fetcher = state.fetchers.get(key);
+
     // Don't abort the controller if this is a deletion of a fetcher.submit()
     // in it's loading phase since - we don't want to abort the corresponding
     // revalidation and want them to complete and land
@@ -2898,8 +2904,8 @@ function createRouter(init) {
   }
   function markFetchersDone(keys) {
     for (let key of keys) {
-      let fetcher = getFetcher(key);
-      let doneFetcher = getDoneFetcher(fetcher.data);
+      let fetcher = state.fetchers.get(key);
+      let doneFetcher = getDoneFetcher(fetcher ? fetcher.data : undefined);
       state.fetchers.set(key, doneFetcher);
     }
   }
@@ -3070,6 +3076,9 @@ function createRouter(init) {
     get routes() {
       return dataRoutes;
     },
+    get window() {
+      return routerWindow;
+    },
     initialize,
     subscribe,
     enableScrollRestoration,
@@ -3080,7 +3089,6 @@ function createRouter(init) {
     // hash-aware URLs in DOM paths
     createHref: to => init.history.createHref(to),
     encodeLocation: to => init.history.encodeLocation(to),
-    getFetcher,
     deleteFetcher,
     dispose,
     getBlocker,
@@ -4266,7 +4274,7 @@ function findNearestBoundary(matches, routeId) {
 }
 function getShortCircuitMatches(routes) {
   // Prefer a root layout route if present, otherwise shim in a route object
-  let route = routes.find(r => r.index || !r.path || r.path === "/") || {
+  let route = routes.length === 1 ? routes[0] : routes.find(r => r.index || !r.path || r.path === "/") || {
     id: "__shim-error-route__"
   };
   return {