pkgver to 1.28.0

3 files changed, 12 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cddbd0d1b22..4868c36f76b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bitwarden
 	pkgdesc = Bitwarden Desktop Application
-	pkgver = 1.27.1
-	pkgrel = 2
+	pkgver = 1.28.0
+	pkgrel = 1
 	url = https://github.com/bitwarden/desktop
 	arch = x86_64
 	arch = aarch64
@@ -23,16 +23,14 @@ pkgbase = bitwarden
 	conflicts = bitwarden-bin
 	options = !strip
 	options = !emptydirs
-	source = bitwarden-1.27.1.tar.gz::https://github.com/bitwarden/desktop/archive/v1.27.1.tar.gz
-	source = jslib-dbd92194ee4536d87bed5d89f39078e68c59a06c.tar.gz::https://github.com/bitwarden/jslib/archive/dbd92194ee4536d87bed5d89f39078e68c59a06c.tar.gz
+	source = bitwarden-1.28.0.tar.gz::https://github.com/bitwarden/desktop/archive/v1.28.0.tar.gz
+	source = jslib-0a2ff12bedd55f5982fb8fe9102c4f20522f72e1.tar.gz::https://github.com/bitwarden/jslib/archive/0a2ff12bedd55f5982fb8fe9102c4f20522f72e1.tar.gz
 	source = package.json.patch
-	source = jslib-angular-package.json.patch
 	source = bitwarden.sh
 	source = bitwarden.desktop
-	sha512sums = de2c476581cac6a8a875d3d6ff11e67cd74f4b1c5dcf00a98df4541b38b848382901dca1284940e4006fbb234bb43a69c24e3c945f73e71f0a448795c41136bf
-	sha512sums = 86eb6d0de6efb6f0e2d18c94787f3a4b881234c998407d03cc2ce6c1f5ae56033552e873dfa80d2357405ca2b772fbcfb3085196d7f83deadb02e2d7fe351ea3
+	sha512sums = 4c769e7f8164abb8bc63dde761453c4e09370550f7377c015d450f6d944de9ab9d5af02304a9779ba7ad694d68ddb8dd8cd669b1cf0a98a9ceecb5873f63a667
+	sha512sums = 686489c2a5d3847dc6e8c25bd7fb878fc82243cd20b83489ba89f129358c4715b5007d6526cd392383a9ddb84c57910b19fc6a3773fe56694e194c990c05dbd1
 	sha512sums = d884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e
-	sha512sums = 558abb27aa08c0838a4c49e1e8b2527eadc25c159c9ad677294d5278220ae25c850afaf0ceac9fb66993ea7fa0d18181735e9b20272cda06d5f3cf164b873d91
 	sha512sums = 32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4
 	sha512sums = 05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd
 
diff --git a/PKGBUILD b/PKGBUILD
index 516f9e505b58..3f5e99b1f218 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: Milo Gilad <myl0gcontact@gmail.com>
 
 pkgname=bitwarden
-pkgver=1.27.1
-pkgrel=2
-_jslibcommit='dbd92194ee4536d87bed5d89f39078e68c59a06c'
-_nodeversion='14.17.3'
+pkgver=1.28.0
+pkgrel=1
+_jslibcommit='0a2ff12bedd55f5982fb8fe9102c4f20522f72e1'
+_nodeversion='14.17.5'
 pkgdesc='Bitwarden Desktop Application'
 arch=('x86_64' 'aarch64')
 url='https://github.com/bitwarden/desktop'
@@ -17,13 +17,11 @@ options=('!strip' '!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bitwarden/desktop/archive/v${pkgver}.tar.gz"
         "jslib-${_jslibcommit}.tar.gz::https://github.com/bitwarden/jslib/archive/${_jslibcommit}.tar.gz"
         "package.json.patch"
-        "jslib-angular-package.json.patch"
         "${pkgname}.sh"
         "${pkgname}.desktop")
-sha512sums=('de2c476581cac6a8a875d3d6ff11e67cd74f4b1c5dcf00a98df4541b38b848382901dca1284940e4006fbb234bb43a69c24e3c945f73e71f0a448795c41136bf'
-            '86eb6d0de6efb6f0e2d18c94787f3a4b881234c998407d03cc2ce6c1f5ae56033552e873dfa80d2357405ca2b772fbcfb3085196d7f83deadb02e2d7fe351ea3'
+sha512sums=('4c769e7f8164abb8bc63dde761453c4e09370550f7377c015d450f6d944de9ab9d5af02304a9779ba7ad694d68ddb8dd8cd669b1cf0a98a9ceecb5873f63a667'
+            '686489c2a5d3847dc6e8c25bd7fb878fc82243cd20b83489ba89f129358c4715b5007d6526cd392383a9ddb84c57910b19fc6a3773fe56694e194c990c05dbd1'
             'd884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e'
-            '558abb27aa08c0838a4c49e1e8b2527eadc25c159c9ad677294d5278220ae25c850afaf0ceac9fb66993ea7fa0d18181735e9b20272cda06d5f3cf164b873d91'
             '32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4'
             '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
 
@@ -35,9 +33,6 @@ prepare() {
 
   # Apply package.json patches
   patch --strip=1 "${srcdir}/desktop-${pkgver}/package.json" ${srcdir}/package.json.patch
-  # TODO(libertylocked): See https://github.com/bitwarden/jslib/issues/440
-  patch --strip=1 "${srcdir}/jslib-${_jslibcommit}/angular/package.json" \
-    ${srcdir}/jslib-angular-package.json.patch
 
   # Patch build to make it work with system electron
   local system_electron_version=$(pacman -Q electron11 | cut -d' ' -f2 | cut -d'-' -f1)
diff --git a/jslib-angular-package.json.patch b/jslib-angular-package.json.patch
deleted file mode 100644
index 40b21680c177..000000000000
--- a/jslib-angular-package.json.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- package.json.orig	2021-07-26 07:01:06.535907475 -0700
-+++ package.json	2021-07-26 07:01:51.151537381 -0700
-@@ -20,6 +20,7 @@
-     "lint:fix": "tslint 'src/**/*.ts' 'spec/**/*.ts' --fix"
-   },
-   "devDependencies": {
-+    "@types/duo_web_sdk": "^2.7.0",
-     "rimraf": "^3.0.2",
-     "typescript": "4.1.5"
-   },
-@@ -34,6 +35,7 @@
-     "@angular/platform-browser-dynamic": "^11.2.11",
-     "@angular/router": "^11.2.11",
-     "@bitwarden/jslib-common": "file:../common",
-+    "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git#378e855ce4a1de1d1b2f7fd60465e564b3e9fbda",
-     "ngx-infinite-scroll": "10.0.1",
-     "rxjs": "6.6.7",
-     "tldjs": "^2.3.1",