diff --git a/.travis.yml b/.travis.yml index a427a119..0340e2d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "9" + - 10 before_install: - curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64 - tar -xf factorio.tar.gz diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..ecd3e298 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +Version 2.0.0 +============= + +Breaking Changes +---------------- +- Node.js versions below 10 are no longer supported. diff --git a/Dockerfile b/Dockerfile index c9892b74..4aefeac4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.11.2 +FROM node:10 RUN apt-get update && apt install git curl tar -y RUN mkdir factorioClusterio diff --git a/README.md b/README.md index 3a03625e..9522d40a 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ NodeJS does not support EOL ubuntu releases. Make sure you are on the most recen Master and all slaves: - sudo curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - + sudo curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - sudo apt install -y nodejs python-dev git wget curl tar build-essential sudo npm install pm2 -g git clone https://github.com/clusterio/factorioClusterio.git @@ -159,7 +159,7 @@ Game Client = The people connecting to the server **Requirements** -download and install nodeJS 8 or 9 from http://nodejs.org +download and install nodeJS 10 from http://nodejs.org download and install git from https://git-scm.com/ diff --git a/package.json b/package.json index 2542ad3a..2a652d46 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "repository": "https://github.com/clusterio/factorioClusterio", "main": "master.js", "scripts": { - "test": "mocha -R spec -- \"./{,!(node_modules)/**/}*.spec.js\" || true", + "test": "mocha --exit -R spec \"./{,!(node_modules)/**/}*.spec.js\" || true", "cover": "nyc npm run-script test", "ci-cover": "nyc --reporter=lcovonly npm run-script test", "start": "echo Run node client.js start [instance] to start slaves && node master.js", @@ -17,24 +17,27 @@ ], "author": "Danielv123", "license": "ISC", + "engines": { + "node": ">=10" + }, "dependencies": { "as-table": "^1.0.31", "averaged-timeseries": "^1.4.0", "base64url": "^3.0.0", - "bcrypt": "^2.0.1", + "bcrypt": "^3.0.6", "bcrypt-promise": "^2.0.0", "body-parser": "^1.18.2", "cli": "^1.0.1", "cli-interact": "^0.1.9", "compression": "^1.7.2", "cookie-parser": "^1.4.3", - "deepmerge": "^1.5.2", + "deepmerge": "^4.0.0", "ejs": "^2.5.7", "express": "^4.16.2", - "express-fileupload": "0.0.6", + "express-fileupload": "1.1.5", "express-prometheus-request-metrics": "github:burnash/express-prometheus-request-metrics", "follow-redirects": "^1.5.0", - "fs-extra": "^6.0.1", + "fs-extra": "^8.1.0", "getmac": "^1.4.0", "ini": "^1.3.5", "jsonwebtoken": "^8.2.1", @@ -45,7 +48,7 @@ "mkdirp-promise": "^5.0.1", "moment": "^2.22.2", "ncp": "^2.0.0", - "needle": "^2.2.4", + "needle": "^2.4.0", "node-factorio-api": "^0.3.5", "node-forge": "^0.7.1", "prom-client": "^10.2.3", @@ -55,21 +58,21 @@ "sanitizer": "^0.1.3", "simple-git": "^1.96.0", "single-line-log": "^1.1.2", - "socket.io": "^2.0.4", - "socket.io-client": "^2.0.4", + "socket.io": "^2.2.0", + "socket.io-client": "^2.2.0", "socket.io-prometheus": "^0.2.1", "sync-request": "^4.0.1", "tail": "^2.0.2", "typescript-collections": "^1.3.2" }, "devDependencies": { - "html5-validator": "^1.0.7", - "mocha": "^3.5.3", - "mocha-sinon": "^2.0.0", + "html5-validator": "^1.2.1", + "mocha": "^6.2.0", + "mocha-sinon": "^2.1.0", "mocha.parallel": "^0.15.5", - "nock": "^9.1.6", + "nock": "^11.3.0", "nyc": "^14.1.1", - "sinon": "^2.4.1", - "supertest": "^3.0.0" + "sinon": "^7.4.1", + "supertest": "^4.0.2" } }