Fix version showing

AttorneyOnline · Jan 31, 2024 · 34e7c00 · 34e7c00
1 parent 3b45995
commit 34e7c00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/vite.config.js b/vite.config.js
@@ -1,5 +1,7 @@
 import path from 'path';
 import dotenv from 'dotenv';
+import packageJson from './package.json'
+
 import { defineConfig } from 'vite';
 
 // this will update the process.env with environment variables in .env file
@@ -24,4 +26,7 @@ export default defineConfig({
         emptyOutDir: true,
         sourcemap: true,
     },
+    define: {
+        __APP_VERSION__: JSON.stringify(packageJson.version)
+    }
 });
diff --git a/webAO/master.ts b/webAO/master.ts
@@ -1,11 +1,5 @@
 import { safeTags } from './encoding';
 
-declare global {
-    interface Window {
-        setServ: (ID: number) => void;
-    }
-}
-
 interface AOServer {
     name: string,
     description: string,
@@ -18,7 +12,8 @@ interface AOServer {
     assets?: string,
 }
 
-const clientVersion = process.env.npm_package_version;
+declare let __APP_VERSION__: string;
+const clientVersion = __APP_VERSION__;
 
 // const MASTERSERVER_IP = 'master.aceattorneyonline.com:27014';
 const serverlist_domain = 'servers.aceattorneyonline.com';
@@ -66,8 +61,7 @@ export function setServ(ID: number) {
     const serverDesc = safeTags(server.description);
     document.getElementById('serverdescription_content').innerHTML = `<b>${onlineStr}</b><br>${serverDesc}`;
 }
-window.setServ = setServ;
-
+(window as any).setServ = setServ;
 
 // Fetches the serverlist from the masterserver
 // Returns a properly typed list of servers