Skip to content

Commit e6fe273

Browse files
committed
Remove unused Vite file system watcher
1 parent 18820ba commit e6fe273

File tree

4 files changed

+54
-48
lines changed

4 files changed

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

packages/remix-dev/vite/plugin.ts

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import * as VirtualModule from "./vmod";
3939
import { resolveFileUrl } from "./resolve-file-url";
4040
import { combineURLs } from "./combine-urls";
4141
import { removeExports } from "./remove-exports";
42-
import { isInRemixMonorepo } from "./is-in-remix-monorepo";
42+
import { ssrExternals } from "./ssr-externals";
4343
import { getVite, preloadVite } from "./vite";
4444
import * as ViteNode from "./vite-node";
4545

@@ -619,27 +619,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
619619
let viteChildCompiler: Vite.ViteDevServer | null = null;
620620
let routesViteNodeContext: ViteNode.Context | null = null;
621621

622-
let ssrExternals = isInRemixMonorepo()
623-
? [
624-
// This is only needed within the Remix repo because these
625-
// packages are linked to a directory outside of node_modules
626-
// so Vite treats them as internal code by default.
627-
"@remix-run/architect",
628-
"@remix-run/cloudflare-pages",
629-
"@remix-run/cloudflare-workers",
630-
"@remix-run/cloudflare",
631-
"@remix-run/css-bundle",
632-
"@remix-run/deno",
633-
"@remix-run/dev",
634-
"@remix-run/express",
635-
"@remix-run/netlify",
636-
"@remix-run/node",
637-
"@remix-run/react",
638-
"@remix-run/serve",
639-
"@remix-run/server-runtime",
640-
]
641-
: undefined;
642-
643622
// This is initialized by `updateRemixPluginContext` during Vite's `config`
644623
// hook, so most of the code can assume this defined without null check.
645624
// During dev, `updateRemixPluginContext` is called again on every config file
@@ -1051,12 +1030,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
10511030
routesViteNodeContext = await ViteNode.createContext({
10521031
root: viteUserConfig.root,
10531032
mode: viteConfigEnv.mode,
1054-
server: {
1055-
watch: viteCommand === "build" ? null : undefined,
1056-
},
1057-
ssr: {
1058-
external: ssrExternals,
1059-
},
10601033
});
10611034

10621035
await updateRemixPluginContext();
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { isInRemixMonorepo } from "./is-in-remix-monorepo";
2+
3+
export const ssrExternals = isInRemixMonorepo()
4+
? [
5+
// This is only needed within the Remix repo because these
6+
// packages are linked to a directory outside of node_modules
7+
// so Vite treats them as internal code by default.
8+
"@remix-run/architect",
9+
"@remix-run/cloudflare-pages",
10+
"@remix-run/cloudflare-workers",
11+
"@remix-run/cloudflare",
12+
"@remix-run/css-bundle",
13+
"@remix-run/deno",
14+
"@remix-run/dev",
15+
"@remix-run/express",
16+
"@remix-run/netlify",
17+
"@remix-run/node",
18+
"@remix-run/react",
19+
"@remix-run/serve",
20+
"@remix-run/server-runtime",
21+
]
22+
: undefined;

packages/remix-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 { getVite, preloadVite } 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
let vite = getVite();
1924

20-
let 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+
let 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
let server = new ViteNodeServer(devServer);

0 commit comments

Comments
 (0)