Update to 17.0.0

- Refresh PKGBUILD
- Remove nvm from build environment if detected
- Add .gitignore

3 files changed, 45 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 934e26f6211a..ffdfdbf85ae8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = standard
 	pkgdesc = JavaScript style guide, linter, and formatter
-	pkgver = 16.0.4
+	pkgver = 17.0.0
 	pkgrel = 1
 	url = https://standardjs.com
 	arch = any
 	license = MIT
 	makedepends = npm
 	depends = nodejs
+	provides = nodejs-standard
+	conflicts = nodejs-standard
 	replaces = nodejs-standard
-	noextract = standard-16.0.4.tar.gz
-	source = standard-16.0.4.tar.gz::https://registry.npmjs.org/standard/-/standard-16.0.4.tgz
-	sha512sums = d80188f3be11342956e3151d33e6e0d4b45756560bcd33449079931b99a1ca7e393a16e0c00fbace7a3090e198cbe58c6f91d1c842efb4dcb7f6471d31031c61
-	b2sums = 6eb93b00d7f0c08ea001d1798a8d94f592a05d7a4f41a93685276fefc70a43307f4f559a53aa2bc38fc5773663e0c60d9286109184cc2c7b4f92fe2f96765d2b
+	noextract = standard-17.0.0.tgz
+	source = https://registry.npmjs.org/standard/-/standard-17.0.0.tgz
+	sha512sums = 1a508cf67cdb2d492bf93611e48d9642821a878c0703694c6aea9bc8f2d5fe8239809c6a847ce18e5f441b637496bfe746a2372826c2be6fd6dec9b1bcb68284
 
 pkgname = standard
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..091d90939cd4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!PKGBUILD
+!.SRCINFO
+!*.patch
diff --git a/PKGBUILD b/PKGBUILD
index 56c1f4698b1e..9c6f36a5c887 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,49 @@
-# Maintainer: George Rawlinson <grawlinson@archlinux.org>
+# Maintainer: Luke Arms <luke@arms.to>
+# Contributor: George Rawlinson <grawlinson@archlinux.org>
 
 pkgname=standard
-pkgver=16.0.4
+pkgver=17.0.0
 pkgrel=1
-pkgdesc="JavaScript style guide, linter, and formatter"
+pkgdesc='JavaScript style guide, linter, and formatter'
 arch=('any')
-url="https://standardjs.com"
+url='https://standardjs.com'
 license=('MIT')
 depends=('nodejs')
 makedepends=('npm')
+provides=('nodejs-standard')
+conflicts=('nodejs-standard')
 replaces=('nodejs-standard')
-source=("$pkgname-$pkgver.tar.gz::https://registry.npmjs.org/$pkgname/-/$pkgname-$pkgver.tgz")
-noextract=("$pkgname-$pkgver.tar.gz")
-sha512sums=('d80188f3be11342956e3151d33e6e0d4b45756560bcd33449079931b99a1ca7e393a16e0c00fbace7a3090e198cbe58c6f91d1c842efb4dcb7f6471d31031c61')
-b2sums=('6eb93b00d7f0c08ea001d1798a8d94f592a05d7a4f41a93685276fefc70a43307f4f559a53aa2bc38fc5773663e0c60d9286109184cc2c7b4f92fe2f96765d2b')
+source=("https://registry.npmjs.org/${pkgname}/-/${pkgname}-${pkgver}.tgz")
+noextract=("${pkgname}-${pkgver}.tgz")
+sha512sums=('1a508cf67cdb2d492bf93611e48d9642821a878c0703694c6aea9bc8f2d5fe8239809c6a847ce18e5f441b637496bfe746a2372826c2be6fd6dec9b1bcb68284')
 
-package() {
-  local NPM_FLAGS=(--no-audit --no-fund --no-update-notifier)
+_maybe_unload_nvm() {
+  # If makepkg is running in an environment serviced by nvm, load and deactivate
+  # it to remove nvm directories from PATH and ensure node and npm run from /usr
+  set -- "${NVM_DIR:-$HOME/.nvm}/nvm.sh"
+  [[ -e $1 ]] || return 0
+  echo "nvm found at $1, deactivating in build environment" >&2
+  . "$1"
+  nvm deactivate
+  nvm unload
+}
 
+package() {
+  _maybe_unload_nvm
   npm install \
     --global \
-    --prefix "$pkgdir/usr" \
-    --cache "$srcdir/npm-cache" \
-    "${NPM_FLAGS[@]}" \
-    "$pkgname-$pkgver.tar.gz"
+    --prefix "${pkgdir}/usr" \
+    --cache "${srcdir}/.npm" \
+    --no-save \
+    --no-progress \
+    --no-audit \
+    --no-fund \
+    "${srcdir}/${pkgname}-${pkgver}.tgz"
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -sr "${pkgdir}/usr/lib/node_modules/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  # npm gives ownership of ALL FILES to build user
+  # See https://github.com/npm/npm/issues/9359 and
   # https://bugs.archlinux.org/task/63396
-  chown -R root:root "$pkgdir"
-
-  # license
-  install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" \
-    "$pkgdir/usr/lib/node_modules/$pkgname/LICENSE"
-
-  # documentation
-  install -vDm644 -t "$pkgdir/usr/share/doc/$pkgname" \
-    "$pkgdir/usr/lib/node_modules/$pkgname/"*.md
+  chmod -R u=rwX,go=rX "${pkgdir}"
+  chown -R root:root "${pkgdir}"
 }