Release builds with electron-builder

.gitignore

@@ -2,6 +2,7 @@
 
 # compiled output
 /dist
+/release
 /tmp
 /out-tsc
 # Only exists if Bazel was run

angular.json

@@ -59,12 +59,14 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
+              "baseHref": "./",
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
+              "watch": false,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true

electron-builder.json

@@ -0,0 +1,29 @@
+{
+  "productName": "Bridge",
+  "directories": {
+    "output": "release/"
+  },
+  "files": [
+    "dist/**/*"
+  ],
+  "win": {
+    "icon": "dist/assets/images/system/icons/win/icon.ico",
+    "compression": "store",
+    "target": [
+      "portable"
+    ]
+  },
+  "mac": {
+    "icon": "dist/assets/images/system/icons/mac/icon.icns",
+    "compression": "maximum",
+    "target": [
+      "dmg"
+    ]
+  },
+  "linux": {
+    "compression": "maximum",
+    "target": [
+      "AppImage"
+    ]
+  }
+}

package.json

@@ -1,14 +1,21 @@
 {
   "name": "bridge",
   "version": "0.0.0",
+  "description": "A handy CloneHero library management tool with built in chart searching and downloading.",
+  "homepage": "https://github.com/maximegris/angular-electron",
+  "author": {
+    "name": "Geo",
+    "email": "geomitron@gmail.com"
+  },
   "main": "dist/electron/main.js",
   "scripts": {
     "start": "run-p serve:angular serve:electron",
-    "serve:electron": "wait-on http-get://localhost:4200/ && tsc -p tsconfig.electron.json && electron . --serve",
-    "serve:angular": "ng serve",
     "lint": "ng lint",
-    "clean": "rimraf dist",
+    "clean": "rimraf dist release",
-    "prod:windows": ""
+    "build:windows": "ng build -c production && npm run build:electron && electron-builder build --windows",
+    "serve:angular": "ng serve",
+    "serve:electron": "wait-on http-get://localhost:4200/ && npm run build:electron && electron . --dev",
+    "build:electron": "tsc -p tsconfig.electron.json"
   },
   "private": true,
   "dependencies": {
@@ -31,12 +38,13 @@
     "@angular/language-service": "~8.2.14",
     "@types/node": "~8.9.4",
     "electron": "^7.1.11",
-    "npm-run-all": "^4.1.5",
+    "electron-builder": "^22.3.2",
-    "wait-on": "^4.0.0",
     "electron-reload": "^1.5.0",
+    "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.1",
     "ts-node": "~7.0.0",
     "tslint": "~5.15.0",
-    "typescript": "~3.5.3"
+    "typescript": "~3.5.3",
+    "wait-on": "^4.0.0"
   }
 }

src/assets/images/logo.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 835 445" style="enable-background:new 0 0 835 445;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;}
+</style>
+<path class="st0" d="M5,5L5,5v180c0,41.4,33.6,75,75,75l0,0l0,0c41.4,0,75-33.6,75-75l0,0c0-41.4-33.6-75-75-75l0,0
+	c-41.4,0-75,33.6-75,75"/>
+<path class="st0" d="M185,260L185,260v-75c0-41.4,33.6-75,75-75"/>
+<path class="st0" d="M290,110L290,110v150"/>
+<path class="st0" d="M470,185c0-41.4-33.6-75-75-75l0,0c-41.4,0-75,33.6-75,75l0,0c0,41.4,33.6,75,75,75l0,0
+	C436.4,260,470,226.4,470,185L470,185V5"/>
+<path class="st0" d="M650,185c0,41.4-33.6,75-75,75l0,0c-41.4,0-75-33.6-75-75s33.6-75,75-75S650,143.6,650,185L650,185v180
+	c0,41.4-33.6,75-75,75l0,0c-41.4,0-75-33.6-75-75"/>
+<path class="st0" d="M680,185L680,185h150c0-41.4-33.6-75-75-75S680,143.6,680,185L680,185c0,41.4,33.6,75,75,75"/>
+</svg>

src/electron/main.ts

@@ -7,7 +7,7 @@ import * as url from 'url'
 
 let mainWindow: BrowserWindow
 const args = process.argv.slice(1)
-const isDevBuild = args.some(val => val == '--serve')
+const isDevBuild = args.some(val => val == '--dev')
 
 restrictToSingleInstance()
 handleOSXWindowClosed()
@@ -103,7 +103,7 @@ function createBrowserWindow() {
 function getLoadUrl() {
   return url.format({
     protocol: isDevBuild ? 'http:' : 'file:',
-    pathname: isDevBuild ? '//localhost:4200/' : path.join(__dirname, 'index.html'),
+    pathname: isDevBuild ? '//localhost:4200/' : path.join(__dirname, '..', 'index.html'),
     slashes: true
   })
 }
@@ -115,7 +115,6 @@ function setUpDevTools() {
   require('electron-reload')(__dirname, {
     electron: require(`${__dirname}/../../node_modules/electron`)
   })
-  mainWindow.loadURL('http://localhost:4200')
 
   mainWindow.webContents.openDevTools()
 }

tsconfig.angular.json

@@ -3,10 +3,6 @@
   "include": [
     "src/**/*.ts"
   ],
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "types": []
-  },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true

tsconfig.json

@@ -16,9 +16,7 @@
       "es2016",
       "es2015",
       "dom"
-    ],
+    ]
-
-    "outDir": "dist/electron"
   },
   "include": [
     "src/electron/**/*.ts"