@remix-run/router 1.2.1-pre.0 → 1.2.1-pre.1

package/dist/router.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.2.1-pre.0
+ * @remix-run/router v1.2.1-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1498,17 +1498,14 @@ function createRouter(init) {
 
 
   function completeNavigation(location, newState) {
-    var _state$navigation$for;
+    var _location$state;
 
     // Deduce if we're in a loading/actionReload state:
     // - We have committed actionData in the store
-    // - The current navigation was a submission
+    // - The current navigation was a mutation submission
     // - We're past the submitting state and into the loading state
-    // - The location we've finished loading is different from the submission
-    //   location, indicating we redirected from the action (avoids false
-    //   positives for loading/submissionRedirect when actionData returned
-    //   on a prior submission)
-    let isActionReload = state.actionData != null && state.navigation.formMethod != null && state.navigation.state === "loading" && ((_state$navigation$for = state.navigation.formAction) == null ? void 0 : _state$navigation$for.split("?")[0]) === location.pathname;
+    // - The location being loaded is not the result of a redirect
+    let isActionReload = state.actionData != null && state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && state.navigation.state === "loading" && ((_location$state = location.state) == null ? void 0 : _location$state._isRedirect) !== true;
     let actionData;
 
     if (newState.actionData) {
@@ -2070,7 +2067,6 @@ function createRouter(init) {
         fetchers: new Map(state.fetchers)
       });
       return startRedirectNavigation(state, actionResult, {
-        submission,
         isFetchActionRedirect: true
       });
     } // Process any non-redirect errors thrown
@@ -2149,9 +2145,7 @@ function createRouter(init) {
     let redirect = findRedirect(results);
 
     if (redirect) {
-      return startRedirectNavigation(state, redirect, {
-        submission
-      });
+      return startRedirectNavigation(state, redirect);
     } // Process and commit output from loaders