fix: consistenly use static/data for 'npm run build' (#661)
This commit is contained in:
		
							parent
							
								
									e41022f176
								
							
						
					
					
						commit
						1024d0350f
					
				@ -1,7 +1,7 @@
 | 
			
		||||
import { RequestHandler } from "express";
 | 
			
		||||
 | 
			
		||||
import { config } from "@/src/services/configService";
 | 
			
		||||
import buildConfig from "@/static/data/buildConfig.json";
 | 
			
		||||
import { buildConfig } from "@/src/services/buildConfigService";
 | 
			
		||||
 | 
			
		||||
import { Account } from "@/src/models/loginModel";
 | 
			
		||||
import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
import { RequestHandler } from "express";
 | 
			
		||||
import staticWorldState from "@/static/fixed_responses/worldState.json";
 | 
			
		||||
import buildConfig from "@/static/data/buildConfig.json";
 | 
			
		||||
import { buildConfig } from "@/src/services/buildConfigService";
 | 
			
		||||
import { IMongoDate, IOid } from "@/src/types/commonTypes";
 | 
			
		||||
 | 
			
		||||
export const worldStateController: RequestHandler = (req, res) => {
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,5 @@
 | 
			
		||||
import express from "express";
 | 
			
		||||
import buildConfig from "@/static/data/buildConfig.json";
 | 
			
		||||
import { buildConfig } from "@/src/services/buildConfigService";
 | 
			
		||||
import fs from "fs/promises";
 | 
			
		||||
 | 
			
		||||
const cacheRouter = express.Router();
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										13
									
								
								src/services/buildConfigService.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								src/services/buildConfigService.ts
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,13 @@
 | 
			
		||||
import path from "path";
 | 
			
		||||
import fs from "fs";
 | 
			
		||||
 | 
			
		||||
const rootDir = path.join(__dirname, "../..");
 | 
			
		||||
const repoDir = path.basename(rootDir) == "build" ? path.join(rootDir, "..") : rootDir;
 | 
			
		||||
const buildConfigPath = path.join(repoDir, "static/data/buildConfig.json");
 | 
			
		||||
export const buildConfig = JSON.parse(fs.readFileSync(buildConfigPath, "utf-8")) as IBuildConfig;
 | 
			
		||||
 | 
			
		||||
interface IBuildConfig {
 | 
			
		||||
    version: string;
 | 
			
		||||
    buildLabel: string;
 | 
			
		||||
    matchmakingBuildId: string;
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user