Move TypeScript Node.js build to dist/node

Use a separate folder for the TypeScript build for Node.js in the dist
folder.  This makes each type of build consistently have its own output
folder instead of being interleaved with the Node.js build.

.eslintrc.js

@@ -391,7 +391,7 @@ module.exports = {
 		"node/process-exit-as-throw": "error",
 		"node/shebang": ["error", {
 			"convertPath": {
-				"*.ts": ["^(.+)\\.ts$", "dist/$1.js"],
+				"*.ts": ["^(.+)\\.ts$", "dist/node/$1.js"],
 			},
 		}],
 	},

docs/devs/plugin-migration-to-alpha-14.md

@@ -78,7 +78,7 @@ import { BaseInstancePlugin } from "@clusterio/host";
 
 Previously the info of a plugin would be loaded by requiring `./plugin_dir/info`, this has been changed to require `./plugin_dir` which in turn means that `info.js` is no longer the default entrypoint.
 To solve this you can either add `"main": "info.js",` to package.json or rename `info.js` to `index.js` (the rest of this guide assumes the entrypoint was renamed to `index.js`).
-The motivation behind this change was to allow TypeScript to output its build to a sub-folder of the plugin, if you're using TypeScript you'll likely have the entrypoint be located in `dist/index.js` instead.
+The motivation behind this change was to allow TypeScript to output its build to a sub-folder of the plugin, if you're using TypeScript you'll likely have the entrypoint be located in `dist/node/index.js` instead.
 
 The expected place where the declaration of a plugin is exported has also changed from `module.exports` to `module.exports.plugin`:
 

packages/controller/package.json

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

packages/controller/src/Controller.ts

@@ -274,7 +274,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"]) {
@@ -333,7 +333,7 @@ export default class Controller {
 
 		if (args.dev) {
 			// eslint-disable-next-line node/no-missing-require
-			webpackConfigs.push(require("../../webpack.config")({})); // Path outside of build
+			webpackConfigs.push(require("../../../webpack.config")({})); // Path outside of build
 		}
 		if (args.devPlugin) {
 			let devPlugins = new Map();
@@ -737,7 +737,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, "..", "..", "web", "static"), staticOptions)
 		);
 		app.use("/static", express.static("static", staticOptions)); // Used for data export files
 
@@ -1226,7 +1226,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": ["index.ts", "controller.ts", "package.json", "src/**/*.ts"],
 	"compilerOptions": {
-		"outDir": "dist",
+		"outDir": "dist/node",
 	},
 }

packages/ctl/package.json

@@ -4,13 +4,13 @@
 	"author": "Hornwitser",
 	"license": "MIT",
 	"version": "2.0.0-alpha.16",
