From 7c2ad68c2a92cea206c26bced24dfb20c41e664d Mon Sep 17 00:00:00 2001 From: mrjvs Date: Wed, 22 Feb 2023 21:54:02 +0100 Subject: [PATCH] add default for NORMAL_ROUTER setting --- src/setup/config.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/setup/config.ts b/src/setup/config.ts index 679e5141..8947d43c 100644 --- a/src/setup/config.ts +++ b/src/setup/config.ts @@ -33,12 +33,13 @@ const env: Record = { const alerts = [] as string[]; // loads from different locations, in order: environment (VITE_{KEY}), window (public/config.js) -function getKey(key: keyof Config): string { +function getKey(key: keyof Config, defaultString?: string): string { let windowValue = (window as any)?.__CONFIG__?.[`VITE_${key}`]; if (windowValue !== undefined && windowValue.length === 0) windowValue = undefined; const value = env[key] ?? windowValue ?? undefined; if (value === undefined) { + if (defaultString) return defaultString; if (!alerts.includes(key)) { // eslint-disable-next-line no-alert window.alert(`Misconfigured instance, missing key: ${key}`); @@ -60,6 +61,6 @@ export function conf(): RuntimeConfig { PROXY_URLS: getKey("CORS_PROXY_URL") .split(",") .map((v) => v.trim()), - NORMAL_ROUTER: (getKey("NORMAL_ROUTER") ?? "false") === "true", + NORMAL_ROUTER: getKey("NORMAL_ROUTER", "false") === "true", }; }