2.0.0a1

2 files changed, 24 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db29d5c3e7dc..078941aa448b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = majsoul-plus
 	pkgdesc = Majsoul browser, with more features
-	pkgver = 1.12.0b4
-	pkgrel = 2
+	pkgver = 2.0.0a1
+	pkgrel = 1
 	url = https://github.com/MajsoulPlus/majsoul-plus
 	arch = x86_64
 	arch = i686
 	license = AGPL3
-	makedepends = npm
+	makedepends = yarn
 	makedepends = imagemagick
-	makedepends = gulp
 	depends = electron
 	conflicts = majsoul-plus-bin
-	source = https://github.com/MajsoulPlus/majsoul-plus/archive/v1.12.0-beta.4.tar.gz
-	sha256sums = 537f5bb4c20ed957d536f0240c513529a44fef519e72dde66e4fdd68c131006b
+	source = majsoul-plus-2.0.0a1.src.tar.gz::https://github.com/MajsoulPlus/majsoul-plus/archive/v2.0.0-alpha.1.tar.gz
+	sha256sums = 40aa0493276e1168e63373325824899884fa586e4d2bf5828fc79ac50273a08a
 
 pkgname = majsoul-plus
 
diff --git a/PKGBUILD b/PKGBUILD
index 88171a1db0dc..783dbffcf138 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Bruce Zhang <zttt183525594@gmail.com>
 pkgname=majsoul-plus
-pkgver=1.12.0b4
-_pkgver=${pkgver/b/-beta.}
-pkgrel=2
+pkgver=2.0.0a1
+_pkgver=${pkgver/a/-alpha.}
+pkgrel=1
 pkgdesc="Majsoul browser, with more features"
 arch=('x86_64' 'i686')
 url="https://github.com/MajsoulPlus/majsoul-plus"
 license=('AGPL3')
 depends=('electron')
-makedepends=('npm' 'imagemagick' 'gulp')
-source=("https://github.com/MajsoulPlus/majsoul-plus/archive/v$_pkgver.tar.gz")
-sha256sums=('537f5bb4c20ed957d536f0240c513529a44fef519e72dde66e4fdd68c131006b')
+makedepends=('yarn' 'imagemagick')
+source=("$pkgname-$pkgver.src.tar.gz::https://github.com/MajsoulPlus/majsoul-plus/archive/v$_pkgver.tar.gz")
+sha256sums=('40aa0493276e1168e63373325824899884fa586e4d2bf5828fc79ac50273a08a')
 conflicts=("majsoul-plus-bin")
 
 prepare() {
@@ -22,13 +22,21 @@ prepare() {
 		targetArch="ia32"
 	fi
 	sed -i "/\"electron\": \"/c\\\"electron\": \"$electronVer\"," package.json
-	sed -i "/\"build-linux\": \"/c\\\"build-linux\": \"gulp sass && electron-packager . Majsoul_Plus  --platform=linux --arch=$targetArch --asar --out ./build/unpacked --ignore=build --overwrite --icon=bin/icons/icon.png\"," package.json
+	sed -i "/\"build-linux\": \"/c\\\"build-linux\": \"yarn pre-build && electron-builder --linux --$targetArch\"," package.json
+
+	sed -i 's/"tar.gz",//' package.json
+	sed -i 's/"AppImage"/"dir"/' package.json
+
+	electronDist="\/usr\/lib\/electron"
+	sed -i "s/\"productName\": \"Majsoul Plus\",/\"productName\": \"Majsoul Plus\",\"electronDist\": \"$electronDist\",/" package.json
+
+	sed -i "s/level !== 'log'/String(level) !== 'log'/" src/index.ts
 }
 
 build() {
 	cd "$pkgname-$_pkgver"
-	npm install
-	npm run build-linux
+	yarn
+	yarn run build-linux
 }
 
 package() {
@@ -42,12 +50,12 @@ package() {
 	mkdir -p "$pkgdir/usr/bin"
 	mkdir -p "$pkgdir/usr/share/applications"
 
-	install -Dm644 "build/unpacked/Majsoul_Plus-linux-$targetArch/resources/app.asar" "$pkgdir/usr/share/majsoul-plus/app.asar"
+	install -Dm644 "build/linux-unpacked/resources/app.asar" "$pkgdir/usr/share/majsoul-plus/app.asar"
 
 	for size in 16 24 32 48 64 72 128 256; do
         target="$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/"
         mkdir -p "$target"
-        convert bin/icons/icon.png -resize ${size}x${size} "$target/majsoul-plus.png"
+        convert assets/bin/icons/icon.png -resize ${size}x${size} "$target/majsoul-plus.png"
     done
 
 	echo "#!/usr/bin/env bash