bump up electron version 0.34 -> 0.35.1

Rokt33r · Rokt33r · commit de3b76b31df4 · 2015-11-23T11:38:35.000+09:00
diff --git a/atom-lib/finder-window.js b/atom-lib/finder-window.js
@@ -1,5 +1,6 @@
-var BrowserWindow = require('browser-window')
-var path = require('path')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const path = require('path')
 
 var finderWindow = new BrowserWindow({
   width: 640,
@@ -18,7 +19,7 @@ var finderWindow = new BrowserWindow({
 
 var url = path.resolve(__dirname, '../browser/finder/index.html')
 
-finderWindow.loadUrl('file://' + url)
+finderWindow.loadURL('file://' + url)
 
 finderWindow.on('blur', function () {
   finderWindow.hide()
diff --git a/atom-lib/main-window.js b/atom-lib/main-window.js
@@ -1,5 +1,6 @@
-var BrowserWindow = require('browser-window')
-var path = require('path')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const path = require('path')
 
 var mainWindow = new BrowserWindow({
   width: 1080,
@@ -11,9 +12,9 @@ var mainWindow = new BrowserWindow({
   'standard-window': false
 })
 
-var url = path.resolve(__dirname, '../browser/main/index.html')
+const url = path.resolve(__dirname, '../browser/main/index.html')
 
-mainWindow.loadUrl('file://' + url)
+mainWindow.loadURL('file://' + url)
 
 mainWindow.setVisibleOnAllWorkspaces(true)
 
diff --git a/atom-lib/menu-template.js b/atom-lib/menu-template.js
@@ -1,4 +1,5 @@
-var BrowserWindow = require('browser-window')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
 
 module.exports = [
   {
diff --git a/browser/finder/index.html b/browser/finder/index.html
@@ -28,7 +28,8 @@
   <div id="content"></div>
   <script src="../../submodules/ace/src-min/ace.js"></script>
   <script>
-    require('web-frame').setZoomLevelLimits(1, 1)
+    const electron = require('electron')
+    electron.webFrame.setZoomLevelLimits(1, 1)
     var scriptUrl = process.env.BOOST_ENV === 'development'
       ? 'http://localhost:8080/assets/finder.js'
       : '../../compiled/finder.js'
diff --git a/browser/finder/index.js b/browser/finder/index.js
@@ -10,9 +10,10 @@ import { selectArticle, searchArticle, refreshData } from './actions'
 import _ from 'lodash'
 import activityRecord from 'boost/activityRecord'
 
-import remote from 'remote'
+const electron = require('electron')
+const { remote, clipboard } = electron
+
 var hideFinder = remote.getGlobal('hideFinder')
-import clipboard from 'clipboard'
 
 function notify (...args) {
   return new window.Notification(...args)
diff --git a/browser/main/HomePage.js b/browser/main/HomePage.js
@@ -7,8 +7,9 @@ import ArticleTopBar from './HomePage/ArticleTopBar'
 import ArticleList from './HomePage/ArticleList'
 import ArticleDetail from './HomePage/ArticleDetail'
 import _ from 'lodash'
-import keygen from 'boost/keygen'
 import { isModalOpen, closeModal } from 'boost/modal'
+const electron = require('electron')
+const BrowserWindow = electron.remote.BrowserWindow
 
 const TEXT_FILTER = 'TEXT_FILTER'
 const FOLDER_FILTER = 'FOLDER_FILTER'
@@ -31,7 +32,7 @@ class HomePage extends React.Component {
     if (process.env.BOOST_ENV === 'development' && e.keyCode === 73 && e.metaKey && e.altKey) {
       e.preventDefault()
       e.stopPropagation()
-      require('remote').require('browser-window').getFocusedWindow().toggleDevTools()
+      BrowserWindow.getFocusedWindow().toggleDevTools()
       return
     }
 
diff --git a/browser/main/HomePage/ArticleNavigator.js b/browser/main/HomePage/ArticleNavigator.js
@@ -7,7 +7,8 @@ import Preferences from 'boost/components/modal/Preferences'
 import CreateNewFolder from 'boost/components/modal/CreateNewFolder'
 import keygen from 'boost/keygen'
 
-import remote from 'remote'
+const electron = require('electron')
+const remote = electron.remote
 let userName = remote.getGlobal('process').env.USER
 
 const BRAND_COLOR = '#18AF90'
diff --git a/browser/main/MainPage.js b/browser/main/MainPage.js
@@ -1,4 +1,5 @@
-import ipc from 'ipc'
+const electron = require('electron')
+const ipc = electron.ipcRenderer
 import React, { PropTypes } from 'react'
 
 var ContactModal = require('boost/components/modal/ContactModal')
diff --git a/browser/main/index.html b/browser/main/index.html
@@ -54,8 +54,9 @@
 
   <script src="../../submodules/ace/src-min/ace.js"></script>
   <script type='text/javascript'>
-    require('web-frame').setZoomLevelLimits(1, 1)
-    var version = require('remote').require('app').getVersion()
+    const electron = require('electron')
+    electron.webFrame.setZoomLevelLimits(1, 1)
+    var version = electron.remote.app.getVersion()
     document.title = 'Boost' + ((version == null || version.length === 0) ? ' DEV' : '')
     var scriptUrl = process.env.BOOST_ENV === 'development'
       ? 'http://localhost:8080/assets/main.js'
diff --git a/browser/main/index.js b/browser/main/index.js
@@ -11,7 +11,8 @@ require('../styles/main/index.styl')
 import { openModal } from 'boost/modal'
 import Tutorial from 'boost/components/modal/Tutorial'
 import activityRecord from 'boost/activityRecord'
-import ipc from 'ipc'
+const electron = require('electron')
+const ipc = electron.ipcRenderer
 
 activityRecord.init()
 window.addEventListener('online', function () {
diff --git a/lib/components/ExternalLink.js b/lib/components/ExternalLink.js
@@ -1,5 +1,6 @@
 import React, { PropTypes } from 'react'
-import shell from 'shell'
+const electron = require('electron')
+const shell = electron.shell
 
 export default class ExternalLink extends React.Component {
   handleClick (e) {
diff --git a/lib/components/MarkdownPreview.js b/lib/components/MarkdownPreview.js
@@ -1,9 +1,11 @@
-import shell from 'shell'
 var React = require('react')
 var { PropTypes } = React
 import markdown from 'boost/markdown'
 var ReactDOM = require('react-dom')
 
+const electron = require('electron')
+const shell = electron.shell
+
 function handleAnchorClick (e) {
   shell.openExternal(e.target.href)
   e.preventDefault()
diff --git a/lib/components/modal/Preference/AppSettingTab.js b/lib/components/modal/Preference/AppSettingTab.js
@@ -1,7 +1,9 @@
 import React from 'react'
 import linkState from 'boost/linkState'
-import remote from 'remote'
-import ipc from 'ipc'
+
+const electron = require('electron')
+const ipc = electron.ipcRenderer
+const remote = electron.remote
 
 export default class AppSettingTab extends React.Component {
   constructor (props) {
@@ -47,7 +49,9 @@ export default class AppSettingTab extends React.Component {
   }
 
   handleKeyDown (e) {
-    this.submitHotKey()
+    if (e.keyCode === 13) {
+      this.submitHotKey()
+    }
   }
 
   render () {
diff --git a/lib/openExternal.js b/lib/openExternal.js
@@ -1,4 +1,5 @@
-var shell = require('shell')
+const electron = require('electron')
+const shell = electron.shell
 
 export default function (e) {
   shell.openExternal(e.currentTarget.href)
diff --git a/main.js b/main.js
@@ -1,11 +1,13 @@
-var app = require('app')
-var Menu = require('menu')
-var MenuItem = require('menu-item')
-var Tray = require('tray')
-var ipc = require('ipc')
-var jetpack = require('fs-jetpack')
-
-require('crash-reporter').start()
+const electron = require('electron')
+const app = electron.app
+const Menu = electron.Menu
+const MenuItem = electron.MenuItem
+const Tray = electron.Tray
+const ipc = electron.ipcMain
+const globalShortcut = electron.globalShortcut
+const autoUpdater = electron.autoUpdater
+const jetpack = require('fs-jetpack')
+electron.crashReporter.start()
 
 var mainWindow = null
 var appIcon = null
@@ -18,8 +20,6 @@ var update = null
 //   if (process.platform !== 'darwin') app.quit()
 // })
 
-var autoUpdater = require('auto-updater')
-
 var appQuit = false
 
 var version = app.getVersion()
@@ -123,7 +123,6 @@ app.on('ready', function () {
 
   finderWindow = require('./atom-lib/finder-window')
 
-  var globalShortcut = require('global-shortcut')
   var userDataPath = app.getPath('userData')
   if (!jetpack.cwd(userDataPath).exists('keymap.json')) {
     jetpack.cwd(userDataPath).file('keymap.json', {content: '{}'})
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "codesign": "codesign --verbose --deep --force --sign \"MAISIN solutions Inc.\" Boost-darwin-x64/Boost.app"
   },
   "config": {
-    "version": "--version=0.34.0 --app-bundle-id=com.maisin.boost",
+    "version": "--version=0.35.1 --app-bundle-id=com.maisin.boost",
     "platform": "--platform=darwin --arch=x64 --prune --icon=resources/app.icns",
     "ignore": "--ignore=Boost-darwin-x64 --ignore=node_modules/devicon/icons --ignore=submodules/ace/(?!src-min)|submodules/ace/(?=src-min-noconflict)"
   },
@@ -55,7 +55,7 @@
     "babel-plugin-react-transform": "^1.1.1",
     "css-loader": "^0.19.0",
     "electron-packager": "^5.1.0",
-    "electron-prebuilt": "^0.33.6",
+    "electron-prebuilt": "^0.35.1",
     "nib": "^1.1.0",
     "react": "^0.14.0",
     "react-dom": "^0.14.0",
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,7 +3,6 @@ var path = require('path')
 var JsonpTemplatePlugin = webpack.JsonpTemplatePlugin
 var FunctionModulePlugin = require('webpack/lib/FunctionModulePlugin')
 var NodeTargetPlugin = require('webpack/lib/node/NodeTargetPlugin')
-var ExternalsPlugin = webpack.ExternalsPlugin
 var opt = {
   path: path.join(__dirname, 'compiled'),
   filename: '[name].js',
@@ -39,29 +38,10 @@ var config = {
   },
   plugins: [
     new webpack.NoErrorsPlugin(),
-    new ExternalsPlugin('commonjs', [
-      'app',
-      'auto-updater',
-      'browser-window',
-      'content-tracing',
-      'dialog',
-      'global-shortcut',
-      'ipc',
-      'menu',
-      'menu-item',
-      'power-monitor',
-      'protocol',
-      'tray',
-      'remote',
-      'web-frame',
-      'clipboard',
-      'crash-reporter',
-      'screen',
-      'shell'
-    ]),
     new NodeTargetPlugin()
   ],
   externals: [
+    'electron',
     'socket.io-client',
     'md5',
     'superagent',
diff --git a/webpack.config.production.js b/webpack.config.production.js
@@ -38,6 +38,7 @@ module.exports = {
     })
   ],
   externals: [
+    'electron',
     'socket.io-client',
     'md5',
     'superagent',
@@ -50,6 +51,5 @@ module.exports = {
   ],
   resolve: {
     extensions: ['', '.js', '.jsx', 'styl']
-  },
-  target: 'atom'
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-var BrowserWindow = require('browser-window')`
	`1`	`+const electron = require('electron')`
	`2`	`+const BrowserWindow = electron.BrowserWindow`
`2`	`3`
`3`	`4`	`module.exports = [`
`4`	`5`	`{`