Merge pull request #377 from Hornwitser/test-package

Move test dependencies into separate package

.travis.yml

@@ -6,7 +6,7 @@ before_install:
   - tar -xf factorio.tar.gz
   - npm install -g codecov
 script:
-  - npx lerna bootstrap --no-ci
+  - npx lerna bootstrap --hoist --no-ci
   - node packages/lib/build_mod --source-dir packages/slave/lua/clusterio_lib --output-dir temp/test/sharedMods
   - curl -o temp/test/sharedMods/subspace_storage_1.99.8.zip -L https://github.com/clusterio/factorioClusterioMod/releases/download/1.99.6/subspace_storage_1.99.8.zip
   - npx lerna run build

docs/contributing.md

@@ -53,7 +53,7 @@ The project is organized into several packages that are all managed through Lern
 In order to get the development environment up and running you will need to run the following commands:
 
     npm install
-    npx lerna bootstrap
+    npx lerna bootstrap --hoist
 
 This installs dependencies needed by tests and links the packages up so they work from the git work tree.
 

lerna.json

@@ -1,7 +1,8 @@
 {
   "packages": [
     "packages/*",
-    "plugins/*"
+    "plugins/*",
+    "test"
   ],
   "version": "2.0.0-alpha.5"
 }

package.json

@@ -2,7 +2,7 @@
   "name": "root",
   "private": true,
   "scripts": {
-    "test": "mocha --check-leaks -R spec --recursive test plugins/global_chat/test plugins/research_sync/test plugins/statistics_exporter/test plugins/subspace_storage/test plugins/player_auth/test",
+    "test": "mocha --check-leaks -R spec --exclude \"**/node_modules/**\" --recursive test plugins/global_chat/test plugins/research_sync/test plugins/statistics_exporter/test plugins/subspace_storage/test plugins/player_auth/test",
     "fast-test": "FAST_TEST=y npm test",
     "cover": "nyc npm test",
     "fast-cover": "FAST_TEST=y nyc npm test",
@@ -21,22 +21,10 @@
     "node": ">=10.16 <11 || >= 12"
   },
   "devDependencies": {
-    "@clusterio/ctl": "file:./packages/ctl",
-    "@clusterio/lib": "file:./packages/lib",
-    "@clusterio/master": "file:packages/master",
-    "@clusterio/slave": "file:./packages/slave",
-    "body-parser": "^1.18.2",
-    "eslint": "^7.2.0",
-    "express": "^4.16.2",
-    "fs-extra": "^8.1.0",
-    "jsdoc": "^3.6.3",
-    "jsonwebtoken": "^8.2.1",
-    "jszip": "^3.2.2",
-    "lerna": "^3.22.1",
-    "mocha": "^6.2.0",
-    "node-forge": "^0.10.0",
-    "nyc": "^14.1.1",
-    "phin": "^3.4.1",
-    "webpack": "^5.0.0"
+    "eslint": "^7.25.0",
+    "jsdoc": "^3.6.6",
+    "lerna": "^4.0.0",
+    "mocha": "^8.4.0",
+    "nyc": "^15.1.0"
   }
 }

packages/ctl/package.json

@@ -20,7 +20,6 @@
   "dependencies": {
     "@clusterio/lib": "^2.0.0-alpha.5",
     "as-table": "^1.0.31",
-    "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "phin": "^3.5.1",
     "winston": "^3.3.3",

packages/lib/package.json

@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "ajv": "^6.12.6",
+    "chalk": "^4.1.0",
     "fs-extra": "^8.1.0",
     "ini": "^1.3.5",
     "isomorphic-ws": "^4.0.1",

packages/master/package.json

@@ -6,7 +6,7 @@
   "version": "2.0.0-alpha.5",
   "main": "master.js",
   "scripts": {
-    "build": "webpack-cli --env.production",
+    "build": "webpack-cli --env production",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
@@ -40,7 +40,8 @@
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "^5.2.0",
-    "webpack-cli": "^3.3.12",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
     "webpack-dev-middleware": "^4.1.0",
     "webpack-merge": "^5.2.0"
   },

packages/slave/package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "@clusterio/lib": "^2.0.0-alpha.5",
     "fs-extra": "^8.1.0",
-    "phin": "^3.4.1",
+    "phin": "^3.5.1",
     "pidusage": "^2.0.18",
     "set-blocking": "^2.0.0",
     "winston": "^3.3.3",

packages/web_ui/package.json

@@ -34,7 +34,8 @@
     "react-dom": "^16.13.1",
     "react-router-dom": "^5.2.0",
     "style-loader": "^2.0.0",
-    "util": "^0.12.3"
+    "util": "^0.12.3",
+    "webpack": "^5.36.2"
   },
   "publishConfig": {
     "access": "public"

plugins/global_chat/package.json

@@ -7,18 +7,23 @@
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
-    "build": "webpack-cli --env.production",
+    "build": "webpack-cli --env production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
     "url": "https://github.com/clusterio/factorioClusterio/issues"
   },
