@remix-run/router 0.0.0-experimental-1e8b7a59 → 0.0.0-experimental-e0f088aa

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-1e8b7a59
+ * @remix-run/router v0.0.0-experimental-e0f088aa
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1751,11 +1751,6 @@ function createRouter(init) {
   // AbortControllers for any in-flight fetchers
   let fetchControllers = new Map();
 
-  // Keys for persisted fetchers
-  // - `false` means it was submitted with `persist:true`
-  // - `true` value means a deletion was requested during submission
-  let persistedFetchers = new Map();
-
   // Track loads based on the order in which they started
   let incrementingLoadId = 0;
 
@@ -1884,20 +1879,19 @@ function createRouter(init) {
 
   // Update our state and notify the calling context of the change
   function updateState(newState, viewTransitionOpts) {
-    // If we're updating fetchers, delete any persisted ones that returned to idle
-    if (newState.fetchers) {
-      let newFetchers = newState.fetchers;
-      newFetchers.forEach((fetcher, key) => {
-        if (persistedFetchers.get(key) && fetcher.state === "idle") {
-          cleanupFetcher(key, fetcher);
-          newFetchers.delete(key);
-        }
-      });
-    }
     state = _extends({}, state, newState);
     subscribers.forEach(subscriber => subscriber(state, {
       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
@@ -2449,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) {
@@ -2480,10 +2471,6 @@ function createRouter(init) {
     let match = getTargetMatch(matches, path);
     pendingPreventScrollReset = (opts && opts.preventScrollReset) === true;
     if (submission && isMutationMethod(submission.formMethod)) {
-      // Mark this fetcher as persisted, but not deleted
-      if (opts.persist) {
-        persistedFetchers.set(key, false);
-      }
       handleFetcherAction(key, routeId, path, match, matches, submission);
       return;
     }
@@ -2494,7 +2481,6 @@ function createRouter(init) {
       routeId,
       path
     });
-    persistedFetchers.delete(key);
     handleFetcherLoader(key, routeId, path, match, matches, submission);
   }
 
@@ -2896,7 +2882,9 @@ function createRouter(init) {
       fetchers: new Map(state.fetchers)
     });
   }
-  function cleanupFetcher(key, fetcher) {
+  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
@@ -2906,24 +2894,8 @@ function createRouter(init) {
     fetchLoadMatches.delete(key);
     fetchReloadIds.delete(key);
     fetchRedirectIds.delete(key);
-    persistedFetchers.delete(key);
-  }
-  function deleteFetcher(key) {
-    let fetcher = state.fetchers.get(key);
-    if (persistedFetchers.has(key) && fetcher && fetcher.state !== "idle") {
-      // Mark for deletion on completion
-      persistedFetchers.set(key, true);
-      return;
-    }
-    cleanupFetcher(key, fetcher);
     state.fetchers.delete(key);
   }
-  function deleteFetcherAndUpdateState(key) {
-    deleteFetcher(key);
-    updateState({
-      fetchers: new Map(state.fetchers)
-    });
-  }
   function abortFetcher(key) {
     let controller = fetchControllers.get(key);
     invariant(controller, "Expected fetch controller: " + key);
@@ -2932,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);
     }
   }
@@ -3117,8 +3089,7 @@ function createRouter(init) {
     // hash-aware URLs in DOM paths
     createHref: to => init.history.createHref(to),
     encodeLocation: to => init.history.encodeLocation(to),
-    getFetcher,
-    deleteFetcher: deleteFetcherAndUpdateState,
+    deleteFetcher,
     dispose,
     getBlocker,
     deleteBlocker,