[arch-commits] Commit in npm/trunk (PKGBUILD)

[Felix Yan]

    Date: Tuesday, October 27, 2020 @ 14:05:34
  Author: felixonmars
Revision: 734420

upgpkg: npm 7.0.5-1

Modified:
  npm/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-27 13:56:54 UTC (rev 734419)
+++ PKGBUILD	2020-10-27 14:05:34 UTC (rev 734420)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=npm
-pkgver=6.14.8
-pkgrel=2
+pkgver=7.0.5
+pkgrel=1
 pkgdesc='A package manager for javascript'
 arch=('any')
 url='https://www.npmjs.com/'
@@ -11,10 +11,10 @@
 # libgl: TODO
 # libvips: for sharp (doc build) (disabled as current version of gatsby imports a broken sharp)
 # libxi: for cwebp (doc build)
-makedepends=('libgl' 'libxi' 'marked' 'marked-man' 'procps-ng' 'python')
+makedepends=('libgl' 'libxi' 'marked' 'marked-man' 'nodejs-yaml' 'procps-ng' 'python')
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/npm/cli/archive/v$pkgver.tar.gz")
-sha512sums=('bfdd3cfa179bb11940847c522e62be8c8771b03ac5d8fe1fd285905ac753f1f97f78149996c1453f3d15d6be2b6d3f572e4a420ea6f6791872a302ccf5e732c0')
+sha512sums=('1f7a89196d19311546709ec19da74062b9ee5171be93daa9951159d354ec978d0b9b860b222487af7883caa1073c8359f61173a34db2cde98efb15b9877ce98f')
 
 prepare() {
   cd cli-$pkgver
@@ -32,11 +32,16 @@
 
 build() {
   cd cli-$pkgver
+  # node's cmark-gfm vendors cmark-gfm. Hard to fix.
+  node bin/npm-cli.js install cmark-gfm --no-global --no-timing --no-save
+
   NODE_PATH=/usr/lib/node_modules make
 }
 
 package() {
   cd cli-$pkgver
+  # More broken in 7.x
+  mkdir -p "$pkgdir"/usr/lib
   make NPMOPTS="--prefix=\"$pkgdir/usr\"" install
 
   # Non-deterministic race in npm gives 777 permissions to random directories.
@@ -51,12 +56,11 @@
   _npmdir="$pkgdir"/usr/lib/node_modules/$pkgname
   rm -r "$_npmdir"/node_modules/{,.bin/}semver
   rm -r "$_npmdir"/node_modules/{,.bin/}node-gyp
-  sed -i '/node-gyp.js/c\  exec /usr/bin/node-gyp "$@"' \
-    "$_npmdir"/node_modules/npm-lifecycle/node-gyp-bin/node-gyp \
-    "$_npmdir"/bin/node-gyp-bin/node-gyp
 
   install -dm755 "$pkgdir"/usr/share/bash-completion/completions
   node "$srcdir"/cli-$pkgver/bin/npm-cli.js completion > "$pkgdir"/usr/share/bash-completion/completions/npm
 
   install -Dm644 "$srcdir"/cli-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+  mv "$pkgdir"/usr/lib/node_modules/npm/man "$pkgdir"/usr/share/
 }