Apple M1 support

packages/insomnia-app/app/common/electron-helpers.ts

@@ -1,4 +1,5 @@
 import * as electron from 'electron';
+import { statSync } from 'fs';
 import mkdirp from 'mkdirp';
 import { join } from 'path';
 
@@ -28,6 +29,25 @@ export function getDataDirectory() {
   return process.env.INSOMNIA_DATA_PATH || app.getPath('userData');
 }
 
+export function getAppPathUniversal() {
+  const { app } = electron.remote || electron;
+
+  const appPath = app.getAppPath();
+
+  if (process.platform !== 'darwin' || !appPath.endsWith('/app.asar')) {
+    return appPath;
+  }
+
+  const archAppPath = appPath.replace(/\/app\.asar$/, `app-${process.arch}.asar`);
+
+  try {
+    statSync(archAppPath);
+    return archAppPath;
+  } catch (e) {
+    return appPath;
+  }
+}
+
 export function getViewportSize(): string | null {
   const { BrowserWindow } = electron.remote || electron;
   const browserWindow = BrowserWindow.getFocusedWindow() || BrowserWindow.getAllWindows()[0];

packages/insomnia-app/app/main/window-utils.ts

@@ -16,7 +16,7 @@ import {
   MNEMONIC_SYM,
 } from '../common/constants';
 import { docsBase } from '../common/documentation';
-import { clickLink, getDataDirectory, restartApp } from '../common/electron-helpers';
+import { clickLink, getAppPathUniversal, getDataDirectory, restartApp } from '../common/electron-helpers';
 import * as log from '../common/log';
 import LocalStorage from './local-storage';
 
@@ -124,7 +124,7 @@ export function createWindow() {
 
   // Load the html of the app.
   const url = process.env.APP_RENDER_URL;
-  const appUrl = url || `file://${app.getAppPath()}/renderer.html`;
+  const appUrl = url || `file://${getAppPathUniversal()}/renderer.html`.replace('app.asar', 'app-arm64.asar');
   console.log(`[main] Loading ${appUrl}`);
   mainWindow?.loadURL(appUrl);
   // Emitted when the window is closed.
@@ -359,7 +359,7 @@ export function createWindow() {
       {
         label: 'Show Open Source Licenses',
         click: () => {
-          const licensePath = path.resolve(app.getAppPath(), '../opensource-licenses.txt');
+          const licensePath = path.resolve(getAppPathUniversal(), '../opensource-licenses.txt');
           shell.openPath(licensePath);
         },
       },

packages/insomnia-app/scripts/package.ts

@@ -55,6 +55,7 @@ const pkg = () => {
   return electronBuilder.build({
     config,
     [targetPlatform]: target,
+    ...targetPlatform === 'mac' ? { universal: true } : {},
   });
 };