From 97979df431aafb1ee343585bf444dce72684d962 Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Thu, 5 Jul 2018 21:06:06 +0200 Subject: [PATCH] Upgraded dependencies, pinned Node.js version. --- .nvmrc | 2 +- .travis.yml | 2 +- README.md | 2 +- package-lock.json | 20 ++++++++++---------- package.json | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.nvmrc b/.nvmrc index 9a03714..41c25a1 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -10 \ No newline at end of file +10.5 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index ca75355..2d8915e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ matrix: - os: osx osx_image: xcode9.4 language: node_js - node_js: "10" + node_js: "10.5" env: - ELECTRON_CACHE=$HOME/.cache/electron - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder diff --git a/README.md b/README.md index ad0599e..ca6ba65 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Getting Started # System Requirements: -* [Node.js](https://nodejs.org/en/) v10.0.0+ +* [Node.js](https://nodejs.org/en/) v10.5.0 This repository is dedicated to the development of the new custom launcher for the [WesterosCraft](http://www.westeroscraft.com/) server. This project is developed primarily with [Node.js](https://nodejs.org/en/) and the [Electron](https://electron.atom.io/) framework. For further reference you may view [the repository of the new launcher written in JavaFX/Java](https://gitlab.com/westeroscraft/WesteroscraftNewLauncher) which was discontinued. You may also view the repository of the [current launcher](https://gitlab.com/westeroscraft/westeroscraftlaunchercore), a modified fork of MCUpdater. diff --git a/package-lock.json b/package-lock.json index bd112dd..93228ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -756,9 +756,9 @@ } }, "electron": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.3.tgz", - "integrity": "sha512-SLCmnEqcpZD+GjNWcqRvr+CC8palbN6O/wlCcGJgUtPkQqwGiUg9V3FK4/0HnWdp0YQpmQrZh9BzqtW3Hiw96w==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.4.tgz", + "integrity": "sha512-rtg6aW2IpWfiwMRk9gqr+a/xOrFlch9sgLNg0UJzCmtUUEGTrbaLxqANr3Ahlx+ODmh/V+WfF7IdEpD76bbssA==", "dev": true, "requires": { "@types/node": "^8.0.24", @@ -767,9 +767,9 @@ } }, "electron-builder": { - "version": "20.19.1", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.19.1.tgz", - "integrity": "sha512-izEIgCjkwHjlSsdD6hC6GUzX7jdtW7pUPfsVnYEbEuTy6899A3thmCz6U0I06yo5N/JHoqeWmEBAxmoEfUFgoQ==", + "version": "20.19.2", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.19.2.tgz", + "integrity": "sha512-dywWWKtFCYp0EqEN3hnfSU9wun9DmRzX8we3R+PKW2fhPyxoOnOtJXKGvtOoPJVKVZFTpgTiRNKz6o4yW6jWcg==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", @@ -777,7 +777,7 @@ "builder-util-runtime": "4.4.0", "chalk": "^2.4.1", "dmg-builder": "4.11.6", - "electron-builder-lib": "20.19.1", + "electron-builder-lib": "20.19.2", "fs-extra-p": "^4.6.1", "is-ci": "^1.1.0", "lazy-val": "^1.0.3", @@ -788,9 +788,9 @@ } }, "electron-builder-lib": { - "version": "20.19.1", - "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.19.1.tgz", - "integrity": "sha512-1grL7EXtbjMQl/bjKF6X3kxaF2E3PYHuQur7mF6nLY/AVfwT/AJZNZe2j6pp4jp7FRitvPgvYs4jf92SzDICFA==", + "version": "20.19.2", + "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.19.2.tgz", + "integrity": "sha512-Tg1apb5cJ+i1SmD1DhN6YHnYuQX8XM4htf9GalTHt6aA5d1qi9FsdKvYbcaO4SbIs51D99WB/T1meTMqCXS+zg==", "dev": true, "requires": { "7zip-bin": "~4.0.2", diff --git a/package.json b/package.json index d35ab28..3792482 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dist:all": "npm run dist -- -wl --x64" }, "engines": { - "node": "10.x.x" + "node": "10.5.x" }, "repository": { "type": "git", @@ -46,8 +46,8 @@ "winreg": "^1.2.4" }, "devDependencies": { - "electron": "^2.0.3", - "electron-builder": "^20.19.1" + "electron": "^2.0.4", + "electron-builder": "^20.19.2" }, "build": { "appId": "westeroscraftlauncher",