From 8108fcac816f07dba2f8741c8c51b4b2b4f1e0dc Mon Sep 17 00:00:00 2001
From: Luciole <31817566+Luciole0x@users.noreply.github.com>
Date: Mon, 14 Aug 2023 11:56:41 +0200
Subject: [PATCH] update package.json to fix test running and import version

---
 packages/controller/controller.ts   | 2 +-
 packages/controller/package.json    | 5 +++--
 packages/controller/src/WsServer.ts | 2 +-
 packages/controller/tsconfig.json   | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/controller/controller.ts b/packages/controller/controller.ts
index 19068d38..c9c9a8fb 100644
--- a/packages/controller/controller.ts
+++ b/packages/controller/controller.ts
@@ -32,7 +32,7 @@ const { ConsoleTransport, levels, logger } = lib;
 
 import Controller from "./src/Controller";
 import UserManager from "./src/UserManager";
-const version = process.env.npm_package_version;
+const version = require("./package.json").version;
 
 // globals
 let controller: Controller;
diff --git a/packages/controller/package.json b/packages/controller/package.json
index 7789ffc4..b61d3d6c 100644
--- a/packages/controller/package.json
+++ b/packages/controller/package.json
@@ -4,7 +4,7 @@
   "author": "Hornwitser",
   "license": "MIT",
   "version": "2.0.0-alpha.13",
-  "main": "controller.ts",
+  "main": "dist/controller/controller.js",
   "scripts": {
     "prepare": "webpack-cli --env production && pnpm build",
     "build": "tsc --build",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@clusterio/web_ui": "^2.0.0-alpha.13",
-	 "@types/busboy": "^1.5.0",
+    "@types/busboy": "^1.5.0",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.17",
     "@types/fs-extra": "^11.0.1",
@@ -48,6 +48,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.4.14",
+    "typescript": "^5.1.6",
     "webpack": "^5.88.2",
     "webpack-dev-middleware": "^6.1.1",
     "webpack-merge": "^5.9.0"
diff --git a/packages/controller/src/WsServer.ts b/packages/controller/src/WsServer.ts
index e1651dd0..e120c8eb 100644
--- a/packages/controller/src/WsServer.ts
+++ b/packages/controller/src/WsServer.ts
@@ -17,7 +17,7 @@ export interface WebSocketClusterio extends WebSocket {
 }
 
 
-const packageVersion = process.env.npm_package_version || "-1";
+const packageVersion = require("../package.json").version;
 
 const wsMessageCounter = new lib.Counter(
 	"clusterio_controller_websocket_message_total",
diff --git a/packages/controller/tsconfig.json b/packages/controller/tsconfig.json
index aefb3e4b..87c2e4ab 100644
--- a/packages/controller/tsconfig.json
+++ b/packages/controller/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "include": ["controller.ts", "src/**/*.ts"],
+  "include": ["controller.ts", "package.json", "src/**/*.ts"],
   "compilerOptions": {
     "lib": ["esnext"],
     "module": "commonjs",
@@ -13,6 +13,7 @@
     "checkJs": false,
     "noEmitOnError": false,
     "esModuleInterop": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+	 "resolveJsonModule": true
   }
 }