From 9ee3fe6c37eefeee9bc047e5792d55140205382a Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Sat, 24 Oct 2020 16:46:02 +0200 Subject: [PATCH 1/3] Move gitignore for web build out of package Mave the ignore entry for packages/master/static out of packages/master/.gitignore to avoid npm using it and causing the web build to be excluded from the package. --- .gitignore | 3 +++ packages/master/.gitignore | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 packages/master/.gitignore diff --git a/.gitignore b/.gitignore index 56c8fbd4..f3818817 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,9 @@ static/export saves /temp/ +# Web build +/packages/master/static + # IDE .idea/ .vs/ diff --git a/packages/master/.gitignore b/packages/master/.gitignore deleted file mode 100644 index 4d2280f9..00000000 --- a/packages/master/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Webpack output -static From 1eca2ec6e613c96ba6e0010e99176162073806bd Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Mon, 26 Oct 2020 15:17:01 +0100 Subject: [PATCH 2/3] Add missing ajv dependency to clusterio/lib The lib/schema module uses ajv for compiling JSON Schema validators but for some reason ajv was not part of the dependency list in its package.json. --- packages/lib/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/lib/package.json b/packages/lib/package.json index 52a9d77b..e4617f7d 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -11,6 +11,7 @@ "node": ">=10.16 <11 || >= 11.13" }, "dependencies": { + "ajv": "^6.12.6", "fs-extra": "^8.1.0", "ini": "^1.3.5", "isomorphic-ws": "^4.0.1", From 7d8b55adb6bcc4230135ebad80446b0bd04c2cf9 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Mon, 26 Oct 2020 15:24:29 +0100 Subject: [PATCH 3/3] Use less strict matching for lib dependency Stop requiring exact version match for the clusterio/lib dependency in master, slave and ctl to make doing alpha releases simpler. --- packages/ctl/package.json | 2 +- packages/master/package.json | 2 +- packages/slave/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ctl/package.json b/packages/ctl/package.json index 53ce9876..da0dc2cb 100644 --- a/packages/ctl/package.json +++ b/packages/ctl/package.json @@ -18,7 +18,7 @@ "node": ">=10.16 <11 || >= 11.13" }, "dependencies": { - "@clusterio/lib": "=2.0.0-alpha.0", + "@clusterio/lib": "^2.0.0-alpha.0", "as-table": "^1.0.31", "chalk": "^3.0.0", "fs-extra": "^8.1.0", diff --git a/packages/master/package.json b/packages/master/package.json index 333e6205..1289c6c4 100644 --- a/packages/master/package.json +++ b/packages/master/package.json @@ -19,7 +19,7 @@ "node": ">=10.16 <11 || >= 11.13" }, "dependencies": { - "@clusterio/lib": "=2.0.0-alpha.0", + "@clusterio/lib": "^2.0.0-alpha.0", "body-parser": "^1.18.2", "compression": "^1.7.2", "cookie-parser": "^1.4.3", diff --git a/packages/slave/package.json b/packages/slave/package.json index f9d2ff22..997fd3ae 100644 --- a/packages/slave/package.json +++ b/packages/slave/package.json @@ -18,7 +18,7 @@ "node": ">=10.16 <11 || >= 11.13" }, "dependencies": { - "@clusterio/lib": "=2.0.0-alpha.0", + "@clusterio/lib": "^2.0.0-alpha.0", "fs-extra": "^8.1.0", "phin": "^3.4.1", "pidusage": "^2.0.18",