Skip to content

Commit de06d68

Browse files
committed
Set environment variable internally during the build
1 parent 7923273 commit de06d68

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

packages/vite-plugin-cloudflare/playground/prerendering/vite.config.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ export default defineConfig({
2424
buildApp: {
2525
order: "post",
2626
async handler(builder) {
27-
process.env.IS_VITE_PRERENDER = "true";
28-
2927
const previewServer = await preview({
3028
root: path.dirname(fileURLToPath(import.meta.url)),
3129
logLevel: "silent",
@@ -56,8 +54,6 @@ export default defineConfig({
5654

5755
await previewServer.close();
5856

59-
delete process.env.IS_VITE_PRERENDER;
60-
6157
const prerenderOutputDirectory =
6258
builder.environments.prerender?.config.build.outDir;
6359

packages/vite-plugin-cloudflare/playground/vitest-setup.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,11 @@ export async function startDefaultServe(): Promise<
309309
const builder = await createBuilder(buildConfig);
310310
await builder.buildApp();
311311

312+
// This environment variable is used to indicate to the preview server that it is being run during a build
313+
// We need to delete it here as, during testing, preview also runs in the same process after the build completes
314+
// eslint-disable-next-line turbo/no-undeclared-env-vars
315+
delete process.env.CLOUDFLARE_VITE_BUILD;
316+
312317
const previewConfig = await loadConfig({
313318
command: "serve",
314319
mode: "development",

packages/vite-plugin-cloudflare/src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ export function cloudflare(pluginConfig: PluginConfig = {}): vite.Plugin[] {
5252
ctx.setResolvedPluginConfig(
5353
resolvePluginConfig(pluginConfig, userConfig, env)
5454
);
55+
56+
if (env.command === "build") {
57+
process.env.CLOUDFLARE_VITE_BUILD = "true";
58+
}
5559
},
5660
async configureServer(viteDevServer) {
5761
// Patch the `server.restart` method to track whether the server is restarting or not.

packages/vite-plugin-cloudflare/src/plugin-config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ export function resolvePluginConfig(
273273
...shared,
274274
remoteBindings: pluginConfig.remoteBindings ?? true,
275275
type: "preview",
276-
workers: getWorkerConfigs(root, !!process.env.IS_VITE_PRERENDER),
276+
workers: getWorkerConfigs(root, !!process.env.CLOUDFLARE_VITE_BUILD),
277277
};
278278
}
279279

0 commit comments

Comments
 (0)