Merge pull request #241 from dicekeys/build-with-electron-forge

Updates for 1.0

Author: UppaJung

.github/workflows/ci.js.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
 
     steps:

.gitignore

@@ -24,5 +24,12 @@ electron/electron-js/
 electron/electron-html/
 electron/out/
 
+
+electron-forge/electron-js/
+electron-forge/electron-html/
+
 # buildinfo files
-*.tsbuildinfo
+*.tsbuildinfo
+
+electron-forge/forge.config.js
+electron-forge/out

.vscode/settings.json

@@ -29,6 +29,7 @@
         "erline",
         "examplesuffixattack",
         "field",
+        "gcloud",
         "Googlebot",
         "gsutil",
         "icloud",
@@ -39,6 +40,7 @@
         "keytar",
         "lastpass",
         "Marshallers",
+        "Mersenne",
         "monospace",
         "monospace span",
         "nnext",
@@ -57,6 +59,7 @@
         "reloadable",
         "seedable",
         "setmeta",
+        "Shamir",
         "span",
         "src",
         "stic",
@@ -67,6 +70,7 @@
         "suffixattack",
         "Teoma",
         "tlds",
+        "togglefullscreen",
         "TRBL",
         "ts",
         "tsbuildinfo",
@@ -99,5 +103,6 @@
     ],
     "files.exclude": {
         "**/node_modules": true
-    }
+    },
+    "typescript.preferences.importModuleSpecifier": "relative"
 }

README.md

@@ -116,10 +116,8 @@ We borrow from environments like SwiftUI, which allow you to run and inspect ind
 creating preview HTML files for key components that operate only on the subset of the application state that required for those views.
 
 ```bash
-vite src/preview.html
+npm run preview
 ```
-Then load [http://localhost:3000/](http://localhost:3000/)
-
 
 ### Windows USB device handling
 Windows requires the app to have admin rights in order to list FIDO usb devices and write to them.

common/IElectronBridge.ts

@@ -53,6 +53,7 @@ export type RemoveListener = () => void;
 export interface MainToPrimaryRendererAsyncApi {
   getRecipesToExport: () => Promise<string>;
   loadRandomDiceKey: () => void;
+  loadFromShares: () => void;
   importRecipes: (jsonRecipesToImport: string) => void;
 }
 

common/package-lock.json

@@ -0,0 +1,16 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true
+  },
+    "extends": [
+      "eslint:recommended",
+      "plugin:@typescript-eslint/eslint-recommended",
+      "plugin:@typescript-eslint/recommended",
+      "plugin:import/errors",
+      "plugin:import/warnings",
+      "plugin:import/typescript"
+    ],
+    "parser": "@typescript-eslint/parser"
+}

electron-forge/.eslintrc.json

@@ -0,0 +1 @@
+@dicekeys:registry=https://npm.pkg.github.com

electron-forge/.npmrc

@@ -0,0 +1,88 @@
+const { FusesPlugin } = require('@electron-forge/plugin-fuses');
+const { FuseV1Options, FuseVersion } = require('@electron/fuses');
+
+import type { ForgeConfig } from '@electron-forge/shared-types';
+
+const config: ForgeConfig = {
+  packagerConfig: {
+    icon: "./packaging/icon",
+    extendInfo: {
+      "CFBundleURLSchemes": ["dicekeys"]
+    },
+    osxSign: {
+      "identity": "DiceKeys, LLC (CTDV6HX5KK)",
+      optionsForFile: (filePath) => {
+        // Here, we keep it simple and return a single entitlements.plist file.
+        // You can use this callback to map different sets of entitlements
+        // to specific files in your packaged app.
+        return {
+          entitlements: './packaging/entitlements.mac.plist'
+        };
+      },
+    },
+    osxNotarize: {
+//      tool: 'notarytool',
+      appleId: process.env.APPLE_ID!,
+      appleIdPassword: process.env.APPLE_ID_PASSWORD!,
+      teamId: "CTDV6HX5KK",
+    },
+    asar: true,
+    protocols: [
+      {
+        "name": "Electron Fiddle",
+        "schemes": ["electron-fiddle"]
+      }
+    ],
+  },
+  rebuildConfig: {},
+  makers: [
+    {
+      name: '@electron-forge/maker-squirrel',
+      config: {},
+    },
+    {
+      name: '@electron-forge/maker-zip',
+      platforms: ['darwin'],
+      config: {},
+    },
+    {
+      "name": "@electron-forge/maker-deb",
+      "config": {
+        "mimeType": ["x-scheme-handler/electron-fiddle"]
+      }
+    },
+    {
+      name: '@electron-forge/maker-rpm',
+      config: {},
+    }, {
+      name: '@electron-forge/maker-dmg',
+      config: {
+        "format": "ULMO",
+        "icon": "./packaging/icon.icns",
+        "background": "./packaging/dmg/background.tiff",
+        "debug": true,
+      }
+    },    
+  ],
+  plugins: [
+    {
+      name: '@electron-forge/plugin-auto-unpack-natives',
+      config: {},
+    },
+    // Fuses are used to enable/disable various Electron functionality
+    // at package time, before code signing the application
+    new FusesPlugin({
+      version: FuseVersion.V1,
+      [FuseV1Options.RunAsNode]: false,
+      [FuseV1Options.EnableCookieEncryption]: true,
+      [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
+      [FuseV1Options.EnableNodeCliInspectArguments]: false,
+      [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
+      [FuseV1Options.OnlyLoadAppFromAsar]: true,
+    }),
+  ]
+};
+
+const {packagerConfig, rebuildConfig, makers, plugins} = config;
+
+export {packagerConfig, rebuildConfig, makers, plugins}