Updates electron and associated dependencies to the latest

Makefile

@@ -51,7 +51,7 @@ PUBLISH ?= onTag
 
 # Main targets
 .PHONY: start
-start: rebuild-deps
+start:
 	@NODE_ENV=$(NODE_ENV) DEV_SERVER=$(DEV_SERVER) npx electron .
 
 .PHONY: dev
@@ -159,10 +159,6 @@ endif
 .PHONY: config-release
 config-release: config.json install
 
-.PHONY: rebuild-deps
-rebuild-deps:
-	@npx electron-rebuild -v $(ELECTRON_VERSION)
-
 .PHONY: format
 format:
 	@npx prettier --ignore-path .gitignore --write "**/*.{js,jsx,json,sass,ts,tsx}"

desktop/app.js

@@ -17,6 +17,7 @@ const createMenuTemplate = require('./menus');
 const platform = require('./detect/platform');
 const updater = require('./updater');
 const { isDev } = require('./env');
+const spellcheck = require('./spellchecker');
 
 require('module').globalPaths.push(path.resolve(path.join(__dirname)));
 
@@ -46,11 +47,6 @@ module.exports = function main() {
       defaultHeight: 768,
     });
 
-    // Create the browser window.
-    const iconPath = path.join(
-      __dirname,
-      '../lib/icons/app-icon/icon_256x256.png'
-    );
     mainWindow = new BrowserWindow({
       backgroundColor: '#fff',
       x: mainWindowState.x,
@@ -59,11 +55,11 @@ module.exports = function main() {
       height: mainWindowState.height,
       minWidth: 370,
       minHeight: 520,
-      icon: iconPath,
       titleBarStyle: 'hidden',
       show: false,
       webPreferences: {
-        nodeIntegration: true,
+        contextIsolation: true,
+        nodeIntegration: false,
         preload: path.join(__dirname, './preload.js'),
       },
     });
@@ -75,6 +71,8 @@ module.exports = function main() {
       mainWindow.loadUrl(url);
     }
 
+    spellcheck(mainWindow);
+
     if (
       'test' !== process.env.NODE_ENV &&
       (isDev || process.argv.includes('--devtools'))

desktop/preload.js

@@ -1 +1,21 @@
-require('./context-menu');
+const { contextBridge, ipcRenderer } = require('electron');
+
+contextBridge.exposeInMainWorld('electron', {
+  send: (channel, data) => {
+    // whitelist channels
+    let validChannels = ['appCommand', 'setAutoHideMenuBar', 'settingsUpdate'];
+    if (validChannels.includes(channel)) {
+      ipcRenderer.send(channel, data);
+    }
+  },
+  receive: (channel, func) => {
+    let validChannels = ['appCommand'];
+    if (validChannels.includes(channel)) {
+      // Deliberately strip event as it includes `sender`
+      ipcRenderer.on(channel, (event, ...args) => {
+        return func(...args);
+      });
+    }
+  },
+  isMac: process.platform === 'darwin',
+});

desktop/spellchecker/index.js

@@ -0,0 +1,63 @@
+'use strict';
+
+/**
+ * External dependencies
+ */
+const { Menu, MenuItem } = require('electron');
+
+module.exports = function (mainWindow) {
+  mainWindow.webContents.on('context-menu', (event, params) => {
+    const menu = new Menu();
+
+    const copy = new MenuItem({ label: 'Copy', role: 'copy' });
+
+    if (!params.isEditable) {
+      // If text is not editable, only permit the `Copy` action
+      menu.append(copy);
+    } else {
+      // Add each spelling suggestion
+      for (const suggestion of params.dictionarySuggestions) {
+        menu.append(
+          new MenuItem({
+            label: suggestion,
+            click: () => mainWindow.webContents.replaceMisspelling(suggestion),
+          })
+        );
+      }
+
+      // Allow users to add the misspelled word to the dictionary
+      if (params.misspelledWord) {
+        menu.append(new MenuItem({ type: 'separator' }));
+        menu.append(
+          new MenuItem({
+            label: 'Add to Dictionary',
+            click: () =>
+              mainWindow.webContents.session.addWordToSpellCheckerDictionary(
+                params.misspelledWord
+              ),
+          })
+        );
+      }
+
+      // If text is editable, permit the Select All, Cut, Copy and Paste actions
+      const cut = new MenuItem({ label: 'Cut', role: 'cut' });
+      const paste = new MenuItem({ label: 'Paste', role: 'paste' });
+      const selectAll = new MenuItem({
+        label: 'Select All',
+        role: 'selectAll',
+      });
+
+      const menuItems = [selectAll, cut, copy, paste];
+
+      if (params?.dictionarySuggestions?.length > 0) {
+        menu.append(new MenuItem({ type: 'separator' }));
+      }
+
+      for (const item of menuItems) {
+        menu.append(item);
+      }
+    }
+
+    menu.popup();
+  });
+};

electron-builder.json

@@ -2,8 +2,8 @@
   "productName": "Simplenote",
   "appId": "com.automattic.simplenote",
   "directories": {
-    "output": "release",
-    "buildResources": "resources"
+    "output": "./release",
+    "buildResources": "./resources"
   },
   "files": ["desktop", "dist", "shared"],
   "mac": {
@@ -55,7 +55,6 @@
     "deleteAppDataOnUninstall": true
   },
   "linux": {
-    "icon": "resources/images/",
     "artifactName": "Simplenote-linux-${version}-${arch}.${ext}",
     "target": [
       {
@@ -84,7 +83,7 @@
       "GenericName": "Note Taking Application",
       "Type": "Application",
       "Icon": "simplenote",
-      "StartupNotify": "true",
+      "StartupNotify": true,
       "Categories": "Utility"
     },
     "vendor": "Automattic, Inc.",