Merge pull request #26 from andrerfneves/hotfix/mac-build-pipeline

chore: add icon to mac build options

.babelrc

@@ -4,6 +4,7 @@
     "@babel/plugin-transform-regenerator",
     "@babel/plugin-proposal-class-properties",
     "@babel/plugin-proposal-object-rest-spread",
-    "@babel/plugin-proposal-optional-chaining"
+    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-syntax-dynamic-import"
   ]
 }

app/redux/create.js

@@ -2,12 +2,12 @@
 
 import { createStore, applyMiddleware, compose } from 'redux';
 import { routerMiddleware } from 'connected-react-router';
-import { createBrowserHistory } from 'history';
+import { createHashHistory } from 'history';
 import thunk from 'redux-thunk';
 
 import { createRootReducer } from './modules/reducer';
 
-export const history = createBrowserHistory();
+export const history = createHashHistory();
 
 const shouldEnableDevTools = (process.env.NODE_ENV !== 'production'
     || process.env.NODE_ENV !== 'staging')

config/main.js

@@ -0,0 +1,5 @@
+const path = require('path');
+
+const appRoot = path.join(__dirname, '..');
+
+require('electron-compile').init(appRoot, require.resolve('./electron'));

config/webpack-prod.config.js

@@ -8,7 +8,7 @@ module.exports = {
     path: outputPath,
     filename: 'bundle.js',
     chunkFilename: '[name].chunk.js',
-    publicPath: '/',
+    publicPath: './',
   },
   ...mainWebpack,
 };

index.js

@@ -1,2 +0,0 @@
-require('@babel/register');
-require('./config/electron');

package.json

@@ -2,7 +2,7 @@
   "name": "zec-react-wallet",
   "version": "0.1.1",
   "description": "Zcash Reference Wallet",
-  "main": "index.js",
+  "main": "config/main.js",
   "license": "MIT",
   "scripts": {
     "start": "concurrently \"cross-env BROWSER=none yarn dev\" \"wait-on http://0.0.0.0:8080 && yarn electron:dev\"",
@@ -32,10 +32,10 @@
   "private": true,
   "devDependencies": {
     "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/plugin-proposal-optional-chaining": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-regenerator": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
@@ -48,13 +48,12 @@
     "docz": "0.13.4",
     "docz-plugin-css": "^0.11.0",
     "docz-theme-default": "0.13.4",
-    "electron": "^3.0.13",
-    "electron-builder": "^20.36.2",
+    "electron": "^4.0.0",
+    "electron-builder": "^20.38.4",
+    "electron-compilers": "^5.9.0",
     "electron-icon-maker": "^0.0.4",
-    "electron-is-dev": "^1.0.1",
     "electron-log": "^2.2.17",
     "electron-positioner": "^4.1.0",
-    "electron-updater": "^4.0.4",
     "eslint": "^5.8.0",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-plugin-flowtype": "^3.2.0",
@@ -87,13 +86,17 @@
     "webpack-dev-server": "^3.1.1"
   },
   "dependencies": {
+    "@babel/core": "^7.0.0",
     "@babel/polyfill": "^7.0.0",
     "@babel/register": "^7.0.0",
     "autoprefixer": "^9.3.1",
     "connected-react-router": "^5.0.1",
     "date-fns": "^1.30.1",
     "dotenv": "^6.2.0",
+    "electron-compile": "^6.4.4",
     "electron-store": "^2.0.0",
+    "electron-updater": "^4.0.4",
+    "electron-is-dev": "^1.0.1",
     "eres": "^1.0.1",
     "got": "^9.3.2",
     "history": "^4.7.2",
@@ -128,9 +131,23 @@
       "output": "dist"
     },
     "files": [
-      "./index.js",
-      "./build/**/*",
-      "./node_modules/**/*"
+      "node_modules/",
+      "services/",
+      "config/",
+      "utils/",
+      "app/",
+      "bin/",
+      "public/",
+      "build/"
+    ],
+    "extraFiles": [
+      {
+        "from": "bin/",
+        "to": "resources/bin",
+        "filter": [
+          "**/*"
+        ]
+      }
     ],
     "linux": {
       "icon": "./build/icons/png",
@@ -144,7 +161,12 @@
       "target": [
         "pkg",
         "dmg"
-      ]
+      ],
+      "icon": "./build/icons/mac/icon.icns"
+    },
+    "win": {
+      "target": "nsis",
+      "icon": "./build/icons/win/icon.ico"
     }
   },
   "jest": {