Skip to content
This repository was archived by the owner on Jul 31, 2019. It is now read-only.

Commit a9e11c6

Browse files
committed
Fixed problem that startup fail
1 parent 54f24cc commit a9e11c6

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ const mainManue = [
6464
mainApp.logout()
6565
.then(() => {
6666
return mainApp.loadToken();
67-
});
67+
})
68+
.catch(e => log.error(e));
6869
} catch (e) {
6970
log.error(e);
7071
}

src/renderer/view/filer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import {remote} from 'electron';
2323
import {inspect} from 'util';
2424
import $ from 'jquery';
25-
import Spinner from 'spin.js';
25+
import {Spinner} from 'spin.js';
2626
require('bootstrap-notify');
2727
import log from 'electron-log';
2828

webpack.app.config.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,17 @@ var mainConfig = {
7373
},
7474
{
7575
test: /\.node$/,
76-
include: /node_modules/,
77-
loader: 'node-loader'
76+
include: path.join(__dirname, 'node_modules'),
77+
use: 'node-loader'
7878
}
7979
]
8080
},
8181
resolve: {
8282
extensions: ['.js', '.json', '.node'],
8383
},
8484
externals: [
85-
'about-window'
85+
'about-window',
86+
'keytar'
8687
],
8788
target: 'electron-main',
8889
plugins: mainPlugins
@@ -140,7 +141,7 @@ var rendererConfig = {
140141
},
141142
{
142143
test: /\.node$/,
143-
include: /node_modules/,
144+
include: path.join(__dirname, 'node_modules'),
144145
loader: 'node-loader'
145146
},
146147
{

0 commit comments

Comments
 (0)