@remix-run/router 1.14.1 → 1.14.2

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.14.1
+ * @remix-run/router v1.14.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -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];
@@ -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
@@ -4202,7 +4202,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();
         }