Commit 9c5524d3 authored by Jérome Perrin's avatar Jérome Perrin

software/theia: Version up 1.28.0 and fix IPv6 url

Resolve `@theia/core` subdependency `vscode-uri` to a locally installed patched version, to workaround https://github.com/microsoft/vscode/issues/154048.

This fixes access to Theia through the IPv6 `backend-url`. That issue was discussed in !1204

The patched version of `vscode-uri` is published here: https://github.com/xavth/vscode-uri/tree/fix/ipv6_url_authority

To do this, `yarn.lock` was regenerated, so this also caused a version up to Theia 1.28.0.

See merge request !1227
parents 9b0e8316 74275b71
...@@ -5,6 +5,7 @@ extends = ...@@ -5,6 +5,7 @@ extends =
../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
../patchelf/buildout.cfg ../patchelf/buildout.cfg
../python3/buildout.cfg ../python3/buildout.cfg
../tar/buildout.cfg
../yarn/buildout.cfg ../yarn/buildout.cfg
download-plugins.cfg download-plugins.cfg
buildout.hash.cfg buildout.hash.cfg
...@@ -20,6 +21,13 @@ recipe = slapos.recipe.build:download ...@@ -20,6 +21,13 @@ recipe = slapos.recipe.build:download
shared = true shared = true
url = ${:_profile_base_location_}/${:_buildout_section_name_} url = ${:_profile_base_location_}/${:_buildout_section_name_}
[vscode-uri]
recipe = slapos.recipe.build:download
shared = true
revision = c45342deb98de5c7b391bd2c08431b536b869a04
url = https://github.com/xavth/vscode-uri/archive/${:revision}.tar.gz
md5sum = 877accd4e29d2293ce33815803d998cc
[theia] [theia]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
...@@ -36,6 +44,19 @@ pre-configure = ...@@ -36,6 +44,19 @@ pre-configure =
echo '${package.json:content}' > %(location)s/package.json echo '${package.json:content}' > %(location)s/package.json
# To regenerate yarn.lock, comment the line below # To regenerate yarn.lock, comment the line below
cp yarn.lock %(location)s cp yarn.lock %(location)s
# Workaround https://github.com/microsoft/vscode/issues/154048
# Once upstream is fixed:
# - remove [vscode-uri] section
# - remove the commands below
# - remove component/tar/buildout.cfg
# - remove the "resolution" field in package.json
# - regenerate yarn.lock
cd %(location)s
${tar:location}/bin/tar -xzf ${vscode-uri:target}
mv vscode-uri-${vscode-uri:revision} vscode-uri
cd vscode-uri
${yarn:location}/bin/yarn
${yarn:location}/bin/yarn install
configure-command = true configure-command = true
make-binary = cd %(location)s && ${yarn:location}/bin/yarn make-binary = cd %(location)s && ${yarn:location}/bin/yarn
make-targets = theia build make-targets = theia build
...@@ -172,6 +193,9 @@ content = ...@@ -172,6 +193,9 @@ content =
"@perrinjerome/theia-open": "latest", "@perrinjerome/theia-open": "latest",
"@perrinjerome/theia-open-cli": "latest" "@perrinjerome/theia-open-cli": "latest"
}, },
"resolutions": {
"**/vscode-uri": "file:./vscode-uri"
},
"devDependencies": { "devDependencies": {
"@theia/cli": "latest" "@theia/cli": "latest"
} }
......
...@@ -19,7 +19,7 @@ md5sum = 8157c22134200bd862a07c6521ebf799 ...@@ -19,7 +19,7 @@ md5sum = 8157c22134200bd862a07c6521ebf799
[yarn.lock] [yarn.lock]
_update_hash_filename_ = yarn.lock _update_hash_filename_ = yarn.lock
md5sum = a1b9ecda50ca67300282f20724180f60 md5sum = db6372aa3895f1d4359c97f47993cd33
[ms-python-disable-jedi-buildout.patch] [ms-python-disable-jedi-buildout.patch]
_update_hash_filename_ = ms-python-disable-jedi-buildout.patch _update_hash_filename_ = ms-python-disable-jedi-buildout.patch
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment