diff --git a/apps/client/src/app.tsx b/apps/client/src/app.tsx index 22010a6..4608c72 100644 --- a/apps/client/src/app.tsx +++ b/apps/client/src/app.tsx @@ -6,7 +6,7 @@ import { LobbyScene } from "./scenes/LobbyScene"; import { GameScene } from "./scenes/GameScene"; -import { GameState, type Room } from "@repo/shared/src/domains/room/room.type"; +import { GameState, type Room } from "@repo/shared"; export default function App() { // 現在シーン状態 diff --git a/apps/client/src/entities/GameMap.ts b/apps/client/src/entities/GameMap.ts index 7fdd5cc..7dd272f 100644 --- a/apps/client/src/entities/GameMap.ts +++ b/apps/client/src/entities/GameMap.ts @@ -1,7 +1,7 @@ // apps/client/src/game/map/GameMap.ts (パスは適宜読み替えてください) import { Container, Graphics } from "pixi.js"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; -import type { MapState, CellUpdate } from "@repo/shared/src/domains/gridMap/gridMap.type"; +import { GAME_CONFIG } from "@repo/shared"; +import type { MapState, CellUpdate } from "@repo/shared"; // 親クラスを Graphics から Container に変更し、レイヤー管理を可能にする export class GameMap extends Container { diff --git a/apps/client/src/entities/Player.ts b/apps/client/src/entities/Player.ts index aa03379..c16cef1 100644 --- a/apps/client/src/entities/Player.ts +++ b/apps/client/src/entities/Player.ts @@ -1,6 +1,6 @@ import { Graphics } from 'pixi.js'; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; -import type { PlayerData } from "@repo/shared/src/domains/player/player.type"; +import { GAME_CONFIG } from "@repo/shared"; +import type { PlayerData } from "@repo/shared"; /** * プレイヤーの共通基底クラス(描画と基本データの保持) diff --git a/apps/client/src/managers/GameManager.ts b/apps/client/src/managers/GameManager.ts index 4ad76f7..c1cb4dd 100644 --- a/apps/client/src/managers/GameManager.ts +++ b/apps/client/src/managers/GameManager.ts @@ -1,7 +1,7 @@ import { Application, Container, Ticker } from "pixi.js"; import { socketClient } from "../network/SocketClient"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; -import type { PlayerData } from "@repo/shared/src/domains/player/player.type"; +import { GAME_CONFIG } from "@repo/shared"; +import type { PlayerData } from "@repo/shared"; import { BasePlayer, LocalPlayer, RemotePlayer } from "../entities/Player"; import { GameMap } from "../entities/GameMap"; import { MAX_DIST } from "../input/VirtualJoystick"; diff --git a/apps/client/src/network/SocketClient.ts b/apps/client/src/network/SocketClient.ts index 2f52f8f..7f0dacb 100644 --- a/apps/client/src/network/SocketClient.ts +++ b/apps/client/src/network/SocketClient.ts @@ -1,8 +1,8 @@ import { io, Socket } from "socket.io-client"; -import { SocketEvents } from "@repo/shared/src/protocol/events"; -import type { MovePayload, PlayerData } from "@repo/shared/src/domains/player/player.type"; -import type { CellUpdate } from "@repo/shared/src/domains/gridMap/gridMap.type"; -import type { Room, JoinRoomPayload } from "@repo/shared/src/domains/room/room.type"; +import { SocketEvents } from "@repo/shared"; +import type { MovePayload, PlayerData } from "@repo/shared"; +import type { CellUpdate } from "@repo/shared"; +import type { Room, JoinRoomPayload } from "@repo/shared"; /** * サーバー WebSocket 通信管理クラス diff --git a/apps/client/src/scenes/GameScene.tsx b/apps/client/src/scenes/GameScene.tsx index bcd9b06..31963a8 100644 --- a/apps/client/src/scenes/GameScene.tsx +++ b/apps/client/src/scenes/GameScene.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef, useState } from "react"; import { VirtualJoystick } from "../input/VirtualJoystick"; import { GameManager } from "../managers/GameManager"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; +import { GAME_CONFIG } from "@repo/shared"; interface GameSceneProps { myId: string | null; diff --git a/apps/server/src/domains/game/GameHandler.ts b/apps/server/src/domains/game/GameHandler.ts index 19481df..9bcbec0 100644 --- a/apps/server/src/domains/game/GameHandler.ts +++ b/apps/server/src/domains/game/GameHandler.ts @@ -1,9 +1,9 @@ import { Server, Socket } from "socket.io"; import { GameManager } from "./GameManager"; import { RoomManager } from "../room/RoomManager"; -import { SocketEvents } from "@repo/shared/src/protocol/events"; -import { RoomStatus } from "@repo/shared/src/domains/room/room.type"; -import type { MovePayload } from "@repo/shared/src/domains/player/player.type"; +import { SocketEvents } from "@repo/shared"; +import { RoomStatus } from "@repo/shared"; +import type { MovePayload } from "@repo/shared"; export const registerGameHandlers = (io: Server, socket: Socket, gameManager: GameManager, roomManager: RoomManager) => { diff --git a/apps/server/src/domains/game/GameLoop.ts b/apps/server/src/domains/game/GameLoop.ts index a74e8f4..54a165f 100644 --- a/apps/server/src/domains/game/GameLoop.ts +++ b/apps/server/src/domains/game/GameLoop.ts @@ -1,8 +1,8 @@ import { Player } from "./entities/Player.js"; import { MapStore } from "./states/MapStore"; -import { getGridIndexFromPosition } from "@repo/shared/src/domains/gridMap/gridMap.logic"; -import type { CellUpdate } from "@repo/shared/src/domains/gridMap/gridMap.type"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; +import { getGridIndexFromPosition } from "@repo/shared"; +import type { CellUpdate } from "@repo/shared"; +import { GAME_CONFIG } from "@repo/shared"; // コールバックで渡すデータの型定義 export interface TickData { diff --git a/apps/server/src/domains/game/GameManager.ts b/apps/server/src/domains/game/GameManager.ts index 8496a89..1eddd5d 100644 --- a/apps/server/src/domains/game/GameManager.ts +++ b/apps/server/src/domains/game/GameManager.ts @@ -1,8 +1,8 @@ import { Player } from "./entities/Player.js"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; +import { GAME_CONFIG } from "@repo/shared"; import { MapStore } from "./states/MapStore"; -import { getGridIndexFromPosition } from "@repo/shared/src/domains/gridMap/gridMap.logic"; -import type { CellUpdate } from "@repo/shared/src/domains/gridMap/gridMap.type"; +import { getGridIndexFromPosition } from "@repo/shared"; +import type { CellUpdate } from "@repo/shared"; import { GameLoop, type TickData } from "./GameLoop"; // プレイヤー集合の生成・更新・参照管理クラス diff --git a/apps/server/src/domains/game/entities/Player.ts b/apps/server/src/domains/game/entities/Player.ts index edc7976..e2fe48a 100644 --- a/apps/server/src/domains/game/entities/Player.ts +++ b/apps/server/src/domains/game/entities/Player.ts @@ -1,5 +1,5 @@ -import type { PlayerData } from "@repo/shared/src/domains/player/player.type"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; +import type { PlayerData } from "@repo/shared"; +import { GAME_CONFIG } from "@repo/shared"; // サーバー側保持プレイヤー状態モデル export class Player implements PlayerData { diff --git a/apps/server/src/domains/game/states/MapStore.ts b/apps/server/src/domains/game/states/MapStore.ts index 4f6f2be..5112529 100644 --- a/apps/server/src/domains/game/states/MapStore.ts +++ b/apps/server/src/domains/game/states/MapStore.ts @@ -1,6 +1,6 @@ // apps/server/src/states/MapStore.ts -import type { CellUpdate } from "@repo/shared/src/domains/gridMap/gridMap.type"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; +import type { CellUpdate } from "@repo/shared"; +import { GAME_CONFIG } from "@repo/shared"; export class MapStore { // 全マスの現在の色(teamId)を保持 diff --git a/apps/server/src/domains/room/RoomHandler.ts b/apps/server/src/domains/room/RoomHandler.ts index d210e01..778c147 100644 --- a/apps/server/src/domains/room/RoomHandler.ts +++ b/apps/server/src/domains/room/RoomHandler.ts @@ -1,7 +1,7 @@ import { Server, Socket } from "socket.io"; import { RoomManager } from "./RoomManager"; -import { SocketEvents } from "@repo/shared/src/protocol/events"; -import type { JoinRoomPayload } from "@repo/shared/src/domains/room/room.type"; +import { SocketEvents } from "@repo/shared"; +import type { JoinRoomPayload } from "@repo/shared"; export const registerRoomHandlers = (io: Server, socket: Socket, roomManager: RoomManager) => { diff --git a/apps/server/src/domains/room/RoomManager.ts b/apps/server/src/domains/room/RoomManager.ts index 3be6e62..ef6ae4f 100644 --- a/apps/server/src/domains/room/RoomManager.ts +++ b/apps/server/src/domains/room/RoomManager.ts @@ -1,5 +1,5 @@ -import { Room, RoomStatus, RoomMember } from "@repo/shared/src/domains/room/room.type"; -import { GAME_CONFIG } from "@repo/shared/src/config/gameConfig"; +import { Room, RoomStatus, RoomMember } from "@repo/shared"; +import { GAME_CONFIG } from "@repo/shared"; export class RoomManager { private rooms: Map = new Map(); diff --git a/apps/server/src/network/SocketManager.ts b/apps/server/src/network/SocketManager.ts index 8ad1602..9622b54 100644 --- a/apps/server/src/network/SocketManager.ts +++ b/apps/server/src/network/SocketManager.ts @@ -1,7 +1,7 @@ import { Server, Socket } from "socket.io"; import { GameManager } from "../domains/game/GameManager"; import { RoomManager } from "../domains/room/RoomManager"; -import { SocketEvents } from "@repo/shared/src/protocol/events"; +import { SocketEvents } from "@repo/shared"; import { registerRoomHandlers, handleRoomDisconnect } from "../domains/room/RoomHandler"; import { registerGameHandlers, handleGameDisconnect } from "../domains/game/GameHandler"; diff --git a/packages/shared/package.json b/packages/shared/package.json index 802898b..02afce3 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,11 +1,23 @@ { "name": "@repo/shared", "version": "1.0.0", - "description": "", "main": "./dist/index.js", + "module": "./dist/index.mjs", "types": "./dist/index.d.ts", + "exports": { + ".": { + "types": "./dist/index.d.ts", + "import": "./dist/index.mjs", + "require": "./dist/index.js" + }, + "./config/*": { + "types": "./dist/config/*.d.ts", + "import": "./dist/config/*.mjs", + "require": "./dist/config/*.js" + } + }, "scripts": { - "build": "tsup src/index.ts --format cjs,esm --dts", + "build": "tsup src/index.ts src/config/gameConfig.ts --format cjs,esm --dts", "test": "echo \"Error: no test specified\" && exit 1" }, "keywords": [],