Merge pull request #220 from chentsulin/electron-1.0

Upgraded electron to v1 and remove crashReporter
narakai · May 14, 2016 · 99d7a1b · 99d7a1b
2 parents 717f579 + dfc7aa2
commit 99d7a1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/main.development.js b/main.development.js
@@ -1,10 +1,9 @@
-import { app, BrowserWindow, Menu, crashReporter, shell } from 'electron';
+import { app, BrowserWindow, Menu, shell } from 'electron';
 
 let menu;
 let template;
 let mainWindow = null;
 
-crashReporter.start();
 
 if (process.env.NODE_ENV === 'development') {
   require('electron-debug')(); // eslint-disable-line global-require

diff --git a/package.js b/package.js
@@ -50,7 +50,7 @@ if (version) {
   // use the same version as the currently-installed electron-prebuilt
   exec('npm list electron-prebuilt --dev', (err, stdout) => {
     if (err) {
-      DEFAULT_OPTS.version = '0.37.6';
+      DEFAULT_OPTS.version = '1.0.2';
     } else {
       DEFAULT_OPTS.version = stdout.split('electron-prebuilt@')[1].replace(/\s/g, '');
     }

diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "css-loader": "^0.23.1",
     "del": "^2.2.0",
     "electron-packager": "^6.0.2",
-    "electron-prebuilt": "^0.37.6",
+    "electron-prebuilt": "^1.0.2",
     "electron-rebuild": "^1.1.3",
     "eslint": "^2.9.0",
     "eslint-config-airbnb": "^9.0.1",