From de8d6f42601059088a700381cd2f37ec0700221c Mon Sep 17 00:00:00 2001 From: meriadec Date: Wed, 24 Jan 2018 16:13:45 +0100 Subject: [PATCH] Make Windaube builded app work. Need to find a fix for wrongly formatted stored data. --- package.json | 3 ++- scripts/start.sh | 4 ++-- src/main/app.js | 2 +- yarn.lock | 11 +++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 609812d2..7cee2b7c 100644 --- a/package.json +++ b/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", diff --git a/scripts/start.sh b/scripts/start.sh index 6dbdb1ab..1302e516 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,5 +1,5 @@ #/bin/bash concurrently --raw \ - "NODE_ENV=development webpack --watch --config webpack/internals.config.js" \ - "NODE_ENV=development electron-webpack dev" + "cross-env NODE_ENV=development webpack --watch --config webpack/internals.config.js" \ + "cross-env NODE_ENV=development electron-webpack dev" diff --git a/src/main/app.js b/src/main/app.js index 63c7569d..58f4e7e8 100644 --- a/src/main/app.js +++ b/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) diff --git a/yarn.lock b/yarn.lock index 49b07487..ba46849e 100644 --- a/yarn.lock +++ b/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"