mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 07:33:12 +09:00
Migrate to ECMAScript Modules
Migrate the usage of CommonJS specific code and imports to ESM. Roughly summarised this: - Changes all require() calls to import statement or expressions. - Changes usage of module.exports to export statements. - Replaces require.resolve with import.meta.resolve. - Replaces conditional imports with conditional subpath imports. - Replaces module === require.main with import.meta.main. - Adds the full filename with extention to all relative imports. - Changes all usage of __dirname and __filename to their import.meta equivalents. - Sets "type": "module" in package.json files. - Removes usage of "use strict". - Adds .ts an an alias of .js for the webpack build. Due to differences in how require and import resolves files the plugin entrypoints will have to include the filename and extension after this migration in order to work.
This commit is contained in:
1 parent
b69111dda3
commit
5dcaca4d0b
261 files changed
+1115
-1330
No files matched your search
+15
-31
@@ -1,14 +1,13 @@
|
||||
"use strict";
|
||||
const events = require("events");
|
||||
const http = require("http");
|
||||
const express = require("express");
|
||||
import events from "node:events";
|
||||
import http from "node:http";
|
||||
import express from "express";
|
||||
|
||||
const lib = require("@clusterio/lib");
|
||||
const { User, UserManager, UserRecord, InstanceManager } = require("@clusterio/controller");
|
||||
import * as lib from "@clusterio/lib";
|
||||
import { User, UserManager, UserRecord, InstanceManager } from "@clusterio/controller";
|
||||
|
||||
const addr = lib.Address.fromShorthand;
|
||||
|
||||
class MockLogger {
|
||||
export class MockLogger {
|
||||
child() { return this; }
|
||||
|
||||
fatal() { }
|
||||
@@ -26,7 +25,7 @@ class MockLogger {
|
||||
verbose() { }
|
||||
}
|
||||
|
||||
class MockSocket {
|
||||
export class MockSocket {
|
||||
constructor() {
|
||||
this.sentMessages = [];
|
||||
this.events = new Map();
|
||||
@@ -66,7 +65,7 @@ class MockSocket {
|
||||
}
|
||||
}
|
||||
|
||||
class MockConnector extends lib.BaseConnector {
|
||||
export class MockConnector extends lib.BaseConnector {
|
||||
constructor(src, dst) {
|
||||
super(src, dst);
|
||||
|
||||
@@ -86,7 +85,7 @@ class MockConnector extends lib.BaseConnector {
|
||||
}
|
||||
}
|
||||
|
||||
class MockServer extends events.EventEmitter {
|
||||
export class MockServer extends events.EventEmitter {
|
||||
constructor() {
|
||||
super();
|
||||
this.reset();
|
||||
@@ -116,7 +115,7 @@ class MockServer extends events.EventEmitter {
|
||||
}
|
||||
}
|
||||
|
||||
class MockInstance extends lib.Link {
|
||||
export class MockInstance extends lib.Link {
|
||||
constructor() {
|
||||
super(new MockConnector(addr({ instanceId: 7357 }), addr({ hostId: 1 })));
|
||||
this.logger = new MockLogger();
|
||||
@@ -144,15 +143,15 @@ class MockInstance extends lib.Link {
|
||||
}
|
||||
}
|
||||
|
||||
class MockHost extends lib.Link {
|
||||
export class MockHost extends lib.Link {
|
||||
constructor() {
|
||||
super(new MockConnector(addr({ hostId: 1 }), addr("controller")));
|
||||
}
|
||||
}
|
||||
|
||||
class MockControl extends lib.Link { }
|
||||
export class MockControl extends lib.Link { }
|
||||
|
||||
class MockController {
|
||||
export class MockController {
|
||||
constructor() {
|
||||
this.app = express();
|
||||
this.app.locals.controller = this;
|
||||
@@ -224,7 +223,7 @@ class MockController {
|
||||
}
|
||||
}
|
||||
|
||||
async function createControllerPlugin(ControllerPluginClass, info) {
|
||||
export async function createControllerPlugin(ControllerPluginClass, info) {
|
||||
let controller = new MockController();
|
||||
let metrics = {};
|
||||
let logger = new MockLogger();
|
||||
@@ -233,25 +232,10 @@ async function createControllerPlugin(ControllerPluginClass, info) {
|
||||
return plugin;
|
||||
}
|
||||
|
||||
async function createInstancePlugin(InstancePluginClass, info) {
|
||||
export async function createInstancePlugin(InstancePluginClass, info) {
|
||||
let instance = new MockInstance();
|
||||
let host = new MockHost();
|
||||
let plugin = new InstancePluginClass(info, instance, host);
|
||||
await plugin.init();
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
||||
module.exports = {
|
||||
MockLogger,
|
||||
MockSocket,
|
||||
MockConnector,
|
||||
MockServer,
|
||||
MockInstance,
|
||||
MockHost,
|
||||
MockControl,
|
||||
MockController,
|
||||
|
||||
createControllerPlugin,
|
||||
createInstancePlugin,
|
||||
};
|
||||
Reference in new issue
Block a user