From a17e9295e721fb340377028e18abd989f3e38d16 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Sun, 7 Mar 2021 15:14:38 +0100 Subject: [PATCH] Use relative imports in lib Use relative imports in lib to avoid an issue with webpack thinking absolute imports inside @clusterio/lib are for a separate module and giving out warnings for it being missing in package.json. --- packages/lib/command.js | 4 ++-- packages/lib/config/classes.js | 2 +- packages/lib/database.js | 2 +- packages/lib/factorio/export.js | 2 +- packages/lib/factorio/patch.js | 2 +- packages/lib/factorio/server.js | 6 +++--- packages/lib/link/connectors.js | 6 +++--- packages/lib/link/link.js | 6 +++--- packages/lib/link/messages.js | 6 +++--- packages/lib/logging_utils.js | 4 ++-- packages/lib/plugin_loader.js | 2 +- packages/lib/shared_commands.js | 6 +++--- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/lib/command.js b/packages/lib/command.js index cd4c1760..133a8805 100644 --- a/packages/lib/command.js +++ b/packages/lib/command.js @@ -7,8 +7,8 @@ * @module lib/command */ "use strict"; -const libLink = require("@clusterio/lib/link"); -const libErrors = require("@clusterio/lib/errors"); +const libLink = require("./link"); +const libErrors = require("./errors"); /** * Represents a command that can be runned by clusterioctl diff --git a/packages/lib/config/classes.js b/packages/lib/config/classes.js index dd85012f..0be19776 100644 --- a/packages/lib/config/classes.js +++ b/packages/lib/config/classes.js @@ -4,7 +4,7 @@ const events = require("events"); const isDeepStrictEqual = require("../is_deep_strict_equal"); -const { basicType } = require("@clusterio/lib/helpers"); +const { basicType } = require("../helpers"); /** diff --git a/packages/lib/database.js b/packages/lib/database.js index 7a727bd2..665cf58a 100644 --- a/packages/lib/database.js +++ b/packages/lib/database.js @@ -8,7 +8,7 @@ "use strict"; const fs = require("fs-extra"); -const { basicType } = require("@clusterio/lib/helpers"); +const { basicType } = require("./helpers"); /** diff --git a/packages/lib/factorio/export.js b/packages/lib/factorio/export.js index 165f011a..093e9be3 100644 --- a/packages/lib/factorio/export.js +++ b/packages/lib/factorio/export.js @@ -6,7 +6,7 @@ const ini = require("ini"); const Jimp = require("jimp"); const JSZip = require("jszip"); -const libBuildMod = require("@clusterio/lib/build_mod"); +const libBuildMod = require("../build_mod"); /** * Generate the export mod needed for exportData diff --git a/packages/lib/factorio/patch.js b/packages/lib/factorio/patch.js index e0322bfe..59df7b83 100644 --- a/packages/lib/factorio/patch.js +++ b/packages/lib/factorio/patch.js @@ -7,7 +7,7 @@ const JSZip = require("jszip"); const path = require("path"); const semver = require("semver"); -const libHash = require("@clusterio/lib/hash"); +const libHash = require("../hash"); const knownScenarios = { diff --git a/packages/lib/factorio/server.js b/packages/lib/factorio/server.js index 896860b1..a4b5079f 100644 --- a/packages/lib/factorio/server.js +++ b/packages/lib/factorio/server.js @@ -9,9 +9,9 @@ const crypto = require("crypto"); const ini = require("ini"); const rconClient = require("rcon-client"); -const libErrors = require("@clusterio/lib/errors"); -const { logger } = require("@clusterio/lib/logging"); -const { escapeRegExp } = require("@clusterio/lib/helpers"); +const libErrors = require("../errors"); +const { logger } = require("../logging"); +const { escapeRegExp } = require("../helpers"); /** diff --git a/packages/lib/link/connectors.js b/packages/lib/link/connectors.js index 0932070f..ef78fefd 100644 --- a/packages/lib/link/connectors.js +++ b/packages/lib/link/connectors.js @@ -3,9 +3,9 @@ const events = require("events"); const WebSocket = require("isomorphic-ws"); -const libSchema = require("@clusterio/lib/schema"); -const libErrors = require("@clusterio/lib/errors"); -const { logger } = require("@clusterio/lib/logging"); +const libSchema = require("../schema"); +const libErrors = require("../errors"); +const { logger } = require("../logging"); /** diff --git a/packages/lib/link/link.js b/packages/lib/link/link.js index a13f22c8..fa98e927 100644 --- a/packages/lib/link/link.js +++ b/packages/lib/link/link.js @@ -1,9 +1,9 @@ // Implementation of Link class "use strict"; -const libSchema = require("@clusterio/lib/schema"); -const libErrors = require("@clusterio/lib/errors"); -const { logger } = require("@clusterio/lib/logging"); +const libSchema = require("../schema"); +const libErrors = require("../errors"); +const { logger } = require("../logging"); const messages = require("./messages"); // Some definitions for the terminology used here: diff --git a/packages/lib/link/messages.js b/packages/lib/link/messages.js index 89a6cbdd..1bbf7bef 100644 --- a/packages/lib/link/messages.js +++ b/packages/lib/link/messages.js @@ -1,8 +1,8 @@ // Message definitions for links "use strict"; -const libSchema = require("@clusterio/lib/schema"); -const libErrors = require("@clusterio/lib/errors"); -const { logger } = require("@clusterio/lib/logging"); +const libSchema = require("../schema"); +const libErrors = require("../errors"); +const { logger } = require("../logging"); class MissingLinkHandlerError extends Error { constructor(type, source, target) { diff --git a/packages/lib/logging_utils.js b/packages/lib/logging_utils.js index 9c0284a3..c80b6997 100644 --- a/packages/lib/logging_utils.js +++ b/packages/lib/logging_utils.js @@ -4,8 +4,8 @@ const Transport = require("winston-transport"); const { LEVEL, MESSAGE } = require("triple-beam"); const chalk = require("chalk"); -const libLink = require("@clusterio/lib/link"); -const libErrors = require("@clusterio/lib/errors"); +const libLink = require("./link"); +const libErrors = require("./errors"); /** diff --git a/packages/lib/plugin_loader.js b/packages/lib/plugin_loader.js index 58cacda7..b784776b 100644 --- a/packages/lib/plugin_loader.js +++ b/packages/lib/plugin_loader.js @@ -5,7 +5,7 @@ */ "use strict"; -const libErrors = require("@clusterio/lib/errors"); +const libErrors = require("./errors"); const path = require("path"); diff --git a/packages/lib/shared_commands.js b/packages/lib/shared_commands.js index 5decd578..2cc378af 100644 --- a/packages/lib/shared_commands.js +++ b/packages/lib/shared_commands.js @@ -6,9 +6,9 @@ const fs = require("fs-extra"); const path = require("path"); -const libConfig = require("@clusterio/lib/config"); -const { logger } = require("@clusterio/lib/logging"); -const libHelpers = require("@clusterio/lib/helpers"); +const libConfig = require("./config"); +const { logger } = require("./logging"); +const libHelpers = require("./helpers"); function print(...content) {