From 8022829ceed91bd67ae4baf3e37380e96af501fa Mon Sep 17 00:00:00 2001 From: Fedorenko Dmitrii Date: Thu, 11 Jun 2026 04:01:15 +0400 Subject: [PATCH 1/3] Pass Vite `server.watch` config to child compiler in dev mode (#14298) --- .changeset/wet-walls-camp.md | 5 +++++ contributors.yml | 1 + packages/react-router-dev/vite/plugin.ts | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changeset/wet-walls-camp.md diff --git a/.changeset/wet-walls-camp.md b/.changeset/wet-walls-camp.md new file mode 100644 index 0000000000..4d79eb8f82 --- /dev/null +++ b/.changeset/wet-walls-camp.md @@ -0,0 +1,5 @@ +--- +"@react-router/dev": patch +--- + +Copy `server.watch` config options from `vite.config.(ts|js)` file to child vite server in development mode. diff --git a/contributors.yml b/contributors.yml index 8de7f34850..0a7e13fb83 100644 --- a/contributors.yml +++ b/contributors.yml @@ -74,6 +74,7 @@ - brophdawg11 - btav - bvangraafeiland +- c0va23 - camthompson - CanRau - caprolactam diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts index 7710912526..a40ccf5c8a 100644 --- a/packages/react-router-dev/vite/plugin.ts +++ b/packages/react-router-dev/vite/plugin.ts @@ -1551,7 +1551,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => { cacheDir: "node_modules/.vite-child-compiler", mode: viteConfig.mode, server: { - watch: viteConfig.command === "build" ? null : undefined, + watch: viteConfig.command === "build" ? null : viteConfig.server.watch, preTransformRequests: false, hmr: false, }, From f67ba21171680fe67440b254b022b879ecabaa7d Mon Sep 17 00:00:00 2001 From: Remix Run Bot Date: Thu, 11 Jun 2026 00:01:55 +0000 Subject: [PATCH 2/3] chore: format --- packages/react-router-dev/vite/plugin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts index a40ccf5c8a..06a4462991 100644 --- a/packages/react-router-dev/vite/plugin.ts +++ b/packages/react-router-dev/vite/plugin.ts @@ -1551,7 +1551,8 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => { cacheDir: "node_modules/.vite-child-compiler", mode: viteConfig.mode, server: { - watch: viteConfig.command === "build" ? null : viteConfig.server.watch, + watch: + viteConfig.command === "build" ? null : viteConfig.server.watch, preTransformRequests: false, hmr: false, }, From 18b5e998c9d35cb98798e81dec424902dabf8537 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Thu, 11 Jun 2026 10:20:57 +1000 Subject: [PATCH 3/3] Migrate changeset for `server.watch` in child compiler (#15178) --- .changeset/wet-walls-camp.md | 5 ----- .../.changes/patch.copy-server-watch-config.md | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 .changeset/wet-walls-camp.md create mode 100644 packages/react-router-dev/.changes/patch.copy-server-watch-config.md diff --git a/.changeset/wet-walls-camp.md b/.changeset/wet-walls-camp.md deleted file mode 100644 index 4d79eb8f82..0000000000 --- a/.changeset/wet-walls-camp.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@react-router/dev": patch ---- - -Copy `server.watch` config options from `vite.config.(ts|js)` file to child vite server in development mode. diff --git a/packages/react-router-dev/.changes/patch.copy-server-watch-config.md b/packages/react-router-dev/.changes/patch.copy-server-watch-config.md new file mode 100644 index 0000000000..e90657d8cd --- /dev/null +++ b/packages/react-router-dev/.changes/patch.copy-server-watch-config.md @@ -0,0 +1 @@ +Pass Vite `server.watch` config to child compiler in development mode.