+  "engines": {
+    "node": ">=10.16 <11 || >= 12"
+  },
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
   "devDependencies": {
+    "@clusterio/lib": "^2.0.0-alpha.5",
     "@clusterio/web_ui": "^2.0.0-alpha.5",
-    "webpack-cli": "^3.3.12",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
     "webpack-merge": "^5.2.0"
   },
   "publishConfig": {

plugins/player_auth/package.json

@@ -7,12 +7,15 @@
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
-    "build": "webpack-cli --env.production",
+    "build": "webpack-cli --env production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
     "url": "https://github.com/clusterio/factorioClusterio/issues"
   },
+  "engines": {
+    "node": ">=10.16 <11 || >= 12"
+  },
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
@@ -20,12 +23,14 @@
     "jsonwebtoken": "^8.2.1"
   },
   "devDependencies": {
+    "@clusterio/lib": "^2.0.0-alpha.5",
     "@clusterio/web_ui": "^2.0.0-alpha.5",
     "antd": "^4.6.5",
-    "phin": "^3.4.1",
+    "phin": "^3.5.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "webpack-cli": "^3.3.12",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
     "webpack-merge": "^5.2.0"
   },
   "publishConfig": {

plugins/research_sync/package.json

@@ -7,12 +7,15 @@
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
-    "build": "webpack-cli --env.production",
+    "build": "webpack-cli --env production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
     "url": "https://github.com/clusterio/factorioClusterio/issues"
   },
+  "engines": {
+    "node": ">=10.16 <11 || >= 12"
+  },
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
@@ -20,8 +23,10 @@
     "fs-extra": "^8.1.0"
   },
   "devDependencies": {
+    "@clusterio/lib": "^2.0.0-alpha.5",
     "@clusterio/web_ui": "^2.0.0-alpha.5",
-    "webpack-cli": "^3.3.12",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
     "webpack-merge": "^5.2.0"
   },
   "publishConfig": {

plugins/statistics_exporter/package.json

@@ -7,18 +7,23 @@
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
-    "build": "webpack-cli --env.production",
+    "build": "webpack-cli --env production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
     "url": "https://github.com/clusterio/factorioClusterio/issues"
   },
+  "engines": {
+    "node": ">=10.16 <11 || >= 12"
+  },
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
   "devDependencies": {
+    "@clusterio/lib": "^2.0.0-alpha.5",
     "@clusterio/web_ui": "^2.0.0-alpha.5",
-    "webpack-cli": "^3.3.12",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
     "webpack-merge": "^5.2.0"
   },
   "publishConfig": {

plugins/subspace_storage/package.json

@@ -7,12 +7,15 @@
   "license": "MIT",
   "repository": "clusterio/factorioClusterio",
   "scripts": {
-    "build": "webpack-cli --env.production",
+    "build": "webpack-cli --env production",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
     "url": "https://github.com/clusterio/factorioClusterio/issues"
   },
+  "engines": {
+    "node": ">=10.16 <11 || >= 12"
+  },
   "peerDependencies": {
     "@clusterio/lib": "^2.0.0-alpha.0"
   },
@@ -20,11 +23,13 @@
     "fs-extra": "^8.1.0"
   },
   "devDependencies": {
+    "@clusterio/lib": "^2.0.0-alpha.5",
     "@clusterio/web_ui": "^2.0.0-alpha.5",
     "antd": "^4.6.5",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "webpack-cli": "^3.3.12",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
     "webpack-merge": "^5.2.0"
   },
   "publishConfig": {

test/integration/server.js

@@ -6,6 +6,7 @@ const path = require("path");
 
 const libFactorio = require("@clusterio/lib/factorio");
 const libErrors = require("@clusterio/lib/errors");
+const { logger } = require("@clusterio/lib/logging");
 
 const { slowTest } = require("./index");
 
@@ -34,6 +35,15 @@ describe("Integration of lib/factorio/server", function() {
 			await fs.ensureDir(writePath);
 			logFile = fs.createWriteStream(path.join(writePath, "log.txt"), "utf8");
 			server.on("output", function(output) {
+				if (output.source === "stderr") {
+					// Factorio doesn't print on stderr but sometimes on
+					// Travis a BrokenPipeError is printed on stderr after
+					// the server has closed for mysterious reasons.
+					// I have no idea what causes it, but it causes a write
+					// after end error if not handled.
+					logger.error(`Factorio stderr: ${JSON.stringify(output)}`);
+					return;
+				}
 				logFile.write(`${JSON.stringify(output)}\n`);
 			});
 

test/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "test",
+  "private": true,
+  "engines": {
+    "node": ">=10.16 <11 || >= 12"
+  },
+  "dependencies": {
+    "@clusterio/ctl": "2.0.0-alpha.5",
+    "@clusterio/lib": "2.0.0-alpha.5",
+    "@clusterio/master": "2.0.0-alpha.5",
+    "@clusterio/slave": "2.0.0-alpha.5",
+    "body-parser": "^1.18.2",
+    "express": "^4.16.2",
+    "fs-extra": "^8.1.0",
+    "jsonwebtoken": "^8.2.1",
+    "jszip": "^3.2.2",
+    "node-forge": "^0.10.0",
+    "phin": "^3.5.1"
+  }
+}