Fix linting issues with new rules

packages/controller/controller.ts

@@ -422,7 +422,7 @@ async function startup() {
 		if (secondSigint) {
 			setBlocking(true);
 			logger.fatal("Caught second interrupt, terminating immediately");
-			// eslint-disable-next-line node/no-process-exit
+
 			process.exit(1);
 		}
 
@@ -435,7 +435,7 @@ async function startup() {
 		if (secondSigterm) {
 			setBlocking(true);
 			logger.fatal("Caught second termination, terminating immediately");
-			// eslint-disable-next-line node/no-process-exit
+
 			process.exit(1);
 		}
 

packages/controller/src/BaseConnection.ts

@@ -16,7 +16,7 @@ import * as routes from "./routes";
  * @alias module:controller/src/BaseConnection
  */
 export default class BaseConnection extends lib.Link {
-	declare ["connector"]: WsServerConnector;
+	declare "connector": WsServerConnector;
 
 	constructor(
 		connector: lib.WebSocketBaseConnector,

packages/controller/src/ControlConnection.ts

@@ -901,7 +901,7 @@ export default class ControlConnection extends BaseConnection {
 	}
 
 	// A large number of small if statements are unavoidable when reducing the number of updates sent
-	// eslint-disable-next-line complexity
+
 	async handleUserBulkImportRequest(request: lib.UserBulkImportRequest) {
 		let backup: undefined | Awaited<ReturnType<ControlConnection["handleUserBulkExportRequest"]>>;
 		const updated = new Map<ControllerUser["id"], ControllerUser>();

packages/controller/src/Controller.ts

@@ -399,13 +399,13 @@ export default class Controller {
 
 	async _startDevServer(args: ControllerArgs) {
 		logger.warn("Webpack development mode enabled");
-		/* eslint-disable @typescript-eslint/no-var-requires, node/no-unpublished-require */
+
 		const webpack = require("webpack");
 		const webpackDevMiddleware = require("webpack-dev-middleware");
 		const webpackConfigs = [];
 
 		if (args.dev) {
-			// eslint-disable-next-line node/no-missing-require
+
 			webpackConfigs.push(require("../../../webpack.config")({})); // Path outside of build
 		}
 		if (args.devPlugin) {
@@ -421,7 +421,7 @@ export default class Controller {
 			}
 			this.app.locals.devPlugins = devPlugins;
 		}
-		/* eslint-enable @typescript-eslint/no-var-requires, node/no-unpublished-require */
+
 
 		const compiler = webpack(webpackConfigs);
 		this.devMiddleware = webpackDevMiddleware(compiler, { serverSideRender: true });

packages/controller/src/HostConnection.ts

@@ -47,7 +47,7 @@ export default class HostConnection extends BaseConnection {
 		this._checkPluginVersions();
 
 		for (let event of ["connect", "drop", "resume", "close"] as const) {
-			// eslint-disable-next-line no-loop-func
+
 			this.connector.on(event, () => {
 				for (let plugin of this._controller.plugins.values()) {
 					plugin.onHostConnectionEvent(this, event);

packages/create/create.js

@@ -114,7 +114,7 @@ async function execFile(cmd, args) {
 			escaped,
 			{
 				shell: true,
-				// eslint-disable-next-line node/no-process-env
+
 				env: process.platform === "win32" ? { ...process.env, pct: "%" } : undefined,
 			},
 			(err, stdout, stderr) => {
@@ -396,7 +396,7 @@ async function installClusterio(mode, plugins) {
 		}
 		for (let plugin of plugins) {
 			if (!pluginList.has(plugin)) {
-				// eslint-disable-next-line node/global-require
+
 				let pluginInfo = require(require.resolve(plugin, { paths: [process.cwd()] })).plugin;
 				pluginList.set(pluginInfo.name, plugin);
 			}

packages/create/escape_arg.js

@@ -50,7 +50,7 @@ function escapeArg(arg) {
 	// For all other platforms the command is /bin/sh -c <command arg arg ...>
 	// The command and its arguments are passed as a single argument to the shell.
 	// See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_02
-	// eslint-disable-next-line no-lonely-if
+
 	if (!/[|&;<>()$`\\"' \t*?\[#~=%]/.test(arg)) {
 		return arg;
 	}

packages/create/templates/plugin-js/index.js

@@ -40,7 +40,7 @@ const plugin = {
 
 //%endif
 //%if controller
-controllerEntrypoint: "./dist/node/controller",
+	controllerEntrypoint: "./dist/node/controller",
 //%endif
 //%if controller & config
 	controllerConfigFields: {

packages/create/templates/plugin-js/web/plugin.jsx

@@ -35,9 +35,9 @@ function MyTemplatePage() {
 
 	return <PageLayout nav={[{ name: "__plugin_name__" }]}>
 		<PageHeader title="__plugin_name__" />
-//%if controller // Subscribing requires web content and the controller
+		//%if controller // Subscribing requires web content and the controller
 		Synced: {String(synced)} Data: {JSON.stringify([...subscribableData.values()])}
-//%endif
+		//%endif
 	</PageLayout>;
 }
 

packages/create/templates/plugin-ts/web/plugin.tsx

@@ -35,9 +35,9 @@ function MyTemplatePage() {
 
 	return <PageLayout nav={[{ name: "__plugin_name__" }]}>
 		<PageHeader title="__plugin_name__" />
-//%if controller // Subscribing requires web content and the controller
+		//%if controller // Subscribing requires web content and the controller
 		Synced: {String(synced)} Data: {JSON.stringify([...subscribableData.values()])}
-//%endif
+		//%endif
 	</PageLayout>;
 }
 

packages/ctl/ctl.ts

@@ -310,7 +310,7 @@ async function startControl() {
 		control.shutdown().catch(err => {
 			setBlocking(true);
 			logger.error(err.stack);
-			// eslint-disable-next-line node/no-process-exit
+
 			process.exit(1);
 		});
 	});

packages/host/host.ts

@@ -243,7 +243,7 @@ async function startHost() {
 		if (secondSigint) {
 			setBlocking(true);
 			logger.fatal("Caught second interrupt, terminating immediately");
-			// eslint-disable-next-line node/no-process-exit
+
 			process.exit(1);
 		}
 
@@ -256,7 +256,7 @@ async function startHost() {
 		if (secondSigterm) {
 			setBlocking(true);
 			logger.fatal("Caught second termination, terminating immediately");
-			// eslint-disable-next-line node/no-process-exit
+
 			process.exit(1);
 		}
 

packages/host/src/Host.ts

@@ -250,7 +250,7 @@ export class HostRouter {
  * Connects to the controller over the WebSocket and manages intsances.
  */
 export default class Host extends lib.Link {
-	declare ["connector"]: HostConnector;
+	declare "connector": HostConnector;
 
 	router = new HostRouter(this);
 	/**
@@ -1201,7 +1201,7 @@ export default class Host extends lib.Link {
 +------------------------------------------------------------+
 ${err.stack}`
 			);
-			// eslint-disable-next-line node/no-process-exit
+
 			process.exit(1);
 		}
 	}

packages/host/src/export.ts

@@ -221,7 +221,7 @@ async function loadLayeredIcon(
 			iconLayer.scale(realScale);
 		}
 
-		// eslint-disable-next-line no-loop-func
+
 		iconLayer.scan(0, 0, iconLayer.bitmap.width, iconLayer.bitmap.height, (x, y, sidx) => {
 			x += xs;
 			y += ys;

packages/host/src/server.ts

@@ -747,7 +747,7 @@ export class FactorioServer extends events.EventEmitter<FactorioServerEvents> {
 		this._rconClient.on("authenticated", () => {
 			this._rconReady = true;
 			this.emit("rcon-ready");
-		 });
+		});
 		this._rconClient.on("end", () => {
 			this._rconClient = null;
 			if (!this._rconReady) {

packages/lib/build_mod.d.ts

@@ -1,10 +1,10 @@
 export interface BuildArgs {
-    factorioVersion?: string;
-    dependencies?: Record<string, string>;
-    clean?: boolean;
-    pack?: boolean;
-    build?: boolean;
-    outputDir: string;
-    sourceDir: string;
+	factorioVersion?: string;
+	dependencies?: Record<string, string>;
+	clean?: boolean;
+	pack?: boolean;
+	build?: boolean;
+	outputDir: string;
+	sourceDir: string;
 };
 export function build(args: BuildArgs): Promise<void>;

packages/lib/src/data/ModPack.ts

@@ -291,7 +291,7 @@ export default class ModPack {
 			const sizeBytes = uint32Bytes(entries.length);
 			const itemBytes = entries.flatMap(([key, item]) => [
 				immutableStringBytes(key),
-				// eslint-disable-next-line no-use-before-define
+
 				propertyTreeBytes(item),
 			]);
 			return Buffer.concat([

packages/lib/src/data/messages_core.ts

@@ -1,6 +1,6 @@
 // Note: Run compile_validator script after making changes to this file.
 import { TSchema, Type, Static } from "@sinclair/typebox";
-// eslint-disable-next-line node/no-missing-import
+
 import messageValidate from "./message_validate"; // generated file
 import { StringEnum } from "./composites";
 
@@ -154,7 +154,7 @@ export class Message {
 	static validate = messageValidate;
 
 	static fromJSON(json: any) {
-		/* eslint-disable no-use-before-define */
+
 		if (json.type === "hello") { return MessageHello.fromJSON(json); }
 		if (json.type === "registerHost") { return MessageRegisterHost.fromJSON(json); }
 		if (json.type === "registerControl") { return MessageRegisterControl.fromJSON(json); }
@@ -168,7 +168,7 @@ export class Message {
 		if (json.type === "responseError") { return MessageResponseError.fromJSON(json); }
 		if (json.type === "event") { return MessageEvent.fromJSON(json); }
 		if (json.type === "disconnect") { return MessageDisconnect.fromJSON(json); }
-		/* eslint-enable no-use-before-define */
+
 		throw new Error(`Unrecognized message type ${json.type}`);
 	}
 }

packages/lib/src/datastore.ts

@@ -137,8 +137,8 @@ export abstract class Datastore<
 	V extends DatastoreValue,
 	U = V,
 > extends EventEmitter<{
-	"update": [ updates: U[] ],
-}> {
+		"update": [ updates: U[] ],
+	}> {
 	private dirty = false;
 
 	constructor(

packages/lib/src/is_deep_strict_equal.js

@@ -1,8 +1,8 @@
-/* eslint-disable node/global-require */
+
 "use strict";
-// eslint-disable-next-line node/no-process-env
+
 if (process.env.APP_ENV === "browser") {
-	// eslint-disable-next-line node/no-extraneous-require
+
 	module.exports = require("fast-deep-equal/es6");
 } else {
 	module.exports = require("util").isDeepStrictEqual;

packages/lib/src/link/WebSocket.js

@@ -1,3 +1,3 @@
 "use strict";
-// eslint-disable-next-line node/no-process-env
+
 module.exports = process.env.APP_ENV === "browser" ? window.WebSocket : require("ws");

packages/lib/src/link/connectors.ts

@@ -271,7 +271,7 @@ export abstract class WebSocketBaseConnector<
 		this._check("connected");
 		if (Date.now() - this._lastHeartbeatMs! > 2000 * this._heartbeatInterval!) {
 			logger.verbose("Connector | closing after heartbeat timed out");
-			// eslint-disable-next-line node/no-process-env
+
 			if (process.env.APP_ENV === "browser") {
 				this._socket!.close(ConnectionClosed.Timeout, "Heartbeat timeout");
 			} else {
@@ -544,7 +544,7 @@ export abstract class WebSocketClientConnector extends WebSocketBaseConnector<We
 		// Open WebSocket to controller
 		logger.verbose(`Connector | connecting to ${url}`);
 
-		// eslint-disable-next-line node/no-process-env
+
 		if (process.env.APP_ENV === "browser") {
 			this._socket = new WebSocket(url) as WebSocketClusterio;
 

packages/lib/src/logging_utils.ts

@@ -519,7 +519,7 @@ export async function queryLog(logDirectory: string, filter: QueryLogFilter, ind
 }
 
 export function handleUnhandledErrors() {
-	/* eslint-disable node/no-process-exit */
+
 	process.on("uncaughtException", err => {
 		logger.fatal(`Uncaught exception:\n${err.stack}`);
 		process.exit(1);
@@ -528,7 +528,7 @@ export function handleUnhandledErrors() {
 		logger.fatal(`Unhandled rejection:\n${reason.stack ? reason.stack : reason}`);
 		process.exit(1);
 	});
-	/* eslint-enable node/no-process-exit */
+
 }
 
 // for testing only

packages/lib/src/plugin_loader.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+
 /**
  * Helpers for loading plugins in Node.js
  * @module lib/plugin_loader

packages/lib/src/shared_commands.ts

@@ -58,7 +58,7 @@ export async function handlePluginCommand(
 
 		let pluginInfo: { name: string };
 		try {
-			// eslint-disable-next-line @typescript-eslint/no-var-requires
+
 			pluginInfo = require(pluginPath).plugin;
 		} catch (err: any) {
 			logger.error(`Unable to import plugin info from ${args.path}:\n${err.stack}`);

packages/web_ui/src/components/BaseConfigTree.tsx

@@ -226,7 +226,7 @@ export default function BaseConfigTree(props: BaseConfigTreeProps) {
 	</>;
 }
 
-// eslint-disable-next-line complexity
+
 function computeTreeData(
 	control: Control,
 	form: FormInstance<any>,

plugins/subspace_storage/dole_nn_base.ts

@@ -61,13 +61,13 @@ export function dose(
 	let inp1 = [numreq, instore_adj, store_last_tick / numreq, dole, carry]; // 0..4
 	let inp2 = [
 		prev_req / numreq,
-				 numreq / numreq_total_adj,
-				 store_last_tick / numreq_total_adj,
-				 prev_req/instore_adj,
-				 b,
-				 numreq_total_adj,
-				 store_last_tick,
-				 debt,
+		numreq / numreq_total_adj,
+		store_last_tick / numreq_total_adj,
+		prev_req/instore_adj,
+		b,
+		numreq_total_adj,
+		store_last_tick,
+		debt,
 	]; // 5..12
 	let inputs = inp1.concat(inp2);
 	let outputs = [0, 0, 0, 0];

test/create/escape_arg.js

@@ -11,7 +11,7 @@ async function exec(file, args) {
 	const { stdout, stderr } = await execFile(
 		file,
 		args.map(escapeArg),
-		// eslint-disable-next-line node/no-process-env
+
 		{ shell: true, cwd: __dirname, env: { ...process.env, pct: "%"} }
 	);
 	return { stdout: JSON.parse(stdout), stderr };

test/integration/index.js

@@ -120,7 +120,7 @@ class TestHostConnector extends lib.WebSocketClientConnector {
 // Mark that this test takes a lot of time, or depeneds on a test
 // that takes a lot of time.
 function slowTest(test) {
-	// eslint-disable-next-line node/no-process-env
+
 	if (process.env.FAST_TEST) {
 		test.skip();
 	}
@@ -221,7 +221,7 @@ function getControl() {
 }
 
 function spawn(name, cmd, waitFor) {
-	// eslint-disable-next-line node/no-process-env
+
 	const silent = process.env.SILENT_TEST;
 	const bootstrap = !controllerProcess || !hostProcess;
 	function log(...args) {
@@ -264,7 +264,7 @@ async function spawnNode(name, cmd, waitFor) {
 before(async function() {
 	this.timeout(40000);
 
-	// eslint-disable-next-line node/no-process-env
+
 	const silent = process.env.SILENT_TEST;
 	if (silent) {
 		console.log("SILENT_TEST is present in env, loggers after bootstrap will be muted.");
@@ -278,7 +278,7 @@ before(async function() {
 	}));
 
 	// If fast test is enabled then output that it is
-	// eslint-disable-next-line node/no-process-env
+
 	if (process.env.FAST_TEST) {
 		console.log("FAST_TEST is present in env, slow tests will be skipped.");
 	}

test/lib/ModStore.test.js

@@ -816,24 +816,24 @@ describe("lib/ModStore", function () {
 				assert.equal(
 					typeof firstMod.latest_release.version,
 					"string",
-					"latest_release version should be string" // eslint-disable-line max-len
+					"latest_release version should be string"
 				);
 				assert.equal(
 					typeof firstMod.latest_release.sha1,
 					"string",
-					"latest_release should have a sha1 string" // eslint-disable-line max-len
+					"latest_release should have a sha1 string"
 				);
 				assert.ok(firstMod.latest_release.info_json, "latest_release should have info_json");
 				assert.equal(
 					typeof firstMod.latest_release.info_json.factorio_version,
 					"string",
-					"info_json should have factorio_version string" // eslint-disable-line max-len
+					"info_json should have factorio_version string"
 				);
 				// Check for an expected field from the user example
 				assert.equal(
 					typeof firstMod.downloads_count,
 					"number",
-					"First mod should have downloads_count number" // eslint-disable-line max-len
+					"First mod should have downloads_count number"
 				);
 			} else {
 				// This should not happen for v1.1 but handles edge cases

test/lib/data/ModPack.js

@@ -303,7 +303,7 @@ describe("lib/data/ModPack", function() {
 						Buffer.from(str),
 					];
 				}
-				/* eslint-disable indent */
+				/* eslint-disable @stylistic/indent */
 				assert.deepEqual(
 					pack.toModSettingsDat(),
 					Buffer.concat([
@@ -373,7 +373,6 @@ describe("lib/data/ModPack", function() {
 										new Uint8Array(Float64Array.from([1]).buffer),
 					])
 				);
-				/* eslint-enable indent */
 			});
 		});
 		describe("defaultModPacks", function() {

test/lib/plugin_loader.js

@@ -46,7 +46,7 @@ describe("lib/plugin_loader", function() {
 		it("should reject on broken plugin", async function() {
 			let brokenMessage;
 			try {
-				// eslint-disable-next-line node/global-require
+
 				require(path.resolve(brokenPlugin));
 			} catch (err) {
 				brokenMessage = err.message;