From 325c9867b23a1d88e06a53c9ff9475b8e14f29c6 Mon Sep 17 00:00:00 2001 From: Jhonatan Date: Mon, 15 Jun 2020 00:53:43 -0300 Subject: [PATCH] fix(electron-builder): icon release not working --- README.md | 2 +- electron-builder.json | 51 ++++++++++++++++++ main-process/main-window/main-window.ts | 7 +-- package.json | 41 -------------- {resources => src/assets}/icons/1024x1024.png | Bin {resources => src/assets}/icons/128x128.png | Bin {resources => src/assets}/icons/16x16.png | Bin {resources => src/assets}/icons/24x24.png | Bin {resources => src/assets}/icons/256x256.png | Bin {resources => src/assets}/icons/32x32.png | Bin {resources => src/assets}/icons/48x48.png | Bin {resources => src/assets}/icons/512x512.png | Bin {resources => src/assets}/icons/64x64.png | Bin {resources => src/assets}/icons/96x96.png | Bin {resources => src/assets/icons}/icon.icns | Bin {resources => src/assets/icons}/icon.ico | Bin {resources => src/assets/icons}/icon.png | Bin 17 files changed, 56 insertions(+), 45 deletions(-) create mode 100644 electron-builder.json rename {resources => src/assets}/icons/1024x1024.png (100%) rename {resources => src/assets}/icons/128x128.png (100%) rename {resources => src/assets}/icons/16x16.png (100%) rename {resources => src/assets}/icons/24x24.png (100%) rename {resources => src/assets}/icons/256x256.png (100%) rename {resources => src/assets}/icons/32x32.png (100%) rename {resources => src/assets}/icons/48x48.png (100%) rename {resources => src/assets}/icons/512x512.png (100%) rename {resources => src/assets}/icons/64x64.png (100%) rename {resources => src/assets}/icons/96x96.png (100%) rename {resources => src/assets/icons}/icon.icns (100%) rename {resources => src/assets/icons}/icon.ico (100%) rename {resources => src/assets/icons}/icon.png (100%) diff --git a/README.md b/README.md index ce5bb9c..3ac5cfa 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- WebView Angular Electron + WebView Angular Electron

diff --git a/electron-builder.json b/electron-builder.json new file mode 100644 index 0000000..f9f2559 --- /dev/null +++ b/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" + } + } +} diff --git a/main-process/main-window/main-window.ts b/main-process/main-window/main-window.ts index e66cefc..3b0ad8c 100644 --- a/main-process/main-window/main-window.ts +++ b/main-process/main-window/main-window.ts @@ -18,8 +18,6 @@ export class MainWindow { const size = electronScreen.getPrimaryDisplay().workAreaSize; - const icon = path.join(__dirname, '..', '..', 'resources', 'icon.png'); - // Create the browser window. this.browserWindow = new BrowserWindow({ x: 0, @@ -27,7 +25,6 @@ export class MainWindow { width: size.width, height: size.height, title: app.getName(), - icon, alwaysOnTop: false, webPreferences: { nodeIntegration: true, @@ -65,9 +62,13 @@ export class MainWindow { require('electron-reload')(__dirname + '../../', { electron: require(`${__dirname}/../../node_modules/electron`) }); + 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'), protocol: 'file:', diff --git a/package.json b/package.json index e1ca41d..16fcc48 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "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 .", - "package": "npm run build:prod && electron-builder build --publish never", "electron:linux": "npm run build:prod && electron-builder build --linux", "electron:windows": "npm run build:prod && electron-builder build --win --x64", "electron:mac": "npm run build:prod && electron-builder build --mac", @@ -89,45 +88,5 @@ "hooks": { "commit-msg": "commitlint -E HUSKY_GIT_PARAMS && npm run lint" } - }, - "build": { - "appId": "com.jhonatanmedeiros.webview-angular-electron", - "productName": "Webview Angular Electron", - "copyright": "Copyright © 2020 ${author}", - "dmg": { - "contents": [ - { - "x": 130, - "y": 220 - }, - { - "x": 410, - "y": 220, - "type": "link", - "path": "/Applications" - } - ] - }, - "win": { - "target": [ - "nsis", - "msi" - ] - }, - "linux": { - "category": "Development", - "packageCategory": "Development", - "target": [ - "deb", - "snap", - "AppImage" - ], - "desktop": { - "Encoding": "UTF-8" - } - }, - "directories": { - "buildResources": "resources" - } } } diff --git a/resources/icons/1024x1024.png b/src/assets/icons/1024x1024.png similarity index 100% rename from resources/icons/1024x1024.png rename to src/assets/icons/1024x1024.png diff --git a/resources/icons/128x128.png b/src/assets/icons/128x128.png similarity index 100% rename from resources/icons/128x128.png rename to src/assets/icons/128x128.png diff --git a/resources/icons/16x16.png b/src/assets/icons/16x16.png similarity index 100% rename from resources/icons/16x16.png rename to src/assets/icons/16x16.png diff --git a/resources/icons/24x24.png b/src/assets/icons/24x24.png similarity index 100% rename from resources/icons/24x24.png rename to src/assets/icons/24x24.png diff --git a/resources/icons/256x256.png b/src/assets/icons/256x256.png similarity index 100% rename from resources/icons/256x256.png rename to src/assets/icons/256x256.png diff --git a/resources/icons/32x32.png b/src/assets/icons/32x32.png similarity index 100% rename from resources/icons/32x32.png rename to src/assets/icons/32x32.png diff --git a/resources/icons/48x48.png b/src/assets/icons/48x48.png similarity index 100% rename from resources/icons/48x48.png rename to src/assets/icons/48x48.png diff --git a/resources/icons/512x512.png b/src/assets/icons/512x512.png similarity index 100% rename from resources/icons/512x512.png rename to src/assets/icons/512x512.png diff --git a/resources/icons/64x64.png b/src/assets/icons/64x64.png similarity index 100% rename from resources/icons/64x64.png rename to src/assets/icons/64x64.png diff --git a/resources/icons/96x96.png b/src/assets/icons/96x96.png similarity index 100% rename from resources/icons/96x96.png rename to src/assets/icons/96x96.png diff --git a/resources/icon.icns b/src/assets/icons/icon.icns similarity index 100% rename from resources/icon.icns rename to src/assets/icons/icon.icns diff --git a/resources/icon.ico b/src/assets/icons/icon.ico similarity index 100% rename from resources/icon.ico rename to src/assets/icons/icon.ico diff --git a/resources/icon.png b/src/assets/icons/icon.png similarity index 100% rename from resources/icon.png rename to src/assets/icons/icon.png