diff --git a/packages/remix-dev/cli/commands.ts b/packages/remix-dev/cli/commands.ts index 4f20012ebcd..95bec84c03e 100644 --- a/packages/remix-dev/cli/commands.ts +++ b/packages/remix-dev/cli/commands.ts @@ -178,7 +178,7 @@ export async function build( }; if (mode === "development" && config.future.unstable_dev) { let origin = await resolveDevOrigin(config); - options.devHttpOrigin = origin; + options.devOrigin = origin; } fse.emptyDirSync(config.assetsBuildDirectory); diff --git a/packages/remix-dev/compiler/options.ts b/packages/remix-dev/compiler/options.ts index 9dc6538ee50..d128116d7de 100644 --- a/packages/remix-dev/compiler/options.ts +++ b/packages/remix-dev/compiler/options.ts @@ -6,7 +6,7 @@ export type Options = { onWarning?: (message: string, key: string) => void; // TODO: required in v2 - devHttpOrigin?: { + devOrigin?: { scheme: string; host: string; port: number; diff --git a/packages/remix-dev/compiler/server/compiler.ts b/packages/remix-dev/compiler/server/compiler.ts index 3dd99e80ffe..47af4230248 100644 --- a/packages/remix-dev/compiler/server/compiler.ts +++ b/packages/remix-dev/compiler/server/compiler.ts @@ -103,7 +103,7 @@ const createEsbuildConfig = ( ctx.config.devServerPort ), "process.env.REMIX_DEV_HTTP_ORIGIN": JSON.stringify( - ctx.options.devHttpOrigin ?? "" // TODO: remove nullish check in v2 + ctx.options.devOrigin ?? "" // TODO: remove nullish check in v2 ), }, jsx: "automatic", diff --git a/packages/remix-dev/compiler/server/plugins/entry.ts b/packages/remix-dev/compiler/server/plugins/entry.ts index 56ca8324180..4966dd3ad93 100644 --- a/packages/remix-dev/compiler/server/plugins/entry.ts +++ b/packages/remix-dev/compiler/server/plugins/entry.ts @@ -51,9 +51,9 @@ ${Object.keys(config.routes) export const publicPath = ${JSON.stringify(config.publicPath)}; export const entry = { module: entryServer }; ${ - options.devHttpOrigin + options.devOrigin ? `export const dev = ${JSON.stringify({ - port: options.devHttpOrigin.port, + port: options.devOrigin.port, })}` : "" } diff --git a/packages/remix-dev/devServer_unstable/index.ts b/packages/remix-dev/devServer_unstable/index.ts index ee1e35c412d..8a6ccf47846 100644 --- a/packages/remix-dev/devServer_unstable/index.ts +++ b/packages/remix-dev/devServer_unstable/index.ts @@ -138,7 +138,7 @@ export let serve = async ( mode: "development", sourcemap: true, onWarning: warnOnce, - devHttpOrigin: origin, + devOrigin: origin, }, }, {