diff --git a/packages/website-ue/src/components/IncrementalLoader/index.tsx b/packages/website-ue/src/components/IncrementalLoader/index.tsx index ecda105be..9905a280c 100644 --- a/packages/website-ue/src/components/IncrementalLoader/index.tsx +++ b/packages/website-ue/src/components/IncrementalLoader/index.tsx @@ -39,7 +39,7 @@ export function IncrementalLoader({ - ) + ), )} ); diff --git a/packages/website-ue/src/components/TankCard/index.tsx b/packages/website-ue/src/components/TankCard/index.tsx index 8702ee4dd..35b232886 100644 --- a/packages/website-ue/src/components/TankCard/index.tsx +++ b/packages/website-ue/src/components/TankCard/index.tsx @@ -1,5 +1,5 @@ import { api } from "../../core/api/dynamic"; -import { clientUnmounted } from "../../core/game/game"; +import { clientUnmounted } from "../../core/game/unmounted"; import { useAwait } from "../../hooks/useAwait"; import { useGameStrings } from "../../hooks/useGameStrings"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website-ue/src/core/game/game.ts b/packages/website-ue/src/core/game/game.ts index 6ae49270e..5294b4b4a 100644 --- a/packages/website-ue/src/core/game/game.ts +++ b/packages/website-ue/src/core/game/game.ts @@ -1,13 +1,11 @@ +import { assertSecret } from "@blitzkit/core"; import { GameInterface } from "@blitzkit/game"; - -export const clientUnmounted = !("WOTB_CLIENT" in import.meta.env); +import { clientUnmounted } from "./unmounted"; let _game: GameInterface | null = null; if (!clientUnmounted) { - _game = new GameInterface(import.meta.env.WOTB_CLIENT); -} else { - console.warn("Running in client denied mode..."); + _game = new GameInterface(assertSecret(import.meta.env.PUBLIC_WOTB_CLIENT)); } export const game = _game; diff --git a/packages/website-ue/src/core/game/unmounted.ts b/packages/website-ue/src/core/game/unmounted.ts new file mode 100644 index 000000000..08a4a31f6 --- /dev/null +++ b/packages/website-ue/src/core/game/unmounted.ts @@ -0,0 +1,5 @@ +export const clientUnmounted = !("PUBLIC_WOTB_CLIENT" in import.meta.env); + +if (clientUnmounted) { + console.warn("Running in client denied mode..."); +} diff --git a/packages/website-ue/src/pages/[...locale]/index.astro b/packages/website-ue/src/pages/[...locale]/index.astro index aaa3f6f75..977557f9f 100644 --- a/packages/website-ue/src/pages/[...locale]/index.astro +++ b/packages/website-ue/src/pages/[...locale]/index.astro @@ -9,7 +9,7 @@ import HomeHero from "../../components/HomeHero.astro"; import HomePlayers from "../../components/HomePlayers.astro"; import HomeTanks from "../../components/HomeTanks.astro"; import HomeTechnical from "../../components/HomeTechnical.astro"; -import { clientUnmounted } from "../../core/game/game"; +import { clientUnmounted } from "../../core/game/unmounted"; import { tools } from "../../core/tools/tools"; import BaseLayout from "../../layouts/BaseLayout.astro"; diff --git a/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts b/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts index de7941946..d5e7f939e 100644 --- a/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts +++ b/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts @@ -1,7 +1,8 @@ import { Nation } from "@protos/game/proto/legacy/blitz_static_tank_component"; import type { APIContext, GetStaticPaths } from "astro"; import { clientUnmountedResponse } from "../../../../core/api/responses"; -import { clientUnmounted, game } from "../../../../core/game/game"; +import { game } from "../../../../core/game/game"; +import { clientUnmounted } from "../../../../core/game/unmounted"; export const getStaticPaths = (async () => { return Object.values(Nation) diff --git a/packages/website-ue/src/pages/api/tanks/[id].webp.ts b/packages/website-ue/src/pages/api/tanks/[id].webp.ts index 6a70f1378..3cec07f9a 100644 --- a/packages/website-ue/src/pages/api/tanks/[id].webp.ts +++ b/packages/website-ue/src/pages/api/tanks/[id].webp.ts @@ -1,10 +1,11 @@ import type { APIContext } from "astro"; import { api } from "../../../core/api/dynamic"; import { - clientUnmountedResponse, - notFoundResponse, + clientUnmountedResponse, + notFoundResponse, } from "../../../core/api/responses"; -import { clientUnmounted, game } from "../../../core/game/game"; +import { game } from "../../../core/game/game"; +import { clientUnmounted } from "../../../core/game/unmounted"; export { getStaticPaths } from "./[id].json";