Merge pull request #47 from meriadec/master

Make Windaube builded app work. Need to find a fix for wrongly format…

package.json

@@ -38,17 +38,18 @@
     "webpack-sources": "1.0.1"
   },
   "dependencies": {
+    "@ledgerhq/common": "2.0.4",
     "@ledgerhq/hw-app-btc": "^1.1.2-beta.068e2a14",
     "@ledgerhq/hw-app-eth": "^1.1.2-beta.068e2a14",
     "@ledgerhq/hw-transport": "^1.1.2-beta.068e2a14",
     "@ledgerhq/hw-transport-node-hid": "^1.1.2-beta.068e2a14",
-    "@ledgerhq/common": "2.0.4",
     "axios": "^0.17.1",
     "bcryptjs": "^2.4.3",
     "bitcoinjs-lib": "^3.3.2",
     "blockchain.info": "^2.11.0",
     "bs58check": "^2.1.1",
     "color": "^2.0.1",
+    "cross-env": "^5.1.3",
     "downshift": "^1.25.0",
     "electron-store": "^1.3.0",
     "electron-updater": "^2.19.1",

scripts/start.sh

@@ -1,5 +1,5 @@
 #/bin/bash
 
 concurrently --raw \
-  "NODE_ENV=development webpack --watch --config webpack/internals.config.js" \
+  "cross-env NODE_ENV=development webpack --watch --config webpack/internals.config.js" \
-  "NODE_ENV=development electron-webpack dev"
+  "cross-env NODE_ENV=development electron-webpack dev"

src/main/app.js

@@ -16,7 +16,7 @@ function createMainWindow() {
           vibrancy: 'ultra-dark', // https://github.com/electron/electron/issues/10521
         }
       : {}),
-    show: false,
+    show: true,
   }
 
   const window = new BrowserWindow(windowOptions)

yarn.lock

@@ -2661,6 +2661,13 @@ crocket@^0.9.11:
   dependencies:
     xpipe "*"
 
+cross-env@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.3.tgz#f8ae18faac87692b0a8b4d2f7000d4ec3a85dfd7"
+  dependencies:
+    cross-spawn "^5.1.0"
+    is-windows "^1.0.0"
+
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -5199,6 +5206,10 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-windows@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
+
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"