From fe171a0c8c8ec485932619b5f57f064d75ddd762 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Wed, 13 Apr 2016 15:35:01 -0700
Subject: [PATCH] fix(require): Move more requires to new electron format

---
 internal_packages/composer-templates/lib/template-store.es6 | 4 ++--
 internal_packages/composer-translate/lib/main.jsx           | 2 +-
 internal_packages/composer/lib/participants-text-field.jsx  | 2 +-
 .../notification-update-available/lib/main.cjsx             | 2 +-
 .../worker-ui/lib/developer-bar-curl-item.cjsx              | 2 +-
 spec_integration/clean-app-boot-spec.es6                    | 2 +-
 spec_integration/logged-in-app-boot-spec.es6                | 2 +-
 src/components/evented-iframe.cjsx                          | 4 ++--
 src/error-logger.js                                         | 2 +-
 src/flux/stores/database-store.coffee                       | 2 +-
 src/nylas-env.coffee                                        | 3 +--
 src/nylas-spellchecker.coffee                               | 2 +-
 src/react-remote/react-remote-child.js                      | 6 +++---
 src/react-remote/react-remote-parent.js                     | 2 +-
 static/index.js                                             | 4 ++--
 static/package-template/lib/my-composer-button.jsx          | 2 +-
 static/react-remote-child.html                              | 6 +++---
 17 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/internal_packages/composer-templates/lib/template-store.es6 b/internal_packages/composer-templates/lib/template-store.es6
