mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-15 08:22:50 +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:
co-authored by
Claude Opus 4.8
parent
cb9cab9aca
commit
a7f992e9b0
@@ -1,6 +1,6 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { PathFinderStepper } from "../../../src/core/pathfinding/PathFinderStepper";
|
||||
import { PathFinder, PathStatus } from "../../../src/core/pathfinding/types";
|
||||
import { PathFinderStepper } from "engine/pathfinding/PathFinderStepper";
|
||||
import { PathFinder, PathStatus } from "engine/pathfinding/types";
|
||||
|
||||
describe("PathFinderStepper", () => {
|
||||
function createMockFinder(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { beforeAll, describe, expect, it } from "vitest";
|
||||
import { Game } from "../../../src/core/game/Game";
|
||||
import { TileRef } from "../../../src/core/game/GameMap";
|
||||
import { PathFinding } from "../../../src/core/pathfinding/PathFinder";
|
||||
import { SteppingPathFinder } from "../../../src/core/pathfinding/types";
|
||||
import { Game } from "engine/game/Game";
|
||||
import { TileRef } from "engine/game/GameMap";
|
||||
import { PathFinding } from "engine/pathfinding/PathFinder";
|
||||
import { SteppingPathFinder } from "engine/pathfinding/types";
|
||||
import { setup } from "../../util/Setup";
|
||||
|
||||
describe("PathFinding.Air", () => {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { beforeAll, describe, expect, it } from "vitest";
|
||||
import { Game } from "../../../src/core/game/Game";
|
||||
import { TileRef } from "../../../src/core/game/GameMap";
|
||||
import { PathFinding } from "../../../src/core/pathfinding/PathFinder";
|
||||
import { SteppingPathFinder } from "../../../src/core/pathfinding/types";
|
||||
import { Game } from "engine/game/Game";
|
||||
import { TileRef } from "engine/game/GameMap";
|
||||
import { PathFinding } from "engine/pathfinding/PathFinder";
|
||||
import { SteppingPathFinder } from "engine/pathfinding/types";
|
||||
import { setup } from "../../util/Setup";
|
||||
|
||||
describe("PathFinding.Rail", () => {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import { beforeAll, describe, expect, it, vi } from "vitest";
|
||||
import { Game } from "../../../src/core/game/Game";
|
||||
import { TileRef } from "../../../src/core/game/GameMap";
|
||||
import { PathFinding } from "../../../src/core/pathfinding/PathFinder";
|
||||
import { Game } from "engine/game/Game";
|
||||
import { TileRef } from "engine/game/GameMap";
|
||||
import { PathFinding } from "engine/pathfinding/PathFinder";
|
||||
import {
|
||||
PathStatus,
|
||||
SteppingPathFinder,
|
||||
} from "../../../src/core/pathfinding/types";
|
||||
} from "engine/pathfinding/types";
|
||||
import { setup } from "../../util/Setup";
|
||||
import { createGame, L, W } from "./_fixtures";
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { SpawnExecution } from "../../../src/core/execution/SpawnExecution";
|
||||
import { SpawnExecution } from "engine/execution/SpawnExecution";
|
||||
import {
|
||||
Game,
|
||||
Player,
|
||||
PlayerInfo,
|
||||
PlayerType,
|
||||
} from "../../../src/core/game/Game";
|
||||
import { TileRef } from "../../../src/core/game/GameMap";
|
||||
import { SpatialQuery } from "../../../src/core/pathfinding/spatial/SpatialQuery";
|
||||
} from "engine/game/Game";
|
||||
import { TileRef } from "engine/game/GameMap";
|
||||
import { SpatialQuery } from "engine/pathfinding/spatial/SpatialQuery";
|
||||
import { createGame, L, W } from "./_fixtures";
|
||||
|
||||
// Spawns player and **expands territory** via getSpawnTiles (euclidean dist 4)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { GameMapImpl } from "../../../src/core/game/GameMap";
|
||||
import { UniversalPathFinding } from "../../../src/core/pathfinding/PathFinder";
|
||||
import { PathStatus } from "../../../src/core/pathfinding/types";
|
||||
import { GameMapImpl } from "engine/game/GameMap";
|
||||
import { UniversalPathFinding } from "engine/pathfinding/PathFinder";
|
||||
import { PathStatus } from "engine/pathfinding/types";
|
||||
|
||||
describe("UniversalPathFinding.Parabola", () => {
|
||||
function createLargeMap() {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
ConnectedComponents,
|
||||
LAND_MARKER,
|
||||
} from "../../../src/core/pathfinding/algorithms/ConnectedComponents";
|
||||
} from "engine/pathfinding/algorithms/ConnectedComponents";
|
||||
import { createGameMap, createIslandMap, L, W } from "./_fixtures";
|
||||
|
||||
// prettier-ignore
|
||||
|
||||
@@ -7,11 +7,11 @@ import {
|
||||
GameMapType,
|
||||
GameMode,
|
||||
GameType,
|
||||
} from "../../../src/core/game/Game";
|
||||
import { createGame as createGameImpl } from "../../../src/core/game/GameImpl";
|
||||
import { GameMapImpl } from "../../../src/core/game/GameMap";
|
||||
import { UserSettings } from "../../../src/core/game/UserSettings";
|
||||
import { GameConfig } from "../../../src/core/Schemas";
|
||||
} from "engine/game/Game";
|
||||
import { createGame as createGameImpl } from "engine/game/GameImpl";
|
||||
import { GameMapImpl } from "engine/game/GameMap";
|
||||
import { UserSettings } from "engine/game/UserSettings";
|
||||
import { GameConfig } from "core-public/Schemas";
|
||||
import { TestConfig } from "../../util/TestConfig";
|
||||
|
||||
export const W = "W"; // Water
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { ComponentCheckTransformer } from "../../../../src/core/pathfinding/transformers/ComponentCheckTransformer";
|
||||
import { PathFinder } from "../../../../src/core/pathfinding/types";
|
||||
import { ComponentCheckTransformer } from "engine/pathfinding/transformers/ComponentCheckTransformer";
|
||||
import { PathFinder } from "engine/pathfinding/types";
|
||||
|
||||
describe("ComponentCheckTransformer", () => {
|
||||
// Mock PathFinder that records calls and returns a simple path
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { GameMapImpl } from "../../../../src/core/game/GameMap";
|
||||
import { MiniMapTransformer } from "../../../../src/core/pathfinding/transformers/MiniMapTransformer";
|
||||
import { PathFinder } from "../../../../src/core/pathfinding/types";
|
||||
import { GameMapImpl } from "engine/game/GameMap";
|
||||
import { MiniMapTransformer } from "engine/pathfinding/transformers/MiniMapTransformer";
|
||||
import { PathFinder } from "engine/pathfinding/types";
|
||||
|
||||
describe("MiniMapTransformer", () => {
|
||||
// Create test maps: main map is 10x10, minimap is 5x5 (2x downscale)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { ShoreCoercingTransformer } from "../../../../src/core/pathfinding/transformers/ShoreCoercingTransformer";
|
||||
import { PathFinder } from "../../../../src/core/pathfinding/types";
|
||||
import { ShoreCoercingTransformer } from "engine/pathfinding/transformers/ShoreCoercingTransformer";
|
||||
import { PathFinder } from "engine/pathfinding/types";
|
||||
import { createGameMap, createIslandMap, L, W } from "../_fixtures";
|
||||
|
||||
describe("ShoreCoercingTransformer", () => {
|
||||
|
||||
Reference in New Issue
Block a user