diff --git a/apps/cyberstorm-remix/app/root.tsx b/apps/cyberstorm-remix/app/root.tsx
index 08a25635a..00b897a09 100644
--- a/apps/cyberstorm-remix/app/root.tsx
+++ b/apps/cyberstorm-remix/app/root.tsx
@@ -38,7 +38,7 @@ import {
} from "@thunderstore/ts-api-react/src/SessionContext";
import {
getPublicEnvVariables,
- publicEnvVariables,
+ publicEnvVariablesType,
} from "cyberstorm/security/publicEnvVariables";
import { StorageManager } from "@thunderstore/ts-api-react/src/storage";
@@ -47,7 +47,7 @@ import { StorageManager } from "@thunderstore/ts-api-react/src/storage";
declare global {
interface Window {
- ENV: publicEnvVariables;
+ NIMBUS_PUBLIC_ENV: publicEnvVariablesType;
Dapper: DapperTs;
nitroAds?: {
createAd: (
@@ -104,9 +104,7 @@ export async function loader() {
sessionId: undefined,
};
return {
- publicEnvVariables: {
- ENV: publicEnvVariables,
- },
+ publicEnvVariables: publicEnvVariables,
currentUser: undefined,
config,
};
@@ -137,9 +135,7 @@ export async function clientLoader() {
const currentUser = await sessionTools.getSessionCurrentUser();
const config = sessionTools.getConfig(publicEnvVariables.VITE_API_URL);
return {
- publicEnvVariables: {
- ENV: publicEnvVariables,
- },
+ publicEnvVariables: publicEnvVariables,
currentUser: currentUser.username ? currentUser : undefined,
config,
};
@@ -221,8 +217,8 @@ export function Layout({ children }: { children: React.ReactNode }) {
@@ -231,7 +227,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
@@ -274,7 +270,7 @@ function App() {
const data = useRouteLoaderData
("root");
const dapper = new DapperTs(() => {
return {
- apiHost: data?.publicEnvVariables.ENV.VITE_API_URL,
+ apiHost: data?.publicEnvVariables.VITE_API_URL,
sessionId: data?.config.sessionId,
};
});
@@ -284,7 +280,7 @@ function App() {
context={{
currentUser: data?.currentUser,
requestConfig: dapper.config,
- domain: data?.publicEnvVariables.ENV.VITE_API_URL,
+ domain: data?.publicEnvVariables.VITE_API_URL,
dapper: dapper,
}}
/>
diff --git a/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts b/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts
index 8e551d7da..92f69427a 100644
--- a/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts
+++ b/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts
@@ -11,14 +11,14 @@ export type publicEnvVariablesKeys =
export type PublicPrefix = `VITE_${envVariable}`;
-export type publicEnvVariables = Partial<{
+export type publicEnvVariablesType = Partial<{
[key in PublicPrefix]: string | undefined;
}>;
export function getPublicEnvVariables(
vars: PublicPrefix[]
-): publicEnvVariables {
- const returnedVars: publicEnvVariables = {};
+): publicEnvVariablesType {
+ const returnedVars: publicEnvVariablesType = {};
if (import.meta.env.SSR) {
vars.forEach((envVar) => {
if (envVar.startsWith("VITE_") && envVar in process.env) {
@@ -27,8 +27,8 @@ export function getPublicEnvVariables(
});
} else {
vars.forEach((envVar) => {
- if (envVar.startsWith("VITE_") && envVar in window.ENV) {
- returnedVars[envVar] = window.ENV[envVar];
+ if (envVar.startsWith("VITE_") && envVar in window.NIMBUS_PUBLIC_ENV) {
+ returnedVars[envVar] = window.NIMBUS_PUBLIC_ENV[envVar];
}
});
}