Use nvm to build (node lts carbon)

3 files changed, 33 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4e300dd4f4d..e9512cd6172a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = bitwarden
 	pkgdesc = Bitwarden Desktop Application
 	pkgver = 1.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/bitwarden/desktop
 	arch = x86_64
 	license = GPL3
-	makedepends = nodejs
 	makedepends = npm
+	makedepends = nvm
 	depends = alsa-lib
 	depends = electron
 	depends = gconf
@@ -21,12 +21,12 @@ pkgbase = bitwarden
 	conflicts = bitwarden-bin
 	options = !strip
 	options = !emptydirs
-	source = bitwarden-1.10.0-git-repo::git+https://github.com/bitwarden/desktop.git#tag=v1.10.0
-	source = jslib-git-repo::git+https://github.com/bitwarden/jslib.git
+	source = bitwarden-1.10.0.tar.gz::https://github.com/bitwarden/desktop/archive/v1.10.0.tar.gz
+	source = jslib-f355840f3cf4af0279c9a078e0c14729a701f37a.tar.gz::https://github.com/bitwarden/jslib/archive/f355840f3cf4af0279c9a078e0c14729a701f37a.tar.gz
 	source = bitwarden.sh
 	source = bitwarden.desktop
-	sha512sums = SKIP
-	sha512sums = SKIP
+	sha512sums = 6d8e25bf3bee9e3fb47602f29e36dcd07e9b8395c83d0a7825c9cfc47d077a6a32260bd79214c04c07a8707372ec4a2881f267de9071e86df9cedf197bb3505a
+	sha512sums = 0049147b8e0209f0b6b5268f7118efa894020613218c6165f550a796194b76aaa78fc10f869f3d008d15d30316ed5c968e48b624f854649d9dc378cb72a97284
 	sha512sums = 4e12df4144ce40be087ef73987dd83e36f4ea2d92101ac34bfcef52059c6a94e2bdb21c73766d9b3596ac7d36d4ca75e9097f1857370ab9f99d9fbfa1f6d696e
 	sha512sums = 05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd
 
diff --git a/.gitignore b/.gitignore
index b33f3ab2c93b..f52b2f5a9940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 pkg/
 src/
-bitwarden-git-repo/
-jslib-git-repo/
-bitwarden-1.*
+*.tar.xz
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index ef6f6449cb4e..a20005278957 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,44 +3,55 @@
 
 pkgname=bitwarden
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
+_jslibcommit='f355840f3cf4af0279c9a078e0c14729a701f37a'
 pkgdesc='Bitwarden Desktop Application'
 arch=('x86_64')
 url='https://github.com/bitwarden/desktop'
 license=('GPL3')
-makedepends=('nodejs' 'npm')
+makedepends=('npm' 'nvm')
 depends=('alsa-lib' 'electron' 'gconf' 'gtk2' 'libnotify' 'libsecret' 'libxss' 'libxtst' 'nspr' 'nss')
 conflicts=('bitwarden-git' 'bitwarden-bin')
 options=('!strip' '!emptydirs')
-source=("${pkgname}-${pkgver}-git-repo::git+https://github.com/bitwarden/desktop.git#tag=v${pkgver}"
-        'jslib-git-repo::git+https://github.com/bitwarden/jslib.git'
+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"
         "${pkgname}.sh"
         "${pkgname}.desktop")
-sha512sums=('SKIP'
-            'SKIP'
+sha512sums=('6d8e25bf3bee9e3fb47602f29e36dcd07e9b8395c83d0a7825c9cfc47d077a6a32260bd79214c04c07a8707372ec4a2881f267de9071e86df9cedf197bb3505a'
+            '0049147b8e0209f0b6b5268f7118efa894020613218c6165f550a796194b76aaa78fc10f869f3d008d15d30316ed5c968e48b624f854649d9dc378cb72a97284'
             '4e12df4144ce40be087ef73987dd83e36f4ea2d92101ac34bfcef52059c6a94e2bdb21c73766d9b3596ac7d36d4ca75e9097f1857370ab9f99d9fbfa1f6d696e'
             '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
 
 prepare() {
-  cd "${pkgname}-${pkgver}-git-repo"
-  git submodule init
-  git config submodule.jslib.url $srcdir/jslib-git-repo
-  git submodule update
+  rmdir "${srcdir}/desktop-${pkgver}/jslib"
+  ln -s "${srcdir}/jslib-${_jslibcommit}" "${srcdir}/desktop-${pkgver}/jslib"
 }
 
 build() {
-  cd "${pkgname}-${pkgver}-git-repo"
+  export npm_config_cache="$srcdir/npm_cache"
+  _npm_prefix=$(npm config get prefix)
+  npm config delete prefix
+  source /usr/share/nvm/init-nvm.sh --install
+  nvm install 10 && nvm use 10
+
+  cd "${srcdir}/desktop-${pkgver}/jslib"
+  npm install
+  cd "${srcdir}/desktop-${pkgver}"
   npm install
   npm run build
   npm run clean:dist
   # Make unpacked dist using electron-builder.
-  # Because `npm run dist:lin` builds a bunch of other irrelevant platforms as it uses
-  # the config in package.json, so we don't use that run-script here.
+  # Don't use `npm run dist:lin` because it builds a bunch of other irrelevant 
+  # platforms as it uses the config in package.json
   npx build --dir build
+
+  # Restore node config from nvm
+  npm config set prefix ${_npm_prefix}
+  nvm unalias default
 }
 
 package() {
-  cd "${pkgname}-${pkgver}-git-repo"
+  cd "${srcdir}/desktop-${pkgver}"
 
   install -dm755 "${pkgdir}/usr/lib/${pkgname}"
   cp -r dist/linux-unpacked/resources "${pkgdir}/usr/lib/${pkgname}/"