-	"main": "dist/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build",
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"bin": {
-		"clusterioctl": "./dist/ctl.js"
+		"clusterioctl": "./dist/node/ctl.js"
 	},
 	"keywords": [
 		"factorio"

packages/ctl/tsconfig.json

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

packages/host/package.json

@@ -4,13 +4,13 @@
 	"author": "Hornwitser",
 	"license": "MIT",
 	"version": "2.0.0-alpha.16",
-	"main": "dist/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build",
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"bin": {
-		"clusteriohost": "./dist/host.js"
+		"clusteriohost": "./dist/node/host.js"
 	},
 	"keywords": [
 		"factorio"

packages/host/src/Instance.ts

@@ -800,7 +800,7 @@ rcon.print(game.table_to_json(players))`.replace(/\r?\n/g, " ");
 
 		// Find stand alone modules to load
 		// XXX for now only the included clusterio module is loaded
-		let modulesDirectory = path.join(__dirname, "..", "..", "modules");
+		let modulesDirectory = path.join(__dirname, "..", "..", "..", "modules");
 		for (let entry of await fs.readdir(modulesDirectory, { withFileTypes: true })) {
 			if (entry.isDirectory()) {
 				if (modules.has(entry.name)) {

packages/host/src/export.ts

@@ -5,7 +5,7 @@ import Jimp from "jimp";
 import JSZip from "jszip";
 
 import * as lib from "@clusterio/lib";
-import * as libBuildMod from "@clusterio/lib/dist/build_mod";
+import * as libBuildMod from "@clusterio/lib/dist/node/build_mod";
 import type { FactorioServer } from "./server";
 
 interface Prototype {
@@ -62,7 +62,7 @@ async function generateExportMod(server: FactorioServer) {
 		clean: false,
 		build: true,
 		pack: true,
-		sourceDir: path.join(__dirname, "..", "..", "lua", "export"),
+		sourceDir: path.join(__dirname, "..", "..", "..", "lua", "export"),
 		outputDir: server.writePath("mods"),
 		bumpPatch: false,
 		factorioVersion: server.version.replace(/\.\d+$/, ""),

packages/host/tsconfig.json

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

packages/lib/package.json

@@ -8,7 +8,7 @@
 		"prepare": "tsc --build && pnpm run compile_validator",
 		"compile_validator": "node scripts/compile_validator.js"
 	},
-	"main": "dist/index.js",
+	"main": "dist/node/index.js",
 	"browser": "browser.ts",
 	"keywords": [
 		"factorio"

packages/lib/scripts/compile_validator.js

@@ -7,9 +7,9 @@ const standaloneCode = require("ajv/dist/standalone").default;
 /* eslint-disable node/no-sync */
 
 // Provide an empty file for message_core to load
-fs.outputFileSync(path.join(__dirname, "../dist/src/data/message_validate.js"), "");
+fs.outputFileSync(path.join(__dirname, "../dist/node/src/data/message_validate.js"), "");
 
-const { Message } = require("../dist/src/data/messages_core");
+const { Message } = require("../dist/node/src/data/messages_core");
 
 const ajv = new Ajv({
 	allowUnionTypes: true,
@@ -28,5 +28,5 @@ function write(output) {
 		`// generated by scripts/compile_validator.js\n// @ts-nocheck\n/* eslint-disable */\n${moduleCode}`
 	);
 }
-write("../dist/src/data/message_validate.js");
+write("../dist/node/src/data/message_validate.js");
 write("../src/data/message_validate.js");

packages/lib/tsconfig.json

@@ -2,7 +2,7 @@
 	"extends": "../../tsconfig.node.json",
 	"include": ["index.ts", "browser.ts", "build_mod.js", "src/**/*.ts", "src/**/*.js"],
 	"compilerOptions": {
-		"outDir": "dist",
+		"outDir": "dist/node",
 		"allowJs": true,
 	},
 }

plugins/global_chat/index.ts

