@remix-run/router 0.0.0-experimental-8bb3ffdf → 0.0.0-experimental-d90c8fb3

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-8bb3ffdf
+ * @remix-run/router v0.0.0-experimental-d90c8fb3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -754,14 +754,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;
   }
@@ -891,7 +891,7 @@
     branches.sort((a, b) => a.score !== b.score ? b.score - a.score // Higher score first
     : compareIndexes(a.routesMeta.map(meta => meta.childrenIndex), b.routesMeta.map(meta => meta.childrenIndex)));
   }
-  const paramRe = /^:\w+$/;
+  const paramRe = /^:[\w-]+$/;
   const dynamicSegmentValue = 3;
   const indexRouteValue = 2;
   const emptySegmentValue = 1;
@@ -981,7 +981,7 @@
         // Apply the splat
         return stringify(params[star]);
       }
-      const keyMatch = segment.match(/^:(\w+)(\??)$/);
+      const keyMatch = segment.match(/^:([\w-]+)(\??)$/);
       if (keyMatch) {
         const [, key, optional] = keyMatch;
         let param = params[key];
@@ -1040,7 +1040,7 @@
       if (isOptional && !value) {
         memo[paramName] = undefined;
       } else {
-        memo[paramName] = safelyDecodeURIComponent(value || "", paramName);
+        memo[paramName] = (value || "").replace(/%2F/g, "/");
       }
       return memo;
     }, {});
@@ -1063,7 +1063,7 @@
     let regexpSource = "^" + path.replace(/\/*\*?$/, "") // Ignore trailing / and /*, we'll handle it below
     .replace(/^\/*/, "/") // Make sure it has a leading /
     .replace(/[\\.*+^${}|()[\]]/g, "\\$&") // Escape special regex chars
-    .replace(/\/:(\w+)(\?)?/g, (_, paramName, isOptional) => {
+    .replace(/\/:([\w-]+)(\?)?/g, (_, paramName, isOptional) => {
       params.push({
         paramName,
         isOptional: isOptional != null
@@ -1092,22 +1092,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
@@ -4202,7 +4194,11 @@
         // Check between word boundaries instead of startsWith() due to the last
         // paragraph of https://httpwg.org/specs/rfc9110.html#field.content-type
         if (contentType && /\bapplication\/json\b/.test(contentType)) {
-          data = await result.json();
+          if (result.body == null) {
+            data = null;
+          } else {
+            data = await result.json();
+          }
         } else {
           data = await result.text();
         }