bump(electron): Fix remaining deprecated requires, move to 1.0.1

internal_packages/composer/lib/composer-view.jsx

@@ -486,7 +486,7 @@ export default class ComposerView extends React.Component {
       return false;
     }
 
-    const dialog = remote.require('dialog');
+    const dialog = remote.dialog;
 
     const {to, cc, bcc, body, files, uploads} = this.props.draft;
     const allRecipients = [].concat(to, cc, bcc);

internal_packages/composer/lib/main.es6

@@ -77,7 +77,7 @@ class ComposerWithWindowProps extends React.Component {
   }
 
   _showInitialErrorDialog(msg) {
-    const dialog = remote.require('dialog');
+    const dialog = remote.dialog;
     // We delay so the view has time to update the restored draft. If we
     // don't delay the modal may come up in a state where the draft looks
     // like it hasn't been restored or has been lost.

internal_packages/composer/spec/composer-view-spec.cjsx

@@ -160,7 +160,7 @@ describe "ComposerView", ->
     beforeEach ->
       spyOn(NylasEnv, "isMainWindow").andReturn true
       {remote} = require('electron')
-      @dialog = remote.require('dialog')
+      @dialog = remote.dialog
       spyOn(remote, "getCurrentWindow")
       spyOn(@dialog, "showMessageBox")
       spyOn(Actions, "sendDraft")

internal_packages/message-list/lib/message-controls.cjsx

@@ -77,8 +77,8 @@ class MessageControls extends React.Component
     Actions.composeForward(thread: @props.thread, message: @props.message)
 
   _onShowActionsMenu: =>
-    SystemMenu = remote.require('menu')
+    SystemMenu = remote.Menu
-    SystemMenuItem = remote.require('menu-item')
+    SystemMenuItem = remote.MenuItem
 
     # Todo: refactor this so that message actions are provided
     # dynamically. Waiting to see if this will be used often.
@@ -108,7 +108,7 @@ class MessageControls extends React.Component
     .then =>
       Actions.sendDraft(draft.clientId)
 
-      dialog = remote.require('dialog')
+      dialog = remote.dialog
       dialog.showMessageBox remote.getCurrentWindow(), {
         type: 'warning'
         buttons: ['OK'],
@@ -119,8 +119,8 @@ class MessageControls extends React.Component
   _onShowOriginal: =>
     fs = require 'fs'
     path = require 'path'
-    BrowserWindow = remote.require('browser-window')
+    BrowserWindow = remote.BrowserWindow
-    app = remote.require('app')
+    app = remote.app
     tmpfile = path.join(app.getPath('temp'), @props.message.id)
 
     NylasAPI.makeRequest

package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/nylas/N1/issues"
   },
-  "electronVersion": "0.37.8",
+  "electronVersion": "1.0.1",
   "dependencies": {
     "async": "^0.9",
     "babel-core": "6.8.0",

script/bootstrap

@@ -48,7 +48,7 @@ function makeSqlite3Command() {
 
   // Use our local version of npm (npm 3x) to build sqlite
   var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
-  return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v0.37-"+targetPlatform+"-"+targetArch
+  return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/bengotow/fts5.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/electron-v1.0-"+targetPlatform+"-"+targetArch
 }
 
 function bootstrap() {

src/components/contenteditable/contenteditable.cjsx

@@ -389,8 +389,7 @@ class Contenteditable extends React.Component
     event.preventDefault()
 
     {remote} = require('electron')
-    Menu = remote.require('menu')
+    {Menu, MenuItem} = remote
-    MenuItem = remote.require('menu-item')
 
     menu = new Menu()
 

src/components/evented-iframe.cjsx

@@ -202,12 +202,8 @@ class EventedIFrame extends React.Component
     # "Copy Image" and "Search Google for 'Bla'"
     event.preventDefault()
 
-    {remote} = require('electron')
+    {remote, clipboard, shell, nativeImage} = require('electron')
-    clipboard = require('electron').clipboard
+    {Menu, MenuItem} = remote
-    Menu = remote.require('menu')
-    MenuItem = remote.require('menu-item')
-    NativeImage = require('native-image')
-    shell = require('electron').shell
     path = require('path')
     fs = require('fs')
     menu = new Menu()
@@ -253,7 +249,7 @@ class EventedIFrame extends React.Component
             canvas.height = img.height
             canvas.getContext("2d").drawImage(imageTarget, 0, 0)
             imageDataURL = canvas.toDataURL("image/png")
-            img = NativeImage.createFromDataURL(imageDataURL)
+            img = nativeImage.createFromDataURL(imageDataURL)
             clipboard.writeImage(img)
           , false)
           img.src = src

src/components/participants-text-field.jsx

@@ -164,8 +164,8 @@ export default class ParticipantsTextField extends React.Component {
 
   _onShowContextMenu = (participant) => {
     // Warning: Menu is already initialized as Menu.cjsx!
-    const MenuClass = remote.require('menu');
+    const MenuClass = remote.Menu;
-    const MenuItem = remote.require('menu-item');
+    const MenuItem = remote.MenuItem;
 
     const menu = new MenuClass();
     menu.append(new MenuItem({

src/components/tokenizing-text-field.cjsx

@@ -502,8 +502,7 @@ class TokenizingTextField extends React.Component
 
   _showDefaultTokenMenu: (token) =>
     {remote} = require('electron')
-    Menu = remote.require('menu')
+    {Menu, MenuItem} = remote
-    MenuItem = remote.require('menu-item')
 
     menu = new Menu()
     menu.append(new MenuItem(

src/error-logger.js

@@ -8,9 +8,9 @@ fs = require('fs-plus');
 path = require('path');
 if (process.type === 'renderer') {
   remote = require('electron').remote;
-  app = remote.require('app');
+  app = remote.app;
 } else {
-  app = require('app');
+  app = require('electron').app;
 }
 
 // A globally available ErrorLogger that can report errors to various

src/nylas-env.coffee

@@ -338,7 +338,7 @@ class NylasEnvConstructor
   # content trace visualizer (chrome://tracing). It's like Chromium Developer
   # Tools Profiler, but for all processes and threads.
   trace: ->
-    tracing = remote.require('electron').contentTracing
+    tracing = remote.contentTracing
     opts =
       categoryFilter: '*',
       traceOptions: 'record-until-full,enable-sampling,enable-systrace',
@@ -411,7 +411,7 @@ class NylasEnvConstructor
     @getCurrentWindow().close()
 
   quit: ->
-    remote.require('app').quit()
+    remote.app.quit()
 
   # Essential: Get the size of current window.
   #
@@ -844,7 +844,7 @@ class NylasEnvConstructor
       null
 
   exit: (status) ->
-    app = remote.require('app')
+    app = remote.app
     app.emit('will-exit')
     remote.process.exit(status)
 

src/nylas-spellchecker.coffee

@@ -1,7 +1,7 @@
 path = require('path')
 spellchecker = require('spellchecker')
 {remote} = require('electron')
-MenuItem = remote.require('menu-item')
+MenuItem = remote.MenuItem
 
 class NylasSpellchecker
   constructor: ->

src/window-event-handler.coffee

@@ -123,7 +123,7 @@ class WindowEventHandler
     {remote} = require('electron')
     _.defer ->
       if remote.getGlobal('application').quitting
-        remote.require('app').quit()
+        remote.app.quit()
       else
         NylasEnv.close()
 
@@ -180,8 +180,7 @@ class WindowEventHandler
     word = event.target.value.substr(wordStart, wordEnd - wordStart)
 
     {remote} = require('electron')
-    Menu = remote.require('menu')
+    {Menu, MenuItem} = remote
-    MenuItem = remote.require('menu-item')
     menu = new Menu()
 
     NylasSpellchecker = require('./nylas-spellchecker')

static/index.js

@@ -60,7 +60,7 @@ function setupWindow (loadSettings) {
   //   productName: 'N1',
   //   companyName: 'Nylas',
   //   // By explicitly passing the app version here, we could save the call
-  //   // of "require('electron').remote.require('app').getVersion()".
+  //   // of "require('electron').remote.app.getVersion()".
   //   extra: {_version: loadSettings.appVersion}
   // })