mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 15:33:12 +09:00
Remove .js suffix in require paths
Remove the .js suffix in require paths to make requires consistent across the project.
This commit is contained in:
1 parent
6bde8a2219
commit
ff3fc3b94b
14 files changed
+21
-21
No files matched your search
@@ -13,7 +13,7 @@ const asTable = require("as-table").configure({delimiter: ' | '});
|
|||||||
const util = require("util");
|
const util = require("util");
|
||||||
|
|
||||||
// internal libraries
|
// internal libraries
|
||||||
const objectOps = require("lib/objectOps.js");
|
const objectOps = require("lib/objectOps");
|
||||||
const fileOps = require("lib/fileOps");
|
const fileOps = require("lib/fileOps");
|
||||||
const pluginManager = require("lib/manager/pluginManager");
|
const pluginManager = require("lib/manager/pluginManager");
|
||||||
const modManager = require("lib/manager/modManager");
|
const modManager = require("lib/manager/modManager");
|
||||||
@@ -594,7 +594,7 @@ async function instanceManagement(config, instance, instanceconfig, server) {
|
|||||||
}
|
}
|
||||||
if(pluginConfig.binary == "nodePackage" && pluginConfig.enabled){
|
if(pluginConfig.binary == "nodePackage" && pluginConfig.enabled){
|
||||||
// require plugin class and execute it
|
// require plugin class and execute it
|
||||||
let pluginClass = require(path.resolve(pluginConfig.pluginPath, "index.js"));
|
let pluginClass = require(path.resolve(pluginConfig.pluginPath, "index"));
|
||||||
plugins[i] = new pluginClass(combinedConfig, async function(data, callback){
|
plugins[i] = new pluginClass(combinedConfig, async function(data, callback){
|
||||||
if(data && data.toString('utf8')[0] != "/") {
|
if(data && data.toString('utf8')[0] != "/") {
|
||||||
console.log("Clusterio | "+ pluginsToLoad[i].name + " | " + data.toString('utf8'));
|
console.log("Clusterio | "+ pluginsToLoad[i].name + " | " + data.toString('utf8'));
|
||||||
|
|||||||
@@ -12,5 +12,5 @@ module.exports = ({config} = {}) => ({
|
|||||||
arg1 is the instanceID
|
arg1 is the instanceID
|
||||||
Promise resolves with a string, either the displayName or instanceID if not found.
|
Promise resolves with a string, either the displayName or instanceID if not found.
|
||||||
*/
|
*/
|
||||||
getInstanceName: require("./getInstanceName.js")(config),
|
getInstanceName: require("./getInstanceName")(config),
|
||||||
})
|
})
|
||||||
@@ -1 +1 @@
|
|||||||
module.exports = require("./isFactorioCommand.js");
|
module.exports = require("./isFactorioCommand");
|
||||||
@@ -36,7 +36,7 @@ modManager.listMods(config, instance);
|
|||||||
*/
|
*/
|
||||||
async function listMods(config, instance) {
|
async function listMods(config, instance) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const instances = require("./../getInstances.js")(config).sync();
|
const instances = require("./../getInstances")(config).sync();
|
||||||
if (instances.includes(instance.name)) {
|
if (instances.includes(instance.name)) {
|
||||||
factorioAPI.init(false, instance.path("instanceMods"), instance.path("saves"), config.factorio_version);
|
factorioAPI.init(false, instance.path("instanceMods"), instance.path("saves"), config.factorio_version);
|
||||||
factorioAPI.authenticate({
|
factorioAPI.authenticate({
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ node master
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Attempt updating
|
// Attempt updating
|
||||||
// const updater = require("./updater.js");
|
// const updater = require("./updater");
|
||||||
// updater.update().then(console.log);
|
// updater.update().then(console.log);
|
||||||
|
|
||||||
// argument parsing
|
// argument parsing
|
||||||
@@ -32,7 +32,7 @@ let config = {};
|
|||||||
|
|
||||||
// homebrew modules
|
// homebrew modules
|
||||||
const generateSSLcert = require("lib/generateSSLcert");
|
const generateSSLcert = require("lib/generateSSLcert");
|
||||||
const pluginManager = require("lib/manager/pluginManager.js");
|
const pluginManager = require("lib/manager/pluginManager");
|
||||||
const database = require("lib/database");
|
const database = require("lib/database");
|
||||||
const factorio = require("lib/factorio");
|
const factorio = require("lib/factorio");
|
||||||
|
|
||||||
@@ -71,8 +71,8 @@ app.use(function(req, res, next){
|
|||||||
next();
|
next();
|
||||||
});
|
});
|
||||||
|
|
||||||
require("./routes.js")(app);
|
require("./routes")(app);
|
||||||
require("./routes/api/getPictures.js")(app);
|
require("./routes/api/getPictures")(app);
|
||||||
// Set folder to serve static content from (the website)
|
// Set folder to serve static content from (the website)
|
||||||
app.use(express.static('static'));
|
app.use(express.static('static'));
|
||||||
|
|
||||||
@@ -480,7 +480,7 @@ app.post("/api/place", authenticate.middleware, function(req, res) {
|
|||||||
res.send("failure");
|
res.send("failure");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const routes_api_remove = require("./routes/api/remove.js");
|
const routes_api_remove = require("./routes/api/remove");
|
||||||
let neuralDole;
|
let neuralDole;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
const averagedTimeSeries = require("averaged-timeseries")
|
const averagedTimeSeries = require("averaged-timeseries")
|
||||||
|
|
||||||
const doleNN = require("lib/dole_nn_base.js")
|
const doleNN = require("lib/dole_nn_base")
|
||||||
|
|
||||||
const Prometheus = require('prom-client');
|
const Prometheus = require('prom-client');
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
const needle = require("needle");
|
const needle = require("needle");
|
||||||
const fs = require("fs-extra");
|
const fs = require("fs-extra");
|
||||||
|
|
||||||
const objectOps = require("lib/objectOps.js");
|
const objectOps = require("lib/objectOps");
|
||||||
const fileOps = require("lib/fileOps");
|
const fileOps = require("lib/fileOps");
|
||||||
|
|
||||||
const pluginConfig = require("./config");
|
const pluginConfig = require("./config");
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
const needle = require("needle");
|
const needle = require("needle");
|
||||||
const isJson = require("./isJson.js");
|
const isJson = require("./isJson");
|
||||||
const pluginConfig = require("./config.js");
|
const pluginConfig = require("./config");
|
||||||
|
|
||||||
const functions = require("./interfacingFunctions");
|
const functions = require("./interfacingFunctions");
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const objectOps = require("lib/objectOps.js");
|
const objectOps = require("lib/objectOps");
|
||||||
const needle = require("needle");
|
const needle = require("needle");
|
||||||
const pluginConfig = require("./config")
|
const pluginConfig = require("./config")
|
||||||
const isJson = require("./isJson")
|
const isJson = require("./isJson")
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ const nock = require("nock");
|
|||||||
|
|
||||||
const isFactorioCommand = require("lib/isFactorioCommand");
|
const isFactorioCommand = require("lib/isFactorioCommand");
|
||||||
|
|
||||||
const researchSync = require("../index.js");
|
const researchSync = require("../index");
|
||||||
|
|
||||||
describe("researchSync/index.js", function() {
|
describe("researchSync/index.js", function() {
|
||||||
it("exports a single class (or at least a function)", function() {
|
it("exports a single class (or at least a function)", function() {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ module.exports = class remoteCommands {
|
|||||||
this.messageInterface = messageInterface;
|
this.messageInterface = messageInterface;
|
||||||
this.config = mergedConfig;
|
this.config = mergedConfig;
|
||||||
this.socket = extras.socket;
|
this.socket = extras.socket;
|
||||||
const pluginManager = require("lib/manager/pluginManager.js");
|
const pluginManager = require("lib/manager/pluginManager");
|
||||||
// const modManager = require("lib/manager/modManager");
|
// const modManager = require("lib/manager/modManager");
|
||||||
this.socket.on("hello", () => {
|
this.socket.on("hello", () => {
|
||||||
this.socket.emit("registerServerManager");
|
this.socket.emit("registerServerManager");
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ class masterPlugin {
|
|||||||
// this.banlist = getDatabaseSync("database/banlist.json").banlist || [];
|
// this.banlist = getDatabaseSync("database/banlist.json").banlist || [];
|
||||||
|
|
||||||
// initialize web API
|
// initialize web API
|
||||||
require("./js/api-endpoints.js")(this);
|
require("./js/api-endpoints")(this);
|
||||||
|
|
||||||
// expose UI elements embedded in the master
|
// expose UI elements embedded in the master
|
||||||
this.ui = require("./js/ui.js").injectThis(this).ui;
|
this.ui = require("./js/ui").injectThis(this).ui;
|
||||||
|
|
||||||
this.serverSockets = {};
|
this.serverSockets = {};
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ var assert = require("assert");
|
|||||||
var fs = require("fs-extra");
|
var fs = require("fs-extra");
|
||||||
|
|
||||||
var fileOps = require("lib/fileOps");
|
var fileOps = require("lib/fileOps");
|
||||||
var generateSSLcert = require("lib/generateSSLcert.js")
|
var generateSSLcert = require("lib/generateSSLcert")
|
||||||
|
|
||||||
describe("generateSSLcert.js(options)", ()=>{
|
describe("generateSSLcert.js(options)", ()=>{
|
||||||
it("Creates a folder with a .crt and .key file in it", async function() {
|
it("Creates a folder with a .crt and .key file in it", async function() {
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ const validateHTML = require('html5-validator');
|
|||||||
const parallel = require('mocha.parallel');
|
const parallel = require('mocha.parallel');
|
||||||
const jwt = require("jsonwebtoken");
|
const jwt = require("jsonwebtoken");
|
||||||
|
|
||||||
const master = require('../master.js');
|
const master = require('../master');
|
||||||
const authenticate = require('lib/authenticate');
|
const authenticate = require('lib/authenticate');
|
||||||
const database = require('lib/database');
|
const database = require('lib/database');
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user