@remix-run/router 1.22.0-pre-v6.1 → 1.23.0-pre-v6.0

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.22.0-pre-v6.1
+ * @remix-run/router v1.23.0-pre-v6.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2324,6 +2324,21 @@
       // `matchRoutes()` has already been called if we're in here via `router.initialize()`
       state.matches : matchRoutes(routesToUse, location, basename);
       let flushSync = (opts && opts.flushSync) === true;
+
+      // Short circuit if it's only a hash change and not a revalidation or
+      // mutation submission.
+      //
+      // Ignore on initial page loads because since the initial hydration will always
+      // be "same hash".  For example, on /page#hash and submit a <Form method="post">
+      // which will default to a navigation to /page
+      if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
+        completeNavigation(location, {
+          matches
+        }, {
+          flushSync
+        });
+        return;
+      }
       let fogOfWar = checkFogOfWar(matches, routesToUse, location.pathname);
       if (fogOfWar.active && fogOfWar.matches) {
         matches = fogOfWar.matches;
@@ -2348,21 +2363,6 @@
         return;
       }
 
-      // Short circuit if it's only a hash change and not a revalidation or
-      // mutation submission.
-      //
-      // Ignore on initial page loads because since the initial hydration will always
-      // be "same hash".  For example, on /page#hash and submit a <Form method="post">
-      // which will default to a navigation to /page
-      if (state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
-        completeNavigation(location, {
-          matches
-        }, {
-          flushSync
-        });
-        return;
-      }
-
       // Create a controller/Request for this navigation
       pendingNavigationController = new AbortController();
       let request = createClientSideRequest(init.history, location, pendingNavigationController.signal, opts && opts.submission);
@@ -2858,7 +2858,7 @@
       let abortController = new AbortController();
       let fetchRequest = createClientSideRequest(init.history, path, abortController.signal, submission);
       if (isFogOfWar) {
-        let discoverResult = await discoverRoutes(requestMatches, new URL(fetchRequest.url).pathname, fetchRequest.signal);
+        let discoverResult = await discoverRoutes(requestMatches, new URL(fetchRequest.url).pathname, fetchRequest.signal, key);
         if (discoverResult.type === "aborted") {
           return;
         } else if (discoverResult.type === "error") {
@@ -3044,7 +3044,7 @@
       let abortController = new AbortController();
       let fetchRequest = createClientSideRequest(init.history, path, abortController.signal);
       if (isFogOfWar) {
-        let discoverResult = await discoverRoutes(matches, new URL(fetchRequest.url).pathname, fetchRequest.signal);
+        let discoverResult = await discoverRoutes(matches, new URL(fetchRequest.url).pathname, fetchRequest.signal, key);
         if (discoverResult.type === "aborted") {
           return;
         } else if (discoverResult.type === "error") {
@@ -3588,7 +3588,7 @@
         matches: null
       };
     }
-    async function discoverRoutes(matches, pathname, signal) {
+    async function discoverRoutes(matches, pathname, signal, fetcherKey) {
       if (!patchRoutesOnNavigationImpl) {
         return {
           type: "success",
@@ -3605,6 +3605,7 @@
             signal,
             path: pathname,
             matches: partialMatches,
+            fetcherKey,
             patch: (routeId, children) => {
               if (signal.aborted) return;
               patchRoutesImpl(routeId, children, routesToUse, localManifest, mapRouteProperties);