@remix-run/router 1.21.0 → 1.21.1

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.21.0
+ * @remix-run/router v1.21.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2043,6 +2043,14 @@
         });
       }
 
+      // Remove any lingering deleted fetchers that have already been removed
+      // from state.fetchers
+      deletedFetchers.forEach(key => {
+        if (!state.fetchers.has(key) && !fetchControllers.has(key)) {
+          deletedFetchersKeys.push(key);
+        }
+      });
+
       // Iterate over a local copy so that if flushSync is used and we end up
       // removing and adding a new subscriber due to the useCallback dependencies,
       // we don't get ourselves into a loop calling the new subscriber immediately
@@ -2056,6 +2064,10 @@
       if (future.v7_fetcherPersist) {
         completedFetchers.forEach(key => state.fetchers.delete(key));
         deletedFetchersKeys.forEach(key => deleteFetcher(key));
+      } else {
+        // We already called deleteFetcher() on these, can remove them from this
+        // Set now that we've handed the keys off to the data layer
+        deletedFetchersKeys.forEach(key => deletedFetchers.delete(key));
       }
     }
 
@@ -3314,13 +3326,11 @@
       });
     }
     function getFetcher(key) {
-      if (future.v7_fetcherPersist) {
-        activeFetchers.set(key, (activeFetchers.get(key) || 0) + 1);
-        // If this fetcher was previously marked for deletion, unmark it since we
-        // have a new instance
-        if (deletedFetchers.has(key)) {
-          deletedFetchers.delete(key);
-        }
+      activeFetchers.set(key, (activeFetchers.get(key) || 0) + 1);
+      // If this fetcher was previously marked for deletion, unmark it since we
+      // have a new instance
+      if (deletedFetchers.has(key)) {
+        deletedFetchers.delete(key);
       }
       return state.fetchers.get(key) || IDLE_FETCHER;
     }
@@ -3335,21 +3345,29 @@
       fetchLoadMatches.delete(key);
       fetchReloadIds.delete(key);
       fetchRedirectIds.delete(key);
-      deletedFetchers.delete(key);
+
+      // If we opted into the flag we can clear this now since we're calling
+      // deleteFetcher() at the end of updateState() and we've already handed the
+      // deleted fetcher keys off to the data layer.
+      // If not, we're eagerly calling deleteFetcher() and we need to keep this
+      // Set populated until the next updateState call, and we'll clear
+      // `deletedFetchers` then
+      if (future.v7_fetcherPersist) {
+        deletedFetchers.delete(key);
+      }
       cancelledFetcherLoads.delete(key);
       state.fetchers.delete(key);
     }
     function deleteFetcherAndUpdateState(key) {
-      if (future.v7_fetcherPersist) {
-        let count = (activeFetchers.get(key) || 0) - 1;
-        if (count <= 0) {
-          activeFetchers.delete(key);
-          deletedFetchers.add(key);
-        } else {
-          activeFetchers.set(key, count);
+      let count = (activeFetchers.get(key) || 0) - 1;
+      if (count <= 0) {
+        activeFetchers.delete(key);
+        deletedFetchers.add(key);
+        if (!future.v7_fetcherPersist) {
+          deleteFetcher(key);
         }
       } else {
-        deleteFetcher(key);
+        activeFetchers.set(key, count);
       }
       updateState({
         fetchers: new Map(state.fetchers)