Update to 1.0.0-beta6

3 files changed, 24 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0a6a622b944..50f00a7c884a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = responsively
 	pkgdesc = A modified browser built using Electron that helps in responsive web development
-	pkgver = 0.19.1
+	pkgver = 1.0.0.beta.6
 	pkgrel = 1
 	url = https://github.com/responsively-org/responsively-app
 	arch = i686
@@ -12,11 +12,11 @@ pkgbase = responsively
 	makedepends = yarn
 	depends = zlib
 	options = !strip
-	source = https://github.com/responsively-org/responsively-app/archive/v0.19.1.tar.gz
+	source = https://github.com/responsively-org/responsively-app/archive/v1.0.0-beta.6.tar.gz
 	source = responsively.desktop
 	source = fix-build.patch
-	sha512sums = 3eb8d65af7ed22662e8055ca549812c39489e8a862830983783c37792a0143dd6dea171f9526d30048b08b8d6d0f7461bcfa821b209d63ebd1c56d41dd924c56
+	sha512sums = d95e8e4621bcbd9d51f3b08a1aaecedd76676f223f3480352acdfd92290b25c8409a8b5595789a02f4eb82edd01e2561c1cdbeb9b44f0fcd6de7c5cd0a5a29f4
 	sha512sums = eebe6acbb675d8804d87e34f6a005f55268ef8927e7bb1c7199791dfdbd4c3839ffe61ba2e59c23359dc9cbbfd74bed9d9610d0cd71e9961666b8167b3a04c33
-	sha512sums = fcdbf9bcd0b3ad34b43bd16dc1445939f996b2d40a747398ce9a07b03a9129baf788053138b93a47d6c2bfe8623d32e2c325b9f5397da5d28cdfdfaed958e49b
+	sha512sums = SKIP
 
 pkgname = responsively
diff --git a/PKGBUILD b/PKGBUILD
index 05e5f8cab297..886b9ffd3c9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kevin MacMartin <prurigro@gmail.com>
 
 pkgname=responsively
-pkgver=0.19.1
+pkgver=1.0.0.beta.6
 pkgrel=1
 pkgdesc='A modified browser built using Electron that helps in responsive web development'
 url='https://github.com/responsively-org/responsively-app'
@@ -10,33 +10,34 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 depends=('zlib')
 makedepends=('yarn')
 options=('!strip')
+_pkgver="${pkgver/\.beta/-beta}"
 
 source=(
-  "https://github.com/responsively-org/responsively-app/archive/v$pkgver.tar.gz"
+  "https://github.com/responsively-org/responsively-app/archive/v${_pkgver}.tar.gz"
   "$pkgname.desktop"
   'fix-build.patch'
 )
 
 sha512sums=(
-  '3eb8d65af7ed22662e8055ca549812c39489e8a862830983783c37792a0143dd6dea171f9526d30048b08b8d6d0f7461bcfa821b209d63ebd1c56d41dd924c56'
+  'd95e8e4621bcbd9d51f3b08a1aaecedd76676f223f3480352acdfd92290b25c8409a8b5595789a02f4eb82edd01e2561c1cdbeb9b44f0fcd6de7c5cd0a5a29f4'
   'eebe6acbb675d8804d87e34f6a005f55268ef8927e7bb1c7199791dfdbd4c3839ffe61ba2e59c23359dc9cbbfd74bed9d9610d0cd71e9961666b8167b3a04c33'
-  'fcdbf9bcd0b3ad34b43bd16dc1445939f996b2d40a747398ce9a07b03a9129baf788053138b93a47d6c2bfe8623d32e2c325b9f5397da5d28cdfdfaed958e49b'
+  'SKIP'
 )
 
 prepare() {
-  cd $pkgname-app-$pkgver
+  cd $pkgname-app-$_pkgver
   patch -p1 < ../fix-build.patch
 }
 
 build() {
-  cd $pkgname-app-$pkgver/desktop-app
+  cd $pkgname-app-$_pkgver/desktop-app
   yarn install
-  yarn package-linux
+  yarn package
 }
 
 package() {
   install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  cd $pkgname-app-$pkgver/desktop-app
-  install -Dm644 resources/icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm755 release/ResponsivelyApp-${pkgver}.AppImage "$pkgdir/usr/bin/$pkgname"
+  cd $pkgname-app-$_pkgver/desktop-app
+  install -Dm644 assets/icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm755 release/build/ResponsivelyApp-${_pkgver}.AppImage "$pkgdir/usr/bin/$pkgname"
 }
diff --git a/fix-build.patch b/fix-build.patch
index fce26f07d1ef..000e4953f17a 100644
--- a/fix-build.patch
+++ b/fix-build.patch
@@ -1,31 +1,12 @@
 diff --git a/desktop-app/package.json b/desktop-app/package.json
-index 9ff6d1c..15827c5 100644
+index 93a5643..3595178 100644
 --- a/desktop-app/package.json
 +++ b/desktop-app/package.json
-@@ -147,8 +147,7 @@
-     },
-     "linux": {
-       "target": [
--        "AppImage",
--        "rpm"
-+        "AppImage"
-       ],
-       "category": "Development"
-     },
-diff --git a/desktop-app/scripts/generate-checksums.js b/desktop-app/scripts/generate-checksums.js
-index 382b54a..77dcdc9 100644
---- a/desktop-app/scripts/generate-checksums.js
-+++ b/desktop-app/scripts/generate-checksums.js
-@@ -5,12 +5,7 @@ const pkg = require('../package.json');
- 
- const version = pkg.version;
- const requiredFiles = [
--  `Responsively-App-${version}.x86_64.rpm`,
--  `ResponsivelyApp-${version}-mac.zip`,
-   `ResponsivelyApp-${version}.AppImage`,
--  `ResponsivelyApp-${version}.dmg`,
--  `ResponsivelyApp ${version}.exe`,
--  `ResponsivelyApp Setup ${version}.exe`,
- ];
- 
- function hashFile(file, algorithm = 'sha512', encoding = 'hex', options = {}) {
+@@ -30,7 +30,6 @@
+     "postinstall": "yarn rimraf node_modules/browser-sync/dist/**/*.map && yarn replace '\"network-throttle\".*' '' node_modules/browser-sync-ui/lib/UI.js && ts-node .erb/scripts/check-native-dep.js && replace-in-file '/// <reference types=\"howler\" />' \"import { Howl } from 'howler';\" node_modules/use-sound/dist/types.d.ts  && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts",
+     "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
+     "package": "ts-node ./.erb/scripts/clean.js dist && yarn run build && electron-builder build --publish never",
+-    "prepare": "cd .. && husky install desktop-app/.husky && chmod a+x desktop-app/.husky/pre-commit",
+     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
+     "dev": "yarn start",
+     "start": "ts-node ./.erb/scripts/check-port-in-use.js && yarn run start:renderer",