Merge branch 'dev' into logan/flat-routes-no-splat-anywhere

.changeset/curvy-mangos-heal.md

@@ -0,0 +1,6 @@
+---
+"remix": patch
+"@remix-run/dev": patch
+---
+
+update flat-routes invalid character error message to include link to React Router proposal

packages/remix-dev/config/flat-routes.ts

@@ -126,22 +126,23 @@ export function getRouteSegments(routeId: string) {
   let pushRouteSegment = (routeSegment: string) => {
     if (!routeSegment) return;
 
-    if (rawRouteSegment.includes("*")) {
+    let notSupportedInRR = (segment: string, char: string) => {
       throw new Error(
-        `Route segment "${rawRouteSegment}" for "${routeId}" cannot contain "*"`
+        `Route segment "${segment}" for "${routeId}" cannot contain "${char}".\n` +
+          `If this is something you need, upvote this proposal for React Router https://github.com/remix-run/react-router/discussions/9822.`
       );
+    };
+
+    if (rawRouteSegment.includes("*")) {
+      return notSupportedInRR(rawRouteSegment, "*");
     }
 
     if (rawRouteSegment.includes(":")) {
-      throw new Error(
-        `Route segment "${rawRouteSegment}" for "${routeId}" cannot contain ":"`
-      );
+      return notSupportedInRR(rawRouteSegment, ":");
     }
 
     if (rawRouteSegment.includes("/")) {
-      throw new Error(
-        `Route segment "${routeSegment}" for "${routeId}" cannot contain "/"`
-      );
+      return notSupportedInRR(routeSegment, "/");
     }
     routeSegments.push(routeSegment);
   };