mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-10 17:14:38 +00:00
refactor: convert to npm-workspaces monorepo (engine/core-public/shared/client/server)
Restructure the single src/ tree into an npm-workspaces monorepo under
packages/, rename core -> engine, extract a types-only core-public layer,
and break the pre-existing engine -> client dependency cycle.
Structure (packages/):
core-public public API/wire schemas + shared enums (clean leaf)
shared framework-agnostic helpers (clean leaf)
engine deterministic simulation (was src/core)
client rendering/UI (was src/client)
server coordination (was src/server)
Dependency DAG: engine -> {core-public, shared}; client -> {core-public,
shared, engine}; server -> {core-public, engine}.
- npm workspaces: root package.json workspaces + per-package package.json;
tsconfig.base.json holds shared options + path aliases
(core-public/* shared/* engine/* client/* server/*) resolved uniformly by
tsc, Vite (resolve.tsconfigPaths), Vitest, and tsx. Lockfile regenerated.
- core-public: moved Schemas/ApiSchemas/CosmeticSchemas/StatsSchemas/
ClanApiSchemas/WorkerSchemas/Base64/PatternDecoder; extracted the enums
(GameTypes), GameEvent type, emoji table, and GraphicsOverrides schema.
Engine re-exports the moved enums/types so existing imports keep working.
- Broke engine -> client cycle:
- renderNumber/renderTroops -> shared/format
- NameBoxCalculator moved into engine
- username validation returns translation key + params; client translates
- applyStateUpdate moved to client (operates on the render-only PlayerState)
- Config/UnitGrid/execution-Util/GameImpl now use structural read
interfaces (engine/game/ReadViews: PlayerLike/UnitLike/GameLike) instead
of importing client view classes; client imports view classes from a new
client/view barrel; deleted the engine/game/GameView re-export shim.
- Build/deploy updated: vite.config, index.html, eslint, Dockerfile
(copies packages/ + tsconfig.base.json before npm ci), .vscode, tests.
Verified: tsc --noEmit clean; 1364 + 65 tests pass; production vite build
succeeds; engine has zero client/server imports; core-public and shared are
dependency leaves.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
import { readdirSync, readFileSync } from "fs";
|
||||
import { dirname, join } from "path";
|
||||
import { fileURLToPath } from "url";
|
||||
import { Game } from "../../../../src/core/game/Game.js";
|
||||
import { DebugSpan } from "../../../../src/core/utilities/DebugSpan.js";
|
||||
import { Game } from "engine/game/Game.js";
|
||||
import { DebugSpan } from "engine/utilities/DebugSpan.js";
|
||||
import { setupFromPath } from "../../utils.js";
|
||||
|
||||
// Available comparison adapters
|
||||
@@ -42,7 +42,7 @@ const cache = new Map<string, MapCache>();
|
||||
function getMapsDirectory(): string {
|
||||
return join(
|
||||
dirname(fileURLToPath(import.meta.url)),
|
||||
"../../../../resources/maps",
|
||||
"resources/maps",
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { TileRef } from "../../../../src/core/game/GameMap.js";
|
||||
import { PathFinding } from "../../../../src/core/pathfinding/PathFinder.js";
|
||||
import { SteppingPathFinder } from "../../../../src/core/pathfinding/types.js";
|
||||
import { DebugSpan } from "../../../../src/core/utilities/DebugSpan.js";
|
||||
import { TileRef } from "engine/game/GameMap.js";
|
||||
import { PathFinding } from "engine/pathfinding/PathFinder.js";
|
||||
import { SteppingPathFinder } from "engine/pathfinding/types.js";
|
||||
import { DebugSpan } from "engine/utilities/DebugSpan.js";
|
||||
import { getAdapter } from "../../utils.js";
|
||||
import { COMPARISON_ADAPTERS, loadMap } from "./maps.js";
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { TileRef } from "../../../../src/core/game/GameMap.js";
|
||||
import { PathFinding } from "../../../../src/core/pathfinding/PathFinder.js";
|
||||
import { SpatialQuery } from "../../../../src/core/pathfinding/spatial/SpatialQuery.js";
|
||||
import { DebugSpan } from "../../../../src/core/utilities/DebugSpan.js";
|
||||
import { TileRef } from "engine/game/GameMap.js";
|
||||
import { PathFinding } from "engine/pathfinding/PathFinder.js";
|
||||
import { SpatialQuery } from "engine/pathfinding/spatial/SpatialQuery.js";
|
||||
import { DebugSpan } from "engine/utilities/DebugSpan.js";
|
||||
import { loadMap } from "./maps.js";
|
||||
|
||||
export interface SpatialQueryResult {
|
||||
|
||||
@@ -80,7 +80,7 @@ app.get(
|
||||
const { name } = req.params;
|
||||
const thumbnailPath = join(
|
||||
dirname(fileURLToPath(import.meta.url)),
|
||||
"../../../resources/maps",
|
||||
"resources/maps",
|
||||
name,
|
||||
"thumbnail.webp",
|
||||
);
|
||||
|
||||
+13
-13
@@ -9,25 +9,25 @@ import {
|
||||
GameMode,
|
||||
GameType,
|
||||
PlayerInfo,
|
||||
} from "../../src/core/game/Game";
|
||||
import { createGame, GameImpl } from "../../src/core/game/GameImpl";
|
||||
import { TileRef } from "../../src/core/game/GameMap";
|
||||
} from "engine/game/Game";
|
||||
import { createGame, GameImpl } from "engine/game/GameImpl";
|
||||
import { TileRef } from "engine/game/GameMap";
|
||||
import {
|
||||
genTerrainFromBin,
|
||||
MapManifest,
|
||||
} from "../../src/core/game/TerrainMapLoader";
|
||||
import { UserSettings } from "../../src/core/game/UserSettings";
|
||||
import { AStarWater } from "../../src/core/pathfinding/algorithms/AStar.Water";
|
||||
import { AStarWaterHierarchical } from "../../src/core/pathfinding/algorithms/AStar.WaterHierarchical";
|
||||
import { PathFinding } from "../../src/core/pathfinding/PathFinder";
|
||||
import { PathFinderBuilder } from "../../src/core/pathfinding/PathFinderBuilder";
|
||||
import { StepperConfig } from "../../src/core/pathfinding/PathFinderStepper";
|
||||
import { MiniMapTransformer } from "../../src/core/pathfinding/transformers/MiniMapTransformer";
|
||||
} from "engine/game/TerrainMapLoader";
|
||||
import { UserSettings } from "engine/game/UserSettings";
|
||||
import { AStarWater } from "engine/pathfinding/algorithms/AStar.Water";
|
||||
import { AStarWaterHierarchical } from "engine/pathfinding/algorithms/AStar.WaterHierarchical";
|
||||
import { PathFinding } from "engine/pathfinding/PathFinder";
|
||||
import { PathFinderBuilder } from "engine/pathfinding/PathFinderBuilder";
|
||||
import { StepperConfig } from "engine/pathfinding/PathFinderStepper";
|
||||
import { MiniMapTransformer } from "engine/pathfinding/transformers/MiniMapTransformer";
|
||||
import {
|
||||
PathStatus,
|
||||
SteppingPathFinder,
|
||||
} from "../../src/core/pathfinding/types";
|
||||
import { GameConfig } from "../../src/core/Schemas";
|
||||
} from "engine/pathfinding/types";
|
||||
import { GameConfig } from "core-public/Schemas";
|
||||
import { TestConfig } from "../util/TestConfig";
|
||||
|
||||
export type BenchmarkRoute = {
|
||||
|
||||
Reference in New Issue
Block a user