Minor updates

remix-run · May 25, 2023 · 0f16b2d · 0f16b2d
1 parent e516138
commit 0f16b2d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/packages/router/__tests__/router-test.ts b/packages/router/__tests__/router-test.ts
@@ -302,7 +302,6 @@ type SetupOpts = {
   future?: FutureConfig;
 };
 
-let globalWindow = window;
 function setup({
   routes,
   basename,
@@ -429,15 +428,18 @@ function setup({
     });
   }
 
-  // jsdom is making more and more properties non-configurable, so we inject our own jest-friendly window 😅
-  let window = {
-    ...globalWindow,
+  // jsdom is making more and more properties non-configurable, so we inject
+  // our own jest-friendly window.
+  let testWindow = {
+    ...window,
     location: {
-      ...globalWindow.location,
+      ...window.location,
       assign: jest.fn(),
       replace: jest.fn(),
     },
-  } as unknown as Window; // spread makes TS sad, since `window.NaN` conflicts with the `[index: number]: Window` index signature
+  } as unknown as Window;
+  // ^ Spread makes TS sad - `window.NaN` conflicts with `[index: number]: Window`
+
   let history = createMemoryHistory({ initialEntries, initialIndex });
   jest.spyOn(history, "push");
   jest.spyOn(history, "replace");
@@ -447,7 +449,7 @@ function setup({
     routes: enhanceRoutes(routes),
     hydrationData,
     future,
-    window,
+    window: testWindow,
   }).initialize();
 
   function getRouteHelpers(
@@ -854,7 +856,7 @@ function setup({
   }
 
   return {
-    window,
+    window: testWindow,
     history,
     router: currentRouter,
     navigate,

diff --git a/packages/router/router.ts b/packages/router/router.ts
@@ -662,8 +662,6 @@ export const IDLE_BLOCKER: BlockerUnblocked = {
 
 const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
 
-const globalWindow = typeof window !== "undefined" ? window : undefined;
-
 const defaultMapRouteProperties: MapRoutePropertiesFunction = (route) => ({
   hasErrorBoundary: Boolean(route.hasErrorBoundary),
 });
@@ -677,14 +675,16 @@ const defaultMapRouteProperties: MapRoutePropertiesFunction = (route) => ({
 /**
  * Create a router and listen to history POP navigations
  */
-export function createRouter({
-  window = globalWindow,
-  ...init
-}: RouterInit): Router {
+export function createRouter(init: RouterInit): Router {
+  const routerWindow = init.window
+    ? init.window
+    : typeof window !== "undefined"
+    ? window
+    : undefined;
   const isBrowser =
-    typeof window !== "undefined" &&
-    typeof window.document !== "undefined" &&
-    typeof window.document.createElement !== "undefined";
+    typeof routerWindow !== "undefined" &&
+    typeof routerWindow.document !== "undefined" &&
+    typeof routerWindow.document.createElement !== "undefined";
   const isServer = !isBrowser;
 
   invariant(
@@ -2088,19 +2088,15 @@ export function createRouter({
       "Expected a location on the redirect navigation"
     );
     // Check if this an absolute external redirect that goes to a new origin
-    if (
-      ABSOLUTE_URL_REGEX.test(redirect.location) &&
-      isBrowser &&
-      typeof window?.location !== "undefined"
-    ) {
+    if (ABSOLUTE_URL_REGEX.test(redirect.location) && isBrowser) {
       let url = init.history.createURL(redirect.location);
       let isDifferentBasename = stripBasename(url.pathname, basename) == null;
 
-      if (window.location.origin !== url.origin || isDifferentBasename) {
+      if (routerWindow.location.origin !== url.origin || isDifferentBasename) {
         if (replace) {
-          window.location.replace(redirect.location);
+          routerWindow.location.replace(redirect.location);
         } else {
-          window.location.assign(redirect.location);
+          routerWindow.location.assign(redirect.location);
         }
         return;
       }