Merge branch 'dev' into markdalgleish/rsc-meta-links-export

Author: markdalgleish

.changeset/bright-bats-wave.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Fix usage of optional path segments in nested routes defined using absolute paths

.changeset/eleven-humans-smell.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Fix optional static segment matching in `matchPath`

.changeset/fresh-brooms-trade.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Fix prerendering when a `basename` is set with `ssr:false`

.github/workflows/close-feature-pr.yml

@@ -13,6 +13,8 @@ jobs:
     name: 🚪 Check Feature PR
     if: github.repository == 'remix-run/react-router' && github.event.label.name == 'feature-request'
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4

contributors.yml

@@ -212,6 +212,7 @@
 - KubasuIvanSakwa
 - KutnerUri
 - kylegirard
+- LadyTsukiko
 - landisdesign
 - latin-1
 - lazybean
@@ -349,6 +350,7 @@
 - SirDaev
 - SkayuX
 - skratchdot
+- skrhlm
 - smff
 - smithki
 - soartec-lab

integration/helpers/cloudflare-dev-proxy-template/package.json

@@ -19,7 +19,7 @@
     "react-router": "workspace:*"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250317.0",
+    "@cloudflare/workers-types": "^4.20250803.0",
     "@react-router/dev": "workspace:*",
     "@react-router/fs-routes": "workspace:*",
     "@react-router/remix-routes-option-adapter": "workspace:*",

integration/helpers/create-fixture.ts

@@ -158,16 +158,15 @@ export async function createFixture(init: FixtureInit, mode?: ServerMode) {
       prerender: init.prerender,
       requestDocument(href: string) {
         let file = new URL(href, "test://test").pathname + "/index.html";
-        let mainPath = path.join(projectDir, "build", "client", file);
-        let fallbackPath = path.join(
-          projectDir,
-          "build",
-          "client",
-          "__spa-fallback.html",
-        );
+        let clientDir = path.join(projectDir, "build", "client");
+        let mainPath = path.join(clientDir, file);
+        let fallbackPath = path.join(clientDir, "__spa-fallback.html");
+        let fallbackPath2 = path.join(clientDir, "index.html");
         let html = existsSync(mainPath)
           ? readFileSync(mainPath)
-          : readFileSync(fallbackPath);
+          : existsSync(fallbackPath)
+            ? readFileSync(fallbackPath)
+            : readFileSync(fallbackPath2);
         return new Response(html, {
           headers: {
             "Content-Type": "text/html",
@@ -344,11 +343,18 @@ export async function createAppFixture(fixture: Fixture, mode?: ServerMode) {
         );
         app.get("*", (req, res, next) => {
           let dir = path.join(fixture.projectDir, "build", "client");
-          let file = req.path.endsWith(".data")
-            ? req.path
-            : req.path + "/index.html";
-          if (file.endsWith(".html") && !existsSync(path.join(dir, file))) {
-            file = "__spa-fallback.html";
+          let file;
+          if (req.path.endsWith(".data")) {
+            file = req.path;
+          } else {
+            let mainPath = req.path + "/index.html";
+            let fallbackPath = "__spa-fallback.html";
+            let fallbackPath2 = "index.html";
+            file = existsSync(mainPath)
+              ? mainPath
+              : existsSync(fallbackPath)
+                ? fallbackPath
+                : fallbackPath2;
           }
           let filePath = path.join(dir, file);
           if (existsSync(filePath)) {