From 6d1ff4c178b0c0d51e7a351c373d8c8da259e475 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Fri, 25 Aug 2023 15:25:43 +0200
Subject: [PATCH] Fix web interface broken by TypeScript porting

---
 packages/controller/src/Controller.ts    | 2 +-
 packages/web_ui/src/bootstrap.jsx        | 2 +-
 plugins/statistics_exporter/package.json | 2 ++
 plugins/subspace_storage/package.json    | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/controller/src/Controller.ts b/packages/controller/src/Controller.ts
index c3ee42a0..e446e995 100644
--- a/packages/controller/src/Controller.ts
+++ b/packages/controller/src/Controller.ts
@@ -164,7 +164,7 @@ export default class Controller {
 			const webpackConfigs = [];
 
 			if (args.dev) {
-				webpackConfigs.push(require("../webpack.config")({}));
+				webpackConfigs.push(require("../../../webpack.config")({}));
 			}
 			if (args.devPlugin) {
 				let devPlugins = new Map();
diff --git a/packages/web_ui/src/bootstrap.jsx b/packages/web_ui/src/bootstrap.jsx
index bf2fa5b8..496bae95 100644
--- a/packages/web_ui/src/bootstrap.jsx
+++ b/packages/web_ui/src/bootstrap.jsx
@@ -50,7 +50,7 @@ async function loadPluginInfos() {
 				throw new Error(`Plugin did not expose its container via plugin_${meta.name}`);
 			}
 			await container.init(__webpack_share_scopes__.default);
-			let pluginInfo = (await container.get("./info"))();
+			let pluginInfo = (await container.get("./info"))().default;
 			pluginInfo.container = container;
 			pluginInfo.package = (await container.get("./package.json"))();
 			pluginInfo.enabled = meta.enabled;
diff --git a/plugins/statistics_exporter/package.json b/plugins/statistics_exporter/package.json
index 7bce6e46..cbe33ac7 100644
--- a/plugins/statistics_exporter/package.json
+++ b/plugins/statistics_exporter/package.json
@@ -23,6 +23,8 @@
   "devDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.13",
     "@clusterio/web_ui": "^2.0.0-alpha.13",
+    "@types/node": "^20.4.5",
+    "typescript": "^5.1.6",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",
     "webpack-merge": "^5.9.0"
diff --git a/plugins/subspace_storage/package.json b/plugins/subspace_storage/package.json
index 4812d7a8..7824b89d 100644
--- a/plugins/subspace_storage/package.json
+++ b/plugins/subspace_storage/package.json
@@ -21,7 +21,7 @@
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
   "dependencies": {
-	"@sinclair/typebox": "^0.30.4",
+    "@sinclair/typebox": "^0.30.4",
     "fs-extra": "^8.1.0"
   },
   "devDependencies": {
@@ -33,6 +33,7 @@
     "antd": "^5.7.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "typescript": "^5.1.6",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",
     "webpack-merge": "^5.9.0"