Move controller's TypeScript output to dist

Be consistent with the other packages and set the controller's
TypeScript compilation outDir to dist instead of dist/controller.

packages/controller/package.json

@@ -4,13 +4,13 @@
   "author": "Hornwitser",
   "license": "MIT",
   "version": "2.0.0-alpha.13",
-  "main": "dist/controller/controller.js",
+  "main": "dist/controller.js",
   "scripts": {
     "prepare": "tsc --build && webpack-cli --env production",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "clusteriocontroller": "./dist/controller/controller.js"
+    "clusteriocontroller": "./dist/controller.js"
   },
   "keywords": [
     "factorio"

packages/controller/src/Controller.ts

@@ -236,7 +236,7 @@ export default class Controller {
 		Controller.addAppRoutes(this.app, this.pluginInfos);
 
 		if (!args.dev) {
-			let manifestPath = path.join(__dirname, "..", "..", "web", "manifest.json");
+			let manifestPath = path.join(__dirname, "..", "web", "manifest.json");
 
 			let manifest = await Controller.loadJsonObject(manifestPath);
 			if (!manifest["main.js"]) {
@@ -541,7 +541,7 @@ export default class Controller {
 		// Set folder to serve static content from (the website)
 		const staticOptions = { immutable: true, maxAge: 1000 * 86400 * 365 };
 		app.use("/static",
-			express.static(path.join(__dirname, "..", "..", "..", "dist", "web", "static"), staticOptions)
+			express.static(path.join(__dirname, "..", "..", "dist", "web", "static"), staticOptions)
 		);
 		app.use("/static", express.static("static", staticOptions)); // Used for data export files
 
@@ -967,7 +967,7 @@ export default class Controller {
 				mainBundle = stats.toJson().assetsByChunkName["main"];
 			}
 
-			fs.readFile(path.join(__dirname, "..", "..", "..", "web", "index.html"), "utf8").then((content) => {
+			fs.readFile(path.join(__dirname, "..", "..", "web", "index.html"), "utf8").then((content) => {
 				res.type("text/html");
 				res.send(content
 					.replace(/__CLUSTER_NAME__/g, res.app.locals.controller.config.get("controller.name"))

packages/controller/tsconfig.json

@@ -5,6 +5,6 @@
 	],
 	"include": ["controller.ts", "package.json", "src/**/*.ts"],
 	"compilerOptions": {
-		"outDir": "dist/controller",
+		"outDir": "dist",
 	},
 }

test/controller/HttpCloser.js

@@ -7,7 +7,7 @@ const util = require("util");
 
 const phin = require("phin");
 
-const HttpCloser = require("@clusterio/controller/dist/controller/src/HttpCloser").default;
+const HttpCloser = require("@clusterio/controller/dist/src/HttpCloser").default;
 
 // Time to wait during async operations to ensure they happened in order.
 const tick = 20;

test/controller/routes.js

@@ -7,7 +7,7 @@ const http = require("http");
 const phin = require("phin");
 
 const { wait } = require("@clusterio/lib");
-const routes = require("@clusterio/controller/dist/controller/src/routes");
+const routes = require("@clusterio/controller/dist/src/routes");
 const mock = require("../mock");
 
 

test/mock.js

@@ -5,7 +5,7 @@ const express = require("express");
 
 const lib = require("@clusterio/lib");
 
-const UserManager = require("@clusterio/controller/dist/controller/src/UserManager").default;
+const UserManager = require("@clusterio/controller/dist/src/UserManager").default;
 
 const addr = lib.Address.fromShorthand;