teutat3s/elk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactor: move url choice into nuxt config

Browse source
This commit is contained in:
Daniel Roe 2022-11-28 21:43:24 +00:00
parent 69d009d02a
commit 8376dcf565
No known key found for this signature in database
GPG key ID: 22D5008E4F5D9B55
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nuxt.config.ts
View file

@ -46,7 +46,11 @@ export default defineNuxtConfig({
}, },
runtimeConfig: { runtimeConfig: {
env: isCI ? 'deployed' : 'local', 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: { cloudflare: {
accountId: '', accountId: '',
namespaceId: '', namespaceId: '',

2
server/shared.ts
View file

@ -14,7 +14,6 @@ import { APP_NAME } from '~/constants'
const config = useRuntimeConfig() const config = useRuntimeConfig()
export const HOST_URL = config.deployUrl export const HOST_URL = config.deployUrl
|| (config.env === 'local' ? 'http://localhost:5314' : 'https://elk.zone')
export const HOST_DOMAIN = parseURL(HOST_URL).host! export const HOST_DOMAIN = parseURL(HOST_URL).host!
const fs = _fs as typeof import('unstorage/dist/drivers/fs')['default'] 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' })) storage.mount('servers', fs({ base: 'node_modules/.cache/servers' }))
} }
else { else {
const config = useRuntimeConfig()
storage.mount('servers', cached(kv({ storage.mount('servers', cached(kv({
accountId: config.cloudflare.accountId, accountId: config.cloudflare.accountId,
namespaceId: config.cloudflare.namespaceId, namespaceId: config.cloudflare.namespaceId,