Skip to content

slapos
slapos
Commit e6265b6f authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Update Theia to 1.0 

Update Thiea to 1.0, described a bit on :
 https://dev.to/svenefftinge/theia-1-0-finally-a-good-browser-ide-3ok0

Add by default some extensions for python and buildout. Also request a frontend so that we can access over IPv4

See merge request !725
parents 7919c834 7316ad33
Pipeline #8833 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 2754 additions and 2641 deletions
    component/nodejs/buildout.cfg
    View file @ e6265b6f
    ...@@ -15,6 +15,12 @@ parts = ...@@ -15,6 +15,12 @@ parts =
    [nodejs] [nodejs]
    <= nodejs-8.9.4 <= nodejs-8.9.4
    [nodejs-10.19.0]
    <= nodejs-base
    openssl_location = ${openssl:location}
    version = v10.19.0
    md5sum = 9e433c753d839d2d2a6341861501674f
    [nodejs-10.6.0] [nodejs-10.6.0]
    <= nodejs-base <= nodejs-base
    openssl_location = ${openssl:location} openssl_location = ${openssl:location}
    ......
    software/theia/README.md
    View file @ e6265b6f
    ...@@ -5,15 +5,6 @@ Theia is a cloud (and desktop) IDE https://www.theia-ide.org ...@@ -5,15 +5,6 @@ Theia is a cloud (and desktop) IDE https://www.theia-ide.org
    This version comes pre-configured with a few plugins, but does not come with python plugin, to let This version comes pre-configured with a few plugins, but does not come with python plugin, to let
    you choose between theia and vscode one. you choose between theia and vscode one.
    ## Installing vscode extensions
    To install vscode's python plugin ( https://code.visualstudio.com/docs/languages/python ):
    <key>F1</key> `Deploy plugin by id` and enter `vscode:extension/ms-python.python` and wait for a while.
    Check theia's log files in case of issues.
    see https://github.com/theia-ide/theia/wiki/Testing-VS-Code-extensions for more details.
    ## jedi ## jedi
    [jedi](https://github.com/davidhalter/jedi) which is used by both thiea and vscode python plugins has [jedi](https://github.com/davidhalter/jedi) which is used by both thiea and vscode python plugins has
    ......
    software/theia/buildout.hash.cfg
    View file @ e6265b6f
    ...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
    [instance] [instance]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = 7c9444fbe8dc8faea67ede2b77e188ed md5sum = 21735765808aac82fb91d53341a3c0d6
    [yarn.lock] [yarn.lock]
    filename = yarn.lock filename = yarn.lock
    md5sum = b63a993a13e7c3b16b66c25fac5ac8b9 md5sum = c2523a5c832f617c374ee621d50d9e52
    [python-language-server-requirements.txt] [python-language-server-requirements.txt]
    filename = python-language-server-requirements.txt filename = python-language-server-requirements.txt
    md5sum = 6c940b7015f45de6e679fc44807e5220 md5sum = 6db2a484cac19787fecd87fffefa4aa9
    software/theia/instance.cfg.in
    View file @ e6265b6f
    ...@@ -17,13 +17,31 @@ recipe = slapos.cookbook:generate.password ...@@ -17,13 +17,31 @@ recipe = slapos.cookbook:generate.password
    username = node username = node
    bytes = 12 bytes = 12
    [frontend-instance-certificate]
    recipe = plone.recipe.command
    command =
    if [ ! -e $${:key-file} ]
    then
    ${openssl-output:openssl} req -x509 -nodes -days 3650 \
    -subj "/C=AA/ST=X/L=X/O=Dis/CN=$${:common-name}" \
    -newkey rsa:1024 -keyout $${:key-file} \
    -out $${:cert-file}
    fi
    update-command = $${:command}
    key-file = $${directory:etc}/$${:_buildout_section_name_}.key
    cert-file = $${directory:etc}/$${:_buildout_section_name_}.crt
    common-name = $${frontend-instance-config:ip}
    location =
    $${:key-file}
    $${:cert-file}
    [frontend-instance-config] [frontend-instance-config]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    rendered = $${directory:etc}/$${:_buildout_section_name_} rendered = $${directory:etc}/$${:_buildout_section_name_}
    template = inline: template = inline:
    https://$${:hostname}:$${:port} { :$${:port} {
    bind $${:ip} bind $${:ip}
    tls self_signed # TODO tls $${frontend-instance-certificate:cert-file} $${frontend-instance-certificate:key-file}
    log stdout log stdout
    errors stderr errors stderr
    gzip gzip
    ...@@ -57,7 +75,7 @@ ip = $${frontend-instance-config:ip} ...@@ -57,7 +75,7 @@ ip = $${frontend-instance-config:ip}
    hostname = $${frontend-instance-config:hostname} hostname = $${frontend-instance-config:hostname}
    port = $${frontend-instance-config:port} port = $${frontend-instance-config:port}
    pidfile = $${directory:pidfiles}/$${:_buildout_section_name_}.pid pidfile = $${directory:pidfiles}/$${:_buildout_section_name_}.pid
    url = https://$${frontend-instance-password:username}:$${frontend-instance-password:passwd}@$${:hostname}:$${:port}/ url = https://$${:hostname}:$${:port}/
    [frontend-reload] [frontend-reload]
    recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
    ...@@ -108,10 +126,24 @@ name = $${:_buildout_section_name_}.py ...@@ -108,10 +126,24 @@ name = $${:_buildout_section_name_}.py
    config-hostname = $${frontend-instance:ip} config-hostname = $${frontend-instance:ip}
    config-port = $${frontend-instance:port} config-port = $${frontend-instance:port}
    [apache-frontend]
    <= slap-connection
    recipe = slapos.cookbook:requestoptional
    name = Theia Frontend
    # XXX We have hardcoded SR URL here.
    software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
    slave = true
    config-url = $${frontend-instance:url}
    config-https-only = true
    config-type = websocket
    config-websocket-path-list = /services
    return = domain secure_access
    [publish-connection-parameter] [publish-connection-parameter]
    recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
    url = $${frontend-instance:url} url = $${apache-frontend:connection-secure_access}
    username = $${frontend-instance-password:username}
    password = $${frontend-instance-password:passwd}
    [instance-parameter] [instance-parameter]
    recipe = slapos.cookbook:slapconfiguration recipe = slapos.cookbook:slapconfiguration
    ......
    software/theia/python-language-server-requirements.txt
    View file @ e6265b6f
    appdirs==1.4.3 appdirs==1.4.3
    astroid==2.3.3
    attrs==18.2.0 attrs==18.2.0
    black==18.9b0 black==18.9b0
    Click==7.0 Click==7.0
    future==0.17.1 future==0.17.1
    isort==4.3.4 isort==4.3.21
    jedi==0.13.2 jedi==0.13.2
    lazy-object-proxy==1.4.3
    mccabe==0.6.1 mccabe==0.6.1
    mypy==0.660 mypy==0.770
    mypy-extensions==0.4.1 mypy-extensions==0.4.3
    parso==0.3.2 parso==0.3.2
    pluggy==0.8.1 pluggy==0.8.1
    pydocstyle==3.0.0 pydocstyle==3.0.0
    pyflakes==2.1.0 pyflakes==2.1.0
    pygls==0.8.1
    pylint==2.4.4
    python-jsonrpc-server==0.1.2 python-jsonrpc-server==0.1.2
    -e git+https://github.com/palantir/python-language-server@50d03d5931d564e9908292ccfa21dd629ee817ba#egg=python_language_server -e git+https://github.com/palantir/python-language-server@50d03d5931d564e9908292ccfa21dd629ee817ba#egg=python_language_server
    rope==0.11.0 rope==0.11.0
    six==1.12.0 six==1.12.0
    snowballstemmer==1.2.1 snowballstemmer==1.2.1
    toml==0.10.0 toml==0.10.0
    typed-ast==1.2.0 typed-ast==1.4.1
    yapf==0.28.0 typing-extensions==3.7.4.2
    wrapt==1.11.2
    yapf==0.29.0
    zc.buildout.languageserver==0.2.0
    software/theia/software.cfg
    View file @ e6265b6f
    ...@@ -24,7 +24,7 @@ parts = ...@@ -24,7 +24,7 @@ parts =
    [nodejs] [nodejs]
    <= nodejs-10.6.0 <= nodejs-10.19.0
    [yarn] [yarn]
    # this could become a component, but it needs to be invoked from nodejs explicitly, # this could become a component, but it needs to be invoked from nodejs explicitly,
    ...@@ -59,14 +59,17 @@ command = ${bash:location}/bin/bash -c " ...@@ -59,14 +59,17 @@ command = ${bash:location}/bin/bash -c "
    export TMPDIR=${:location}/tmp PATH=${nodejs:location}/bin/:${python2.7:location}/bin/:$PATH && export TMPDIR=${:location}/tmp PATH=${nodejs:location}/bin/:${python2.7:location}/bin/:$PATH &&
    mkdir -p ${:location} && \ mkdir -p ${:location} && \
    mkdir -p \$TMPDIR && \ mkdir -p \$TMPDIR && \
    mkdir -p ${:THEIA_DEFAULT_PLUGINS} && \
    cd ${:location} && \ cd ${:location} && \
    cp ${package.json:rendered} . && cp ${package.json:rendered} . &&
    cp ${yarn.lock:output} . && cp ${yarn.lock:output} . &&
    ${yarn:location}/bin/yarn && \ ${yarn:location}/bin/yarn && \
    ${yarn:location}/bin/yarn theia build" ${yarn:location}/bin/yarn theia build && \
    ${yarn:location}/bin/yarn theia download:plugins"
    location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
    stop-on-error = true stop-on-error = true
    uses = ${yarn.lock:recipe} uses = ${yarn.lock:recipe}
    THEIA_DEFAULT_PLUGINS = ${:location}/plugins/
    [yarn.lock] [yarn.lock]
    recipe = slapos.recipe.template recipe = slapos.recipe.template
    ...@@ -76,11 +79,11 @@ mode = 0644 ...@@ -76,11 +79,11 @@ mode = 0644
    [package.json] [package.json]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    # this comes from https://github.com/theia-ide/theia-apps/blob/def6d29a5fb3739aebc17c6a5b67f1b5c16caacd/theia-full-docker/next.package.json # this comes from https://github.com/theia-ide/theia-apps/blob/0cc6a3dc2a6dec1b2b4f9572e9d878a67dc81ff5/theia-full-docker/latest.package.json
    # but "@theia/php": "next" was removed, because we don't have php/composer component so installation failed # but we pin vscode-json-languageserver to 1.2.2, otherwise 1.2.3 is picked and it seems to be incompatible.*
    # See https://github.com/theia-ide/theia-apps/issues/333
    template = template =
    inline: inline:{
    {
    "private": true, "private": true,
    "theia": { "theia": {
    "frontend": { "frontend": {
    ...@@ -110,56 +113,124 @@ template = ...@@ -110,56 +113,124 @@ template =
    } }
    }, },
    "dependencies": { "dependencies": {
    "@theia/callhierarchy": "next", "@theia/callhierarchy": "latest",
    "@theia/core": "next", "@theia/core": "latest",
    "@theia/cpp": "next", "@theia/cpp": "latest",
    "@theia/debug": "next", "@theia/debug": "latest",
    "@theia/debug-nodejs": "next", "@theia/editor": "latest",
    "@theia/docker": "next", "@theia/editor-preview": "latest",
    "@theia/editor": "next", "@theia/file-search": "latest",
    "@theia/editorconfig": "next", "@theia/filesystem": "latest",
    "@theia/editor-preview": "next", "@theia/getting-started": "latest",
    "@theia/file-search": "next", "@theia/git": "latest",
    "@theia/filesystem": "next", "@theia/json": "latest",
    "@theia/git": "next", "@theia/keymaps": "latest",
    "@theia/go": "next", "@theia/languages": "latest",
    "@theia/getting-started": "next", "@theia/markers": "latest",
    "@theia/java": "next", "@theia/messages": "latest",
    "@theia/json": "next", "@theia/metrics": "latest",
    "@theia/keymaps": "next", "@theia/mini-browser": "latest",
    "@theia/languages": "next", "@theia/monaco": "latest",
    "@theia/markers": "next", "@theia/navigator": "latest",
    "@theia/merge-conflicts": "next", "@theia/outline-view": "latest",
    "@theia/messages": "next", "@theia/output": "latest",
    "@theia/metrics": "next", "@theia/plantuml": "latest",
    "@theia/mini-browser": "next", "@theia/plugin": "latest",
    "@theia/monaco": "next", "@theia/plugin-ext": "latest",
    "@theia/navigator": "next", "@theia/plugin-ext-vscode": "latest",
    "@theia/outline-view": "next", "@theia/preferences": "latest",
    "@theia/output": "next", "@theia/preview": "latest",
    "@theia/plantuml": "next", "@theia/process": "latest",
    "@theia/plugin": "next", "@theia/rust": "latest",
    "@theia/plugin-ext": "next", "@theia/search-in-workspace": "latest",
    "@theia/plugin-ext-vscode": "next", "@theia/task": "latest",
    "@theia/preferences": "next", "@theia/terminal": "latest",
    "@theia/preview": "next", "@theia/userstorage": "latest",
    "@theia/process": "next", "@theia/variable-resolver": "latest",
    "@theia/ruby": "next", "@theia/workspace": "latest"
    "@theia/rust": "next", },
    "@theia/search-in-workspace": "next", "resolutions": {
    "@theia/task": "next", "vscode-json-languageserver": "1.2.2",
    "@theia/terminal": "next", "vscode-languageserver-protocol": "3.15.0-next.9",
    "@theia/textmate-grammars": "next", "vscode-languageserver-types": "3.15.0-next.4",
    "@theia/tslint": "next", "**/vscode-json-languageserver/**/vscode-languageserver": "6.0.0-next.1"
    "@theia/typescript": "next",
    "@theia/userstorage": "next",
    "@theia/variable-resolver": "next",
    "@theia/workspace": "next",
    "theia-yang-extension": "next",
    "typescript": "latest"
    }, },
    "devDependencies": { "devDependencies": {
    "@theia/cli": "next" "@theia/cli": "latest"
    },
    "theiaPluginsDir": "plugins",
    "theiaPlugins": {
    "vscode-builtin-bat": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/bat-1.39.1-prel.vsix",
    "vscode-builtin-clojure": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/clojure-1.39.1-prel.vsix",
    "vscode-builtin-coffeescript": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/coffeescript-1.39.1-prel.vsix",
    "vscode-builtin-configuration-editing": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/configuration-editing-1.39.1-prel.vsix",
    "vscode-builtin-cpp": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/cpp-1.39.1-prel.vsix",
    "vscode-builtin-csharp": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/csharp-1.39.1-prel.vsix",
    "vscode-builtin-css": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/css-1.39.1-prel.vsix",
    "vscode-builtin-debug-auto-launch": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/debug-auto-launch-1.39.1-prel.vsix",
    "vscode-builtin-docker": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/docker-1.39.1-prel.vsix",
    "vscode-builtin-emmet": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/emmet-1.39.1-prel.vsix",
    "vscode-builtin-fsharp": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/fsharp-1.39.1-prel.vsix",
    "vscode-builtin-go": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/go-1.39.1-prel.vsix",
    "vscode-builtin-groovy": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/groovy-1.39.1-prel.vsix",
    "vscode-builtin-grunt": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/grunt-1.39.1-prel.vsix",
    "vscode-builtin-gulp": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/gulp-1.39.1-prel.vsix",
    "vscode-builtin-handlebars": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/handlebars-1.39.1-prel.vsix",
    "vscode-builtin-hlsl": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/hlsl-1.39.1-prel.vsix",
    "vscode-builtin-html": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/html-1.39.1-prel.vsix",
    "vscode-builtin-ini": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/ini-1.39.1-prel.vsix",
    "vscode-builtin-jake": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/jake-1.39.1-prel.vsix",
    "vscode-builtin-java": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/java-1.39.1-prel.vsix",
    "vscode-builtin-javascript": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/javascript-1.39.1-prel.vsix",
    "vscode-builtin-json": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/json-1.39.1-prel.vsix",
    "vscode-builtin-less": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/less-1.39.1-prel.vsix",
    "vscode-builtin-log": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/log-1.39.1-prel.vsix",
    "vscode-builtin-lua": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/lua-1.39.1-prel.vsix",
    "vscode-builtin-make": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/make-1.39.1-prel.vsix",
    "vscode-builtin-markdown": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/markdown-1.39.1-prel.vsix",
    "vscode-builtin-merge-conflicts": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/merge-conflict-1.39.1-prel.vsix",
    "vscode-builtin-npm": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/npm-1.39.1-prel.vsix",
    "vscode-builtin-node-debug": "https://github.com/theia-ide/vscode-node-debug/releases/download/v1.35.3/node-debug-1.35.3.vsix",
    "vscode-builtin-node-debug2": "https://github.com/theia-ide/vscode-node-debug2/releases/download/v1.33.0/node-debug2-1.33.0.vsix",
    "vscode-builtin-objective-c": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/objective-c-1.39.1-prel.vsix",
    "vscode-builtin-perl": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/perl-1.39.1-prel.vsix",
    "vscode-builtin-powershell": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/powershell-1.39.1-prel.vsix",
    "vscode-builtin-pug": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/pug-1.39.1-prel.vsix",
    "vscode-builtin-python": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/python-1.39.1-prel.vsix",
    "vscode-builtin-r": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/r-1.39.1-prel.vsix",
    "vscode-builtin-razor": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/razor-1.39.1-prel.vsix",
    "vscode-builtin-ruby": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/ruby-1.39.1-prel.vsix",
    "vscode-builtin-rust": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/rust-1.39.1-prel.vsix",
    "vscode-builtin-scss": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/scss-1.39.1-prel.vsix",
    "vscode-builtin-shaderlab": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/shaderlab-1.39.1-prel.vsix",
    "vscode-builtin-shellscript": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/shellscript-1.39.1-prel.vsix",
    "vscode-builtin-sql": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/sql-1.39.1-prel.vsix",
    "vscode-builtin-swift": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/swift-1.39.1-prel.vsix",
    "vscode-builtin-theme-abyss": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-abyss-1.39.1-prel.vsix",
    "vscode-builtin-theme-defaults": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-defaults-1.39.1-prel.vsix",
    "vscode-builtin-theme-kimbie-dark": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-kimbie-dark-1.39.1-prel.vsix",
    "vscode-builtin-theme-monokai": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-monokai-1.39.1-prel.vsix",
    "vscode-builtin-theme-dimmed": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-monokai-dimmed-1.39.1-prel.vsix",
    "vscode-builtin-theme-quietlight": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-quietlight-1.39.1-prel.vsix",
    "vscode-builtin-theme-red": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-red-1.39.1-prel.vsix",
    "vscode-builtin-theme-solarized-dark": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-solarized-dark-1.39.1-prel.vsix",
    "vscode-builtin-theme-tomorrow-night-blue": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/theme-tomorrow-night-blue-1.39.1-prel.vsix",
    "vscode-builtin-typescript": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/typescript-1.39.1-prel.vsix",
    "vscode-builtin-typescript-language-features": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/typescript-language-features-1.39.1-prel.vsix",
    "vscode-builtin-vb": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/vb-1.39.1-prel.vsix",
    "vscode-builtin-icon-theme-seti": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/vscode-theme-seti-1.39.1-prel.vsix",
    "vscode-builtin-xml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/xml-1.39.1-prel.vsix",
    "vscode-builtin-yaml": "https://github.com/theia-ide/vscode-builtin-extensions/releases/download/v1.39.1-prel/yaml-1.39.1-prel.vsix",
    "vscode-editorconfig": "https://github.com/theia-ide/editorconfig-vscode/releases/download/v0.14.4/EditorConfig-0.14.4.vsix",
    "vscode-eslint": "https://github.com/theia-ide/vscode-eslint/releases/download/release%2F2.0.15/vscode-eslint-2.0.15.vsix",
    "vscode-go": "https://github.com/microsoft/vscode-go/releases/download/0.12.0/Go-0.12.0.vsix",
    "vscode-java-debug": "https://github.com/microsoft/vscode-java-debug/releases/download/0.24.0/vscjava.vscode-java-debug-0.24.0.vsix",
    "vscode-java-dependency-viewer": "https://github.com/microsoft/vscode-java-dependency/releases/download/0.6.0/vscode-java-dependency-0.6.0.vsix",
    "vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.54.2/redhat.java-0.54.2.vsix",
    "vscode-java-test": "https://github.com/microsoft/vscode-java-test/releases/download/0.22.0/vscjava.vscode-java-test-0.22.0.vsix",
    "vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix",
    "vscode-ruby": "https://github.com/rubyide/vscode-ruby/releases/download/v0.25.0/ruby-0.25.0.vsix",
    "vscode-zc-buildout": "https://github.com/perrinjerome/vscode-zc-buildout/releases/download/v0.2.0/vscode-zc-buildout-0.2.0.vsix"
    } }
    } }
    rendered = ${buildout:directory}/${:_buildout_section_name_} rendered = ${buildout:directory}/${:_buildout_section_name_}
    ...@@ -198,6 +269,7 @@ template = ...@@ -198,6 +269,7 @@ template =
    #!/bin/bash #!/bin/bash
    export PATH=${nodejs:location}/bin/:${python-language-server:location}/bin/:${bash:location}/bin/:${git:location}/bin/:$PATH export PATH=${nodejs:location}/bin/:${python-language-server:location}/bin/:${bash:location}/bin/:${git:location}/bin/:$PATH
    . ${gowork:env.sh} . ${gowork:env.sh}
    export THEIA_DEFAULT_PLUGINS="local-dir:${theia:THEIA_DEFAULT_PLUGINS}"
    export SHELL=bash export SHELL=bash
    # reset PS1 from gowork # reset PS1 from gowork
    export PS1='$ ' export PS1='$ '
    ......
    software/theia/test/test.py
    View file @ e6265b6f
    ...@@ -44,19 +44,20 @@ setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass( ...@@ -44,19 +44,20 @@ setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
    class TestTheia(SlapOSInstanceTestCase): class TestTheia(SlapOSInstanceTestCase):
    def setUp(self): def setUp(self):
    self.theia_url = self.computer_partition.getConnectionParameterDict( self.connection_parameters = self.computer_partition.getConnectionParameterDict()
    )['url']
    def test_http_get(self): def test_http_get(self):
    resp = requests.get(self.theia_url, verify=False) resp = requests.get(self.connection_parameters['url'], verify=False)
    self.assertEqual(requests.codes.ok, resp.status_code) self.assertEqual(requests.codes.unauthorized, resp.status_code)
    # without login/password, this is unauthorized # with login/password, this is allowed
    parsed_url = urlparse(self.theia_url) parsed_url = urlparse(self.connection_parameters['url'])
    resp = requests.get( resp = requests.get(
    parsed_url._replace( parsed_url._replace(
    netloc='[{}]:{}'.format( netloc='{}:{}@[{}]:{}'.format(
    self.connection_parameters['username'],
    self.connection_parameters['password'],
    parsed_url.hostname, parsed_url.hostname,
    parsed_url.port)).geturl(), parsed_url.port)).geturl(),
    verify=False) verify=False)
    self.assertEqual(requests.codes.unauthorized, resp.status_code) self.assertEqual(requests.codes.ok, resp.status_code)
    software/theia/yarn.lock
    View file @ e6265b6f
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7