3.0.1-1

2 files changed, 24 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fcf63fd0f847..b27a3f4e50ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,14 @@
 pkgbase = vscode-langservers-extracted
-	pkgdesc = vscode-langservers bin collection.
-	pkgver = 2.4.0
-	pkgrel = 2
+	pkgdesc = Language servers extracted from VSCode.
+	pkgver = 3.0.1
+	pkgrel = 1
 	url = https://github.com/hrsh7th/vscode-langservers-extracted
 	arch = any
 	license = MIT
 	makedepends = npm
 	depends = nodejs
-	noextract = vscode-langservers-extracted-2.4.0.tgz
-	source = https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-2.4.0.tgz
-	source = vscode-css-language-server
-	source = vscode-html-language-server
-	source = vscode-json-language-server
-	sha256sums = 7b2033734f26ba7abb017d31bc3208d2f446b5d324fd5663e716ba7ce82ba3c3
-	sha256sums = 1f085bae8d3a80ebf8899f4ddb6efc18438fe8f8ee54165e5d7003d40c73235e
-	sha256sums = 750f31ad2a1041500a6208d989a21fac09d73732c4ab3e2f4c9345b0b80f97a1
-	sha256sums = 8936486374e88da553e9da7993ced588c8e31fafb1e85763d9dede92be383d52
+	noextract = vscode-langservers-extracted-3.0.1.tgz
+	source = https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-3.0.1.tgz
+	sha256sums = 4352a88c53f88240be2b478300be67562b80fa73c527060dde444462312c6ee3
 
 pkgname = vscode-langservers-extracted
diff --git a/PKGBUILD b/PKGBUILD
index 6144c0b6f963..1d5c7d990fa2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,23 @@
-# Maintainer: Yufan You <ouuansteve at gmail>
+# Maintainer: Sam A. Horvath-Hunt <hello@samhh.com>
 
-_npmname=vscode-langservers-extracted
 pkgname=vscode-langservers-extracted
-pkgver=2.4.0
-pkgrel=2
-pkgdesc='vscode-langservers bin collection.'
-arch=('any')
-url='https://github.com/hrsh7th/vscode-langservers-extracted'
-license=('MIT')
-depends=('nodejs')
-makedepends=('npm')
-source=("https://registry.npmjs.org/${_npmname}/-/${_npmname}-${pkgver}.tgz")
-_servers=(css html json)
-for _server in "${_servers[@]}"; do
-    source+=("vscode-$_server-language-server")
-done
-sha256sums=('7b2033734f26ba7abb017d31bc3208d2f446b5d324fd5663e716ba7ce82ba3c3'
-            '1f085bae8d3a80ebf8899f4ddb6efc18438fe8f8ee54165e5d7003d40c73235e'
-            '750f31ad2a1041500a6208d989a21fac09d73732c4ab3e2f4c9345b0b80f97a1'
-            '8936486374e88da553e9da7993ced588c8e31fafb1e85763d9dede92be383d52')
-noextract=("${_npmname}-${pkgver}.tgz")
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="Language servers extracted from VSCode."
+url="https://github.com/hrsh7th/vscode-langservers-extracted"
+license=("MIT")
+arch=("any")
+depends=("nodejs")
+makedepends=("npm")
+source=("https://registry.npmjs.org/${pkgname}/-/${pkgname}-${pkgver}.tgz")
+noextract=("${pkgname}-${pkgver}.tgz")
+sha256sums=('4352a88c53f88240be2b478300be67562b80fa73c527060dde444462312c6ee3')
 
-package() {
-    cd "$srcdir"
-    local _npmdir="$pkgdir/usr/lib/node_modules/"
-    mkdir -p "$_npmdir"
-    cd "$_npmdir"
-    npm install -g --prefix "$pkgdir/usr" "$srcdir/$_npmname-$pkgver.tgz"
-    install -Dm644 "$_npmdir/$_npmname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-    chown -R root:root "${pkgdir}"
+prepare() {
+  tar xf "${pkgname}-${pkgver}.tgz" package/LICENSE
+}
 
-    for _server in "${_servers[@]}"; do
-        install -Dm755 -t "$pkgdir/usr/bin" "$srcdir/vscode-$_server-language-server"
-    done
+package() {
+  npm i -g --cache "${srcdir}/npm-cache" --prefix "$pkgdir/usr" "$srcdir/$pkgname-$pkgver.tgz"
+  install -Dm644 package/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }