Update window.history before setting updated React state on navigatio…

…ns (#10448)

* fix window.location is not equal to useLocation()

* Update contributors.yml

.changeset/big-vans-act.md

@@ -0,0 +1,6 @@
+---
+"@remix-run/router": patch
+"react-router-dom": patch
+---
+
+Fix window.location is not equal to useLocation()

contributors.yml

@@ -215,3 +215,4 @@
 - yionr
 - yuleicul
 - zheng-chuang
+- holynewbie

packages/router/router.ts

@@ -1008,6 +1008,16 @@ export function createRouter(init: RouterInit): Router {
       inFlightDataRoutes = undefined;
     }
 
+    if (isUninterruptedRevalidation) {
+      // If this was an uninterrupted revalidation then do not touch history
+    } else if (pendingAction === HistoryAction.Pop) {
+      // Do nothing for POP - URL has already been updated
+    } else if (pendingAction === HistoryAction.Push) {
+      init.history.push(location, location.state);
+    } else if (pendingAction === HistoryAction.Replace) {
+      init.history.replace(location, location.state);
+    }
+
     updateState({
       ...newState, // matches, errors, fetchers go through as-is
       actionData,
@@ -1025,16 +1035,6 @@ export function createRouter(init: RouterInit): Router {
       blockers: new Map(state.blockers),
     });
 
-    if (isUninterruptedRevalidation) {
-      // If this was an uninterrupted revalidation then do not touch history
-    } else if (pendingAction === HistoryAction.Pop) {
-      // Do nothing for POP - URL has already been updated
-    } else if (pendingAction === HistoryAction.Push) {
-      init.history.push(location, location.state);
-    } else if (pendingAction === HistoryAction.Replace) {
-      init.history.replace(location, location.state);
-    }
-
     // Reset stateful navigation vars
     pendingAction = HistoryAction.Pop;
     pendingPreventScrollReset = false;