@remix-run/router 1.23.2 → 1.23.3

package/dist/utils.d.ts

@@ -439,6 +439,7 @@ export declare function resolveTo(toArg: To, routePathnames: string[], locationP
  * @private
  */
 export declare function getToPathname(to: To): string | undefined;
+export declare const removeDoubleSlashes: (path: string) => string;
 /**
  * @private
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/router",
-  "version": "1.23.2",
+  "version": "1.23.3",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
   "keywords": [
     "remix",

package/router.ts

@@ -50,6 +50,7 @@ import {
   joinPaths,
   matchRoutes,
   matchRoutesImpl,
+  removeDoubleSlashes,
   resolveTo,
   stripBasename,
 } from "./utils";
@@ -5186,7 +5187,7 @@ function normalizeRedirectLocation(
     }
     let isSameBasename = stripBasename(url.pathname, basename) != null;
     if (url.origin === currentUrl.origin && isSameBasename) {
-      return url.pathname + url.search + url.hash;
+      return removeDoubleSlashes(url.pathname) + url.search + url.hash;
     }
   }
 

package/utils.ts

@@ -545,6 +545,7 @@ export function matchRoutesImpl<
   rankRouteBranches(branches);
 
   let matches = null;
+  let decoded = decodePath(pathname);
   for (let i = 0; matches == null && i < branches.length; ++i) {
     // Incoming pathnames are generally encoded from either window.location
     // or from router.navigate, but we want to match against the unencoded
@@ -552,7 +553,6 @@ export function matchRoutesImpl<
     // encoded here but there also shouldn't be anything to decode so this
     // should be a safe operation.  This avoids needing matchRoutes to be
     // history-aware.
-    let decoded = decodePath(pathname);
     matches = matchRouteBranch<string, RouteObjectType>(
       branches[i],
       decoded,
@@ -1150,7 +1150,7 @@ export function resolvePath(to: To, fromPathname = "/"): Path {
     } else {
       if (toPathname.includes("//")) {
         let oldPathname = toPathname;
-        toPathname = toPathname.replace(/\/\/+/g, "/");
+        toPathname = removeDoubleSlashes(toPathname);
         warning(
           false,
           `Pathnames cannot have embedded double slashes - normalizing ` +
@@ -1353,11 +1353,14 @@ export function getToPathname(to: To): string | undefined {
     : to.pathname;
 }
 
+export const removeDoubleSlashes = (path: string): string =>
+  path.replace(/\/\/+/g, "/");
+
 /**
  * @private
  */
 export const joinPaths = (paths: string[]): string =>
-  paths.join("/").replace(/\/\/+/g, "/");
+  removeDoubleSlashes(paths.join("/"));
 
 /**
  * @private