fix: windows issues

Author: slon2015

.github/workflows/executable-publish.yml

@@ -34,4 +34,6 @@ jobs:
         with:
           files: |
             desktop-app/out/make/**/*.dmg
+            desktop-app/out/make/**/*.exe
+            desktop-app/out/make/**/*.msi
             desktop-app/out/make/zip/**/*.zip

desktop-app/forge.config.ts

@@ -1,6 +1,7 @@
 import type { ForgeConfig } from "@electron-forge/shared-types";
 import { MakerZIP } from "@electron-forge/maker-zip";
 import { MakerDMG } from "@electron-forge/maker-dmg";
+import { MakerSquirrel } from "@electron-forge/maker-squirrel";
 import { AutoUnpackNativesPlugin } from "@electron-forge/plugin-auto-unpack-natives";
 import { WebpackPlugin } from "@electron-forge/plugin-webpack";
 import { FusesPlugin } from "@electron-forge/plugin-fuses";
@@ -18,13 +19,24 @@ const config: ForgeConfig = {
   },
   rebuildConfig: {},
   makers: [
-    new MakerZIP({}, ["darwin"]),
-    new MakerDMG({
-      name: "Drew Localhost",
-      icon: "./assets/drew-icon.icns",
-      appPath: ".drew-localhost",
-      title: "Drew Localhost",
-    }),
+    new MakerZIP({}, ["darwin", "win32", "win64"]),
+    new MakerSquirrel(
+      {
+        iconUrl: "./assets/drew-icon.icns",
+        title: "Drew Localhost",
+        name: "Drew Localhost",
+      },
+      ["win32", "win64"]
+    ),
+    new MakerDMG(
+      {
+        name: "Drew Localhost",
+        icon: "./assets/drew-icon.icns",
+        appPath: ".drew-localhost",
+        title: "Drew Localhost",
+      },
+      ["darwin"]
+    ),
   ],
   plugins: [
     new AutoUnpackNativesPlugin({}),

desktop-app/package.json

@@ -21,6 +21,7 @@
     "@electron-forge/plugin-auto-unpack-natives": "^7.5.0",
     "@electron-forge/plugin-fuses": "^7.5.0",
     "@electron-forge/plugin-webpack": "^7.5.0",
+    "@electron-forge/shared-types": "^7.5.0",
     "@electron/fuses": "^1.8.0",
     "@types/dockerode": "^3.3.31",
     "@types/fs-extra": "^11.0.4",
@@ -33,11 +34,12 @@
     "eslint": "^8.0.1",
     "eslint-plugin-import": "^2.25.0",
     "fork-ts-checker-webpack-plugin": "^7.2.13",
+    "json-loader": "^0.5.7",
     "node-loader": "^2.0.0",
     "style-loader": "^3.0.0",
     "ts-loader": "^9.2.2",
-    "ts-node": "^10.0.0",
-    "typescript": "~4.5.4"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.6.3"
   },
   "keywords": [],
   "author": {
@@ -46,7 +48,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@drewpackages/host-common": "^1.0.4",
+    "@drewpackages/host-common": "^1.1.0",
     "dockerode": "^4.0.2",
     "electron-squirrel-startup": "^1.0.1",
     "fs-extra": "^11.2.0"

desktop-app/src/index.ts

@@ -9,6 +9,10 @@ import isDev from "electron-is-dev";
 declare const MAIN_WINDOW_WEBPACK_ENTRY: string;
 declare const MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: string;
 
+if (require("electron-squirrel-startup")) {
+  app.quit();
+}
+
 const createWindow = () => {
   // Create the browser window.
   const mainWindow = new BrowserWindow({
@@ -17,6 +21,7 @@ const createWindow = () => {
     webPreferences: {
       preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
     },
+    autoHideMenuBar: true,
   });
 
   const docker = new DockerService();

desktop-app/src/services/deployments/service.ts

@@ -1,8 +1,8 @@
 import { FormulaExecutionDump } from "@drewpackages/host-common";
 import { DumpDeployerService } from "../dump-deployer/service";
 import { DeployedDappsStore, DeploymentStatus } from "./type";
-import { normalize, join } from "node:path";
-import { readFile, exists, writeFile } from "fs-extra";
+import { normalize, join, dirname } from "node:path";
+import { readFile, exists, writeFile, mkdir, pathExists } from "fs-extra";
 import { app } from "electron";
 import { DockerService } from "../docker/service";
 import { DappMarketplaceService } from "../marketplace/service";
@@ -31,6 +31,12 @@ export class DeploymentsService {
   private async persistDeployedDappsStote(
     store: DeployedDappsStore
   ): Promise<void> {
+    const dappsFileDir = dirname(DEPLOYED_DAPPS_STORE_PATH);
+
+    if (!(await pathExists(dappsFileDir))) {
+      await mkdir(dappsFileDir, { recursive: true });
+    }
+
     await writeFile(DEPLOYED_DAPPS_STORE_PATH, JSON.stringify(store, null, 2));
   }
 

desktop-app/src/services/dump-deployer/fetcher.ts

@@ -1,10 +1,15 @@
 import { normalize, join } from "node:path";
 import { app } from "electron";
+import { existsSync, mkdirSync } from "fs-extra";
 
 export const FORMULAS_DIR = normalize(
   join(app.getPath("appData"), `/.drew-localhost/formulas`)
 );
 
+if (!existsSync(FORMULAS_DIR)) {
+  mkdirSync(FORMULAS_DIR, { recursive: true });
+}
+
 export function getFormulaPath(formulaName: string): string {
   return normalize(join(FORMULAS_DIR, formulaName));
 }

desktop-app/src/services/marketplace/service.ts

@@ -15,9 +15,7 @@ export class DappMarketplaceService {
     dappId: string
   ): Promise<FormulaExecutionDump | "not-provided"> {
     try {
-      const { default: dump }: { default: FormulaExecutionDump } = await import(
-        `../../dapps/dumps/${dappId}.json`
-      );
+      const dump = await require(`../../dapps/dumps/${dappId}.json`);
       return dump;
     } catch {
       return "not-provided";

desktop-app/webpack.rules.ts

@@ -19,7 +19,7 @@ export const rules: Required<ModuleOptions>["rules"] = [
     },
   },
   {
-    test: /\.tsx?$/,
+    test: [/\.tsx?$/, /\.json$/],
     exclude: /(node_modules|\.webpack)/,
     use: {
       loader: "ts-loader",

ui/src/index.css

@@ -4,4 +4,10 @@
   @tailwind base;
 }
 @tailwind components;
-@tailwind utilities;
+@tailwind utilities;
+
+html,
+body {
+  max-width: 100%;
+  overflow-x: hidden;
+}