Merge pull request #86 from seopei/update-to-electron-builder

Update to electron-builder

electron-builder.json

@@ -1,10 +1,25 @@
 {
+  "productName": "angular-electron",
   "directories": {
     "app": "dist",
     "output": "app-builds"
   },
   "win": {
     "icon": "dist/favicon",
-        "target": ["portable"]
+    "target": [
+      "portable"
+    ]
+  },
+  "mac": {
+    "icon": "dist/favicon",
+    "target": [
+      "dmg"
+    ]
+  },
+  "linux": {
+    "icon": "dist/favicon",
+    "target": [
+      "AppImage"
+    ]
   }
 }

package.js

@@ -1,60 +0,0 @@
-"use strict";
-
-var packager = require('electron-packager');
-const pkg = require('./package.json');
-const argv = require('minimist')(process.argv.slice(1));
-
-const appName = argv.name || pkg.name;
-const buildVersion = pkg.version || '1.0';
-const shouldUseAsar = argv.asar || false;
-const shouldBuildAll = argv.all || false;
-const arch = argv.arch || 'all';
-const platform = argv.platform || 'darwin';
-
-const DEFAULT_OPTS = {
-    dir: './dist',
-    name: appName,
-    asar: shouldUseAsar,
-    buildVersion: buildVersion
-};
-
-
-pack(platform, arch, function done(err, appPath) {
-    if (err) {
-        console.log(err);
-    } else {
-        console.log('Application packaged successfuly!', appPath);
-    }
-
-});
-
-function pack(plat, arch, cb) {
-    // there is no darwin ia32 electron
-    if (plat === 'darwin' && arch === 'ia32') return;
-
-    let icon = 'src/favicon';
-
-    if (icon) {
-        DEFAULT_OPTS.icon = icon + (() => {
-            let extension = '.png';
-            if (plat === 'darwin') {
-                extension = '.icns';
-            } else if (plat === 'win32') {
-                extension = '.ico';
-            }
-            return extension;
-        })();
-    }
-
-    const opts = Object.assign({}, DEFAULT_OPTS, {
-        platform: plat,
-        arch,
-        prune: true,
-        overwrite: true,
-        all: shouldBuildAll,
-        out: `app-builds`
-    });
-
-    console.log(opts)
-    packager(opts, cb);
-}

package.json

@@ -29,10 +29,9 @@
     "electron:test": "electron ./dist",
     "electron:dev": "npm run build && electron ./dist",
     "electron:prod": "npm run build:prod && electron ./dist",
-    "electron:linux": "npm run build:prod && node package.js --asar --platform=linux --arch=x64",
+    "electron:linux": "npm run build:prod && npx electron-builder build --linux",
-    "electron:windows": "npm run build:prod && node package.js --asar --platform=win32 --arch=ia32",
+    "electron:windows": "npm run build:prod && npx electron-builder build --windows",
-    "electron:winportable": "npm run build:prod && npx electron-builder build --windows",
+    "electron:mac": "npm run build:prod && npx electron-builder build --mac",
-    "electron:mac": "npm run build:prod && node package.js --asar --platform=darwin --arch=x64",
     "test": "karma start ./karma.conf.js",
     "pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build",
     "e2e": "protractor ./protractor.conf.js"
@@ -68,7 +67,6 @@
     "cssnano": "3.10.0",
     "electron": "1.7.8",
     "electron-builder": "19.45.4",
-    "electron-packager": "9.1.0",
     "electron-reload": "1.2.1",
     "exports-loader": "0.6.4",
     "file-loader": "1.1.5",

webpack.config.js

@@ -111,7 +111,7 @@ function getPlugins() {
       "context": "src",
       "to": "",
       "from": {
-        "glob": "favicon.ico",
+        "glob": "favicon.*",
         "dot": true
       }
     }