@remix-run/router 1.15.0 → 1.15.1

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.15.0
+ * @remix-run/router v1.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -498,6 +498,10 @@
       // See https://bugzilla.mozilla.org/show_bug.cgi?id=878297
       let base = window.location.origin !== "null" ? window.location.origin : window.location.href;
       let href = typeof to === "string" ? to : createPath(to);
+      // Treating this as a full URL will strip any trailing spaces so we need to
+      // pre-encode them since they might be part of a matching splat param from
+      // an ancestor route
+      href = href.replace(/ $/, "%20");
       invariant(base, "No window.location.(origin|href) available to create URL for href: " + href);
       return new URL(href, base);
     }
@@ -754,14 +758,14 @@
     rankRouteBranches(branches);
     let matches = null;
     for (let i = 0; matches == null && i < branches.length; ++i) {
-      matches = matchRouteBranch(branches[i],
       // Incoming pathnames are generally encoded from either window.location
       // or from router.navigate, but we want to match against the unencoded
       // paths in the route definitions.  Memory router locations won't be
       // 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.
-      safelyDecodeURI(pathname));
+      let decoded = decodePath(pathname);
+      matches = matchRouteBranch(branches[i], decoded);
     }
     return matches;
   }
@@ -1040,7 +1044,7 @@
       if (isOptional && !value) {
         memo[paramName] = undefined;
       } else {
-        memo[paramName] = safelyDecodeURIComponent(value || "", paramName);
+        memo[paramName] = (value || "").replace(/%2F/g, "/");
       }
       return memo;
     }, {});
@@ -1092,22 +1096,14 @@
     let matcher = new RegExp(regexpSource, caseSensitive ? undefined : "i");
     return [matcher, params];
   }
-  function safelyDecodeURI(value) {
+  function decodePath(value) {
     try {
-      return decodeURI(value);
+      return value.split("/").map(v => decodeURIComponent(v).replace(/\//g, "%2F")).join("/");
     } catch (error) {
       warning(false, "The URL path \"" + value + "\" could not be decoded because it is is a " + "malformed URL segment. This is probably due to a bad percent " + ("encoding (" + error + ")."));
       return value;
     }
   }
-  function safelyDecodeURIComponent(value, paramName) {
-    try {
-      return decodeURIComponent(value);
-    } catch (error) {
-      warning(false, "The value for the URL param \"" + paramName + "\" will not be decoded because" + (" the string \"" + value + "\" is a malformed URL segment. This is probably") + (" due to a bad percent encoding (" + error + ")."));
-      return value;
-    }
-  }
 
   /**
    * @private