Merge branch 'release/1.0.1'

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.0.1](https://github.com/JhonatanMedeiros/webview-angular-electron/compare/1.0.0...1.0.1) (2020-06-15)
+
+
+### Bug Fixes
+
+* **electron-builder:** icon release not working ([325c986](https://github.com/JhonatanMedeiros/webview-angular-electron/commit/325c9867b23a1d88e06a53c9ff9475b8e14f29c6))
+
+
+
 # 1.0.0 (2020-05-24)
 
 

README.md

@@ -1,13 +1,26 @@
-[![Angular Logo](https://www.vectorlogo.zone/logos/angular/angular-icon.svg)](https://angular.io/) [![Electron Logo](https://www.vectorlogo.zone/logos/electronjs/electronjs-icon.svg)](https://electronjs.org/)
-
-![Maintained][maintained-badge]
-[![Make a pull request][prs-badge]][prs]
-[![License](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENSE.md)
+<p align="center">
+  <img width="30%" src="./src/assets/icons/icon.png" alt="WebView Angular Electron"/>
+</p>
+
+<p align="center">
+  <a aria-label="Maintained" href="https://img.shields.io/badge/maintained-yes-brightgreen">
+    <img src="https://img.shields.io/badge/maintained-yes-brightgreen"></img>
+  </a>
+  <a aria-label="Make a pull request" href="http://makeapullrequest.com">
+    <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat"></img>
+  </a>
+  <a aria-label="License" href="https://github.com/JhonatanMedeiros/webview-angular-electron/blob/master/LICENSE">
+    <img src="http://img.shields.io/badge/Licence-MIT-brightgreen.svg"></img>
+  </a>
+</p>
+<br>
 
 # WebView Angular Electron
 
 ## 🖥 Introduction
 
+The WebView Angular Electron is a Desktop Application, to manage multiples webview  
+
 WebView Angular Electron with Angular 9 and Electron 8 (Typescript + SASS + Hot Reload) for Desktop applications.
 
 Currently, runs with:

electron-builder.json

@@ -0,0 +1,51 @@
+{
+  "appId": "com.jhonatanmedeiros.webview-angular-electron",
+  "productName": "Webview Angular Electron",
+  "artifactName": "WebviewAngularElectron-${version}-${os}-${arch}.${ext}",
+  "copyright": "Copyright © 2020 ${author}",
+  "directories": {
+    "output": "release/"
+  },
+  "files": [
+    "**/*",
+    "!**/*.ts",
+    "!*.code-workspace",
+    "!LICENSE.md",
+    "!package.json",
+    "!package-lock.json",
+    "!src/",
+    "!e2e/",
+    "!hooks/",
+    "!angular.json",
+    "!_config.yml",
+    "!karma.conf.js",
+    "!tsconfig.json",
+    "!tslint.json"
+  ],
+  "win": {
+    "icon": "dist/webview-angular-electron/assets/icons",
+    "target": [
+      "nsis",
+      "msi"
+    ]
+  },
+  "mac": {
+    "icon": "dist/webview-angular-electron/assets/icons",
+    "target": [
+      "dmg"
+    ]
+  },
+  "linux": {
+    "icon": "dist/webview-angular-electron/assets/icons",
+    "category": "Development",
+    "packageCategory": "Development",
+    "target": [
+      "deb",
+      "snap",
+      "AppImage"
+    ],
+    "desktop": {
+      "Encoding": "UTF-8"
+    }
+  }
+}

main-process/main-window/main-window.ts

@@ -8,6 +8,7 @@ export class MainWindow {
 
   browserWindow: BrowserWindow = null;
   serve = args.some(val => val === '--serve');
+  port = args.some(val => val === '--port');
 
   constructor() {
     this.createWindow();
@@ -31,11 +32,6 @@ export class MainWindow {
       },
     });
 
-    if (process.platform === 'linux') {
-      const icon = path.join(__dirname, '../../src/assets/electron-logo.png');
-      this.browserWindow.setIcon(icon);
-    }
-
     this.initURL();
 
     // Emitted when the window is closed.
@@ -66,11 +62,15 @@ export class MainWindow {
       require('electron-reload')(__dirname + '../../', {
         electron: require(`${__dirname}/../../node_modules/electron`)
       });
-      this.browserWindow.loadURL('http://localhost:4200');
+      const icon = path.join(__dirname, '..', '..', 'src', 'assets', 'icons', 'icon.png');
+      this.browserWindow.setIcon(icon);
+      this.browserWindow.loadURL(`http://localhost:${this.port || 4200}`);
 
     } else {
+      const icon = path.join(__dirname, '..', '..', 'dist', 'webview-angular-electron', 'assets', 'icons', 'icon.png');
+      this.browserWindow.setIcon(icon);
       this.browserWindow.loadURL(url.format({
-        pathname: path.join(__dirname, '/../../dist/webview-angular-electron/index.html'),
+        pathname: path.join(__dirname, '..', '..', 'dist', 'webview-angular-electron', 'index.html'),
         protocol: 'file:',
         slashes: true
       }));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webview-angular-electron",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Manage multiples WebView with Angular e Electron",
   "author": {
     "email": "[email protected]",
@@ -10,17 +10,17 @@
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
     "ng": "ng",
-    "start": "npm-run-all -p electron:serve ng:serve",
+    "start": "npm-run-all -p electron:serve ng:serve --",
     "build": "npm run electron:serve-tsc && ng build --base-href ./",
     "build:dev": "npm run build --",
     "build:prod": "npm run build -- --prod",
-    "ng:serve": "ng serve",
-    "ng:serve:web": "npm run ng:serve",
+    "ng:serve": "ng serve -- --port=4200",
+    "ng:serve:web": "npm run ng:serve --",
     "electron:serve-tsc": "tsc -p tsconfig-serve.json",
     "electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve",
     "electron:local": "npm run build:prod && electron .",
     "electron:linux": "npm run build:prod && electron-builder build --linux",
-    "electron:windows": "npm run build:prod && electron-builder build --windows",
+    "electron:windows": "npm run build:prod && electron-builder build --win --x64",
     "electron:mac": "npm run build:prod && electron-builder build --mac",
     "release": "node scripts/release.js",
     "release:changelog": "standard-changelog",
@@ -88,36 +88,5 @@
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS && npm run lint"
     }
-  },
-  "build": {
-    "appId": "com.jhonatanmedeiros.webview-angular-electron",
-    "productName": "Webview Angular Electron",
-    "linux": {
-      "category": "Development",
-      "packageCategory": "Development",
-      "target": [
-        {
-          "target": "deb",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "target": "snap",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64"
-          ]
-        }
-      ],
-      "desktop": {
-        "Encoding": "UTF-8"
-      }
-    }
   }
 }