@@ -6,8 +6,8 @@ export const plugin: lib.PluginDeclaration = {
 	name: "global_chat",
 	title: "Global Chat",
 	description: "Forwards chat between instances.",
-	instanceEntrypoint: "dist/plugin/instance",
-	ctlEntrypoint: "dist/plugin/control",
+	instanceEntrypoint: "dist/node/instance",
+	ctlEntrypoint: "dist/node/control",
 
 	messages: [
 		ChatEvent,

plugins/global_chat/package.json

@@ -6,7 +6,7 @@
 	"homepage": "https://github.com/clusterio/clusterio#readme",
 	"license": "MIT",
 	"repository": "clusterio/clusterio",
-	"main": "dist/plugin/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
 		"test": "echo \"Error: run tests from root\" && exit 1"

plugins/global_chat/test/plugin.js

@@ -4,9 +4,9 @@ const lib = require("@clusterio/lib");
 
 const mock = require("../../../test/mock");
 const lines = require("../../../test/lib/factorio/lines");
-const instance = require("../dist/plugin/instance");
-const info = require("../dist/plugin/index").plugin;
-const { ChatEvent } = require("../dist/plugin/messages");
+const instance = require("../dist/node/instance");
+const info = require("../dist/node/index").plugin;
+const { ChatEvent } = require("../dist/node/messages");
 
 
 describe("global_chat plugin", function() {

plugins/global_chat/tsconfig.json

@@ -6,6 +6,6 @@
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
 	"compilerOptions": {
-		"outDir": "dist/plugin",
+		"outDir": "dist/node",
 	},
 }

plugins/inventory_sync/index.ts

@@ -22,7 +22,7 @@ export const plugin: lib.PluginDeclaration = {
 	title: "Inventory sync",
 	description: "Synchronizes players inventories between instances",
 
-	instanceEntrypoint: "dist/plugin/instance",
+	instanceEntrypoint: "dist/node/instance",
 	instanceConfigFields: {
 		"inventory_sync.rcon_chunk_size": {
 			title: "Rcon inventory chunk size",
@@ -33,7 +33,7 @@ export const plugin: lib.PluginDeclaration = {
 		},
 	},
 
-	controllerEntrypoint: "dist/plugin/controller",
+	controllerEntrypoint: "dist/node/controller",
 	controllerConfigFields: {
 		"inventory_sync.player_lock_timeout": {
 			title: "Player Lock Timeout",

plugins/inventory_sync/package.json

@@ -6,7 +6,7 @@
 	"homepage": "https://github.com/clusterio/factorioClusterio#readme",
 	"license": "MIT",
 	"repository": "clusterio/factorioClusterio",
-	"main": "dist/plugin/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
 		"test": "echo \"Error: run tests from root\" && exit 1"

plugins/inventory_sync/tsconfig.json

@@ -6,6 +6,6 @@
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
 	"compilerOptions": {
-		"outDir": "dist/plugin",
+		"outDir": "dist/node",
 	},
 }

plugins/player_auth/index.ts

@@ -15,8 +15,8 @@ export const plugin: lib.PluginDeclaration = {
 	name: "player_auth",
 	title: "Player Auth",
 	description: "Provides authentication to the cluster via logging into a Factorio server.",
-	controllerEntrypoint: "dist/plugin/controller",
-	instanceEntrypoint: "dist/plugin/instance",
+	controllerEntrypoint: "dist/node/controller",
+	instanceEntrypoint: "dist/node/instance",
 	webEntrypoint: "./web",
 	controllerConfigFields: {
 		"player_auth.code_length": {

plugins/player_auth/package.json

@@ -6,7 +6,7 @@
 	"homepage": "https://github.com/clusterio/clusterio#readme",
 	"license": "MIT",
 	"repository": "clusterio/clusterio",
-	"main": "dist/plugin/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
 		"test": "echo \"Error: run tests from root\" && exit 1"

plugins/player_auth/test/plugin.js

@@ -5,10 +5,10 @@ const jwt = require("jsonwebtoken");
 
 const mock = require("../../../test/mock");
 
-const controller = require("../dist/plugin/controller");
-const instance = require("../dist/plugin/instance");
-const info = require("../dist/plugin/index").plugin;
-const { FetchPlayerCodeRequest, SetVerifyCodeRequest } = require("../dist/plugin/messages");
+const controller = require("../dist/node/controller");
+const instance = require("../dist/node/instance");
+const info = require("../dist/node/index").plugin;
+const { FetchPlayerCodeRequest, SetVerifyCodeRequest } = require("../dist/node/messages");
 const lib = require("@clusterio/lib");
 
 

plugins/player_auth/tsconfig.json

@@ -6,6 +6,6 @@
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
 	"compilerOptions": {
-		"outDir": "dist/plugin",
+		"outDir": "dist/node",
 	},
 }

plugins/research_sync/index.ts

@@ -6,8 +6,8 @@ export const plugin: lib.PluginDeclaration = {
 	name: "research_sync",
 	title: "Research Sync",
 	description: "Synchronises technology research progress between instances.",
-	instanceEntrypoint: "dist/plugin/instance",
-	controllerEntrypoint: "dist/plugin/controller",
+	instanceEntrypoint: "dist/node/instance",
+	controllerEntrypoint: "dist/node/controller",
 
 	messages: [
 		messages.ContributionEvent,

plugins/research_sync/package.json

@@ -6,7 +6,7 @@
 	"homepage": "https://github.com/clusterio/clusterio#readme",
 	"license": "MIT",
 	"repository": "clusterio/clusterio",
-	"main": "dist/plugin/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
 		"test": "echo \"Error: run tests from root\" && exit 1"

plugins/research_sync/test/missing.js

@@ -2,5 +2,5 @@
 // required here in order to track coverage for them.
 
 "use strict";
-require("../dist/plugin/instance");
-require("../dist/plugin/controller");
+require("../dist/node/instance");
+require("../dist/node/controller");

plugins/research_sync/tsconfig.json

@@ -6,6 +6,6 @@
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
 	"compilerOptions": {
-		"outDir": "dist/plugin",
+		"outDir": "dist/node",
 	},
 }

plugins/statistics_exporter/index.ts

@@ -12,7 +12,7 @@ export const plugin: lib.PluginDeclaration = {
 	description:
 		"Provides in-game item/fluid production, builds, kills, and pollution "+
 		"statistics to the cluster's Prometheus endpoint.",
-	instanceEntrypoint: "dist/plugin/instance",
+	instanceEntrypoint: "dist/node/instance",
 	instanceConfigFields: {
 		"statistics_exporter.command_timeout": {
 			title: "Command Timeout",

plugins/statistics_exporter/package.json

@@ -6,7 +6,7 @@
 	"homepage": "https://github.com/clusterio/clusterio#readme",
 	"license": "MIT",
 	"repository": "clusterio/clusterio",
-	"main": "dist/plugin/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
 		"test": "echo \"Error: run tests from root\" && exit 1"

plugins/statistics_exporter/test/plugin.js

@@ -2,8 +2,8 @@
 const assert = require("assert").strict;
 
 const mock = require("../../../test/mock");
-const instance = require("../dist/plugin/instance");
-const info = require("../dist/plugin/index").plugin;
+const instance = require("../dist/node/instance");
+const info = require("../dist/node/index").plugin;
 
 
 describe("statistics_exporter plugin", function() {

plugins/statistics_exporter/tsconfig.json

@@ -6,6 +6,6 @@
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
 	"compilerOptions": {
-		"outDir": "dist/plugin",
+		"outDir": "dist/node",
 	},
 }

plugins/subspace_storage/index.ts

@@ -22,7 +22,7 @@ export const plugin: lib.PluginDeclaration = {
 	name: "subspace_storage",
 	title: "Subspace Storage",
 	description: "Provides shared storage across instances for the Subspace Storage mod",
-	instanceEntrypoint: "dist/plugin/instance",
+	instanceEntrypoint: "dist/node/instance",
 	instanceConfigFields: {
 		"subspace_storage.log_item_transfers": {
 			title: "Log Item Transfers",
@@ -32,7 +32,7 @@ export const plugin: lib.PluginDeclaration = {
 		},
 	},
 
-	controllerEntrypoint: "dist/plugin/controller",
+	controllerEntrypoint: "dist/node/controller",
 	controllerConfigFields: {
 		"subspace_storage.division_method": {
 			title: "Division Method",

plugins/subspace_storage/package.json

@@ -6,7 +6,7 @@
 	"homepage": "https://github.com/clusterio/clusterio#readme",
 	"license": "MIT",
 	"repository": "clusterio/clusterio",
-	"main": "dist/plugin/index.js",
+	"main": "dist/node/index.js",
 	"scripts": {
 		"prepare": "tsc --build && webpack-cli --env production",
 		"test": "echo \"Error: run tests from root\" && exit 1"

plugins/subspace_storage/test/missing.js

@@ -2,7 +2,7 @@
 // required here in order to track coverage for them.
 
 "use strict";
-require("../dist/plugin/instance");
-require("../dist/plugin/controller");
-require("../dist/plugin/dole");
-require("../dist/plugin/dole_nn_base");
+require("../dist/node/instance");
+require("../dist/node/controller");
+require("../dist/node/dole");
+require("../dist/node/dole_nn_base");

plugins/subspace_storage/test/routes.js

@@ -1,7 +1,7 @@
 "use strict";
 const assert = require("assert").strict;
 
-const routes = require("../dist/plugin/routes");
+const routes = require("../dist/node/routes");
 const { get } = require("../../../test/integration");
 
 

plugins/subspace_storage/tsconfig.json

@@ -6,6 +6,6 @@
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
 	"compilerOptions": {
-		"outDir": "dist/plugin",
+		"outDir": "dist/node",
 	},
 }

test/controller/HttpCloser.js

@@ -7,7 +7,7 @@ const util = require("util");
 
 const phin = require("phin");
 
-const HttpCloser = require("@clusterio/controller/dist/src/HttpCloser").default;
+const HttpCloser = require("@clusterio/controller/dist/node/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/src/routes");
+const routes = require("@clusterio/controller/dist/node/src/routes");
 const mock = require("../mock");
 
 

test/host.js

@@ -3,8 +3,8 @@ const assert = require("assert").strict;
 const path = require("path");
 
 const lib = require("@clusterio/lib");
-const Host = require("@clusterio/host/dist/src/Host").default;
-const { _discoverInstances } = require("@clusterio/host/dist/src/Host");
+const Host = require("@clusterio/host/dist/node/src/Host").default;
+const { _discoverInstances } = require("@clusterio/host/dist/node/src/Host");
 
 describe("Host testing", function() {
 	describe("discoverInstances()", function() {

test/host/Instance.js

@@ -4,7 +4,7 @@ const path = require("path");
 
 const lib = require("@clusterio/lib");
 const { PlayerStats, wait } = lib;
-const Instance = require("@clusterio/host/dist/src/Instance").default;
+const Instance = require("@clusterio/host/dist/node/src/Instance").default;
 const { MockConnector, MockServer } = require("../mock");
 
 const addr = lib.Address.fromShorthand;

test/host/export.js

@@ -2,8 +2,8 @@
 const assert = require("assert").strict;
 const path = require("path");
 
-const { FactorioServer } = require("@clusterio/host/dist/src/server");
-const { _exportLocale } = require("@clusterio/host/dist/src/export");
+const { FactorioServer } = require("@clusterio/host/dist/node/src/server");
+const { _exportLocale } = require("@clusterio/host/dist/node/src/export");
 
 
 describe("host/src/export", function() {

test/host/patch.js

@@ -5,7 +5,7 @@ const JSZip = require("jszip");
 const path = require("path");
 
 const lib = require("@clusterio/lib");
-const patch = require("@clusterio/host/dist/src/patch");
+const patch = require("@clusterio/host/dist/node/src/patch");
 
 
 describe("host/patch", function() {

test/host/server.js

@@ -4,7 +4,7 @@ const events = require("events");
 const fs = require("fs-extra");
 const path = require("path");
 
-const hostServer = require("@clusterio/host/dist/src/server");
+const hostServer = require("@clusterio/host/dist/node/src/server");
 const lib = require("@clusterio/lib");
 const { wait } = lib;
 const { testLines } = require("../lib/factorio/lines");

test/integration/export.js

@@ -2,8 +2,8 @@
 const assert = require("assert").strict;
 const path = require("path");
 
-const { _exportLocale } = require("@clusterio/host/dist/src/export");
-const { FactorioServer } = require("@clusterio/host/dist/src/server");
+const { _exportLocale } = require("@clusterio/host/dist/node/src/export");
+const { FactorioServer } = require("@clusterio/host/dist/node/src/server");
 
 
 describe("Integration of lib/factorio/export", function() {

test/integration/index.js

@@ -12,11 +12,11 @@ const lib = require("@clusterio/lib");
 const { LineSplitter, ConsoleTransport, logger } = lib;
 
 // Make sure permissions from plugins are loaded
-require("../../plugins/global_chat/dist/plugin/index");
-require("../../plugins/player_auth/dist/plugin/index");
-require("../../plugins/research_sync/dist/plugin/index");
-require("../../plugins/statistics_exporter/dist/plugin/index");
-require("../../plugins/subspace_storage/dist/plugin/index");
+require("../../plugins/global_chat/dist/node/index");
+require("../../plugins/player_auth/dist/node/index");
+require("../../plugins/research_sync/dist/node/index");
+require("../../plugins/statistics_exporter/dist/node/index");
+require("../../plugins/subspace_storage/dist/node/index");
 
 const subspaceStorageVersion = "1.99.8";
 const subspaceStorageGitHubTag = "1.99.6"; // Tag subspaceStorageVersion was released under on GitHub

test/integration/patch.js

@@ -4,7 +4,7 @@ const fs = require("fs-extra");
 const JSZip = require("jszip");
 const path = require("path");
 
-const { patch, SaveModule } = require("@clusterio/host/dist/src/patch");
+const { patch, SaveModule } = require("@clusterio/host/dist/node/src/patch");
 const lib = require("@clusterio/lib");
 
 const { slowTest } = require("./index");

test/integration/server.js

@@ -5,7 +5,7 @@ const fs = require("fs-extra");
 const path = require("path");
 
 const lib = require("@clusterio/lib");
-const { FactorioServer, _getVersion } = require("@clusterio/host/dist/src/server");
+const { FactorioServer, _getVersion } = require("@clusterio/host/dist/node/src/server");
 const { logger } = lib;
 
 const { slowTest } = require("./index");

test/mock.js

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