From d4d495b3f483d12a5f91413c3b06c990d9ccc667 Mon Sep 17 00:00:00 2001
From: ScriptedAlchemy <zackaryjackson@bytedance.com>
Date: Thu, 3 Apr 2025 19:21:38 -0700
Subject: [PATCH 1/2] chore: version packages

---
 .changeset/huge-pans-do.md | 5 -----
 CHANGELOG.md               | 6 ++++++
 package.json               | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/huge-pans-do.md

diff --git a/.changeset/huge-pans-do.md b/.changeset/huge-pans-do.md
deleted file mode 100644
index 6065ba5..0000000
--- a/.changeset/huge-pans-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'rsbuild-plugin-react-router': patch
----
-
-do not set target when output is esm
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba9bf24..6d5383c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # rsbuild-plugin-react-router
 
+## 0.0.4
+
+### Patch Changes
+
+- 88b052d: do not set target when output is esm
+
 ## 0.0.3
 
 ### Patch Changes
diff --git a/package.json b/package.json
index 833fc70..b33bd4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-react-router",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "React Router plugin for Rsbuild",
   "repository": {
     "type": "git",

From 797b40117decfc181a647bd09c89eafba08e88f2 Mon Sep 17 00:00:00 2001
From: Anggih Septiawan <46193391+anggihseptiawan@users.noreply.github.com>
Date: Wed, 16 Jul 2025 00:52:05 +0700
Subject: [PATCH 2/2] fix: correctly expose routeDiscovery configuration for
 React Router v7 (#25)

Co-authored-by: ScriptedAlchemy <zackaryjackson@bytedance.com>
---
 .changeset/crazy-books-kiss.md |  5 +++++
 src/index.ts                   |  4 ++++
 src/server-utils.ts            | 29 +++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 .changeset/crazy-books-kiss.md

diff --git a/.changeset/crazy-books-kiss.md b/.changeset/crazy-books-kiss.md
new file mode 100644
index 0000000..437d3d1
--- /dev/null
+++ b/.changeset/crazy-books-kiss.md
@@ -0,0 +1,5 @@
+---
+'rsbuild-plugin-react-router': patch
+---
+
+Fix: Correctly expose routeDiscovery configuration for React Router v7 in Rspack builds.
diff --git a/src/index.ts b/src/index.ts
index f7009e8..74f787c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -97,6 +97,9 @@ export const pluginReactRouter = (
         return {} as Config;
       });
 
+    // Set default routeDiscovery configuration
+    const routeDiscovery = { mode: 'lazy', manifestPath: '/__manifest' } as const;
+
     const routesPath = findEntryFile(resolve(appDirectory, 'routes'));
 
     // Then read the routes
@@ -175,6 +178,7 @@ export const pluginReactRouter = (
         appDirectory,
         ssr,
         federation: options.federation,
+        routeDiscovery,
       }),
       'virtual/react-router/with-props': generateWithProps(),
     });
diff --git a/src/server-utils.ts b/src/server-utils.ts
index 9b47faf..ce4c419 100644
--- a/src/server-utils.ts
+++ b/src/server-utils.ts
@@ -12,6 +12,15 @@ function generateAsyncTemplate(
     basename: string;
     appDirectory: string;
     ssr: boolean;
+    routeDiscovery:
+      | {
+          mode: 'lazy';
+          manifestPath?: string;
+        }
+      | {
+          mode: 'initial';
+        }
+      | undefined;
   }
 ): string {
   return `
@@ -82,6 +91,7 @@ function generateAsyncTemplate(
     export const future = ${JSON.stringify({})};
     export const isSpaMode = ${!options.ssr};
     export const ssr = ${options.ssr};
+    export const routeDiscovery = ${JSON.stringify(options.routeDiscovery)};
     export const publicPath = "/";
     export const prerender = [];
     export const entry = { module: entryServer };
@@ -115,6 +125,15 @@ function generateStaticTemplate(
     basename: string;
     appDirectory: string;
     ssr: boolean;
+    routeDiscovery:
+      | {
+          mode: 'lazy';
+          manifestPath?: string;
+        }
+      | {
+          mode: 'initial';
+        }
+      | undefined;
   }
 ): string {
   return `
@@ -136,6 +155,7 @@ function generateStaticTemplate(
     export const future = ${JSON.stringify({})};
     export const isSpaMode = ${!options.ssr};
     export const ssr = ${options.ssr};
+    export const routeDiscovery = ${JSON.stringify(options.routeDiscovery)};
     export const prerender = [];
     export const publicPath = "/";
     export const entry = { module: entryServer };
@@ -173,6 +193,15 @@ function generateServerBuild(
     appDirectory: string;
     ssr: boolean;
     federation?: boolean;
+    routeDiscovery:
+      | {
+          mode: 'lazy';
+          manifestPath?: string;
+        }
+      | {
+          mode: 'initial';
+        }
+      | undefined;
   }
 ): string {
   return options.federation