Update to version 0.10.1

4 files changed, 18 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ddca4abfe26..32f50d3a7578 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,25 @@
 pkgbase = daedalus
 	pkgdesc = Cryptocurrency wallet
-	pkgver = 0.9.1
+	pkgver = 0.10.1
 	pkgrel = 1
 	url = https://github.com/input-output-hk/daedalus
 	arch = any
 	license = MIT
 	makedepends = asar
 	makedepends = git
+	makedepends = nodejs-lts-carbon
 	makedepends = npm
 	makedepends = python2
 	depends = cardano-sl
 	depends = electron
-	source = git+https://github.com/input-output-hk/daedalus.git#commit=cd19ef984bce3ff27fd08e792d09c1ecd262716e
+	source = git+https://github.com/input-output-hk/daedalus.git#commit=53caf28e54d5baa86438ec72077c41d504aacd20
 	source = daedalus.desktop
 	source = daedalus.js
 	source = no-check-dev-engines.patch
-	source = use-system-electron.patch
 	sha256sums = SKIP
 	sha256sums = 965733a8cdbd1f983ce66413908da6da1ebfaa9e73e5a949620aa6347d2db294
 	sha256sums = 8e2b172d2ebcf172135d9fffb25b8c2ab0319e9abbbba0f0827381e9bd043cab
-	sha256sums = 43195e9a8073dc9bbf6285d918b4e496d715a5cc5eb0991abb17871724e5358b
-	sha256sums = b91eda12b173fab3c2e0523a2c10556a63852f32c0fd6a4df3db5cb04d03b8ce
+	sha256sums = f59cfbb07ec62a2f9a4f9c34a8b53575e7bdb2c0749e56d4479395adfcacbbdb
 
 pkgname = daedalus
 
diff --git a/PKGBUILD b/PKGBUILD
index d63227c54be3..1363e91f8736 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,35 @@
 # Maintainer: Nicola Squartini <tensor5@gmail.com>
 
 pkgname=daedalus
-pkgver=0.9.1
-_commit=cd19ef984bce3ff27fd08e792d09c1ecd262716e
+pkgver=0.10.1
+_commit=53caf28e54d5baa86438ec72077c41d504aacd20
 pkgrel=1
 pkgdesc='Cryptocurrency wallet'
 arch=('any')
 url='https://github.com/input-output-hk/daedalus'
 license=('MIT')
 depends=('cardano-sl' 'electron')
-makedepends=('asar' 'git' 'npm' 'python2')
+makedepends=('asar' 'git' 'nodejs-lts-carbon' 'npm' 'python2')
 source=("git+https://github.com/input-output-hk/daedalus.git#commit=${_commit}"
         "${pkgname}.desktop"
         "${pkgname}.js"
-        'no-check-dev-engines.patch'
-        'use-system-electron.patch')
+        'no-check-dev-engines.patch')
 sha256sums=('SKIP'
             '965733a8cdbd1f983ce66413908da6da1ebfaa9e73e5a949620aa6347d2db294'
             '8e2b172d2ebcf172135d9fffb25b8c2ab0319e9abbbba0f0827381e9bd043cab'
-            '43195e9a8073dc9bbf6285d918b4e496d715a5cc5eb0991abb17871724e5358b'
-            'b91eda12b173fab3c2e0523a2c10556a63852f32c0fd6a4df3db5cb04d03b8ce')
+            'f59cfbb07ec62a2f9a4f9c34a8b53575e7bdb2c0749e56d4479395adfcacbbdb')
 
 prepare() {
     cd ${pkgname}
 
     patch -Np1 -i ../no-check-dev-engines.patch
-    patch -Np1 -i ../use-system-electron.patch
 }
 
 build() {
     cd ${pkgname}
 
     PYTHON=python2 npm install
-    npm run build
+    NODE_ENV=production npm run build
 }
 
 package() {
@@ -40,13 +37,8 @@ package() {
 
     appdir=/usr/lib/${pkgname}
     install -Dm644 -t "${pkgdir}${appdir}" package.json
-    install -Dm644 -t "${pkgdir}${appdir}/app" app/index.html
-    install -Dm644 -t "${pkgdir}${appdir}/dist" dist/*
-
-    cd ${pkgdir}${appdir}
-    npm install electron-store source-map-support
-    rm package-lock.json
-    cd "${srcdir}/${pkgname}"
+    install -Dm644 -t "${pkgdir}${appdir}/dist/main" dist/main/*
+    install -Dm644 -t "${pkgdir}${appdir}/dist/renderer" dist/renderer/*
 
     asar pack "${pkgdir}${appdir}" "${pkgdir}/usr/lib/daedalus.asar"
     rm -r "${pkgdir}${appdir}"
diff --git a/no-check-dev-engines.patch b/no-check-dev-engines.patch
index 46b06a416c66..2dc02f408e8b 100644
--- a/no-check-dev-engines.patch
+++ b/no-check-dev-engines.patch
@@ -1,10 +1,10 @@
 --- a/package.json
 +++ b/package.json
-@@ -16,7 +16,6 @@
-     "start-debug-hot": "npm run start-hot -- --debug=5858",
-     "package": "cross-env NODE_ENV=production node -r babel-register -r babel-polyfill webpack/package.js",
+@@ -14,7 +14,6 @@
+     "debug": "gulp debug",
+     "package": "gulp build && cross-env NODE_ENV=production node -r babel-register -r babel-polyfill scripts/package.js",
      "package-all": "npm run package -- --all",
 -    "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
-     "preinstall": "which electron || npm install electron@1.7.11",
-     "dev": "npm run purge-translations && concurrently --kill-others \"npm run hot-server\" \"npm run start-hot\"",
-     "debug": "concurrently --kill-others \"npm run hot-server\" \"npm run start-debug-hot\" \"electron-inspector\"",
+     "cleanup": "mop -v",
+     "cucumber": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 cucumber-js --compiler js:babel-register --format 'progress-bar' --format-options '{\"snippetInterface\": \"synchronous\"}' --tags 'not @skip'",
+     "cucumber-watch": "npm run cucumber -- --tags @watch",
diff --git a/use-system-electron.patch b/use-system-electron.patch
deleted file mode 100644
index 4122d6b268b1..000000000000
--- a/use-system-electron.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -67,9 +64,7 @@
-     "cucumber": "3.1.0",
-     "del": "2.2.2",
-     "devtron": "1.4.0",
--    "electron": "1.7.11",
-     "electron-devtools-installer": "2.2.1",
--    "electron-inspector": "0.1.4",
-     "electron-packager": "9.1.0",
-     "electron-rebuild": "1.6.0",
-     "eslint": "3.18.0",