Skip to content

Commit 99d2145

Browse files
authored
Merge pull request #5 from gihrig/update
Update to Electron 1.4.x
2 parents d2f300e + 7358958 commit 99d2145

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

main.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import app from 'app';
2-
import BrowserWindow from 'browser-window';
1+
import { app, BrowserWindow } from 'electron';
32

43
let mainWindow = null;
54

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"babel-preset-es2015": "^6.3.13",
1212
"babel-preset-react": "^6.3.13",
1313
"babel-register": "^6.3.13",
14-
"react": "*",
15-
"react-dom": "^0.14.3"
14+
"react": "^15.3.2",
15+
"react-dom": "^15.3.2"
1616
},
1717
"devDependencies": {
18-
"electron-prebuilt": "^0.36.0"
18+
"electron": "^1.4.3"
1919
}
2020
}

0 commit comments

Comments
 (0)