chore: fix static/data for 'npm run build'
Previously, buildConfig.json was loaded from build/static/data while cache files were loaded from static/data. Now all files are loaded from static/data and there is no build/static/data folder anymore.
This commit is contained in:
		
							parent
							
								
									212a5e7035
								
							
						
					
					
						commit
						8f6fd33b77
					
				@ -1,7 +1,7 @@
 | 
				
			|||||||
import { RequestHandler } from "express";
 | 
					import { RequestHandler } from "express";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { config } from "@/src/services/configService";
 | 
					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 { Account } from "@/src/models/loginModel";
 | 
				
			||||||
import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";
 | 
					import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
import { RequestHandler } from "express";
 | 
					import { RequestHandler } from "express";
 | 
				
			||||||
import staticWorldState from "@/static/fixed_responses/worldState.json";
 | 
					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";
 | 
					import { IMongoDate, IOid } from "@/src/types/commonTypes";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export const worldStateController: RequestHandler = (req, res) => {
 | 
					export const worldStateController: RequestHandler = (req, res) => {
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
import express from "express";
 | 
					import express from "express";
 | 
				
			||||||
import buildConfig from "@/static/data/buildConfig.json";
 | 
					import { buildConfig } from "@/src/services/buildConfigService";
 | 
				
			||||||
import fs from "fs/promises";
 | 
					import fs from "fs/promises";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const cacheRouter = express.Router();
 | 
					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