From 8376dcf5657e530c202fc2a011231ad093873ec8 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 28 Nov 2022 21:43:24 +0000 Subject: [PATCH] refactor: move url choice into nuxt config --- nuxt.config.ts | 6 +++++- server/shared.ts | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index ce95feef..eae115dd 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -46,7 +46,11 @@ export default defineNuxtConfig({ }, runtimeConfig: { env: isCI ? 'deployed' : 'local', - deployUrl: process.env.PULL_REQUEST === 'true' ? process.env.DEPLOY_PRIME_URL : '', + deployUrl: !isCI + ? 'http://localhost:5314' + : process.env.PULL_REQUEST === 'true' + ? process.env.DEPLOY_PRIME_URL + : 'https://elk.zone', cloudflare: { accountId: '', namespaceId: '', diff --git a/server/shared.ts b/server/shared.ts index 5eb997cf..90abba23 100644 --- a/server/shared.ts +++ b/server/shared.ts @@ -14,7 +14,6 @@ import { APP_NAME } from '~/constants' const config = useRuntimeConfig() export const HOST_URL = config.deployUrl - || (config.env === 'local' ? 'http://localhost:5314' : 'https://elk.zone') export const HOST_DOMAIN = parseURL(HOST_URL).host! const fs = _fs as typeof import('unstorage/dist/drivers/fs')['default'] @@ -26,7 +25,6 @@ if (config.env === 'local') { storage.mount('servers', fs({ base: 'node_modules/.cache/servers' })) } else { - const config = useRuntimeConfig() storage.mount('servers', cached(kv({ accountId: config.cloudflare.accountId, namespaceId: config.cloudflare.namespaceId,