Start trying to build for Windows with electron-builder

Author: pimterry

.github/workflows/ci.yml

@@ -3,8 +3,13 @@ on: push
 jobs:
   build:
     name: Build & test
-    runs-on: ubuntu-latest
-    container: httptoolkit/act-build-base
+    strategy:
+      matrix:
+        os: [
+          "ubuntu-18.04",
+          "windows-2019"
+        ]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
 

.gitignore

@@ -4,4 +4,3 @@ build/
 dist/
 httptoolkit-server/
 appveyor-tools/
-certificates/encrypted-win-cert.pfx

certificates/encrypted-win-cert.pfx.enc

@@ -47,6 +47,11 @@
     "extraResources": [
       "httptoolkit-server/**/*"
     ],
+    "win": {
+      "target": ["nsis"],
+      "icon": "./src/icon.ico",
+      "forceCodeSigning": true
+    },
     "linux": {
       "target": [
         "deb"
@@ -70,7 +75,6 @@
     "@sentry/electron": "^0.17.1",
     "electron-context-menu": "^0.15.1",
     "electron-first-run": "^3.0.0",
-    "electron-squirrel-startup": "^1.0.0",
     "electron-window-state": "^5.0.3",
     "rimraf": "^2.7.1",
     "semver": "^7.2.1",

electron-forge.config.js

@@ -400,26 +400,18 @@ if (!amMainInstance) {
 
     reportStartupEvents();
 
-    if (require('electron-squirrel-startup')) {
-        // We've been opened as part of a Windows install.
-        // squirrel-startup handles all the hard work, we just need to not do anything.
-
-        // Brief delay before quitting, so our analytics register
-        setTimeout(() => app.quit(), 500);
-    } else {
-        cleanupOldServers().catch(console.log)
-        .then(() => startServer())
-        .catch((err) => {
-            console.error('Failed to start server, exiting.', err);
-
-            // Hide immediately, shutdown entirely after a brief pause for Sentry
-            windows.forEach(window => window.hide());
-            setTimeout(() => process.exit(1), 500);
-        });
+    cleanupOldServers().catch(console.log)
+    .then(() => startServer())
+    .catch((err) => {
+        console.error('Failed to start server, exiting.', err);
+
+        // Hide immediately, shutdown entirely after a brief pause for Sentry
+        windows.forEach(window => window.hide());
+        setTimeout(() => process.exit(1), 500);
+    });
 
-        app.on('ready', () => createWindow());
-        // We use a single process instance to manage the server, but we
-        // do allow multiple windows.
-        app.on('second-instance', () => createWindow());
-    }
+    app.on('ready', () => createWindow());
+    // We use a single process instance to manage the server, but we
+    // do allow multiple windows.
+    app.on('second-instance', () => createWindow());
 }

package-lock.json

@@ -2,27 +2,14 @@ import * as isFirstRun from 'electron-first-run';
 import * as setupUA from 'universal-analytics';
 
 /*
-This file tracks some basic metric on app installs, uninstalls
-and usage. All of this is anonymous, and nothing user identifiable
+This file tracks some basic metric on app first run.
+All of this is anonymous, and nothing user identifiable
 is sent, it's only used to get an idea of real world app usage.
 */
 
 export function reportStartupEvents() {
     const analytics = setupUA('UA-117670723-2');
 
-    if (process.platform === 'win32') {
-        const cmd = process.argv[1];
-
-        // Report installer install/update/uninstall events
-        if (cmd === '--squirrel-install') {
-            analytics.event('Setup', 'Install').send();
-        } else if (cmd === '--squirrel-updated') {
-            analytics.event('Setup', 'Update').send();
-        } else if (cmd === '--squirrel-uninstall') {
-            analytics.event('Setup', 'Uninstall').send();
-        }
-    }
-
     if (isFirstRun()) {
         analytics.event('Setup', 'First run', process.platform).send();
     }