Merge pull request #429 from littleskunk/nodejs

Update to nodejs v6.9.1

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - "4.2.2"
+  - "4.4.3"
+  - "6.9.1"
 before_script:
   - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start
 after_script:

app/package.json

@@ -3,7 +3,7 @@
   "productName": "Storj Share",
   "identifier": "com.storj.farmer",
   "description": "Storj Share GUI",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "author": "Storj <[email protected]>",
   "main": "main.js",
   "config": {

package.json

@@ -3,9 +3,8 @@
     "asar": "^0.7.2",
     "chai": "^3.4.1",
     "coveralls": "^2.11.4",
-    "electron-prebuilt": "=1.4.4",
-    "electron-mocha": "^2.3.0",
-    "flatten-packages": "^0.1.4",
+    "electron": "=1.4.4",
+    "electron-mocha": "^3.1.1",
     "fs-jetpack": "^0.7.0",
     "gulp": "^3.9.0",
     "gulp-babel": "^5.2.1",
@@ -14,7 +13,7 @@
     "gulp-util": "^3.0.6",
     "istanbul": "^0.4.1",
     "jshint": "^2.8.0",
-    "mocha": "^2.3.4",
+    "mocha": "^3.1.2",
     "proxyquire": "^1.7.3",
     "q": "^1.4.1",
     "sinon": "^1.17.2",

tasks/release_linux.js

@@ -30,7 +30,7 @@ var init = function () {
 
 var copyRuntime = function () {
   return projectDir.copyAsync(
-    'node_modules/electron-prebuilt/dist',
+    'node_modules/electron/dist',
     readyAppDir.path(),
     { overwrite: true }
   );

tasks/release_osx.js

@@ -23,7 +23,7 @@ var init = function () {
 };
 
 var copyRuntime = function () {
-    return projectDir.copyAsync('node_modules/electron-prebuilt/dist/Electron.app', finalAppDir.path());
+    return projectDir.copyAsync('node_modules/electron/dist/Electron.app', finalAppDir.path());
 };
 
 var cleanupRuntime = function() {

tasks/release_windows.js

@@ -25,7 +25,7 @@ var init = function () {
 };
 
 var copyRuntime = function () {
-    return projectDir.copyAsync('node_modules/electron-prebuilt/dist', 
+    return projectDir.copyAsync('node_modules/electron/dist', 
                                 readyAppDir.path(),
                                 { overwrite: true });
 };

tasks/start.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var Q = require('q');
-var electron = require('electron-prebuilt');
+var electron = require('electron');
 var pathUtil = require('path');
 var childProcess = require('child_process');
 var utils = require('./utils');

tasks/utils.js

@@ -30,5 +30,5 @@ module.exports.getEnvName = function () {
 
 module.exports.getElectronVersion = function () {
     var manifest = jetpack.read(__dirname + '/../package.json', 'json');
-    return manifest.devDependencies['electron-prebuilt'].substring(1);
+    return manifest.devDependencies['electron'].substring(1);
 };