Electron 11 Upgrade (#28)

* Update to new electron, major refactoring * Update dat-fetch * Delete electron browser view * Minor cleanup after refactor
AgregoreWeb · Sep 18, 2020 · abf6593 · abf6593
1 parent a858702
commit abf6593
Show file tree

Hide file tree

Showing 19 changed files with 796 additions and 746 deletions.
diff --git a/app/actions.js b/app/actions.js
@@ -1,7 +1,5 @@
 const { app } = require('electron')
 
-const { createWindow } = require('./windows')
-
 const { accelerators } = require('./config')
 
 const FOCUS_URL_BAR_SCRIPT = `
@@ -12,118 +10,123 @@ const OPEN_FIND_BAR_SCRIPT = `
 document.getElementById('find').show()
 `
 
-module.exports = {
-  OpenDevTools: {
-    label: 'Open Dev Tools',
-    accelerator: accelerators.OpenDevTools,
-    click: onOpenDevTools
-  },
-  NewWindow: {
-    label: 'New Window',
-    click: onNewWindow,
-    accelerator: accelerators.NewWindow
-  },
-  Forward: {
-    label: 'Forward',
-    accelerator: accelerators.Forward,
-    click: onGoForward
-  },
-  Back: {
-    label: 'Back',
-    accelerator: accelerators.Back,
-    click: onGoBack
-  },
-  FocusURLBar: {
-    label: 'Focus URL Bar',
-    click: onFocusURlBar,
-    accelerator: accelerators.FocusURLBar
-  },
-  FindInPage: {
-    label: 'Find in Page',
-    click: onFindInPage,
-    accelerator: accelerators.FindInPage
-  },
-  Reload: {
-    label: 'Reload',
-    accelerator: accelerators.Reload,
-    click: onReload
-  },
-  HardReload: {
-    label: 'Hard Reload',
-    accelerator: accelerators.HardReload,
-    click: onHardReload
-  },
-  LearnMore: {
-    label: 'Learn More',
-    accelerator: accelerators.LearnMore,
-    click: onLearMore
-  },
-  SetAsDefault: {
-    label: 'Set as default browser',
-    accelerator: accelerators.SetAsDefault,
-    click: onSetAsDefault
+module.exports = { createActions }
+
+function createActions ({
+  createWindow
+}) {
+  return {
+    OpenDevTools: {
+      label: 'Open Dev Tools',
+      accelerator: accelerators.OpenDevTools,
+      click: onOpenDevTools
+    },
+    NewWindow: {
+      label: 'New Window',
+      click: onNewWindow,
+      accelerator: accelerators.NewWindow
+    },
+    Forward: {
+      label: 'Forward',
+      accelerator: accelerators.Forward,
+      click: onGoForward
+    },
+    Back: {
+      label: 'Back',
+      accelerator: accelerators.Back,
+      click: onGoBack
+    },
+    FocusURLBar: {
+      label: 'Focus URL Bar',
+      click: onFocusURlBar,
+      accelerator: accelerators.FocusURLBar
+    },
+    FindInPage: {
+      label: 'Find in Page',
+      click: onFindInPage,
+      accelerator: accelerators.FindInPage
+    },
+    Reload: {
+      label: 'Reload',
+      accelerator: accelerators.Reload,
+      click: onReload
+    },
+    HardReload: {
+      label: 'Hard Reload',
+      accelerator: accelerators.HardReload,
+      click: onHardReload
+    },
+    LearnMore: {
+      label: 'Learn More',
+      accelerator: accelerators.LearnMore,
+      click: onLearMore
+    },
+    SetAsDefault: {
+      label: 'Set as default browser',
+      accelerator: accelerators.SetAsDefault,
+      click: onSetAsDefault
+    }
+  }
+  async function onSetAsDefault () {
+    app.setAsDefaultProtocolClient('http')
+    app.setAsDefaultProtocolClient('https')
   }
-}
-
-async function onSetAsDefault () {
-  app.setAsDefaultProtocolClient('http')
-  app.setAsDefaultProtocolClient('https')
-}
 
-async function onLearMore () {
-  const { shell } = require('electron')
-  await shell.openExternal('https://github.com/RangerMauve/agregore-browser')
-}
+  async function onLearMore () {
+    const { shell } = require('electron')
+    await shell.openExternal('https://github.com/RangerMauve/agregore-browser')
+  }
 
-function onOpenDevTools (event, focusedWindow, focusedWebContents) {
-  const contents = getContents(focusedWindow)
-  for (const webContents of contents) {
-    webContents.openDevTools()
+  function onOpenDevTools (event, focusedWindow, focusedWebContents) {
+    const contents = getContents(focusedWindow)
+    for (const webContents of contents) {
+      webContents.openDevTools()
+    }
   }
-}
 
-function onNewWindow (event, focusedWindow, focusedWebContents) {
-  createWindow()
-}
+  function onNewWindow (event, focusedWindow, focusedWebContents) {
+    createWindow()
+  }
 
-function onFocusURlBar (event, focusedWindow) {
-  focusedWindow.webContents.focus()
-  focusedWindow.webContents.executeJavaScript(FOCUS_URL_BAR_SCRIPT, true)
-}
+  function onFocusURlBar (event, focusedWindow) {
+    focusedWindow.webContents.focus()
+    focusedWindow.webContents.executeJavaScript(FOCUS_URL_BAR_SCRIPT, true)
+  }
 
-function onFindInPage (event, focusedWindow) {
-  focusedWindow.webContents.focus()
-  focusedWindow.webContents.executeJavaScript(OPEN_FIND_BAR_SCRIPT, true)
-}
+  function onFindInPage (event, focusedWindow) {
+    focusedWindow.webContents.focus()
+    focusedWindow.webContents.executeJavaScript(OPEN_FIND_BAR_SCRIPT, true)
+  }
 
-function onReload (event, focusedWindow, focusedWebContents) {
+  function onReload (event, focusedWindow, focusedWebContents) {
   // Reload
-  for (const webContents of getContents(focusedWindow)) {
-    webContents.reload()
+    for (const webContents of getContents(focusedWindow)) {
+      webContents.reload()
+    }
   }
-}
 
-function onHardReload (event, focusedWindow, focusedWebContents) {
+  function onHardReload (event, focusedWindow, focusedWebContents) {
   // Hard reload
-  for (const webContents of getContents(focusedWindow)) {
-    webContents.reloadIgnoringCache()
+    for (const webContents of getContents(focusedWindow)) {
+      webContents.reloadIgnoringCache()
+    }
   }
-}
 
-function onGoForward (event, focusedWindow) {
-  for (const webContents of getContents(focusedWindow)) {
-    webContents.goForward()
+  function onGoForward (event, focusedWindow) {
+    for (const webContents of getContents(focusedWindow)) {
+      webContents.goForward()
+    }
   }
-}
 
-function onGoBack (event, focusedWindow) {
-  for (const webContents of getContents(focusedWindow)) {
-    webContents.goBack()
+  function onGoBack (event, focusedWindow) {
+    for (const webContents of getContents(focusedWindow)) {
+      webContents.goBack()
+    }
   }
-}
 
-function getContents (focusedWindow) {
-  const views = focusedWindow.getBrowserViews()
-  if (!views.length) return [focusedWindow.webContents]
-  return views.map(({ webContents }) => webContents)
+  function getContents (focusedWindow) {
+    const views = focusedWindow.getBrowserViews()
+    if (!views.length) return [focusedWindow.webContents]
+    return views.map(({ webContents }) => webContents)
+  }
 }