[pull] main from remix-run:main

contributors.yml

@@ -433,6 +433,7 @@
 - souzasmatheus
 - SovietGhost
 - soxtoby
+- spokodev
 - srmagura
 - SsongQ-92
 - stasundr

packages/create-react-router/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router-architect/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router-dev/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "vite/client", "@vitejs/plugin-rsc/types", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router-express/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router-fs-routes/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router-node/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router-remix-routes-option-adapter/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router/.changes/patch.rank-static-routes-above-suffixed-params.md

@@ -0,0 +1,5 @@
+Fix route ranking/scoring bug with dynamic parameters containing static extension suffixes (i.e., `/:name.xml`)
+
+- These were not being detected as dynamic param segments and instead got incorrectly scored higher as a static segment
+- This meant they could potentially tie truly static routes like `/sitemap.xml` and outrank them based on definition order
+- These are now correctly identified as dynamic parameter segments and scored correctly

packages/react-router/__tests__/path-matching-test.tsx

@@ -190,6 +190,85 @@ describe("path matching", () => {
     ).toStrictEqual({ lang: "en" });
     expect(matchPath("/sitemap/:lang?.xml", "/sitemap.xml")).toBeNull();
   });
+
+  it("ranks a static routes above dynamic params with a static suffix", () => {
+    // Dynamic before static
+    expect(
+      pickPathsAndParams(
+        [{ path: "/:lang.xml" }, { path: "/sitemap.xml" }],
+        "/sitemap.xml",
+      ),
+    ).toEqual([
+      {
+        path: "/sitemap.xml",
+        params: {},
+      },
+    ]);
+
+    // Static before dynamic
+    expect(
+      pickPathsAndParams(
+        [{ path: "/sitemap.xml" }, { path: "/:lang.xml" }],
+        "/sitemap.xml",
+      ),
+    ).toEqual([
+      {
+        path: "/sitemap.xml",
+        params: {},
+      },
+    ]);
+
+    // Params still get extracted for dynamic-matching paths
+    expect(
+      pickPathsAndParams(
+        [{ path: "/sitemap.xml" }, { path: "/:lang.xml" }],
+        "/fr.xml",
+      ),
+    ).toEqual([
+      {
+        path: "/:lang.xml",
+        params: { lang: "fr" },
+      },
+    ]);
+  });
+
+  it("ranks dynamic params with a suffix above dynamic params", () => {
+    // Dynamic+suffix before dynamic
+    expect(
+      pickPathsAndParams(
+        [{ path: "/:a.json" }, { path: "/:b" }],
+        "/thing.json",
+      ),
+    ).toEqual([
+      {
+        path: "/:a.json",
+        params: { a: "thing" },
+      },
+    ]);
+
+    // Dynamic before dynamic+suffix
+    expect(
+      pickPathsAndParams(
+        [{ path: "/:b" }, { path: "/:a.json" }],
+        "/thing.json",
+      ),
+    ).toEqual([
+      {
+        path: "/:a.json",
+        params: { a: "thing" },
+      },
+    ]);
+
+    // Non-suffix still matches dynamic param
+    expect(
+      pickPathsAndParams([{ path: "/:a.json" }, { path: "/:b" }], "/thing"),
+    ).toEqual([
+      {
+        path: "/:b",
+        params: { b: "thing" },
+      },
+    ]);
+  });
 });
 
 describe("path matching with a basename", () => {

packages/react-router/__tests__/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "types": ["node", "jest"],
+    "rootDir": "..",
+    "noEmit": true
+  }
+}

packages/react-router/lib/router/utils.ts

@@ -1352,6 +1352,8 @@ function rankRouteBranches(branches: RouteBranch[]): void {
 }
 
 const paramRe = /^:[\w-]+$/;
+const partialParamRe = /^:[\w-]+/;
+const partialDynamicSegmentValue = 3.5;
 const dynamicSegmentValue = 3;
 const indexRouteValue = 2;
 const emptySegmentValue = 1;
@@ -1374,12 +1376,13 @@ function computeScore(path: string, index: boolean | undefined): number {
     .filter((s) => !isSplat(s))
     .reduce(
       (score, segment) =>
-        score +
-        (paramRe.test(segment)
-          ? dynamicSegmentValue
-          : segment === ""
-            ? emptySegmentValue
-            : staticSegmentValue),
+        // prettier-ignore
+        score + (
+          paramRe.test(segment) ? dynamicSegmentValue :
+          partialParamRe.test(segment) ? partialDynamicSegmentValue :
+          segment === "" ? emptySegmentValue :
+          staticSegmentValue
+        ),
       initialScore,
     );
 }