Skip to content

Use ModuleRunner for SSR #3645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lishaduck wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −14
Open

Use ModuleRunner for SSR #3645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/plugin-vite/src/plugins/deno.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ export function deno(): Plugin {
platform: "browser",
preserveJsx: true,
cachedOnly: true,
})
.createLoader();
}).createLoader();
},
applyToEnvironment() {
return true;
Expand Down
30 changes: 18 additions & 12 deletions packages/plugin-vite/src/plugins/dev_server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import type { DevEnvironment, Plugin } from "vite";
import {
type DevEnvironment,
isRunnableDevEnvironment,
type Plugin,
} from "vite";
import * as path from "@std/path";
import { ASSET_CACHE_BUST_KEY } from "fresh/internal";
import { createRequest, sendResponse } from "@remix-run/node-fetch-server";
import { hashCode } from "../shared.ts";

interface FetchHandler {
default: {
fetch: (req: Request) => Promise<Response>;
};
}

export function devServer(): Plugin[] {
let publicDir = "";
return [
Expand Down Expand Up @@ -69,16 +79,15 @@ export function devServer(): Plugin[] {
// Ignore
}

if (!isRunnableDevEnvironment(server.environments.ssr)) return;

try {
const mod = await server.ssrLoadModule("fresh:server_entry");
const req = createRequest(nodeReq, nodeRes);
mod.setErrorInterceptor((err: unknown) => {
if (err instanceof Error) {
server.ssrFixStacktrace(err);
}
});
const mod = await server.environments.ssr.runner.import<unknown>(
"fresh:server_entry",
) as FetchHandler;

const res = (await mod.default.fetch(req)) as Response;
const req = createRequest(nodeReq, nodeRes);
const res = await mod.default.fetch(req);

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

await sendResponse(nodeRes, res);
} catch (err) {
if (err instanceof Error) {
server.ssrFixStacktrace(err);
}
return next(err);
}
});
Expand Down
Loading