index 2a4136037..3bded06dd 100644
--- a/internal_packages/composer-templates/lib/template-store.es6
+++ b/internal_packages/composer-templates/lib/template-store.es6
@@ -135,11 +135,11 @@ class TemplateStore extends NylasStore {
   }
 
   _displayError(message) {
-    const dialog = require('remote').require('dialog');
+    const dialog = require('electron').remote.dialog;
     dialog.showErrorBox('Template Creation Error', message);
   }
   _displayDialog(title, message, buttons) {
-    const dialog = require('remote').require('dialog');
+    const dialog = require('electron').remote.dialog;
     return (dialog.showMessageBox({
       title: title,
       message: title,
diff --git a/internal_packages/composer-translate/lib/main.jsx b/internal_packages/composer-translate/lib/main.jsx
index 68a174933..d8adb55f1 100644
--- a/internal_packages/composer-translate/lib/main.jsx
+++ b/internal_packages/composer-translate/lib/main.jsx
@@ -49,7 +49,7 @@ class TranslateButton extends React.Component {
 
   _onError(error) {
     Actions.closePopover()
-    const dialog = require('remote').require('dialog');
+    const dialog = require('electron').remote.dialog;
     dialog.showErrorBox('Language Conversion Failed', error.toString());
   }
 
diff --git a/internal_packages/composer/lib/participants-text-field.jsx b/internal_packages/composer/lib/participants-text-field.jsx
index 5dfc8d506..43495fda9 100644
--- a/internal_packages/composer/lib/participants-text-field.jsx
+++ b/internal_packages/composer/lib/participants-text-field.jsx
@@ -161,7 +161,7 @@ export default class ParticipantsTextField extends React.Component {
     const menu = new MenuClass();
     menu.append(new MenuItem({
       label: `Copy ${participant.email}`,
-      click: () => require('clipboard').writeText(participant.email),
+      click: () => require('electron').clipboard.writeText(participant.email),
     }))
     menu.append(new MenuItem({
       type: 'separator',
diff --git a/internal_packages/notification-update-available/lib/main.cjsx b/internal_packages/notification-update-available/lib/main.cjsx
index 4ff44b93f..d5585a7af 100644
--- a/internal_packages/notification-update-available/lib/main.cjsx
+++ b/internal_packages/notification-update-available/lib/main.cjsx
@@ -64,5 +64,5 @@ module.exports =
       ipcRenderer.send 'command', 'application:install-update'
       true
     if action.id is 'release-bar:view-changelog'
-      require('shell').openExternal('https://github.com/nylas/N1/blob/master/CHANGELOG.md')
+      require('electron').shell.openExternal('https://github.com/nylas/N1/blob/master/CHANGELOG.md')
       false
diff --git a/internal_packages/worker-ui/lib/developer-bar-curl-item.cjsx b/internal_packages/worker-ui/lib/developer-bar-curl-item.cjsx
index 5f562e3f4..9a17da4da 100644
--- a/internal_packages/worker-ui/lib/developer-bar-curl-item.cjsx
+++ b/internal_packages/worker-ui/lib/developer-bar-curl-item.cjsx
@@ -20,7 +20,7 @@ class DeveloperBarCurlItem extends React.Component
     return @props.item isnt nextProps.item
 
   _onCopyCommand: =>
-    clipboard = require('clipboard')
+    clipboard = require('electron').clipboard
     clipboard.writeText(@props.item.command)
 
   _isError: ->
diff --git a/spec_integration/clean-app-boot-spec.es6 b/spec_integration/clean-app-boot-spec.es6
index a7be9b973..5af725eb7 100644
--- a/spec_integration/clean-app-boot-spec.es6
+++ b/spec_integration/clean-app-boot-spec.es6
@@ -22,7 +22,7 @@ describe('Clean app boot', ()=> {
 
   it("has the autoupdater pointing to the correct url when there's no config loaded", () => {
     this.app.client.execute(()=>{
-      const app = require('remote').getGlobal('application');
+      const app = require('electron').remote.getGlobal('application');
       return {
         platform: process.platform,
         arch: process.arch,
diff --git a/spec_integration/logged-in-app-boot-spec.es6 b/spec_integration/logged-in-app-boot-spec.es6
index a28e2e7a5..d119d20ba 100644
--- a/spec_integration/logged-in-app-boot-spec.es6
+++ b/spec_integration/logged-in-app-boot-spec.es6
@@ -19,7 +19,7 @@ describe('Logged in app boot', () => {
 
   it("has the autoupdater pointing to the correct url", () => {
     this.app.client.execute(()=>{
-      app = require('remote').getGlobal('application')
+      app = require('electron').remote.getGlobal('application')
       return {
         platform: process.platform,
         arch: process.arch,
diff --git a/src/components/evented-iframe.cjsx b/src/components/evented-iframe.cjsx
index 144e0117b..0c8995429 100644
--- a/src/components/evented-iframe.cjsx
+++ b/src/components/evented-iframe.cjsx
@@ -182,11 +182,11 @@ class EventedIFrame extends React.Component
     event.preventDefault()
 
     {remote} = require('electron')
-    clipboard = require('clipboard')
+    clipboard = require('electron').clipboard
     Menu = remote.require('menu')
     MenuItem = remote.require('menu-item')
     NativeImage = require('native-image')
-    shell = require('shell')
+    shell = require('electron').shell
     path = require('path')
     fs = require('fs')
     menu = new Menu()
diff --git a/src/error-logger.js b/src/error-logger.js
index f3a399681..a8a8297af 100644
--- a/src/error-logger.js
+++ b/src/error-logger.js
@@ -63,7 +63,7 @@ module.exports = ErrorLogger = (function() {
   }
 
   ErrorLogger.prototype.openLogs = function() {
-    var shell = require('shell');
+    var shell = require('electron').shell;
     shell.openItem(this._logPath());
   };
 
diff --git a/src/flux/stores/database-store.coffee b/src/flux/stores/database-store.coffee
index 15f5719e7..b229922dd 100644
--- a/src/flux/stores/database-store.coffee
+++ b/src/flux/stores/database-store.coffee
@@ -226,7 +226,7 @@ class DatabaseStore extends NylasStore
         catch err
           console.log("Could not write mail rules to file: #{err}")
 
-      app = require('remote').getGlobal('application')
+      app = require('electron').remote.getGlobal('application')
       app.rebuildDatabase()
 
   _prettyConsoleLog: (q) =>
diff --git a/src/nylas-env.coffee b/src/nylas-env.coffee
index 752e1924f..9a6fb94f9 100644
--- a/src/nylas-env.coffee
+++ b/src/nylas-env.coffee
@@ -627,8 +627,7 @@ class NylasEnvConstructor extends Model
     width > 0 and height > 0 and x + width > 0 and y + height > 0
 
   getDefaultWindowDimensions: ->
-    screen = remote.require('screen')
-    {width, height} = screen.getPrimaryDisplay().workAreaSize
+    {width, height} = remote.screen.getPrimaryDisplay().workAreaSize
     x = 0
     y = 0
 
diff --git a/src/nylas-spellchecker.coffee b/src/nylas-spellchecker.coffee
index 9335edae7..cd7a70811 100644
--- a/src/nylas-spellchecker.coffee
+++ b/src/nylas-spellchecker.coffee
@@ -48,7 +48,7 @@ class NylasSpellchecker
 
   # Separate method for testing
   _setWebframeSpellchecker: (lang, spellCheck) ->
-    require('web-frame').setSpellCheckProvider(lang, false, {spellCheck})
+    require('electron').webFrame.setSpellCheckProvider(lang, false, {spellCheck})
 
   # node-spellchecker's method for resolving the builtin hunspell
   # dictionaries for Linux (From
diff --git a/src/react-remote/react-remote-child.js b/src/react-remote/react-remote-child.js
index ecc16ac1e..4082ee9af 100644
--- a/src/react-remote/react-remote-child.js
+++ b/src/react-remote/react-remote-child.js
@@ -11,7 +11,7 @@ restoreSelection = exp.restoreSelection;
 getSelectionData = exp.getSelectionData;
 
 var receiveEvent = function (json) {
-  var remote = require('remote');
+  var remote = require('electron').remote;
 
   if (json.selectionData) {
     document.removeEventListener("selectionchange", selectionChange);
@@ -108,7 +108,7 @@ events.forEach(function(type) {
       representation.targetChecked = event.target.checked;
     }
 
-    var remote = require('remote');
+    var remote = require('electron').remote;
     ipc.send("from-react-remote-window", {windowId: remote.getCurrentWindow().id, event: representation});
     if ((event.type != 'keydown') && (event.type != 'keypress') && (event.type != 'keyup')) {
       event.preventDefault();
@@ -121,7 +121,7 @@ selectionChange = function() {
   selectionData = getSelectionData()
   if (_.isEqual(selectionData, lastSelectionData)) { return; }
   lastSelectionData = _.clone(selectionData)
-  var remote = require('remote');
+  var remote = require('electron').remote;
   remote.getCurrentWindow().id
   ipc.send("from-react-remote-window-selection", selectionData);
 }
diff --git a/src/react-remote/react-remote-parent.js b/src/react-remote/react-remote-parent.js
index 5fc6c80f7..5a27009f6 100644
--- a/src/react-remote/react-remote-parent.js
+++ b/src/react-remote/react-remote-parent.js
@@ -223,7 +223,7 @@ var openWindowForComponent = function(Component, options) {
     }
   }
 
-  var remote = require('remote');
+  var remote = require('electron').remote;
   var url = require('url');
   var BrowserWindow = remote.require('browser-window');
 
diff --git a/static/index.js b/static/index.js
index 16f7c00a7..0ecffa9e4 100644
--- a/static/index.js
+++ b/static/index.js
@@ -30,7 +30,7 @@ function handleSetupError (error) {
 
 function copyEnvFromMainProcess() {
   var _ = require('underscore');
-  var remote = require('remote');
+  var remote = require('electron').remote;
   var newEnv = _.extend({}, process.env, remote.process.env);
   process.env = newEnv;
 }
@@ -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('remote').require('app').getVersion()".
+  //   // of "require('electron').remote.require('app').getVersion()".
   //   extra: {_version: loadSettings.appVersion}
   // })
 
diff --git a/static/package-template/lib/my-composer-button.jsx b/static/package-template/lib/my-composer-button.jsx
index 5e0141114..fbf8a7541 100644
--- a/static/package-template/lib/my-composer-button.jsx
+++ b/static/package-template/lib/my-composer-button.jsx
@@ -33,7 +33,7 @@ export default class MyComposerButton extends React.Component {
   }
 
   _getDialog() {
-    return require('remote').require('dialog');
+    return require('electron').remote.dialog;
   }
 
   render() {
diff --git a/static/react-remote-child.html b/static/react-remote-child.html
index cac38747b..6196b2545 100644
--- a/static/react-remote-child.html
+++ b/static/react-remote-child.html
@@ -3,9 +3,9 @@
     <div class="sheet-toolbar">
       <div style="position:absolute; width:100%; height:100%; z-index: 1;" class="sheet-toolbar-container">
         <div name="ToolbarWindowControls" class="toolbar-window-controls">
-          <button class="close" onClick="require('remote').getCurrentWindow().close()"></button>
-          <button class="minimize" onClick="require('remote').getCurrentWindow().minimize()"></button>
-          <button class="maximize" onClick="require('remote').getCurrentWindow().maximize()"></button>
+          <button class="close" onClick="require('electron').remote.getCurrentWindow().close()"></button>
+          <button class="minimize" onClick="require('electron').remote.getCurrentWindow().minimize()"></button>
+          <button class="maximize" onClick="require('electron').remote.getCurrentWindow().maximize()"></button>
         </div>
         <div class="window-title"></div>
       </div>