Fix some small errors with environment variables (#207)

packages/settings/utils.ts

@@ -7,14 +7,14 @@ export function getRuntimeConfig(
   const activeEnv = typeof window === "undefined" ? "server" : "client";
   if (import.meta.env.SSR) {
     // We are running on the server, try to get directly from process.env
-    val = globalThis.environment?.[key];
+    val = process.env["VITE_" + key];
   } else {
     // We are running on the client and have access to window.env
     val = window.env[key];
   }
   if (val === undefined) {
     val = import.meta.env["VITE_" + key];
-    if (val !== undefined && import.meta.env.DEV) {
+    if (val !== undefined) {
       console.warn(`Environment variable ${key} loaded statically`);
     }
   }

server/index.js

@@ -30,7 +30,6 @@ const flavors = [
 
 // Synthesize the config from the environment at runtime
 const environment = synthesizeConfigFromEnvironment();
-globalThis.environment = environment;
 
 async function startServer() {
   const app = express();
@@ -44,6 +43,10 @@ async function startServer() {
     // (In dev, Vite's middleware serves our static assets.)
     const sirv = (await import("sirv")).default;
     app.use(sirv(`${root}/dist/client`));
+    // Special case for cesium files at /cesium prefix
+    // These should be copied into the client bundle but are not right now.
+    // Ideally we'd be able to remove this fix.
+    app.use("/cesium", sirv(`${root}/dist/cesium`));
   } else {
     // We instantiate Vite's development server and integrate its middleware to our server.
     // ⚠️ We instantiate it only in development. (It isn't needed in production and it

vite.config.ts

@@ -23,7 +23,6 @@ const aliasedModules = [
 
 const gitEnv = revisionInfo(pkg, "https://github.com/UW-Macrostrat/web");
 // prefix with VITE_ to make available to client
-
 for (const [key, value] of Object.entries(gitEnv)) {
   process.env["VITE_" + key] = value;
 }
@@ -66,9 +65,6 @@ const config: UserConfig = {
     sourcemap: true,
   },
   define: {
-    "process.env": {
-      NODE_DEBUG: false,
-    },
     // Cesium base URL
     CESIUM_BASE_URL: JSON.stringify("/cesium"),
   },