diff --git a/src/cli/commands/index.ts b/src/cli/commands/index.ts index 5c64df49b..f8644a263 100644 --- a/src/cli/commands/index.ts +++ b/src/cli/commands/index.ts @@ -56,7 +56,7 @@ export async function runQuirrelDev( } await quirrel.server.app.jobs.updateCron("anonymous", { - baseUrl: getApplicationBaseUrl(), + baseUrl: getApplicationBaseUrl(config.host), crons: jobs, }); }); diff --git a/src/client/config.ts b/src/client/config.ts index ac1afb7c6..192136d3b 100644 --- a/src/client/config.ts +++ b/src/client/config.ts @@ -89,7 +89,7 @@ export function getOldEncryptionSecrets(): string[] | null { return JSON.parse(process.env.QUIRREL_OLD_SECRETS ?? "null"); } -let developmentApplicationBaseUrl: string | undefined; +let developmentApplicationPort: number | undefined; function getNetlifyURL() { const siteId = process.env.SITE_ID; @@ -108,12 +108,12 @@ function getVercelURL() { return process.env.VERCEL_URL; } -export function getApplicationBaseUrl(): string { +export function getApplicationBaseUrl(host = "localhost"): string { const baseUrl = resolveEnvReference("QUIRREL_BASE_URL") || getNetlifyURL() || getVercelURL() || - developmentApplicationBaseUrl; + `http://${host}:${developmentApplicationPort}`; if (!baseUrl) { throw new Error("Please specify QUIRREL_BASE_URL."); @@ -123,17 +123,17 @@ export function getApplicationBaseUrl(): string { } export function registerDevelopmentDefaults({ - applicationBaseUrl, + applicationPort, }: { - applicationBaseUrl: string; + applicationPort: number; }) { if (isProduction()) { return; } - if (developmentApplicationBaseUrl) { + if (developmentApplicationPort) { return; } - developmentApplicationBaseUrl = applicationBaseUrl; + developmentApplicationPort = applicationPort; } diff --git a/src/netlify.ts b/src/netlify.ts index a84c842e5..93a7dc385 100644 --- a/src/netlify.ts +++ b/src/netlify.ts @@ -1,7 +1,7 @@ import { registerDevelopmentDefaults } from "./client/config"; registerDevelopmentDefaults({ - applicationBaseUrl: "http://localhost:8888", + applicationPort: 8888, }); export * from "./redwood"; diff --git a/src/next.ts b/src/next.ts index e2a291a02..14e2fc8ab 100644 --- a/src/next.ts +++ b/src/next.ts @@ -35,7 +35,7 @@ export { }; registerDevelopmentDefaults({ - applicationBaseUrl: "http://localhost:3000", + applicationPort: 3000, }); export type Queue = Omit< diff --git a/src/nuxt.ts b/src/nuxt.ts index 27dcb6ce9..31c3e2cbb 100644 --- a/src/nuxt.ts +++ b/src/nuxt.ts @@ -3,7 +3,7 @@ import { registerDevelopmentDefaults } from "./client/config"; import * as connect from "./connect"; registerDevelopmentDefaults({ - applicationBaseUrl: "http://localhost:3000", + applicationPort: 3000, }); export function Queue( diff --git a/src/redwood.ts b/src/redwood.ts index c1195bfa4..1d3c46c70 100644 --- a/src/redwood.ts +++ b/src/redwood.ts @@ -18,7 +18,7 @@ export { }; registerDevelopmentDefaults({ - applicationBaseUrl: "http://localhost:8911", + applicationPort: 8911, }); function decodeBase64(v: string): string { diff --git a/src/remix.ts b/src/remix.ts index 276da31cf..3540b5d23 100644 --- a/src/remix.ts +++ b/src/remix.ts @@ -24,7 +24,7 @@ export { }; registerDevelopmentDefaults({ - applicationBaseUrl: "http://localhost:3000", + applicationPort: 3000, }); export type Queue = Omit< diff --git a/src/sveltekit.ts b/src/sveltekit.ts index fc68be098..e95669d37 100644 --- a/src/sveltekit.ts +++ b/src/sveltekit.ts @@ -11,7 +11,7 @@ import { registerDevelopmentDefaults } from "./client/config"; export { Job, EnqueueJobOptions, DefaultJobOptions, QuirrelJobHandler }; registerDevelopmentDefaults({ - applicationBaseUrl: "localhost:5173", + applicationPort: 5173, }); interface SvelteEvent {