Skip to content

Commit df086de

Browse files
Remove unused Vite file system watcher (remix-run#13133)
1 parent b0dfdc6 commit df086de

File tree

5 files changed

+49
-42
lines changed

5 files changed

+49
-42
lines changed

.changeset/ninety-otters-repeat.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Remove unused Vite file system watcher

packages/react-router-dev/config/config.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
configRoutesToRouteManifest,
2323
} from "./routes";
2424
import { detectPackageManager } from "../cli/detectPackageManager";
25-
import { isReactRouterRepo } from "./is-react-router-repo";
2625

2726
const excludedConfigPresetKeys = ["presets"] as const satisfies ReadonlyArray<
2827
keyof ReactRouterConfig
@@ -546,10 +545,6 @@ export async function createConfigLoader({
546545
let viteNodeContext = await ViteNode.createContext({
547546
root,
548547
mode: watch ? "development" : "production",
549-
server: !watch ? { watch: null } : {},
550-
ssr: {
551-
external: ssrExternals,
552-
},
553548
});
554549

555550
let reactRouterConfigFile = findEntry(root, "react-router.config", {
@@ -732,22 +727,6 @@ export async function resolveEntryFiles({
732727
return { entryClientFilePath, entryServerFilePath };
733728
}
734729

735-
export const ssrExternals = isReactRouterRepo()
736-
? [
737-
// This is only needed within this repo because these packages
738-
// are linked to a directory outside of node_modules so Vite
739-
// treats them as internal code by default.
740-
"react-router",
741-
"react-router-dom",
742-
"@react-router/architect",
743-
"@react-router/cloudflare",
744-
"@react-router/dev",
745-
"@react-router/express",
746-
"@react-router/node",
747-
"@react-router/serve",
748-
]
749-
: undefined;
750-
751730
const entryExts = [".js", ".jsx", ".ts", ".tsx"];
752731

753732
function findEntry(

packages/react-router-dev/vite/plugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import * as VirtualModule from "./virtual-module";
4141
import { resolveFileUrl } from "./resolve-file-url";
4242
import { combineURLs } from "./combine-urls";
4343
import { removeExports } from "./remove-exports";
44+
import { ssrExternals } from "./ssr-externals";
4445
import {
4546
type RouteChunkName,
4647
type RouteChunkExportName,
@@ -59,7 +60,6 @@ import {
5960
type ConfigLoader,
6061
createConfigLoader,
6162
resolveEntryFiles,
62-
ssrExternals,
6363
configRouteToBranchRoute,
6464
} from "../config/config";
6565
import * as WithProps from "./with-props";
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { isReactRouterRepo } from "../config/is-react-router-repo";
2+
3+
export const ssrExternals = isReactRouterRepo()
4+
? [
5+
// This is only needed within this repo because these packages
6+
// are linked to a directory outside of node_modules so Vite
7+
// treats them as internal code by default.
8+
"react-router",
9+
"react-router-dom",
10+
"@react-router/architect",
11+
"@react-router/cloudflare",
12+
"@react-router/dev",
13+
"@react-router/express",
14+
"@react-router/node",
15+
"@react-router/serve",
16+
]
17+
: undefined;

packages/react-router-dev/vite/vite-node.ts

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,42 @@ import { installSourcemapsSupport } from "vite-node/source-map";
44
import type * as Vite from "vite";
55

66
import { preloadVite, getVite } from "./vite";
7+
import { ssrExternals } from "./ssr-externals";
78

89
export type Context = {
910
devServer: Vite.ViteDevServer;
1011
server: ViteNodeServer;
1112
runner: ViteNodeRunner;
1213
};
1314

14-
export async function createContext(
15-
viteConfig: Vite.InlineConfig = {}
16-
): Promise<Context> {
15+
export async function createContext({
16+
root,
17+
mode,
18+
}: {
19+
root: Vite.UserConfig["root"];
20+
mode: Vite.ConfigEnv["mode"];
21+
}): Promise<Context> {
1722
await preloadVite();
1823
const vite = getVite();
1924

20-
const devServer = await vite.createServer(
21-
vite.mergeConfig(
22-
{
23-
server: {
24-
preTransformRequests: false,
25-
hmr: false,
26-
},
27-
optimizeDeps: {
28-
noDiscovery: true,
29-
},
30-
configFile: false,
31-
envFile: false,
32-
plugins: [],
33-
},
34-
viteConfig
35-
)
36-
);
25+
const devServer = await vite.createServer({
26+
root,
27+
mode,
28+
server: {
29+
preTransformRequests: false,
30+
hmr: false,
31+
watch: null,
32+
},
33+
ssr: {
34+
external: ssrExternals,
35+
},
36+
optimizeDeps: {
37+
noDiscovery: true,
38+
},
39+
configFile: false,
40+
envFile: false,
41+
plugins: [],
42+
});
3743
await devServer.pluginContainer.buildStart({});
3844

3945
const server = new ViteNodeServer(devServer);

0 commit comments

Comments
 (0)