mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-16 23:30:41 +09:00
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.
This commit is contained in:
1 parent
152eb7d454
commit
8c4d2db192
50 files changed
+82
-82
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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");
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
|
||||
+2
-2
@@ -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() {
|
||||
|
||||
+1
-1
@@ -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() {
|
||||
|
||||
+1
-1
@@ -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");
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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");
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
|
||||
Reference in new issue
Block a user