Skip to content

Commit

Permalink
refactor(vite): rename Vite dev server variable (#8265)
Browse files Browse the repository at this point in the history
  • Loading branch information
markdalgleish committed Dec 12, 2023
1 parent 755d0a2 commit 7562e4d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions integration/helpers/vite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ export const EXPRESS_SERVER = (args: {
installGlobals();
let vite =
let viteDevServer =
process.env.NODE_ENV === "production"
? undefined
: await import("vite").then(({ createServer }) =>
createServer({
: await import("vite").then((vite) =>
vite.createServer({
server: { middlewareMode: true },
})
);
const app = express();
if (vite) {
app.use(vite.middlewares);
if (viteDevServer) {
app.use(viteDevServer.middlewares);
} else {
app.use(
"/assets",
Expand All @@ -71,8 +71,8 @@ export const EXPRESS_SERVER = (args: {
app.all(
"*",
createRequestHandler({
build: vite
? () => vite.ssrLoadModule("virtual:remix/server-build")
build: viteDevServer
? () => viteDevServer.ssrLoadModule("virtual:remix/server-build")
: await import("./build/index.js"),
getLoadContext: () => (${JSON.stringify(args.loadContext ?? {})}),
})
Expand Down

0 comments on commit 7562e4d

Please sign in to comment.