diff --git a/lerna.json b/lerna.json index fa71e1ce..37e443a1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,8 @@ { "packages": [ "packages/*", - "plugins/*" + "plugins/*", + "test" ], "version": "2.0.0-alpha.5" } diff --git a/package.json b/package.json index 091a03b4..ce16a81f 100644 --- a/package.json +++ b/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", + "lerna": "^4.0.0", "mocha": "^6.2.0", - "node-forge": "^0.10.0", - "nyc": "^14.1.1", - "phin": "^3.4.1", - "webpack": "^5.0.0" + "nyc": "^14.1.1" } } diff --git a/packages/master/package.json b/packages/master/package.json index 1e1e57dd..0ceff75e 100644 --- a/packages/master/package.json +++ b/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" }, diff --git a/packages/slave/package.json b/packages/slave/package.json index e19303c4..0ec58391 100644 --- a/packages/slave/package.json +++ b/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", diff --git a/packages/web_ui/package.json b/packages/web_ui/package.json index c9649974..f7ca7056 100644 --- a/packages/web_ui/package.json +++ b/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" diff --git a/plugins/global_chat/package.json b/plugins/global_chat/package.json index 594fec72..cf128391 100644 --- a/plugins/global_chat/package.json +++ b/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": { diff --git a/plugins/player_auth/package.json b/plugins/player_auth/package.json index a83f8041..8d7a141e 100644 --- a/plugins/player_auth/package.json +++ b/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": { diff --git a/plugins/research_sync/package.json b/plugins/research_sync/package.json index a672a29a..fbc21d5f 100644 --- a/plugins/research_sync/package.json +++ b/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": { diff --git a/plugins/statistics_exporter/package.json b/plugins/statistics_exporter/package.json index b74fdb36..24b8865a 100644 --- a/plugins/statistics_exporter/package.json +++ b/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": { diff --git a/plugins/subspace_storage/package.json b/plugins/subspace_storage/package.json index f19c62c4..a29c638c 100644 --- a/plugins/subspace_storage/package.json +++ b/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": { diff --git a/test/package.json b/test/package.json new file mode 100644 index 00000000..b1e3fc98 --- /dev/null +++ b/test/package.json @@ -0,0 +1,15 @@ +{ + "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", + "node-forge": "^0.10.0", + "phin": "^3.5.1" + } +}