Skip to content

Commit dfbb37d

Browse files
lotheacncopa
authored andcommitted
community/yaml-language-server: mangle paths to work with 1.19.0
redhat-developer/yaml-language-server#1096 is related, but not sufficient, to solve the problem: in addition to the `@vscode/l10n` library, localization bundles must be installed in a location where yaml-language-server can find them at runtime, and by default this it `../l10n/` relative to server.js.
1 parent 37cceb9 commit dfbb37d

File tree

3 files changed

+42
-6
lines changed

3 files changed

+42
-6
lines changed

testing/yaml-language-server/APKBUILD

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# Maintainer: Lauri Tirkkonen <lauri@hacktheplanet.fi>
22
pkgname=yaml-language-server
33
pkgver=1.19.0
4-
pkgrel=0
4+
pkgrel=1
55
pkgdesc="Language Server for YAML Files"
66
url="https://github.com/redhat-developer/yaml-language-server"
77
arch="noarch"
88
license="MIT"
99
depends="nodejs"
1010
makedepends="yarn esbuild jq"
1111
source="https://github.com/redhat-developer/yaml-language-server/archive/refs/tags/$pkgver/yaml-language-server-$pkgver.tar.gz
12-
yaml-language-server"
12+
yaml-language-server
13+
b707580afd61837d19fb8f896a9ea4a3c596ad34.patch
14+
"
1315
subpackages="$pkgname-doc"
1416

1517
_get_yarn_deps() {
@@ -41,9 +43,13 @@ package() {
4143
local moddir="$pkgdir"/usr/lib/node_modules/$pkgname
4244
local extpkgs="vscode-json-languageservice $(_get_yarn_deps vscode-json-languageservice)"
4345

44-
install -d "$moddir"/node_modules
45-
install -m 0644 dist/server.js "$moddir"/
46+
install -d "$moddir"/node_modules "$moddir"/yaml-language-server
47+
# l10n json bundles are loaded by server.js from "../l10n" relative to
48+
# server.js, so we have to place both of them accordingly
49+
install -m 0644 dist/server.js "$moddir"/yaml-language-server/server.js
50+
cp -r l10n "$moddir"/
4651
for p in $extpkgs; do
52+
mkdir -p "$(dirname "$target")"
4753
cp -r node_modules/$p "$moddir"/node_modules/
4854
done
4955

@@ -52,5 +58,6 @@ package() {
5258
}
5359
sha512sums="
5460
a109290edb5034610b88aff07bce9c5b40ac0838c8bb509454bdfa23e14b68b4f7fa283b7fcf99083adf617df68c4337b8a4d9ddb586c2bcae7430cb18531605 yaml-language-server-1.19.0.tar.gz
55-
a2040e537f2cace289cc1b983da219c9efc65ee7e287cd0863017d8274f3257cb429177e1d3e351a90c4b18b2d3c10e20a185d0f357056700562a7b28ace504f yaml-language-server
61+
d9445f6fd34b08a743362583b0bb72b681c38807eb7b7e8a697221b1bc98528cfa2d037d448fb46ce8ce05d8a9854262cec4962c875e59b1d70571e7d5a67512 yaml-language-server
62+
97e1a79851e271008b1f3fc2e8dab6ba27f1487fc25f0cc2a2e60a12dc3e25b3b686a7bb6c134214e3d2d09a19705541cefa87b92b059dd2c1b92e309b04f4be b707580afd61837d19fb8f896a9ea4a3c596ad34.patch
5663
"
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From b707580afd61837d19fb8f896a9ea4a3c596ad34 Mon Sep 17 00:00:00 2001
2+
From: "Daniel M. Capella" <polyzen@users.noreply.github.com>
3+
Date: Fri, 11 Jul 2025 07:17:23 +0000
4+
Subject: [PATCH] @vscode/l10n is a runtime dependency (#1096)
5+
6+
---
7+
package.json | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/package.json b/package.json
11+
index 26d27ea6..a70e75a8 100644
12+
--- a/package.json
13+
+++ b/package.json
14+
@@ -27,6 +27,7 @@
15+
"url": "https://github.com/redhat-developer/yaml-language-server.git"
16+
},
17+
"dependencies": {
18+
+ "@vscode/l10n": "^0.0.9",
19+
"ajv": "^8.17.1",
20+
"ajv-draft-04": "^1.0.0",
21+
"lodash": "4.17.21",
22+
@@ -48,7 +49,6 @@
23+
"@types/sinon-chai": "^3.2.5",
24+
"@typescript-eslint/eslint-plugin": "^5.38.0",
25+
"@typescript-eslint/parser": "^5.38.0",
26+
- "@vscode/l10n": "^0.0.9",
27+
"@vscode/l10n-dev": "^0.0.35",
28+
"chai": "^4.2.0",
29+
"coveralls": "3.1.1",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh -e
22

3-
exec node /usr/lib/node_modules/yaml-language-server/server.js "$@"
3+
exec node /usr/lib/node_modules/yaml-language-server/yaml-language-server/server.js "$@"

0 commit comments

Comments
 (0)