Refactor PKGBUILD with maintainer change

4 files changed, 30 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 079d86f01575..1d774815364a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = nodejs-webpack
 	pkgdesc = JavaScript bundler (CommonJs, AMD, ES6 modules, CSS, Images, JSON, CoffeeScript, LESS)
-	pkgver = 5.64.0
+	pkgver = 5.70.0
 	pkgrel = 1
 	url = https://webpack.js.org/
 	arch = any
 	license = MIT
 	makedepends = npm
 	depends = nodejs
-	noextract = webpack-5.64.0.tgz
-	options = !strip
-	source = https://registry.npmjs.org/webpack/-/webpack-5.64.0.tgz
-	sha256sums = 86a7242474750ff41f879c732b7b2093485d38ea343dfcf055fadfeb9f1d0861
+	noextract = nodejs-webpack-5.70.0.tgz
+	source = nodejs-webpack-5.70.0.tgz::http://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz
+	sha256sums = ae0c864188574863a49a3f631080afb85bb350e4d3e66f83698a1c748c12bb52
 
 pkgname = nodejs-webpack
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..823e26cbb013
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg
+src
+*.tar.*
+*.tgz
diff --git a/PKGBUILD b/PKGBUILD
index 1e6dcf540b57..101c98211afc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,28 @@
-# Maintainer: Simon Legner <Simon.Legner@gmail.com>
-_npmname=webpack
+# Maintainer: Jonathan Neidel <aur@jneidel.com>
+
 pkgname=nodejs-webpack
-pkgver=5.64.0
+pkgver=5.70.0
 pkgrel=1
 pkgdesc="JavaScript bundler (CommonJs, AMD, ES6 modules, CSS, Images, JSON, CoffeeScript, LESS)"
 arch=(any)
 url="https://webpack.js.org/"
 license=(MIT)
-depends=('nodejs')
-makedepends=('npm')
-source=(https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
-noextract=($_npmname-$pkgver.tgz)
-sha256sums=('86a7242474750ff41f879c732b7b2093485d38ea343dfcf055fadfeb9f1d0861')
-options=(!strip)
+depends=(nodejs)
+makedepends=(npm)
+source=("${pkgname}-${pkgver}.tgz::http://registry.npmjs.org/${pkgname#nodejs-}/-/${pkgname#nodejs-}-${pkgver}.tgz")
+noextract=("${pkgname}-${pkgver}.tgz")
+sha256sums=("ae0c864188574863a49a3f631080afb85bb350e4d3e66f83698a1c748c12bb52")
 
 package() {
-  cd $srcdir
-  local _npmdir="$pkgdir/usr/lib/node_modules/"
-  mkdir -p $_npmdir
-  cd $_npmdir
-  npm install -g --prefix "$pkgdir/usr" $_npmname@$pkgver
+  # copied from: nodejs-nativefier
+  npm install -g --cache "${srcdir}/npm-cache" --prefix "${pkgdir}/usr" "${srcdir}/${pkgname}-${pkgver}.tgz"
+
+  # Fixing permissions
   find "$pkgdir"/usr -type d -exec chmod 755 {} +
-  install -Dm755 "$_npmdir/$_npmname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
 
-# vim:set ts=2 sw=2 et:
+  # npm gives ownership of ALL FILES to build user
+  # https://bugs.archlinux.org/task/63396
+  chown -R root:root "${pkgdir}"
+
+  install -Dm644 "$pkgdir/usr/lib/node_modules/${pkgname#nodejs-}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/shasum b/shasum
new file mode 100755
index 000000000000..1c66f226453e
--- /dev/null
+++ b/shasum
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+VERSION=$(grep pkgver PKGBUILD | head -n1 | cut -d= -f2)
+wget "http://registry.npmjs.org/webpack/-/webpack-$VERSION.tgz" -qO - 2>/dev/null | sha256sum | cut -d\  -f1 | tr -d "\n" | xclip -f -sel clip