Merge with develop

gulpTasks/building.js

@@ -25,6 +25,7 @@ gulp.task('clean-dist', (cb) => {
 
 gulp.task('copy-app-source-files', () => {
     return gulp.src([
+        'node_modules/**',
         './main.js',
         './clientBinaries.json',
         './modules/**',
@@ -107,13 +108,13 @@ gulp.task('build-dist', (cb) => {
         homepage: 'https://github.com/ethereum/mist',
         build: {
             appId: `com.ethereum.${type}`,
-            category: 'public.app-category.productivity',
             asar: true,
             directories: {
                 buildResources: '../build',
                 output: '../dist'
             },
             linux: {
+                category: 'WebBrowser',
                 target: [
                     'zip',
                     'deb'
@@ -124,6 +125,9 @@ gulp.task('build-dist', (cb) => {
                     'zip'
                 ]
             },
+            mac: {
+                category: 'public.app-category.productivity',
+            },
             dmg: {
                 background: '../build/dmg-background.jpg',
                 iconSize: 128,
@@ -171,6 +175,9 @@ gulp.task('build-dist', (cb) => {
             }
         }
     })
+    .catch((err) => {
+        throw new Error(err);
+    })
     .finally(() => {
         cb();
     });
@@ -202,7 +209,7 @@ gulp.task('release-dist', (done) => {
             break;
         case 'mac':
             cp(
-                path.join('mac', `${applicationName}-${version}.dmg`), `${appNameHypen}-macosx-${versionDashed}.dmg`);
+                `${applicationName}-${version}.dmg`, `${appNameHypen}-macosx-${versionDashed}.dmg`);
             break;
         case 'linux':
             cp(

package.json

@@ -45,7 +45,7 @@
     "del": "^2.2.2",
     "ecstatic": "^2.1.0",
     "electron": "1.3.13",
-    "electron-builder": "^12.2.2",
+    "electron-builder": "^17.0.1",
     "eslint": "^3.19.0",
     "eslint-config-airbnb-base": "^11.1.3",
     "eslint-plugin-import": "^2.2.0",