Skip to content

Commit

Permalink
package: bump to latest electron
Browse files Browse the repository at this point in the history
  • Loading branch information
evanlucas committed Dec 15, 2016
1 parent 2fd913f commit cd692c7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
11 changes: 6 additions & 5 deletions desktop.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

const inherits = require('util').inherits
const App = require('./app')
const remote = require('remote')
const app = remote.require('app')
const ipcRenderer = require('electron').ipcRenderer
const shell = require('shell')
const electron = require('electron')
const remote = electron.remote
const app = remote.app
const ipcRenderer = electron.ipcRenderer
const shell = electron.shell
const currentWindow = remote.getCurrentWindow()
const Menu = remote.require('menu')
const Menu = remote.Menu
const pkg = require('./package')

module.exports = Desktop
Expand Down
6 changes: 3 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict'

const BrowserWindow = require('browser-window')
const app = require('app')
const path = require('path')
const electron = require('electron')
const BrowserWindow = electron.BrowserWindow
const app = electron.app
const path = require('path')
const shortcuts = electron.globalShortcut
const fs = require('fs')
const v8 = require('v8')
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"daily-file-writer": "~1.0.0",
"debug": "~2.2.0",
"delegate-dom": "0.0.1",
"electron-prebuilt": "~0.37.2",
"eyearesee-client": "~1.5.1",
"keytar": "~3.0.0",
"leveldown": "~1.4.3",
Expand All @@ -35,8 +34,9 @@
},
"devDependencies": {
"chalk": "~1.1.3",
"electron": "^1.4.12",
"electron-packager": "~5.2.1",
"electron-rebuild": "~1.0.2",
"electron-rebuild": "^1.4.0",
"less": "~2.5.3",
"lintit": "~1.0.1",
"semver": "~5.1.0",
Expand Down

0 comments on commit cd692c7

Please sign in to comment.