fixup files after move

Author: thejoshwolfe

package.json

@@ -12,8 +12,8 @@
   },
   "scripts": {
     "build": "npm install --no-audit --no-fund && npm run build:client && npm run build:server",
-    "build:client": "cd public && npm run build",
-    "build:server": "cd lib && npm run build",
-    "run": "cd lib && npm run run"
+    "build:client": "cd src/client && npm run build",
+    "build:server": "cd src/server && npm run build",
+    "run": "cd src/server && npm run run"
   }
 }

public/index.html

@@ -219,6 +219,6 @@
       <p id="loadingMessageDiv">Please wait...</p>
     </div>
     <div id="modalMaskDiv" style="display: none;"></div>
-    <script type="module" src="client.js"></script>
+    <script type="module" src="client/client.js"></script>
   </body>
 </head>

run.sh

@@ -1 +1 @@
-cd lib && exec node server.js
+cd src/server && exec node server.js

src/client/client.ts

@@ -7,7 +7,7 @@ import {
 } from "./math.js";
 import {
   UserInfo, UserId, MakeAMoveArgs, DbEntry, DbEntryId, RoomState, ObjectState, ImagePath, ObjectId,
-} from "./protocol.js";
+} from "../shared/protocol.js";
 import {
   setScreenMode, ScreenMode,
   canMoveLockedObjects,

src/client/connection.ts

@@ -6,7 +6,7 @@ import {
 import {
   UserInfo, UserId,
   JoinRoomArgs, UserJoinedArgs, UserLeftArgs, ChangeMyNameArgs, ChangeMyRoleArgs, RoleId,
-} from "./protocol.js";
+} from "../shared/protocol.js";
 import {
   ScreenMode, getScreenMode, setScreenMode,
   renderUserList,

src/client/package-lock.json

@@ -14,11 +14,12 @@
     "noPropertyAccessFromIndexSignature": false,
     "noUncheckedIndexedAccess": false,
 
-    "module": "ES2022",
-
     "removeComments": true,
     "sourceMap": true,
 
+    "rootDir": "..",
+    "outDir": "../../public",
+    "module": "ES2022",
     "lib": [
       "ES2018",
       "DOM"

src/client/tsconfig.json

@@ -3,7 +3,7 @@ import {
 } from "./connection.js";
 import {
   UserInfo, UserId,
-} from "./protocol.js";
+} from "../shared/protocol.js";
 import {
   fixFloatingThingZ, renderAllObjects, renderPlayerLabelObjects,
   getRoles,

src/client/ui_layout.ts

@@ -1,4 +1,5 @@
 {
+  "type": "module",
   "dependencies": {
     "express": "^4.18.2",
     "ws": "^8.16.0"

src/server/package-lock.json

@@ -2,14 +2,14 @@ import http from "http";
 import express from "express";
 import {WebSocket, WebSocketServer} from "ws";
 
-import database from "./database";
-import defaultRoomState from "./defaultRoom";
+import database from "./database.js";
+import defaultRoomState from "./defaultRoom.js";
 
 const bindIpAddress = "127.0.0.1";
 
 function main() {
   const app = express();
-  app.use(express.static("../public"));
+  app.use(express.static("../../public"));
   const httpServer = http.createServer(app);
   const wss = new WebSocketServer({server: httpServer});
   wss.on("error", function(err) {

src/server/package.json

@@ -14,10 +14,10 @@
     "noPropertyAccessFromIndexSignature": false,
     "noUncheckedIndexedAccess": false,
 
-    "module": "NodeNext",
-
     "removeComments": true,
-    "sourceMap": true
+    "sourceMap": true,
+
+    "module": "NodeNext"
   },
   "files": [
     "server.ts"