refactor: context isolation via preload script

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

config/webpack.config.main.base.ts

@@ -12,7 +12,10 @@ const configuration: webpack.Configuration = {
 
   target: 'electron-main',
 
-  entry: [path.join(webpackPaths.srcMainPath, 'main.ts')],
+  entry: {
+    main: path.join(webpackPaths.srcMainPath, 'main.ts'),
+    preload: path.join(webpackPaths.srcMainPath, 'preload.ts'),
+  },
 
   output: {
     path: webpackPaths.buildPath,

config/webpack.config.preload.base.ts

@@ -10,7 +10,7 @@ const configuration: webpack.Configuration = {
 
   mode: 'development',
 
-  target: 'electron-main',
+  target: 'electron-preload',
 
   entry: [path.join(webpackPaths.srcMainPath, 'preload.ts')],
 

config/webpack.config.renderer.base.ts

@@ -15,7 +15,7 @@ const configuration: webpack.Configuration = {
 
   mode: 'development',
 
-  target: 'electron-renderer',
+  target: ['web', 'electron-renderer'],
 
   entry: [path.join(webpackPaths.srcRendererPath, 'index.tsx')],
 

src/main/main.ts

@@ -21,12 +21,11 @@ const browserWindowOpts = {
   minHeight: 400,
   resizable: false,
   skipTaskbar: true, // Hide the app from the Windows taskbar
-  // TODO #700 refactor to use preload script with a context bridge
   webPreferences: {
     preload: path.join(__dirname, 'preload.js'),
-    contextIsolation: true, // TODO change this
+    contextIsolation: true,
     enableRemoteModule: false,
-    nodeIntegration: false, // TODO change this
+    nodeIntegration: false,
   },
 };
 

src/main/preload.ts

@@ -5,9 +5,6 @@ import { Constants } from '../renderer/utils/constants';
 import type { GitifyAPI } from './types';
 
 const api: GitifyAPI = {
-  // Define the global variable
-  global: globalThis,
-
   openExternalLink: (url) =>
     ipcRenderer.send(namespacedEvent('open-external-link'), url),
 

src/main/types.ts

@@ -1,5 +1,4 @@
 export interface GitifyAPI {
-  global: typeof globalThis;
   openExternalLink: (url: string) => void;
   getAppVersion: () => Promise<string>;
   encryptValue: (value: string) => Promise<string>;