Skip to content

Commit 1ac6488

Browse files
committed
refactor: use module runner api
1 parent 885e7d1 commit 1ac6488

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

packages/plugin-vite/src/plugins/deno.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ export function deno(): Plugin {
4747
platform: "browser",
4848
preserveJsx: true,
4949
cachedOnly: true,
50-
})
51-
.createLoader();
50+
}).createLoader();
5251
},
5352
applyToEnvironment() {
5453
return true;

packages/plugin-vite/src/plugins/dev_server.ts

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import type { DevEnvironment, Plugin } from "vite";
1+
import {
2+
type DevEnvironment,
3+
isRunnableDevEnvironment,
4+
type Plugin,
5+
} from "vite";
26
import * as path from "@std/path";
37
import { ASSET_CACHE_BUST_KEY } from "fresh/internal";
48
import { createRequest, sendResponse } from "@remix-run/node-fetch-server";
59
import { hashCode } from "../shared.ts";
610

11+
interface FetchHandler {
12+
default: {
13+
fetch: (req: Request) => Promise<Response>;
14+
};
15+
}
16+
717
export function devServer(): Plugin[] {
818
let publicDir = "";
919
return [
@@ -69,16 +79,15 @@ export function devServer(): Plugin[] {
6979
// Ignore
7080
}
7181

82+
if (!isRunnableDevEnvironment(server.environments.ssr)) return;
83+
7284
try {
73-
const mod = await server.ssrLoadModule("fresh:server_entry");
74-
const req = createRequest(nodeReq, nodeRes);
75-
mod.setErrorInterceptor((err: unknown) => {
76-
if (err instanceof Error) {
77-
server.ssrFixStacktrace(err);
78-
}
79-
});
85+
const mod = await server.environments.ssr.runner.import<unknown>(
86+
"fresh:server_entry",
87+
) as FetchHandler;
8088

81-
const res = (await mod.default.fetch(req)) as Response;
89+
const req = createRequest(nodeReq, nodeRes);
90+
const res = await mod.default.fetch(req);
8291

8392
// Collect css eagerly to avoid FOUC. This is a workaround for
8493
// Vite not supporting css natively. It's a bit hacky, but
@@ -107,9 +116,6 @@ export function devServer(): Plugin[] {
107116

108117
await sendResponse(nodeRes, res);
109118
} catch (err) {
110-
if (err instanceof Error) {
111-
server.ssrFixStacktrace(err);
112-
}
113119
return next(err);
114120
}
115121
});

0 commit comments

Comments
 (0)