Update Release Candidate

component/bash-completion/buildout.cfg

+[buildout]
+extends = ../xz-utils/buildout.cfg
+parts = bash-completion
+
+[bash-completion]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz
+md5sum = 2514c6772d0de6254758b98c53f91861
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/golang/buildout.cfg

@@ -52,13 +52,23 @@ environment-extra =
 
 [golang1.14]
 <= golang-common
-url = https://golang.org/dl/go1.14.10.src.tar.gz
-md5sum = c0b485e8ac8b1978b5164e3e200150fa
+url = https://golang.org/dl/go1.14.12.src.tar.gz
+md5sum = ae124560e0185a82883b57cc9662aa73
 
 # go1.14 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
+[golang1.15]
+<= golang-common
+url = https://golang.org/dl/go1.15.5.src.tar.gz
+md5sum = 12a60d319ff58c03c323e8dcc125ae81
+
+# go1.15 needs go1.4 to bootstrap
+environment-extra =
+  GOROOT_BOOTSTRAP=${golang14:location}
+
+
 # ---- infrastructure to build Go workspaces / projects ----
 
 # gowork is a top-level section representing workspace

component/helloweb/buildout.cfg

@@ -25,7 +25,7 @@ parts =
 install =
     lab.nexedi.com/nexedi/helloweb/go/...
 
-golang  = ${golang1.14:location}
+golang  = ${golang1.15:location}
 
 # -*- go -*-
 [helloweb-go]

component/nxdtest/buildout.cfg

+[buildout]
+extends =
+  ../pygolang/buildout.cfg
+  ../git/buildout.cfg
+
+
+[nxdtest]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${pygolang:egg}
+          ${nxdtest-egg:egg}
+scripts = nxdtest
+# convenience for nxdtest users
+exe     = ${buildout:bin-directory}/nxdtest
+
+[nxdtest-egg]
+recipe  = zc.recipe.egg:develop
+setup   = ${nxdtest-repository:location}
+egg     = nxdtest
+
+[nxdtest-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/nxdtest.git
+revision = 40e2c4ab
+location = ${buildout:parts-directory}/nxdtest
+git-executable = ${git:location}/bin/git

component/nxdtest/test-py3.cfg

+# SlapOS software release to test nxdtest on Nexedi testing infrastructure.
+[buildout]
+extends =
+  ../defaults.cfg
+  test.cfg
+
+[python]
+part = python3

component/nxdtest/test.cfg

+# SlapOS software release to test nxdtest on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+    ../../stack/nxdtest.cfg
+    ../pytest/buildout.cfg
+
+parts =
+    python-interpreter
+    slapos-cookbook
+    instance.cfg
+
+# override to install test extra
+[nxdtest-egg]
+egg = nxdtest[test]
+
+[python-interpreter]
+eggs +=
+  ${pytest:eggs}
+  ${nxdtest:eggs}
+
+# env.sh for interpreter to be on $PATH.
+[nxdtest-env.sh]
+recipe   = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+template = inline:
+  export PS1="(nxdtest-env) $PS1"
+  export PATH=${buildout:bin-directory}:$PATH
+
+# instance to run nxdtest.
+[instance.cfg]
+<= jinja2-template
+template = inline:
+  [buildout]
+  extends = ${nxdtest-instance.cfg:rendered}
+
+  [runTestSuite]
+  env.sh  = ${nxdtest-env.sh:rendered}
+  workdir = ${nxdtest-repository:location}
+

component/pygolang/buildout.cfg

@@ -37,6 +37,14 @@ interpreter = python
 # interpreter code that buildout generates cannot process `-m pytest --<pytest-option>`
 # -> use pymain from gpython to workaround that.
 initialization =
+  # minimal support for -O argument.
+  if '-O' in sys.argv:
+    import os
+    with open(sys.argv[0]) as f:
+        executable = f.readlines()[0][2:-1]
+    sys.argv.remove('-O')
+    os.execve(executable, sys.argv, dict(os.environ, PYTHONOPTIMIZE='1'))
+
   # set sys.executable to self, so that subprocess and friends go through us
   # and this way spawn children with correct sys.path where all eggs that
   # parent have are present. TODO consider migrating this into pymain

component/pygolang/test-py3.cfg

+# SlapOS software release to test pygolang/py3 on Nexedi testing infrastructure.
+
+[buildout]
+extends = test.cfg
+
+[python]
+part = python3

component/wendelin.core/buildout.cfg

@@ -3,6 +3,7 @@
 [buildout]
 extends =
   ../pygolang/buildout.cfg
+  ../numpy/buildout.cfg
   ../git/buildout.cfg
 
 parts =
@@ -27,6 +28,11 @@ setup-eggs =
     ${pygolang:egg}[pyx.build]
 environment = wendelin.core-env
 
+# dependent eggs that must come through in-tree recipes
+depends =
+    ${numpy:egg}
+
+
 [wendelin.core-env]
 # wendelin.core needs git(dev) to build
 PATH = ${git:location}/bin:%(PATH)s

slapos/recipe/erp5testnode/__init__.py

@@ -36,7 +36,7 @@ class Recipe(GenericBaseRecipe):
     self.path_list = []
     options = self.options.copy()
     del options['recipe']
-    CONFIG = {k.replace('-', '_'): v for k, v in options.iteritems()}
+    CONFIG = {k.replace('-', '_'): v for k, v in options.items()}
     CONFIG['PATH'] = os.environ['PATH']
 
     if self.options['instance-dict']:
@@ -44,7 +44,7 @@ class Recipe(GenericBaseRecipe):
       config_instance_dict.add_section('instance_dict')
       instance_dict = json.loads(self.options['instance-dict'])
 
-      for k ,v in instance_dict.iteritems():
+      for k ,v in instance_dict.items():
         config_instance_dict.set('instance_dict', k, v)
       value = io.StringIO()
       config_instance_dict.write(value)

slapos/test/recipe/test_erp5testnode.py

+import functools
+import os
+import shutil
+import tempfile
+import unittest
+
+from six.moves import configparser
+import zc.buildout.testing
+
+
+class UserInfoTest(unittest.TestCase):
+  def setUp(self):
+    self.tmp_dir = tempfile.mkdtemp()
+    self.addCleanup(shutil.rmtree, self.tmp_dir)
+
+    self.get_temp_path = functools.partial(os.path.join, self.tmp_dir)
+
+    self.buildout = buildout = zc.buildout.testing.Buildout()
+    buildout['slap-connection'] = {
+        'computer-id': 'computer-id',
+        'server-url': 'https://slapos.example.com',
+    }
+    # dummy defaults
+    buildout['erp5testnode'] = {
+        'apache-binary': '/bin/httpd',
+        'apache-htpasswd': '/bin/htpasswd',
+        'apache-mime-file': '/etc/mime.types',
+        'apache-modules-dir': '/srv/modules',
+        'frontend-url': 'https://example.com/',
+        'git-binary': '/bin/git',
+        'httpd-cert-file': 'etc/httpd-public.crt',
+        'httpd-key-file': 'etc/httpd-public.key',
+        'httpd-conf-file': 'etc/httpd.conf',
+        'httpd-ip': '::1',
+        'httpd-lock-file': 'var/run/httpd.lock',
+        'httpd-log-directory': 'var/log',
+        'httpd-pid-file': 'var/run/httpd.pid',
+        'httpd-port': '9080',
+        'httpd-software-access-port': '9081',
+        'httpd-software-directory': 'srv/software',
+        'httpd-wrapper': 'bin/httpd',
+        'instance-dict': '',
+        'ipv4-address': '127.0.0.1',
+        'ipv6-address': '::1',
+        'keep-log-days': '3',
+        'log-directory': 'var/log/testnode',
+        'log-file': 'var/log/erp5testnode.log',
+        'log-frontend-url': 'https://example.com',
+        'node-quantity': '2',
+        'proxy-host': '127.0.0.1',
+        'proxy-port': '5000',
+        'recipe': 'slapos.cookbook:erp5testnode',
+        'run-directory': 'var/run/testnode',
+        'shared-part-list': 'srv/shared',
+        'slapos-binary': '/bin/slapos',
+        'slapos-directory': 'srv/slapos',
+        'software-directory': 'srv/software',
+        'software-path-list': '[""]',
+        'srv-directory': 'srv',
+        'test-node-title': 'TEST NODE TITLE',
+        'test-suite-directory': 'srv/test_suite',
+        'test-suite-master-url': 'https://testnode.example.com',
+        'testnode': '/bin/testnode',
+        'working-directory': 'srv/testnode',
+        'wrapper': 'bin/erp5testnode-service',
+        'zip-binary': '/bin/zip',
+    }
+
+    # values for test
+    buildout['erp5testnode']['configuration-file'] = self.get_temp_path(
+        'configuration-file')
+    buildout['erp5testnode']['wrapper'] = self.get_temp_path('wrapper')
+    buildout['erp5testnode']['httpd-conf-file'] = self.get_temp_path(
+        'httpd-conf-file')
+    buildout['erp5testnode']['httpd-wrapper'] = self.get_temp_path(
+        'httpd-wrapper')
+
+    buildout['erp5testnode']['log-directory'] = self.get_temp_path(
+        'log-directory')
+    os.mkdir(self.get_temp_path('log-directory'))
+    # software URLs are given as a json encoded string
+    buildout['erp5testnode'][
+        'software-path-list'] = '["https://example.com/slapos/software.cfg", "https://example.com/slapos/another-software.cfg"]'
+
+    from slapos.recipe import erp5testnode
+    self.recipe = erp5testnode.Recipe(
+        buildout,
+        'erp5testnode',
+        buildout['erp5testnode'],
+    )
+
+  def test_installed_paths(self):
+    self.assertEqual(
+        sorted(self.recipe.install()),
+        sorted([
+            self.get_temp_path('configuration-file'),
+            self.get_temp_path('wrapper'),
+            self.get_temp_path('httpd-conf-file'),
+            self.get_temp_path('httpd-wrapper'),
+        ]))
+
+  def test_configuration_file(self):
+    self.recipe.install()
+
+    parser = configparser.ConfigParser()
+    parser.read(self.get_temp_path('configuration-file'))
+
+    # this is generally a valid configparser file.
+    self.assertEqual(parser.get('testnode', 'slapos_directory'), 'srv/slapos')
+
+    # software URLs are specified comma separated (XXX not sure it was
+    # good idea, but it's like this)
+    self.assertEqual(parser.get('software_list', 'path_list'),
+      "https://example.com/slapos/software.cfg,https://example.com/slapos/another-software.cfg")
+
+
+  def test_log_directory_apache(self):
+    self.recipe.install()
+
+    self.assertTrue(
+        os.path.exists(self.get_temp_path('log-directory', 'index.html')))
+
+    # apache to expose log directory
+    with open(self.get_temp_path('httpd-conf-file')) as f:
+      self.assertIn(
+          'DocumentRoot "{}"'.format(self.get_temp_path('log-directory')),
+          f.read())
+
+    # wrapper references the config file
+    with open(self.get_temp_path('httpd-wrapper')) as f:
+      self.assertIn(self.get_temp_path('httpd-conf-file'), f.read())

software/nayuos/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [template-instance]
 filename = instance.cfg
-md5sum = aa91245be4b946d0537f6e007f0d72ea
+md5sum = 0974248c0b0ad5da45670386a5301e47

software/nayuos/instance.cfg

 # Jinja2 template of a buildout file to create runnable scripts
 #
 # Received variables
-# -  software_dir: location where this repository was cloned to
-# -  instance_dir: location where this 'instance.cfg' is gettin rendered (same as ${buildout:directory})
+# -  project_dir: location where this repository was cloned to
+# -  software_dir: location where this 'instance.cfg' is gettin rendered (same as ${buildout:directory})
 
 [buildout]
 parts =
@@ -12,6 +12,7 @@ parts =
   template-full-build-script
   template-sudo-wrapper
   template-cros-sdk-wrapper
+  resiliency-exclude-file
 
 extends = {{ monitor_template }}
 # standard declaration of eggs directories
@@ -30,7 +31,7 @@ git-executable = {{ git_path }}/bin/git
 [customize-path]
 # add depot tools directory (for cros_sdk binary among others) and git directory to the path
 command =
-  export PATH="${directory:wrapper_dir}":"{{ git_path }}/bin":"{{ curl_path }}/bin":"${depot-tools:location}":"{{thin_provisioning_tools}}/sbin":"$PATH";
+  export PATH="${directory:wrapper_dir}":"{{ software_dir }}/bin":"{{ git_path }}/bin":"{{ curl_path }}/bin":"${depot-tools:location}":"{{thin_provisioning_tools}}/sbin":"$PATH";
 
 [nayuos-ebuilds]
 recipe = slapos.recipe.build:gitclone
@@ -56,8 +57,10 @@ cert = ${slap_connection:cert_file}
 recipe = slapos.cookbook:mkdirectory
 log = ${buildout:directory}/var/log
 run = ${buildout:directory}/etc/run
+backup = ${buildout:directory}/srv/backup
 wrapper_dir = ${buildout:directory}/wrapper_bin
 cros_location = ${buildout:directory}/parts/chromiumos
+images = ${:cros_location}/images
 
 [bin]
 # dummy section to hold references to frequently used binaries
@@ -79,7 +82,7 @@ config-command = ${promise-sudo-on-host-bin:wrapper-path}
 
 [template-sudo-wrapper]
 recipe = slapos.recipe.template:jinja2
-template = {{ software_dir }}/scripts/wrapper_sudo.in
+template = {{ project_dir }}/scripts/wrapper_sudo.in
 rendered = ${directory:wrapper_dir}/sudo
 md5sum = ded5a92be4e37ec32eb9d3087d3e19bd
 mode = 0700
@@ -90,7 +93,7 @@ context =
 
 [template-cros-sdk-wrapper]
 recipe = slapos.recipe.template:jinja2
-template = {{ software_dir }}/scripts/wrapper_cros_sdk.in
+template = {{ project_dir }}/scripts/wrapper_cros_sdk.in
 rendered = ${bin:wrapper_cros_sdk}
 md5sum = 7159fe3d5b85a283733cf686c4ee0a74
 mode = 0700
@@ -104,25 +107,32 @@ context =
 # create the rendered script in the buildout-directory/etc/run
 # (use jinja for templating)
 recipe = slapos.recipe.template:jinja2
-template = {{ software_dir }}/scripts/cros_full_build.in
+template = {{ project_dir }}/scripts/cros_full_build.in
 rendered = ${directory:run}/cros_full_build
-md5sum = f3b3b5408b69f752f2221d3965caf590
+#md5sum = f3b3b5408b69f752f2221d3965caf590
 mode = 0700
 context =
   key bash_path                         bin:bash
   key instance_log_dir                  directory:log
+  key instance_dir                      buildout:directory
   key cros_location                     directory:cros_location
   key export_path_cmd                   customize-path:command
   key branch                            parameters:configuration.branch
   key boards_list                       parameters:configuration.boards
   key keep_cache                        parameters:configuration.keep_cache
   key ebuilds_dir                       nayuos-ebuilds:location
-  raw scripts_dir                       {{ software_dir }}/scripts
-  raw logo_dir                          {{ software_dir }}/logo
-  raw wallpaper_dir                     {{ software_dir }}/wallpaper
-  raw patch_dir                         {{ software_dir }}/patch
+  raw scripts_dir                       {{ project_dir }}/scripts
+  raw logo_dir                          {{ project_dir }}/logo
+  raw wallpaper_dir                     {{ project_dir }}/wallpaper
+  raw patch_dir                         {{ project_dir }}/patch
 # packages to be copied from our overlay into ChromiuOS' overlay
 # those packages will be marked as dependency of root filesystem
   raw nayu_dev_rootfs_packages          app-misc/nayuos-chromium-policy
 # those packages will be marked as dependency of the chromium build itself
   raw nayu_dev_packages                 dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
+
+[resiliency-exclude-file]
+# Generate rdiff exclude file for resiliency
+recipe = collective.recipe.template
+input = inline: parts/chromiumos/release*
+output = ${directory:srv}/exporter.exclude

software/nayuos/software.cfg

@@ -8,19 +8,29 @@ extends =
   ../../component/libexpat/buildout.cfg
   ../../component/libaio/buildout.cfg
   ../../component/boost-lib/buildout.cfg
+  ../../component/rsync/buildout.cfg
 
 parts +=
+  eggs
   slapos-cookbook
   template-instance
   git
   curl
   thin-provisioning-tools
 
-versions = versions
+[gcc]
+min_version = 0
 
-[versions]
-slapos.recipe.template = 4.4
+[python]
+# we need python3 for repo/cros_sdk command
+part = python3
 
+[eggs]
+# name is python3 so that cros_sdk uses it automatically through "/usr/bin/env python3"
+recipe = zc.recipe.egg
+interpreter = python3
+eggs =
+  setuptools
 
 [template-instance]
 # jinja2 render instance.cfg file in the buildout directory
@@ -29,10 +39,11 @@ template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/${:filename}
 mode = 0644
 context =
-  key software_dir            :_profile_base_location_
-  key instance_dir            buildout:directory
+  key project_dir             :_profile_base_location_
+  key software_dir            buildout:directory
   key curl_path               curl:location
   key git_path                git:location
+  key rsync_path              rsync:location
   key eggs_directory          buildout:eggs-directory
   key develop_eggs_directory  buildout:develop-eggs-directory
   key thin_provisioning_tools thin-provisioning-tools:location
@@ -56,3 +67,6 @@ dependencies =
   libexpat
   libaio
   boost-lib
+
+[versions]
+slapos.recipe.template = 4.4

software/neotest/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [neotest-env.sh]
 filename = neotest-env.sh.in
-md5sum = bd46e95f1cea62c3b0082fe8c0c9c90b
+md5sum = dd41bd736561b7d59b5ec7e0ab7cde98
 
 [neotest]
 filename = neotest.in

software/neotest/neotest-env.sh.in

@@ -9,24 +9,7 @@ PATH="${ioping:location}/bin:$PATH"
 PATH="${lmbench:location}/bin:$PATH"
 PATH="${mariadb:location}/bin:$PATH"
 PATH="${mariadb:location}/scripts:$PATH"
-PATH="${python:location}/bin:$PATH"
-
-# add all eggs and develop-eggs to py path
-#
-# XXX better leverage something like zc.recipe.egg to generate eggs path buildout way
-# XXX see e.g. https://lab.nexedi.com/nexedi/slapos/merge_requests/242#note_49644 for why
-# TODO(kirr) try doing so
-PYTHONPATH=${buildout:develop-eggs-directory}:$PYTHONPATH       # for .egg-link to be found by setuptools
-for egglink in ${buildout:develop-eggs-directory}/*.egg-link; do
-    PYTHONPATH=`cat $egglink |head -1`:$PYTHONPATH
-done
-
-for egg in ${buildout:develop-eggs-directory}/*.egg ${buildout:eggs-directory}/*.egg; do
-        export PYTHONPATH=$egg:$PYTHONPATH
-done
-
+PATH="${buildout:bin-directory}/:$PATH"  # for python with eggs
 
 export PATH
-export PYTHONPATH
-
 export PS1="(neotest-`basename ${buildout:directory}`) $PS1"

software/neotest/software.cfg

@@ -18,7 +18,6 @@ extends =
     ../../component/coreutils/buildout.cfg
     ../../component/util-linux/buildout.cfg
     ../../component/pygolang/buildout.cfg
-    ../../component/numpy/buildout.cfg
     ../../stack/nxdtest.cfg
 
 
@@ -36,8 +35,12 @@ parts =
     neoppod-develop
     neoppod
     wendelin.core-dev
-    eggs
+    scripts
 
+# for ZEO scripts (runzeo)
+    ZEO/scripts
+
+    neotest-python
     neotest-env.sh
     neotest
 
@@ -100,23 +103,21 @@ template = inline:
 
 
 
-# eggs:
-[eggs]
-recipe  = zc.recipe.egg
-eggs    =
-# wendelin.core still requires ZODB3 but having ZODB4 or 5 installed satisfies latest ZODB3
-    ZODB3
-# also for wc
-    ${numpy:egg}
-# to install not only wendelin.core modules but also scripts
-    wendelin.core
-# for ZEO scripts (runzeo)
-    ${ZEO:egg}
-# for e.g. tcpu.py
-    ${pygolang:egg}
+# bin/python is preinstalled with sys.path to wendelin.core & friends.
+[neotest-python]
+<= python-interpreter
+eggs +=
+    ${wendelin.core-dev:egg}
+    ${neoppod:eggs}
 # for instance
     plone.recipe.command
 
+[scripts]
+recipe  = zc.recipe.egg:scripts
+eggs    =
+# to install not only wendelin.core modules but also scripts
+    ${wendelin.core-dev:egg}
+
 
 # wendelin.core: latest not yet released
 [wendelin.core-repository]

software/powerdns/buildout.hash.cfg

@@ -18,15 +18,15 @@ md5sum = fddea033e1aa9d6147a1a47bd7cc4b62
 
 [template-powerdns]
 filename = instance-powerdns.cfg
-md5sum = 9cd4e436fa432f37b9f8f4de8350581b
+md5sum = 0920200cb05a68b1b4a161a927d9488f
 
 [template-pdns-configuration]
 _update_hash_filename_ = template/pdns.conf.jinja2
-md5sum = e45d72de87b4adb89c195ba463be4077
+md5sum = 20c37ea06a8fa405bc02470d5115fd11
 
 [template-dns-replicate]
 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
-md5sum = a23e241a236f90ae1afbb5bd5ba0b32d
+md5sum = c2bd424f588ad57d37f4cf1329734fb6
 
 [iso-list]
 _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -43,6 +43,7 @@ context =
 {%   set dns_name = 'ns%s' % i -%}
 {%   set dns_domain = dns_name_template_string % i %}
 {%   set request_section_title = 'request-%s' % dns_name -%}
+{%   set promise_section_title = 'promise-listen-port-%s' % dns_name -%}
 {%   set sla_key = "-sla-%s-" % i -%}
 {%   set sla_key_length = sla_key | length %}
 {%   set sla_parameters = [] %}
@@ -55,6 +56,7 @@ context =
 {%   do dns_domain_list.append(dns_domain) -%}
 {%   do dns_section_list.append(request_section_title) -%}
 {%   do part_list.append(request_section_title) -%}
+{%   do part_list.append(promise_section_title) -%}
 
 [{{request_section_title}}]
 <= replicate
@@ -69,6 +71,15 @@ config-soa = {{ "%s,%s" % (dns_domain, server_admin) }}
 sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }}
 {%   endfor -%}
 
+[{{promise_section_title}}]
+<= monitor-promise-base
+module = check_port_listening
+name = pdns-port-listening.py
+{%   set ipv6 = '${' ~ request_section_title ~ ':connection-powerdns-ipv6}' -%}
+config-hostname = {{ipv6}}
+{%   set port = '${' ~ request_section_title ~ ':connection-powerdns-port}' -%}
+config-port = {{port}}
+
 {%  do monitor_url_list.append('${' ~ request_section_title ~ ':connection-monitor-base-url}') -%}
 {% endfor -%}
 
@@ -101,7 +112,7 @@ software-url = {{ slapparameter_dict.pop(dns_software_url_key) }}
 software-url = ${slap-connection:software-release-url}
 {% endif %}
 software-type = {{dns_type}}
-return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url
+return = slave-instance-information-list monitor-base-url powerdns-ipv6 powerdns-port powerdns-ipv4
 config-server-admin = {{ server_admin }}
 config-ns-record = {{ ns_record }}
 {% for parameter, value in slapparameter_dict.items() -%}
@@ -114,12 +125,17 @@ config-monitor-password = ${monitor-htpasswd:passwd}
 
 [publish-information]
 recipe = slapos.cookbook:publish
-domain = {{ slapparameter_dict.get('domain') }}
 slave-amount = {{ slave_instance_list | length }}
 ns-record = {{ ns_record }}
 monitor-url = ${monitor-publish-parameters:monitor-url}
 monitor-user = ${monitor-publish-parameters:monitor-user}
 monitor-password = ${monitor-publish-parameters:monitor-password}
+{% for dns_name, dns_section in zip(dns_list, dns_section_list) -%}
+{%   set dns_ipv6 = '${' ~ dns_section ~ ':connection-powerdns-ipv6}' -%}
+{%   set dns_port = '${' ~ dns_section ~ ':connection-powerdns-port}' -%}
+{{ dns_name }}-ipv6 = {{ dns_ipv6 }}
+{{ dns_name }}-port = {{ dns_port }}
+{% endfor -%}
 {% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
 {% if monitor_interface_url -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}

software/powerdns/instance-powerdns.cfg

@@ -55,7 +55,7 @@ context =
 #
 [pdns]
 configuration = $${pdns-directory:configuration}/pdns.conf
-local-ipv4 = $${instance-parameter:ipv4-random}
+ipv4 = $${instance-parameter:ipv4-random}
 ipv6 = $${instance-parameter:ipv6-random}
 port = 5353
 socket-directory = $${pdns-directory:socket-directory}
@@ -139,7 +139,7 @@ extra-context =
 <= monitor-promise-base
 module = check_port_listening
 name = pdns-port-listening.py
-config-hostname = $${pdns:local-ipv4}
+config-hostname = $${pdns:ipv4}
 config-port = $${pdns:port}
 
 [publish-connection-informations]
@@ -147,6 +147,9 @@ recipe = slapos.cookbook:publish
 monitor-url = $${monitor-publish-parameters:monitor-url}
 monitor-user = $${monitor-publish-parameters:monitor-user}
 monitor-password = $${monitor-publish-parameters:monitor-password}
+powerdns-ipv4 = $${pdns:ipv4}
+powerdns-ipv6 = $${pdns:ipv6}
+powerdns-port = $${pdns:port}
 
 [buildout]
 parts =

software/powerdns/software.cfg

@@ -55,7 +55,6 @@ PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 plone.recipe.command = 1.1
 slapos.recipe.template = 4.4
-dnspython = 1.15.0
 passlib = 1.7.1
 GitPython = 2.1.11
 lockfile = 0.12.2

software/powerdns/template/pdns.conf.jinja2

 # -------------------------------------------------------------------------
 
 # Configure ip/port binding
-local-address={{ pdns.get('local-ipv4') }}
+local-address={{ pdns.get('ipv4') }}
 local-ipv6={{ pdns.get('ipv6') }}
 local-port={{ pdns.get('port') }}
 
@@ -10,7 +10,7 @@ socket-dir={{ pdns.get('socket-directory') }}
 
 # Monitoring
 webserver=yes
-webserver-address={{ pdns.get('local-ipv4') }}
+webserver-address={{ pdns.get('ipv4') }}
 webserver-port={{ pdns.get('webserver-port') }}
 
 # These totally disable query+packet caching for all zones.  This is necessary

software/powerdns/test/setup.py

@@ -47,6 +47,7 @@ setup(name=name,
           'erp5.util',
           'supervisor',
           'psutil',
+          'dnspython',
       ],
       zip_safe=True,
       test_suite='test',

software/powerdns/test/test.py

@@ -25,7 +25,12 @@
 #
 ##############################################################################
 
+import dns.edns
+import dns.message
+import dns.query
+import http.client
 import os
+import requests
 
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
@@ -35,10 +40,64 @@ setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
         os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
 
+DNS_PORT = 5353
+
+AFRICAN_SUBNET = '41.0.0.0'
+CHINA_TELECOM_SUBNET = '1.0.32.0'
+CHINA_UNICOM_SUBNET = '116.181.0.0'
+CHINA_MOBILE_SUBNET = '112.21.42.5'
+EAST_ASIAN_SUBNET = '1.11.0.0'
+EUROPEAN_SUBNET = '5.42.160.0'
+HONG_KONG_SUBNET = '1.32.192.0'
+JAPANESE_SUBNET = '1.0.16.0'
+NORTH_AMERICAN_SUBNET = '3.0.0.0'
+OCEANIAN_SUBNET = '1.120.0.0'
+SOUTH_AMERICAN_SUBNET = '45.70.188.0'
+WEST_ASIAN_SUBNET = '46.70.0.0'
+
 
 class PowerDNSTestCase(SlapOSInstanceTestCase):
   # power dns uses sockets and need shorter paths on test nodes.
   __partition_reference__ = 'pdns'
+  default_zone = 'domain.com'
+
+  # focus to test connexion parameters only depending on PowerDNS
+  def getPowerDNSParameterDict(self, parameter_dict):
+    new_parameter_dict = {}
+    for key, value in parameter_dict.items():
+      if key in [
+        'ns-record',
+        'ns1-port',
+        'ns1-ipv6',
+        'slave-amount',
+      ]:
+        new_parameter_dict[key] = value
+    return new_parameter_dict
+
+  def getPowerDNSConnexionParameterDict(self):
+    return self.getPowerDNSParameterDict(
+      self.requestDefaultInstance().getConnectionParameterDict()
+    )
+
+  def _test_parameter_dict(self, zone=None, dns_quantity=1, slave_amount=0):
+    if zone is None:
+      zone = self.default_zone
+
+    parameter_dict = self.getPowerDNSConnexionParameterDict()
+    expected_dict = {
+      'ns-record': '',
+    }
+
+    ns_record = ''
+    for replicate_nb in range(1, dns_quantity + 1):
+      prefix = 'ns%s' % replicate_nb
+      ns_record += prefix + '.%s' % zone
+      expected_dict[prefix + '-port'] = str(DNS_PORT)
+      expected_dict[prefix + '-ipv6'] = self._ipv6_address
+    expected_dict['ns-record'] = ns_record
+    expected_dict['slave-amount'] = str(slave_amount)
+
+    self.assertEqual(expected_dict, parameter_dict)
 
 
 class ServicesTestCase(PowerDNSTestCase):
@@ -63,3 +122,194 @@ class ServicesTestCase(PowerDNSTestCase):
       expected_process_name = name.format(hash=h)
 
       self.assertIn(expected_process_name, process_names)
+
+
+class TestMonitorAccess(PowerDNSTestCase):
+
+  def test(self):
+    connection_parameter_dict = self.requestDefaultInstance()\
+      .getConnectionParameterDict()
+    monitor_base_url = connection_parameter_dict.get('monitor-url')
+    result = requests.get(
+      monitor_base_url, verify=False, auth=(
+        connection_parameter_dict.get('monitor-user'),
+        connection_parameter_dict.get('monitor-password')
+      )
+    )
+
+    self.assertEqual(
+      http.client.OK,
+      result.status_code
+    )
+
+
+class TestMasterRequest(PowerDNSTestCase):
+
+  def test(self):
+    self._test_parameter_dict()
+
+
+class TestMasterRequestDomain(PowerDNSTestCase):
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+      'zone': 'toto.example.com',
+    }
+
+  def test(self):
+    self._test_parameter_dict(zone=self.getInstanceParameterDict()['zone'])
+
+
+class PowerDNSSlaveTestCase(PowerDNSTestCase):
+
+  @classmethod
+  def requestDefaultInstance(cls):
+    default_instance = super(PowerDNSSlaveTestCase, cls)\
+        .requestDefaultInstance()
+    cls.requestSlaves()
+    return default_instance
+
+  @classmethod
+  def requestSlaves(cls):
+    software_url = cls.getSoftwareURL()
+    software_type = cls.getInstanceSoftwareType()
+    for slave_reference, partition_parameter_kw in cls\
+            .getSlaveParameterDictDict().items():
+      cls.logger.debug(
+        'requesting slave "%s" software:%s parameters:%s',
+        slave_reference, software_url, partition_parameter_kw)
+      cls.slap.request(
+        software_release=software_url,
+        software_type=software_type,
+        partition_reference=slave_reference,
+        partition_parameter_kw=partition_parameter_kw,
+        shared=True
+      )
+
+  @classmethod
+  def getSlaveConnectionParameterDictList(cls):
+    parameter_dict_list = []
+
+    for slave_reference, partition_parameter_kw in cls\
+            .getSlaveParameterDictDict().items():
+      parameter_dict_list.append(cls.slap.request(
+        software_release=cls.getSoftwareURL(),
+        software_type=cls.getInstanceSoftwareType(),
+        partition_reference=slave_reference,
+        partition_parameter_kw=partition_parameter_kw,
+        shared=True
+      ).getConnectionParameterDict())
+    return parameter_dict_list
+
+  @classmethod
+  def getSlaveParameterDictDict(cls):
+    return {
+      'slave-pdns1': {
+        'record': 'test1',
+        'origin': 'nexedi.com',
+        'default': 'test1.com.',
+        'africa': 'test1africa.com.',
+        'china-telecom': 'test1china-telecom.com.',
+        'china-unicom': 'test1china-unicom.com.',
+        'china-mobile': 'test1china-mobile.com.',
+        'east-asia': 'test1east-asia.com.',
+        'europe': 'test1europe.com.',
+        'hong-kong': 'test1hong-kong.com.',
+        'japan': 'test1japan.com.',
+        'north-america': 'test1north-america.com.',
+        'oceania': 'test1oceania.com.',
+        'south-america': 'test1south-america.com.',
+        'west-asia': 'test1west-asia.com.',
+      },
+      'slave-pdns2': {
+        'record': 'test2',
+        'origin': 'nexedi.com',
+        'default': 'test2.com.',
+        'china-telecom': 'test2china-telecom.com.',
+        'europe': 'test2europe.com.',
+        'japan': 'test2japan.com.',
+      }
+    }
+
+  def dns_query(self, domain_name, subnet):
+    message = dns.message.make_query(domain_name, 'A')
+    client_subnet_option = dns.edns.ECSOption(subnet)
+    message.use_edns(options=[client_subnet_option])
+    answer = dns.query.udp(message, self._ipv6_address, port=DNS_PORT)
+    return answer.find_rrset(
+            dns.message.ANSWER,
+            dns.name.from_text(domain_name),
+            dns.rdataclass.IN,
+            dns.rdatatype.CNAME
+          ).to_text().split()[-1]
+
+  def _test_dns_resolver(self, zone):
+    slave_parameter_dict_dict = self.getSlaveParameterDictDict()
+    subnet_dict = {
+      'africa': AFRICAN_SUBNET,
+      'china-telecom': CHINA_TELECOM_SUBNET,
+      'china-unicom': CHINA_UNICOM_SUBNET,
+      'china-mobile': CHINA_MOBILE_SUBNET,
+      'east-asia': EAST_ASIAN_SUBNET,
+      'europe': EUROPEAN_SUBNET,
+      'hong-kong': HONG_KONG_SUBNET,
+      'japan': JAPANESE_SUBNET,
+      'north-america': NORTH_AMERICAN_SUBNET,
+      'oceania': OCEANIAN_SUBNET,
+      'south-america': SOUTH_AMERICAN_SUBNET,
+      'west-asia': WEST_ASIAN_SUBNET,
+    }
+    default_rr_dict = {
+      'europe': 'eu',
+      'africa': 'af',
+      'south-america': 'sa',
+      'north-america': 'na',
+      'china-telecom': 'cn-t',
+      'china-unicom': 'cn-u',
+      'china-mobile': 'cn-m',
+      'japan': 'jp',
+      'hong-kong': 'hk',
+      'east-asia': 'as',
+      'west-asia': 'eu',
+      'oceania': 'oc',
+    }
+
+    for slave_name in slave_parameter_dict_dict:
+      slave_parameter_dict = slave_parameter_dict_dict[slave_name]
+      domain_name = '%s.%s' % (slave_parameter_dict['record'], zone)
+      for region in subnet_dict:
+        self.assertEqual(
+          slave_parameter_dict.pop(
+            region,
+            '%s.%s.' % (default_rr_dict[region], slave_parameter_dict['origin'])
+          ),
+          self.dns_query(domain_name, subnet_dict[region])
+        )
+
+  def _test(self, zone=None):
+    if zone is None:
+      zone = self.default_zone
+    self._test_parameter_dict(
+      zone=zone,
+      slave_amount=len(self.getSlaveParameterDictDict())
+    )
+    self._test_dns_resolver(zone)
+
+
+class TestSlaveRequest(PowerDNSSlaveTestCase):
+
+  def test(self):
+    self._test()
+
+
+class TestSlaveRequestDomain(PowerDNSSlaveTestCase):
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+      'zone': 'toto.example.com',
+    }
+
+  def test(self):
+    self._test(zone=self.getInstanceParameterDict()['zone'])

software/slapos-sr-testing/README.md

@@ -31,15 +31,15 @@ slapos request --node=computer_guid=$COMP $INSTANCE_NAME $SR
 # and load this script to set environment variables
 source ( environment-script from step above )
 
-# Clone a working copy somewhere
-cd ~/srv/runner/project/
-git clone https://lab.nexedi.com/nexedi/slapos.git slapos_work
+# The source code is a git clone working copy on the instance
+cd ~/srv/runner/instance/slappartXXX/parts/slapos/
 
 # change directory to the directory containing test for this software
-cd ~/srv/runner/project/slapos_work/software/helloworld/test/
+cd ./software/helloworld/test/
+# make changes to test code or profile
 
-# run test (with debugging features activated)
-SLAPOS_TEST_DEBUG= 1 python_for_test setup.py test
+# run test for helloworld software release (with debugging features activated)
+SLAPOS_TEST_DEBUG=1 python_for_test -m unittest discover -v
 ```
 
 ## Environment variables

software/slapos-sr-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 4246cde0a27138e057ba1635cc621edf
+md5sum = 9639d0c0e161c094454808fb95fc9781

software/slapos-sr-testing/instance.cfg

 [buildout]
+extends = {{ nxdtest_instance }}
 parts =
-  slapos-test-runner
+  runTestSuite
   publish
 
 eggs-directory = {{ buildout['eggs-directory'] }}
@@ -26,46 +27,53 @@ repository = {{ slapos_location }}
 [directory]
 recipe = slapos.cookbook:mkdirectory
 bin = ${buildout:directory}/bin
-working-dir = ${buildout:directory}/tmp
 etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+test-working-dir = ${buildout:directory}/tmp
+nxdtest-working-dir = ${:var}/nxdtest
 
-[slapos-test-runner]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:bin}/runTestSuite
-command-line =
-  {{ buildout['bin-directory'] }}/runTestSuite
-  --python_interpreter={{ buildout['bin-directory'] }}/{{ interpreter }}
-  --source_code_path_list={{ ','.join(tests.splitlines()) }}
+[slapos-test-runner-nxdtest-environment.sh]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:etc}/${:_buildout_section_name_}
+template = inline:
+  export PATH={{ buildout['bin-directory'] }}:{{ curl_location }}/bin/:{{ faketime_location }}/bin/:{{ openssl_location }}/bin/:/usr/bin/:/bin
+  export SLAPOS_TEST_IPV4=${slap-configuration:ipv4-random}
+  export SLAPOS_TEST_IPV6=${slap-configuration:ipv6-random}
+  export SLAPOS_TEST_WORKING_DIR=${directory:test-working-dir}
 
-environment =
-  PATH=${slapos-test-runner-environment:PATH}
-  SLAPOS_TEST_IPV4=${slapos-test-runner-environment:SLAPOS_TEST_IPV4}
-  SLAPOS_TEST_IPV6=${slapos-test-runner-environment:SLAPOS_TEST_IPV6}
-  SLAPOS_TEST_WORKING_DIR=${slapos-test-runner-environment:SLAPOS_TEST_WORKING_DIR}
+[slapos-test-runner-dot-nxdtest]
+recipe = slapos.recipe.template:jinja2
+rendered = ${:workdir}/.nxdtest
+workdir = ${directory:nxdtest-working-dir}
+template = inline:
+  {% for test in tests.splitlines() %}
+    TestCase(
+      {{ repr(test.split()[0]) }},
+      [ {{ repr(interpreter) }}, '-m', 'unittest', 'discover', '-v'],
+      cwd={{ repr(test.split()[1]) }},
+      summaryf=UnitTest.summary,
+    )
+  {% endfor %}
 
-[slapos-test-runner-environment]
-PATH = {{ buildout['bin-directory'] }}:{{ curl_location }}/bin/:{{ faketime_location }}/bin/:{{ openssl_location }}/bin/:/usr/bin/:/bin
-SLAPOS_TEST_IPV4 = ${slap-configuration:ipv4-random}
-SLAPOS_TEST_IPV6 = ${slap-configuration:ipv6-random}
-SLAPOS_TEST_WORKING_DIR = ${directory:working-dir}
+[runTestSuite]
+env.sh = ${slapos-test-runner-nxdtest-environment.sh:rendered}
+workdir = ${slapos-test-runner-dot-nxdtest:workdir}
 
 [slapos-local-development-environment.sh]
 recipe = slapos.recipe.template:jinja2
 rendered = ${directory:etc}/${:_buildout_section_name_}
 template = inline:
-  export PATH=${slapos-test-runner-environment:PATH}:$PATH
-  export SLAPOS_TEST_IPV4=${slapos-test-runner-environment:SLAPOS_TEST_IPV4}
-  export SLAPOS_TEST_IPV6=${slapos-test-runner-environment:SLAPOS_TEST_IPV6}
-  export SLAPOS_TEST_WORKING_DIR=${slapos-test-runner-environment:SLAPOS_TEST_WORKING_DIR}
+  source ${slapos-test-runner-nxdtest-environment.sh:rendered}
   {% set shared_part_list = [] %}
   {% for shared_part in buildout['shared-part-list'].splitlines() -%}
     {% do shared_part_list.append(shared_part) %}
   {%- endfor %}
   export SLAPOS_TEST_SHARED_PART_LIST={{ os.pathsep.join(shared_part_list) }}
   echo "Environment loaded."
+  echo "The embedded SlapOS is in $SLAPOS_TEST_WORKING_DIR"
   echo "To work on a test, execute:"
-  echo "   SLAPOS_TEST_DEBUG=1 {{ interpreter }} setup.py test"
-  echo "from test folder"
+  echo "   SLAPOS_TEST_DEBUG=1 {{ interpreter }} -m unittest discover -v"
+  echo "from a folder containing software release test."
   echo
 
 [publish]

software/slapos-sr-testing/software-py3.cfg

@@ -12,9 +12,9 @@ eggs +=
 
 [template]
 extra =
-  ${slapos.test.helloworld-setup:setup}
-  ${slapos.test.monitor-setup:setup}
-  ${slapos.test.plantuml-setup:setup}
-  ${slapos.test.powerdns-setup:setup}
-  ${slapos.test.proftpd-setup:setup}
-  ${slapos.test.repman-setup:setup}
+  helloworld ${slapos.test.helloworld-setup:setup}
+  monitor ${slapos.test.monitor-setup:setup}
+  plantuml ${slapos.test.plantuml-setup:setup}
+  powerdns ${slapos.test.powerdns-setup:setup}
+  proftpd ${slapos.test.proftpd-setup:setup}
+  repman ${slapos.test.repman-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -13,11 +13,12 @@ extends =
   ../../component/python-backports-lzma/buildout.cfg
 
   ../../stack/slapos.cfg
+  ../../stack/nxdtest.cfg
 
   ./buildout.hash.cfg
 
 parts =
-  eggs
+  eggs/scripts
   slapos-cookbook
   template
 
@@ -167,8 +168,8 @@ egg = slapos.core
 setup = ${slapos.core-repository:location}
 
 [eggs]
-recipe = zc.recipe.egg
-eggs =
+<= python-interpreter
+eggs +=
   ${lxml-python:egg}
   ${slapos.core-setup:egg}
   ${pillow-python:egg}
@@ -202,21 +203,24 @@ eggs =
   ${slapos.test.dream-setup:egg}
   ${slapos.test.metabase-setup:egg}
   ${slapos.test.repman-setup:egg}
-entry-points =
-  runTestSuite=erp5.util.testsuite:runTestSuite
-scripts =
-  runTestSuite
-  slapos
-  supervisorctl
-  supervisord
-interpreter=
-  python_for_test
+
+# We don't name this interpreter `python`, so that when we run slapos node
+# software, installation scripts running `python` use a python without any
+# custom eggs pre-installed, not our special python interpreter.
+interpreter = python_for_test
 
 # patches for eggs
 patch-binary = ${patch:location}/bin/patch
 PyPDF2-patches = ${:_profile_base_location_}/../../component/egg-patch/PyPDF2/0001-Custom-implementation-of-warnings.formatwarning-remo.patch#d25bb0f5dde7f3337a0a50c2f986f5c8
 PyPDF2-patch-options = -p1
 
+[eggs/scripts]
+recipe = zc.recipe.egg
+eggs = ${eggs:eggs}
+scripts =
+  slapos
+  supervisord
+
 [git-clone-repository]
 recipe = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
@@ -236,6 +240,7 @@ mode = 640
 context =
   section buildout buildout
   import os os
+  key nxdtest_instance nxdtest-instance.cfg:rendered
   key git_location git:location
   key slapos_location slapos-repository:location
   key interpreter eggs:interpreter
@@ -243,29 +248,31 @@ context =
   key openssl_location openssl-output:bin
   key faketime_location faketime:location
   key tests :tests
+
 tests =
-  ${slapos.test.kvm-setup:setup}
-  ${slapos.test.slaprunner-setup:setup}
-  ${slapos.test.metabase-setup:setup}
+  json-schemas ${slapos.cookbook-setup:setup}
+  kvm ${slapos.test.kvm-setup:setup}
+  slaprunner ${slapos.test.slaprunner-setup:setup}
+  metabase ${slapos.test.metabase-setup:setup}
   ${:extra}
 extra =
-  ${slapos.cookbook-setup:setup}
-  ${slapos.test.backupserver-setup:setup}
-  ${slapos.test.caddy-frontend-setup:setup}
-  ${slapos.test.erp5-setup:setup}
-  ${slapos.test.htmlvalidatorserver-setup:setup}
-  ${slapos.test.slapos-master-setup:setup}
-  ${slapos.test.re6stnet-setup:setup}
-  ${slapos.test.seleniumserver-setup:setup}
-  ${slapos.test.jstestnode-setup:setup}
-  ${slapos.test.jupyter-setup:setup}
-  ${slapos.test.nextcloud-setup:setup}
-  ${slapos.test.turnserver-setup:setup}
-  ${slapos.test.theia-setup:setup}
-  ${slapos.test.grafana-setup:setup}
-  ${slapos.test.gitlab-setup:setup}
-  ${slapos.test.cloudooo-setup:setup}
-  ${slapos.test.dream-setup:setup}
+  backupserver ${slapos.test.backupserver-setup:setup}
+  caddy-frontend ${slapos.test.caddy-frontend-setup:setup}
+  erp5 ${slapos.test.erp5-setup:setup}
+  htmlvalidatorserver ${slapos.test.htmlvalidatorserver-setup:setup}
+  slapos-master ${slapos.test.slapos-master-setup:setup}
+  re6stnet ${slapos.test.re6stnet-setup:setup}
+  seleniumserver ${slapos.test.seleniumserver-setup:setup}
+  jstestnode ${slapos.test.jstestnode-setup:setup}
+  jupyter ${slapos.test.jupyter-setup:setup}
+  nextcloud ${slapos.test.nextcloud-setup:setup}
+  turnserver ${slapos.test.turnserver-setup:setup}
+  theia ${slapos.test.theia-setup:setup}
+  grafana ${slapos.test.grafana-setup:setup}
+  gitlab ${slapos.test.gitlab-setup:setup}
+  cloudooo ${slapos.test.cloudooo-setup:setup}
+  dream ${slapos.test.dream-setup:setup}
+  repman ${slapos.test.repman-setup:setup}
 
 [versions]
 # slapos.core is used from the clone always

software/slapos-testing/README.md

@@ -2,13 +2,11 @@
 
 This software release is used to run unit test of slapos eggs.
 
-The approach is to use setuptools' integrated test runner, `python setup.py test`, to run tests.
+The approach is to use nxdtest test runner, which will run tests for each
+projects, as described in `.nxdtest` file.
 
-The `python` used in this command will be a `zc.recipe.egg` interpreter with
-all eggs pre-installed by this software release.
-
-The results of this test suite running on Nexedi ERP5 are published as `SlapOS.Eggs.UnitTest-Master.Python3`
-and `SlapOS.Eggs.UnitTest-Master.Python2`.
+The results of this test suite running on Nexedi ERP5 are published as 
+`SlapOS.Eggs.UnitTest-Master.Python3` and `SlapOS.Eggs.UnitTest-Master.Python2`.
 
 
 Here's an example session of how a developer could use this software release in
@@ -23,21 +21,27 @@ INSTANCE_NAME=$COMP
 
 slapos supply $SR $COMP
 slapos node software
-slapos request --node=node=$COMP $INSTANCE_NAME $SR
+slapos request --node=computer_guid=$COMP $INSTANCE_NAME $SR
 slapos node instance
 
+# The path of a an environment script was published by slapos parameters, as
+# "environment-script"
+slapos request --node=computer_guid=$COMP $INSTANCE_NAME $SR
+
+# sourcing the script in the shell configure all environment variables and
+# print a message explaining how to run tests
+source ( environment script from step above )
+
 # The source code is a git clone working copy on the instance
-cd ~/srv/runner/instance/slappart0/parts/slapos.core/
+cd ~/srv/runner/instance/slappartXXX/parts/slapos.core/
 
 # make some changes to the code
 vim slapos/tests/client.py
 
-# run tests, using bundled python intepreter with pre-installed eggs dependencies
-SLAPOS_TEST_IPV6=::1 \
-SLAPOS_TEST_IPV4=127.0.0.1 \
-SLAPOS_TEST_VERBOSE=1 \
-SLAPOS_TEST_DEBUG=1 \
-~/srv/runner/instance/slappart0/software_release/bin/python_for_test setup.py test
+# run slapos.core tests
+runTestSuite --run slapos.core
+# ... or run all eggs tests
+runTestSuite
 
 # when satified, commit changes
 git add -p && git commit

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 2df601dd3ccb3ba38b3aee7243b7f8e5
+md5sum = 3b1b386f6ad4c9ac50ab1f1e1384e751

software/slapos-testing/instance.cfg

 [buildout]
+extends = ${nxdtest-instance.cfg:rendered}
 parts =
-  phantomjs-wrapper
-  slapos-test-runner
+  runTestSuite
+  publish
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -21,6 +22,8 @@ bin = $${buildout:directory}/bin
 etc = $${buildout:directory}/etc
 services = $${:etc}/run
 srv = $${buildout:directory}/srv
+var = $${buildout:directory}/var
+nxdtest-working-dir = $${:var}/nxdtest
 
 [download-source]
 recipe = slapos.recipe.build:gitclone
@@ -75,30 +78,127 @@ repository = ${slapos.rebootstrap-repository:location}
 repository = ${rubygemsrecipe-repository:location}
 
 
-[slapos-test-runner]
-recipe = slapos.cookbook:wrapper
-wrapper-path = $${create-directory:bin}/runTestSuite
-command-line =
-  ${buildout:bin-directory}/runTestSuite
-  --python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
-  --source_code_path_list=$${kedifa:location},$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location},$${slapos.libnetworkcache:location},$${slapos.rebootstrap:location},$${rubygemsrecipe:location}
-
-# Notes about environment:
-# * slapos.cookbook:wrapper does not seem to allow "extending" PATH. Tests
-#   needs ping, which is a setuid binary that cannot be installed via slapos
-#   way of building software without root access, so we keep "standard"
-#   /usr/bin and /bin in $PATH
-# * SLAPOS_TEST_environment is safe to be used by tests, but there is no
-#   guarantee about free ports on IPV4 and IPV6
-# * LOCAL_IPV4 is backward compatible, to be migrated, SLAPOS_TEST_IPV4
-environment =
-  PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${rsync:location}/bin/:${buildout:bin-directory}:/usr/bin/:/bin/
-  LOCAL_IPV4=$${slap-configuration:ipv4-random}
-  SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
-  SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
-
-
-[phantomjs-wrapper]
-recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/phantomjs-slapos
-wrapper-path = $${create-directory:bin}/phantomjs
+[slapos-test-runner-nxdtest-environment.sh]
+recipe = slapos.recipe.template:jinja2
+rendered = $${create-directory:etc}/$${:_buildout_section_name_}
+template = inline:
+  export PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${rsync:location}/bin/:${buildout:bin-directory}:$PATH
+  export SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
+  export SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
+
+
+[slapos-test-runner-dot-nxdtest]
+recipe = slapos.recipe.template:jinja2
+rendered = $${:workdir}/.nxdtest
+workdir = $${create-directory:nxdtest-working-dir}
+
+template = inline:
+  TestCase(
+      "kedifa",
+      ['python', '-m', 'unittest', 'discover', '-v'],
+      cwd="""$${kedifa:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "caucase",
+      # XXX caucase uses 2to3 dynamically in setup.py, so it only supports
+      # runnning tests with python setup.py test
+      ['python', 'setup.py', 'test'],
+      cwd="""$${caucase:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "erp5.util",
+      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'erp5/tests/'],
+      cwd="""$${erp5.util:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.cookbook",
+      # slapos/test contain both tests for recipes and tests for
+      # json schemas, we only care about recipe tests here, json
+      # schemas are tested in software/slapos-sr-testing
+      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test/recipe'],
+      cwd="""$${slapos.cookbook:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.core",
+      # ['python', '-m', 'unittest', 'discover', '-v'],
+      # XXX some test fail when running with unittest (slapos*.cfg.example
+      # files cannot be found with pkg_resources.resource_string), so we keep
+      # using setup.py test for now.
+      ['python', 'setup.py', 'test'],
+      cwd="""$${slapos.core:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.recipe.build",
+      ['python', '-m', 'unittest', 'discover', '-v'],
+      cwd="""$${slapos.recipe.build:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.recipe.cmmi",
+      ['python', '-m', 'unittest', 'discover', '-v'],
+      cwd="""$${slapos.recipe.cmmi:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.recipe.template",
+      # ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
+      # XXX some test fail when running with unittest, so we keep using setup.py test
+      ['python', 'setup.py', 'test'],
+      cwd="""$${slapos.recipe.template:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.toolbox",
+      # ['python', '-m', 'unittest', 'discover', '-v'],
+      # XXX We can not just run unittest discover here, since slapos/lamp
+      # imports MySQLDb and we currently don't have installed
+      # slapos.toolbox[lampconfigure] and on python3 discovery make a
+      # failing test for this import error.
+      # Currently slapos/lamp is not tested, but if it it is still used,
+      # the TODO seem to also install slapos.toolbox[lampconfigure] here.
+      ['python', '-m', 'unittest', 'discover', '-v', '--start', 'slapos/test', '--top-level-directory', '.'],
+      cwd="""$${slapos.toolbox:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.libnetworkcache",
+      ['python', '-m', 'unittest', '-v', 'slapos.libnetworkcachetests'],
+      cwd="""$${slapos.libnetworkcache:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "slapos.rebootstrap",
+      ['python', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'],
+      cwd="""$${slapos.rebootstrap:location}""",
+      summaryf=UnitTest.summary,
+  )
+  TestCase(
+      "rubygemsrecipe",
+      ['python', '-m', 'unittest', 'discover', '-v'],
+      cwd="""$${rubygemsrecipe:location}""",
+      summaryf=UnitTest.summary,
+  )
+
+[runTestSuite]
+env.sh = $${slapos-test-runner-nxdtest-environment.sh:rendered}
+workdir = $${slapos-test-runner-dot-nxdtest:workdir}
+
+[slapos-local-development-environment.sh]
+recipe = slapos.recipe.template:jinja2
+rendered = $${create-directory:etc}/$${:_buildout_section_name_}
+template = inline:
+  source $${slapos-test-runner-nxdtest-environment.sh:rendered}
+  echo "Environment loaded."
+  echo "To work on a test, execute:"
+  echo "   $${runTestSuite:wrapper-path} -k test_name"
+  echo "replacing test_name by the name of the test."
+  echo
+
+[publish]
+recipe = slapos.cookbook:publish
+environment-script = $${slapos-local-development-environment.sh:rendered}

software/slapos-testing/software.cfg

@@ -14,11 +14,12 @@ extends =
   ../../component/lmsensors/buildout.cfg
   ../../component/rsync/buildout.cfg
   ../../stack/slapos.cfg
+  ../../stack/nxdtest.cfg
   ./buildout.hash.cfg
 
 parts =
   bootstrap-slapos.recipe.cmmi
-  eggs
+  eggs/scripts
   phantomjs
   template
 
@@ -103,8 +104,8 @@ egg = rubygemsrecipe[test]
 setup = ${rubygemsrecipe-repository:location}
 
 [eggs]
-recipe = zc.recipe.egg
-eggs =
+<= python-interpreter
+eggs +=
   ${lxml-python:egg}
   ${python-cryptography:egg}
   ${backports.lzma:egg}
@@ -126,14 +127,13 @@ eggs =
   ${rubygemsrecipe-setup:egg}
   zope.testing
   supervisor
-entry-points =
-  runTestSuite=erp5.util.testsuite:runTestSuite
+
+[eggs/scripts]
+recipe = zc.recipe.egg
+eggs = ${eggs:eggs}
 scripts =
-  runTestSuite
   slapos
   supervisord
-interpreter=
-  python_for_test
 
 [git-clone-repository]
 recipe = slapos.recipe.build:gitclone

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 6e279c46b07bf56b7b037a8ee2c6587e
+md5sum = 2582723c31166244ff25cb3d8c839ffa
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -46,6 +46,7 @@ common-runner-parts =
   custom-frontend-promise
 {% endif %}
 {% endif %}
+  project-link
 ## Monitoring part
   monitor-base
   monitor-check-webrunner-internal-instance
@@ -159,6 +160,11 @@ software-test = $${:test}/software
 instance-test = $${:test}/instance
 sessions = $${buildout:directory}/.sessions
 
+[project-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = $${directory:srv}
+link-binary = $${runnerdirectory:project}
+
 [slaprunner]
 slaprunner = ${buildout:bin-directory}/slaprunner
 slapos = ${buildout:bin-directory}/slapos

software/theia/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 2ceb9389281c00261abd864fc8ed566f
+md5sum = 1c60191f8724854f979a17d2624e65d8
 
 [yarn.lock]
 filename = yarn.lock
-md5sum = c7aa84922a1b80fd8a4c3d96f6ac7e25
+md5sum = 5a89742266a9f9d4115efa6d641fd5bb
 
 [python-language-server-requirements.txt]
 filename = python-language-server-requirements.txt

software/theia/instance.cfg.in

@@ -173,7 +173,7 @@ template =
         ],
         "options": {
           "env": {
-            "SLAPOS_CONFIGURATION": "$${slapos-standalone-activate:slapos-configuration}",
+            "SLAPOS_CONFIGURATION": "$${slapos-standalone-config:slapos-configuration}",
             "GIT_EXEC_PATH": ""
           }
         },
@@ -197,7 +197,7 @@ template =
         ],
         "options": {
           "env": {
-            "SLAPOS_CONFIGURATION": "$${slapos-standalone-activate:slapos-configuration}",
+            "SLAPOS_CONFIGURATION": "$${slapos-standalone-config:slapos-configuration}",
             "GIT_EXEC_PATH": ""
           }
         },
@@ -227,6 +227,7 @@ template =
   export TMP=$${directory:tmp}
   export TEMP=$TMP
   export LC_ALL=C.UTF-8
+  export TERMINFO=${ncurses:location}/lib/terminfo/
   export EDITOR="${python-language-server:location}/bin/python -m theia_open --wait"
   exec ${theia-wrapper:rendered} $@
 ip =  $${instance-parameter:ipv4-random}
@@ -256,36 +257,76 @@ template = inline:
   import time
   args = sys.argv[1:]
   # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
-  if not args: args = ["-c", ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash", ]
+  if not args: args = ["-c", ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash --rcfile $${theia-bashrc:rendered}", ]
   # otherwise, assume this shell is running task and add an artificial delay to workaround https://github.com/eclipse-theia/theia/issues/2961
   else: time.sleep(1)
   os.execv('${bash:location}/bin/bash', ['${bash:location}/bin/bash']  + args)
 
+[theia-bashrc]
+recipe = slapos.recipe.template:jinja2
+rendered = $${directory:etc}/$${:_buildout_section_name_}
+template =
+  inline:
+  # enable bash completion
+  . ${bash-completion:location}/etc/profile.d/bash_completion.sh
+  # source user's .bashrc
+  [ -f ~/.bashrc ] && . ~/.bashrc
+depends =
+  $${shell-setup-completion:recipe}
+
+[shell-setup-completion]
+recipe = plone.recipe.command
+stop-on-error = true
+command =
+  ${buildout:bin-directory}/slapos complete > $${directory:bash-completions}/slapos
+  ${buildout:bin-directory}/slapos complete --shell fish > $${directory:fish-completions}/slapos.fish
+
+
+[slapos-standalone-config]
+ipv4 = $${instance-parameter:ipv4-random}
+ipv6 = $${instance-parameter:ipv6-random}
+port = 4000
+slapos-configuration = $${directory:runner}/etc/slapos.cfg
+computer-id = slaprunner
+
 [slapos-standalone-activate]
 recipe = slapos.recipe.template:jinja2
 rendered = $${directory:bin}/$${:_buildout_section_name_}
 mode = 0700
-# XXX maybe standalone slapos should provide an activate script like virtualenv is doing?
 template =
   inline:#!/bin/sh
   export PATH=${buildout:bin-directory}:$PATH
-  ${slapos-standalone:script-path} \
-      $${directory:slapos} \
-      $${:ipv4} \
-      $${:ipv6} \
-      $${:port} \
+  export SLAPOS_CONFIGURATION=$${slapos-standalone-config:slapos-configuration}
+  export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
+  echo 'Standalone SlapOS for computer `$${slapos-standalone-config:computer-id}` activated'
+
+[slapos-standalone]
+recipe = slapos.recipe.template:jinja2
+rendered = $${directory:bin}/$${:_buildout_section_name_}
+mode = 0700
+template =
+  inline:#!/bin/sh
+  export PATH=${buildout:bin-directory}:$PATH
+  exec ${slapos-standalone:script-path} \
+      $${directory:runner} \
+      $${slapos-standalone-config:ipv4} \
+      $${slapos-standalone-config:ipv6} \
+      $${slapos-standalone-config:port} \
+      $${slapos-standalone-config:computer-id} \
       $${slap-connection:server-url} \
       $${slap-connection:computer-id} \
       $${slap-connection:partition-id} \
       --key='$${slap-connection:key-file}' \
       --cert='$${slap-connection:cert-file}'
-  export SLAPOS_CONFIGURATION=$${:slapos-configuration}
-  export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
 
-ipv4 = $${instance-parameter:ipv4-random}
-ipv6 = $${instance-parameter:ipv6-random}
-port = 4000
-slapos-configuration = $${directory:slapos}/etc/slapos.cfg
+[slapos-standalone-instance]
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${directory:services}/$${:_buildout_section_name_}
+command-line = $${slapos-standalone:rendered}
+hash-files =
+  $${slapos-standalone:rendered}
+hostname = $${slapos-standalone-config:ipv4}
+port = $${slapos-standalone-config:port}
 
 [promises]
 recipe =
@@ -293,6 +334,7 @@ instance-promises =
   $${theia-listen-promise:name}
   $${frontend-listen-promise:name}
   $${apache-frontend-url-available-promise:name}
+  $${slapos-standalone-listen-promise:name}
 
 [theia-listen-promise]
 <= monitor-promise-base
@@ -315,6 +357,14 @@ name = $${:_buildout_section_name_}.py
 config-url = $${apache-frontend:connection-secure_access}
 config-check-secure = 1
 
+[slapos-standalone-listen-promise]
+<= monitor-promise-base
+module = check_port_listening
+# XXX promise plugins can not contain "slapos" in their names
+name = standalone-listen-promise.py
+config-hostname = $${slapos-standalone-instance:hostname}
+config-port = $${slapos-standalone-instance:port}
+
 [apache-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
@@ -353,8 +403,11 @@ dot-theia = $${buildout:directory}/.theia/
 pidfiles = $${:var}/run
 
 services = $${:etc}/service
+runner = $${:srv}/runner
 project = $${:srv}/project
-slapos = $${:srv}/slapos
 frontend-static = $${:srv}/frontend-static
 frontend-static-public = $${:frontend-static}/public
 frontend-static-css = $${:frontend-static}/css
+
+bash-completions = $${buildout:directory}/.local/share/bash-completion/completions/
+fish-completions = $${buildout:directory}/.config/fish/completions/

software/theia/software.cfg

@@ -4,6 +4,7 @@ extends =
    ../../component/caddy/buildout.cfg
    ../../component/git/buildout.cfg
    ../../component/bash/buildout.cfg
+   ../../component/bash-completion/buildout.cfg
    ../../component/fish-shell/buildout.cfg
    ../../component/tmux/buildout.cfg
    ../../component/tig/buildout.cfg
@@ -55,9 +56,11 @@ entry-points =
   ${:scripts}=not_used:main
 initialization =
   import argparse
+  import glob
   import os.path
   import sys
-  import glob
+  import signal
+  import time
 
   import slapos.slap.standalone
 
@@ -66,6 +69,7 @@ initialization =
   parser.add_argument('ipv4')
   parser.add_argument('ipv6')
   parser.add_argument('server_port', type=int)
+  parser.add_argument('computer_id')
   forwarded_arguments = parser.add_argument_group('forwarded')
   forwarded_arguments.add_argument('master_url')
   forwarded_arguments.add_argument('computer')
@@ -91,7 +95,10 @@ initialization =
       args.base_directory,
       args.ipv4,
       args.server_port,
+      computer_id=args.computer_id,
       shared_part_list=shared_part_list,
+      software_root="%s/software" % args.base_directory,
+      instance_root="%s/instance" % args.base_directory,
       partition_forward_configuration=partition_forward_configuration,
   )
   standalone.start()
@@ -104,7 +111,26 @@ initialization =
         args.ipv4,
         args.ipv6
     )
-  print ("Standalone SlapOS for computer `{}` activated".format(standalone.computer._computer_id))
+  print("Standalone SlapOS for computer `{}` started".format(args.computer_id))
+  # Run instance at least once, to start the supervisor managing instances.
+  try:
+    standalone.waitForInstance(max_retry=0)
+  except slapos.slap.standalone.SlapOSNodeCommandError as e:
+    print("Error instanciating: {}".format(e))
+
+  quit_requested = []
+  def signal_handler(signum, frame):
+    print("Signal {signum} received".format(signum=signum))
+    quit_requested.append(True)
+  signal.signal(signal.SIGTERM, signal_handler)
+
+  print("Standalone SlapOS ready")
+  while not quit_requested:
+    time.sleep(.1)
+
+  print("Stopping standalone subsystem")
+  standalone.stop()
+  print("Exiting")
   sys.exit(0)
 
 needs-these-eggs-scripts-in-path =
@@ -343,7 +369,7 @@ command =
 
 
 [cli-utilities]
-PATH = ${nodejs:location}/bin/:${bash:location}/bin/:${fish-shell:location}/bin/:${tig:location}/bin/:${vim:location}/bin/:${tmux:location}/bin/:${git:location}/bin/:${curl:location}/bin:${python2.7:location}/bin/
+PATH = ${nodejs:location}/bin/:${bash:location}/bin/:${fish-shell:location}/bin/:${tig:location}/bin/:${vim:location}/bin/:${tmux:location}/bin/:${git:location}/bin/:${curl:location}/bin:${python2.7:location}/bin/:${buildout:bin-directory}
 
 [theia-wrapper]
 recipe = slapos.recipe.template:jinja2

software/theia/test/test.py

@@ -36,9 +36,13 @@ import re
 from six.moves.urllib.parse import urlparse, urljoin
 
 import pexpect
+import psutil
 import requests
 
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+from slapos.grid.svcbackend import getSupervisorRPC
+from slapos.grid.svcbackend import _getSupervisordSocketPath
+
 
 setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
@@ -110,12 +114,11 @@ class TestTheia(SlapOSInstanceTestCase):
         pass
     process.logfile = DebugLogFile()
 
-    process.expect_exact('Standalone SlapOS: Formatting 20 partitions')
-    process.expect_exact('Standalone SlapOS for computer `local` activated')
+    process.expect_exact('Standalone SlapOS for computer `slaprunner` activated')
 
     # try to supply and install a software to check that this slapos is usable
     process.sendline(
-        'slapos supply https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg local'
+        'slapos supply https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg slaprunner'
     )
     process.expect(
         'Requesting software installation of https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg...'
@@ -135,12 +138,6 @@ class TestTheia(SlapOSInstanceTestCase):
     # interrupt this, we don't want to actually wait for software installation
     process.sendcontrol('c')
 
-    # shutdown this slapos
-    process.sendline(
-        'supervisorctl -c {}/srv/slapos/etc/supervisord.conf shutdown'.format(
-            self.computer_partition_root_path))
-    process.expect('Shut down')
-
     process.terminate()
     process.wait()
 
@@ -153,3 +150,37 @@ class TestTheia(SlapOSInstanceTestCase):
         'touch "{}"'.format(test_file)
     ])
     self.assertTrue(os.path.exists(test_file))
+
+
+class TestTheiaEmbeddedSlapOSShutdown(SlapOSInstanceTestCase):
+  __partition_reference__ = 'T' # for sockets in included slapos
+
+  def test_stopping_instance_stops_embedded_slapos(self):
+    embedded_slapos_supervisord_socket = _getSupervisordSocketPath(
+        os.path.join(
+            self.computer_partition_root_path,
+            'srv',
+            'slapos',
+            'inst',
+        ), self.logger)
+
+    # Wait a bit for this supervisor to be started.
+    for _ in range(20):
+      if os.path.exists(embedded_slapos_supervisord_socket):
+        break
+      time.sleep(1)
+
+    # get the pid of the supervisor used to manage instances
+    with getSupervisorRPC(embedded_slapos_supervisord_socket) as embedded_slapos_supervisor:
+      embedded_slapos_process = psutil.Process(embedded_slapos_supervisor.getPID())
+
+    # Stop theia's services
+    with self.slap.instance_supervisor_rpc as instance_supervisor:
+      process_info, = [
+          p for p in instance_supervisor.getAllProcessInfo()
+          if p['name'].startswith('slapos-standalone-instance-')
+      ]
+      instance_supervisor.stopProcessGroup(process_info['group'])
+
+    # the supervisor controlling instances is also stopped
+    self.assertFalse(embedded_slapos_process.is_running())

software/theia/yarn.lock

@@ -9,24 +9,24 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.1.tgz#d7386a689aa0ddf06255005b4b991988021101a0"
-  integrity sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==
+"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
+  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
 "@babel/core@^7.10.0":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
-  integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
+  version "7.12.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
+  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.1"
+    "@babel/generator" "^7.12.5"
     "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helpers" "^7.12.1"
-    "@babel/parser" "^7.12.3"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.7"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.9"
+    "@babel/types" "^7.12.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -36,12 +36,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468"
-  integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==
+"@babel/generator@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
+  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.12.5"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -60,14 +60,14 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz#310e352888fbdbdd8577be8dfdd2afb9e7adcf50"
-  integrity sha512-jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==
+"@babel/helper-compilation-targets@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
   dependencies:
-    "@babel/compat-data" "^7.12.1"
+    "@babel/compat-data" "^7.12.5"
     "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.12.0"
+    browserslist "^4.14.5"
     semver "^5.5.0"
 
 "@babel/helper-create-class-features-plugin@^7.12.1":
@@ -82,12 +82,11 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
 
 "@babel/helper-create-regexp-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
-  integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
+  integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
     regexpu-core "^4.7.1"
 
 "@babel/helper-define-map@^7.10.4":
@@ -130,18 +129,18 @@
     "@babel/types" "^7.10.4"
 
 "@babel/helper-member-expression-to-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
-  integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
+  integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.12.7"
 
-"@babel/helper-module-imports@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz#1644c01591a15a2f084dd6d092d9430eb1d1216c"
-  integrity sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==
+"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.12.5"
 
 "@babel/helper-module-transforms@^7.12.1":
   version "7.12.1"
@@ -159,24 +158,17 @@
     lodash "^4.17.19"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
-  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
+  integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.7"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-regex@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
-  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
-  dependencies:
-    lodash "^4.17.19"
-
 "@babel/helper-remap-async-to-generator@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
@@ -187,14 +179,14 @@
     "@babel/types" "^7.12.1"
 
 "@babel/helper-replace-supers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9"
-  integrity sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
+  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.12.1"
     "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/helper-simple-access@^7.12.1":
   version "7.12.1"
@@ -237,14 +229,14 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.1.tgz#8a8261c1d438ec18cb890434df4ec768734c1e79"
-  integrity sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==
+"@babel/helpers@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
   dependencies:
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -255,10 +247,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.4", "@babel/parser@^7.12.1", "@babel/parser@^7.12.3":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.3.tgz#a305415ebe7a6c7023b40b5122a0662d928334cd"
-  integrity sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==
+"@babel/parser@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
+  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
 
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
@@ -317,10 +309,10 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6"
-  integrity sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==
+"@babel/plugin-proposal-numeric-separator@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
+  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
@@ -342,10 +334,10 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
-  integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==
+"@babel/plugin-proposal-optional-chaining@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
+  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
@@ -674,13 +666,12 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
-"@babel/plugin-transform-sticky-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
-  integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==
+"@babel/plugin-transform-sticky-regex@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
+  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
 
 "@babel/plugin-transform-template-literals@^7.12.1":
   version "7.12.1"
@@ -712,13 +703,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/preset-env@^7.10.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
-  integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
+  integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
   dependencies:
-    "@babel/compat-data" "^7.12.1"
-    "@babel/helper-compilation-targets" "^7.12.1"
-    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/compat-data" "^7.12.7"
+    "@babel/helper-compilation-targets" "^7.12.5"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-validator-option" "^7.12.1"
     "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
@@ -728,10 +719,10 @@
     "@babel/plugin-proposal-json-strings" "^7.12.1"
     "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.12.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.7"
     "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
     "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
     "@babel/plugin-proposal-private-methods" "^7.12.1"
     "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
@@ -773,14 +764,14 @@
     "@babel/plugin-transform-reserved-words" "^7.12.1"
     "@babel/plugin-transform-shorthand-properties" "^7.12.1"
     "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-sticky-regex" "^7.12.1"
+    "@babel/plugin-transform-sticky-regex" "^7.12.7"
     "@babel/plugin-transform-template-literals" "^7.12.1"
     "@babel/plugin-transform-typeof-symbol" "^7.12.1"
     "@babel/plugin-transform-unicode-escapes" "^7.12.1"
     "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.1"
-    core-js-compat "^3.6.2"
+    "@babel/types" "^7.12.7"
+    core-js-compat "^3.7.0"
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
@@ -795,40 +786,40 @@
     esutils "^2.0.2"
 
 "@babel/runtime@^7.10.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740"
-  integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
-  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+"@babel/template@^7.10.4", "@babel/template@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.1.tgz#941395e0c5cc86d5d3e75caa095d3924526f0c1e"
-  integrity sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9":
+  version "7.12.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
+  integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.1"
+    "@babel/generator" "^7.12.5"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.1.tgz#e109d9ab99a8de735be287ee3d6a9947a190c4ae"
-  integrity sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.4.4":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
+  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
     lodash "^4.17.19"
@@ -982,16 +973,16 @@
   resolved "https://registry.yarnpkg.com/@stroncium/procfs/-/procfs-1.2.1.tgz#6b9be6fd20fb0a4c20e99a8695e083c699bb2b45"
   integrity sha512-X1Iui3FUNZP18EUvysTHxt+Avu2nlVzyf90YM8OYgP6SGzTzzX/0JgObfO1AQQDzuZtNNz29bVh8h5R97JrjxA==
 
-"@theia/application-manager@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.7.0.tgz#02dbba8b5ae30053ec02c598faf2ac374c059894"
-  integrity sha512-9fWg8NiGtZjHy+jmeaK/nWWrnEh6eI3bVJY1jt5RwJ+QC2+48ZoIupp73xxNzrAOqvV6CO38WUgdQh63Fcc9zg==
+"@theia/application-manager@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.8.0.tgz#4870935a0f95f2f6a96227063bdbe67dcd18d31b"
+  integrity sha512-dNXy0pO+Zzb4w9SoeE1PazOirJh/4mFtUPtPEjizKB0m5c5G3TN6CZ6OGutnjHPgxMRChf9HYoOyFHAL4KXCfw==
   dependencies:
     "@babel/core" "^7.10.0"
     "@babel/plugin-transform-classes" "^7.10.0"
     "@babel/plugin-transform-runtime" "^7.10.0"
     "@babel/preset-env" "^7.10.0"
-    "@theia/application-package" "^1.7.0"
+    "@theia/application-package" "^1.8.0"
     "@theia/compression-webpack-plugin" "^3.0.0"
     "@types/fs-extra" "^4.0.2"
     "@types/webpack" "^4.41.2"
@@ -1014,10 +1005,10 @@
     webpack-cli "2.0.12"
     worker-loader "^1.1.1"
 
-"@theia/application-package@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.7.0.tgz#fa1b2a7c43f873a3d6e4f0f992fff23101013575"
-  integrity sha512-xRrS3Br6No+ho1azhwRV7iWGfjz7SJQ5id9hYUaZ2Bu59MYvB7J+CYAmigfYDayWYwkV5jUpT5rKAnxZbYr2FQ==
+"@theia/application-package@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.8.0.tgz#087821f73e0f822d11ed400fd7c04df9917b755f"
+  integrity sha512-fpTZLT46RCV2XMzYGpJMr7vzKTEOwK/m8jtDwap9ik+iiJ2rxJsc8COzuSnYcrWH0F6EvM1DcWBL30BK7UM3Ng==
   dependencies:
     "@types/fs-extra" "^4.0.2"
     "@types/request" "^2.0.3"
@@ -1031,23 +1022,23 @@
     semver "^5.4.1"
     write-json-file "^2.2.0"
 
-"@theia/callhierarchy@^1.7.0", "@theia/callhierarchy@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.7.0.tgz#8fd27c44d64d3734fe9b52ff1a8993796012b880"
-  integrity sha512-cqBRF/qev/kGSKdaF+u4Y7iPfpHYttjFUoqx5LSwsZe6YDs03HmthzKx0IvHrYj2dUBuyA73Oym/3dqkMW6YLA==
+"@theia/callhierarchy@^1.8.0", "@theia/callhierarchy@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.8.0.tgz#88bfc6a4d90e61c74329bfce3f313b631da927cd"
+  integrity sha512-wnHxelw5FXaW7Uz3D51cm5c/pJMN1ROpprp8e8nhnhsyHRM50B0cyKTCWFTR6mLIYqojXYn8h+IChJ9nyBSIlA==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
     ts-md5 "^1.2.2"
 
 "@theia/cli@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.7.0.tgz#cf1251fdc65f48c38c1bdd49edc946e011cad5bf"
-  integrity sha512-qp1AZLYm3W20pSUM9PGy2jAv1GzTTbPdiNky5HV9bM1vC5UV+nzjIB/dURfMgQivcTXzBWNd/bX1EI/D62dwIw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.8.0.tgz#34dd06ddaadd3ffc431a3f97f56c24b88f0bd397"
+  integrity sha512-xckbi7wxfBL53lxTgHjKekp3ju+nUD/0H6UNhxmaZTLXd1NohNh7f16I/apjgulvjfkpwHQbfS3PJ3lVAJnzAg==
   dependencies:
-    "@theia/application-manager" "^1.7.0"
-    "@theia/application-package" "^1.7.0"
+    "@theia/application-manager" "^1.8.0"
+    "@theia/application-package" "^1.8.0"
     "@types/chai" "^4.2.7"
     "@types/mkdirp" "^0.5.2"
     "@types/mocha" "^5.2.7"
@@ -1066,7 +1057,7 @@
     puppeteer "^2.0.0"
     puppeteer-to-istanbul "^1.2.2"
     temp "^0.9.1"
-    yargs "^11.1.0"
+    yargs "^15.3.1"
 
 "@theia/compression-webpack-plugin@^3.0.0":
   version "3.0.0"
@@ -1080,24 +1071,24 @@
     serialize-javascript "^1.4.0"
     webpack-sources "^1.0.1"
 
-"@theia/console@^1.7.0", "@theia/console@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.7.0.tgz#2abd619f72be471a2bd060f6801d990dfb0c6597"
-  integrity sha512-ZJQLsvxdXL+YrMcbA1bYBFqT4k4udAU+3BCFEBZ5f4g77s8c7MTrL0Sp+Pm3Q5B/EmQMTT3fwmcEMoBHwpqxkQ==
+"@theia/console@^1.8.0", "@theia/console@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.8.0.tgz#2b141a23140669e1cf46c6df2a75dc1ec44714a2"
+  integrity sha512-lKN2I15rjDrg1eI49xuaTnO40cuaWJLR1DiwMydmsitxaJ7zxpv2ZUqITY1xtacxZeIISHYOvax8w3c/w3qsOw==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    anser "^1.4.7"
+    "@theia/core" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    anser "^2.0.1"
 
-"@theia/core@^1.7.0", "@theia/core@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.7.0.tgz#046e6b503561a03e765a4d9f38b2d60a9156dc21"
-  integrity sha512-7Wq+szhj/A8UxZgCBj/uuFutenSZqsnxYzkjt1UkScuKdSIkpof12IuYGSk6kgJV8roMZdkpaICqET1GHOYMTw==
+"@theia/core@^1.8.0", "@theia/core@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.8.0.tgz#dc5d1a311635806e0c476aa73d0626b71f0f96fe"
+  integrity sha512-v6e8OEhqQlOSS1Bv6UVifNqBN29Dzcvf55Hq8r/+iSHfRQ7SjNnVJwinF5xMpNwXYc2lBS3AiovNNekrpC/RGA==
   dependencies:
     "@babel/runtime" "^7.10.0"
     "@phosphor/widgets" "^1.9.3"
     "@primer/octicons-react" "^9.0.0"
-    "@theia/application-package" "^1.7.0"
+    "@theia/application-package" "^1.8.0"
     "@types/body-parser" "^1.16.4"
     "@types/cookie" "^0.3.3"
     "@types/express" "^4.16.0"
@@ -1110,7 +1101,7 @@
     "@types/route-parser" "^0.1.1"
     "@types/safer-buffer" "^2.1.0"
     "@types/ws" "^5.1.2"
-    "@types/yargs" "^11.1.0"
+    "@types/yargs" "^15"
     ajv "^6.5.3"
     body-parser "^1.17.2"
     cookie "^0.4.0"
@@ -1141,7 +1132,7 @@
     vscode-uri "^2.1.1"
     vscode-ws-jsonrpc "^0.2.0"
     ws "^7.1.2"
-    yargs "^11.1.0"
+    yargs "^15.3.1"
 
 "@theia/cpp-debug@latest":
   version "1.0.0"
@@ -1153,26 +1144,26 @@
     ajv "^6.5.3"
     lodash "^4.17.10"
 
-"@theia/debug@^1.7.0", "@theia/debug@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.7.0.tgz#d25d8144b10d3d2cdd2a51ce1f05c7579ccf2c42"
-  integrity sha512-JAXWo5/W+6p4mXC9x5AgP8VF+RXMxFAd+97FoDly75K1nqXDoJKv2AgXf8rNNBxG2MH0ieOBTKXYruMR9OS6YQ==
-  dependencies:
-    "@theia/application-package" "^1.7.0"
-    "@theia/console" "^1.7.0"
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/markers" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    "@theia/output" "^1.7.0"
-    "@theia/preferences" "^1.7.0"
-    "@theia/process" "^1.7.0"
-    "@theia/task" "^1.7.0"
-    "@theia/terminal" "^1.7.0"
-    "@theia/userstorage" "^1.7.0"
-    "@theia/variable-resolver" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/debug@^1.8.0", "@theia/debug@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.8.0.tgz#2f589d1b6525b1dd44b683099ab0ab24cf19aa7c"
+  integrity sha512-TecOK7cB2+4ctpgY8o7WS+mKBTnxd+xPVfu+OU1cmSvwYVo46k3eAd1C+yo0NIUs06iF7c9uisG+MeqzYzDMIg==
+  dependencies:
+    "@theia/application-package" "^1.8.0"
+    "@theia/console" "^1.8.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/markers" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    "@theia/output" "^1.8.0"
+    "@theia/preferences" "^1.8.0"
+    "@theia/process" "^1.8.0"
+    "@theia/task" "^1.8.0"
+    "@theia/terminal" "^1.8.0"
+    "@theia/userstorage" "^1.8.0"
+    "@theia/variable-resolver" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     jsonc-parser "^2.2.0"
     mkdirp "^0.5.0"
     p-debounce "^2.1.0"
@@ -1182,43 +1173,43 @@
     vscode-debugprotocol "^1.32.0"
 
 "@theia/editor-preview@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/editor-preview/-/editor-preview-1.7.0.tgz#c029b8e456f4873c51d8124b60a237300f591d2d"
-  integrity sha512-6lnbiFUm0pUTkjfd8qlYqJi/tC9GVMwlkJY5hE93x26a51au71BVNvoJDSkhTURmdBlSsUIGzlmJkryI84UdCw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/editor-preview/-/editor-preview-1.8.0.tgz#3d6552799528e7711c40ddcf1f4952055badc804"
+  integrity sha512-aFBynXDYLyEsBQxd+yshgX2i68nDIEsLUu5106NUJwdsY/Bq0NedALFFFWrL4wdWWUf+hx5bJjNxkSRd5sZBEw==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
 
-"@theia/editor@^1.7.0", "@theia/editor@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.7.0.tgz#183e069d0fbdf31bc2e3e27cdf5cf3c8ce38121b"
-  integrity sha512-7h7kpkqEggixyp/iLYlczD/VN7u6jLeWGw2RNMkX2F19M6jo0LUlsdEfTUpYDbx6y8SLP/wyCkvn6X0kPqgOsg==
+"@theia/editor@^1.8.0", "@theia/editor@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.8.0.tgz#0c07d3db117d1f7cb95bbecdf57040d8a9d7c267"
+  integrity sha512-hY+LyzBZM1JwYimII10KC7o/gB3BwQidvBo/+sLaFKw1DUDnCi+HQI6lpZM2LC+IKWhs6hn6Uh0tm/63LylynQ==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/variable-resolver" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/variable-resolver" "^1.8.0"
     "@types/base64-arraybuffer" "0.1.0"
     base64-arraybuffer "^0.1.5"
 
-"@theia/file-search@^1.7.0", "@theia/file-search@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.7.0.tgz#581c79bf76d165cf94ee4339f0a2ef23ef2dca5d"
-  integrity sha512-PkLD7ia2E9iblAfs1qoN1zRFvdmyEjI7F5AiOXtjE5GfpX4cOoLTtemTfCbuFKzYY33i9W4Vwyk8EzlcEbpgvA==
-  dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/process" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/file-search@^1.8.0", "@theia/file-search@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.8.0.tgz#a451975790f2c39cb60e4e840706fc6bb6c54904"
+  integrity sha512-I3cjE86pVVcdj90e4fm5JgxIMEKLDGrfFbTMbcHM6CqqyNVqqKdiXtlMyX1bpt7yapzGzwooQJfhLc1Yie42Iw==
+  dependencies:
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/process" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     fuzzy "^0.1.3"
     vscode-ripgrep "^1.2.4"
 
-"@theia/filesystem@^1.7.0", "@theia/filesystem@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.7.0.tgz#dafa4f930d65f4750cd62934f3110d794cd1fb9c"
-  integrity sha512-t8CoxFh3QOHs7r6ccVquejHf/PUAO0wBEPDxLQhTAxJcXWDgW0ebIesWjmf9CndDWMGOa2X0MLxpEcabVEv3+Q==
+"@theia/filesystem@^1.8.0", "@theia/filesystem@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.8.0.tgz#db76b0326f48ed4b7671adc2215fe9a35b0a5259"
+  integrity sha512-+7dZKmFznM/EWQU+tYTDsAcj/ywDY3O3Y8CDxAu77Bo/8O6+UBbp2Pm5fOcqL2xGQ/8CLe03zmrSQ41/LMdSyQ==
   dependencies:
-    "@theia/application-package" "^1.7.0"
-    "@theia/core" "^1.7.0"
+    "@theia/application-package" "^1.8.0"
+    "@theia/core" "^1.8.0"
     "@types/body-parser" "^1.17.0"
     "@types/rimraf" "^2.0.2"
     "@types/tar-fs" "^1.16.1"
@@ -1233,28 +1224,28 @@
     vscode-languageserver-textdocument "^1.0.1"
 
 "@theia/getting-started@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/getting-started/-/getting-started-1.7.0.tgz#409719f1479f2e2b4db83ccc15986e091dd1cec2"
-  integrity sha512-2SCo+RL8VqU5UwfTISNiDAbXdncoDTQfpLrvzpp9XgTv+nRqkQ5YmCUf4WPWRLJEdbT1IZF8KwQi4kWRUUSXpg==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/getting-started/-/getting-started-1.8.0.tgz#c506c5f3b358d4309902c5a10527e235678a20b4"
+  integrity sha512-pR7BTHkqarVoHvjO8nFHNsKoYrmskxrZMgvtFQzAmSLMtYry2DPWcfIPcGBucvJGLB9wWJ49wSn+AH4S1AeWsA==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/keymaps" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/keymaps" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
 
 "@theia/git@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.7.0.tgz#ab8c9d2e867b0bae9d0dd9ac8bc7537c860c1bc5"
-  integrity sha512-lJTkyQnqL7fjs2ztsmzjIiyrEPPspxipm0TLyj8geBuqlAmHGWKQQQSaTdXLbAqzggCPr6QwGFheCnFguVdafw==
-  dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    "@theia/navigator" "^1.7.0"
-    "@theia/scm" "^1.7.0"
-    "@theia/scm-extra" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.8.0.tgz#ce10757f4177684f0eae224aba3fa1acb22d2cc7"
+  integrity sha512-WFJl1A7/fa0MwX1fg7hNuMPTzkWwd1UpdirH48jX2CKYJ2/MsK8IJWv1SxqtbH+mkFMu4HhzZ9nFtzMbxXd+Tg==
+  dependencies:
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    "@theia/navigator" "^1.8.0"
+    "@theia/scm" "^1.8.0"
+    "@theia/scm-extra" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     "@types/diff" "^3.2.2"
     "@types/p-queue" "^2.3.1"
     diff "^3.4.0"
@@ -1266,58 +1257,58 @@
     p-queue "^2.4.2"
     ts-md5 "^1.2.2"
 
-"@theia/keymaps@^1.7.0", "@theia/keymaps@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/keymaps/-/keymaps-1.7.0.tgz#536b931c56108fd036295adbcbe23c4333736bac"
-  integrity sha512-Gtiffa39PWJbmrY+d96IxMO0BVNz3fuxzrYdkdySXOwABSsfVGKdhkJXSRpIQanF04jgA2HtM1hZQtq/hBecGw==
+"@theia/keymaps@^1.8.0", "@theia/keymaps@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/keymaps/-/keymaps-1.8.0.tgz#4ecdd4b7e8b2eaec15f5b8e313cbd37cb3e5a057"
+  integrity sha512-1J4KqXvoAjDEkR+WO9D9ntm6A8R1FUQKEhmRaqpIxwVnuXqxE9sEH9gLagXwErrzoHqLr9OAEM34YWRgjst8NQ==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    "@theia/userstorage" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    "@theia/userstorage" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     "@types/lodash.debounce" "4.0.3"
     ajv "^6.5.3"
     fuzzy "^0.1.3"
     jsonc-parser "^2.2.0"
     lodash.debounce "^4.0.8"
 
-"@theia/markers@^1.7.0", "@theia/markers@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.7.0.tgz#d4f22ee093b2616a3586751cb9e89945218d6806"
-  integrity sha512-FdgSikx/NumvappUWWAUsJYKDF36sUVwK//RWxuvjR1zoYGKnNsewwE/+OR2/1lJps+URZ3YtGmSYCwyCRMk7A==
+"@theia/markers@^1.8.0", "@theia/markers@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.8.0.tgz#cdbd41607a6bf7f9441d4274f1301d4e5b1b15b5"
+  integrity sha512-hyw6prv6JoTey6N14FzG7Dti/fAc9FbCtKPizGY1UvZFmaY/ibpUoj3o5iRSui/qNg2VOGLA+schgqKZOPQMjA==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/navigator" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/navigator" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
 
-"@theia/messages@^1.7.0", "@theia/messages@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.7.0.tgz#65b2517ff9cbb9cc2e1511248ffc981cf887e2ef"
-  integrity sha512-XPQafp8OyM8FXz0168mDR3tZqDPYs1bJnxNB1rv7U7R/fih9Dh0Cn7iPakZ6Wc+p9hMDs94Q58IMTrKXYLhNBg==
+"@theia/messages@^1.8.0", "@theia/messages@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.8.0.tgz#b950de2f94cf307fa44be4d279c0ccbe01609a13"
+  integrity sha512-GfSPkSDv5IazgRzf9N9JByeP6DO/QpAiwCY3N+kntedO47EUQF9B9vY+KiWZVsm+K0Z/lKnTfxoD6fcD+GxPPw==
   dependencies:
-    "@theia/core" "^1.7.0"
+    "@theia/core" "^1.8.0"
     lodash.throttle "^4.1.1"
     markdown-it "^8.4.0"
     react-perfect-scrollbar "^1.5.3"
     ts-md5 "^1.2.2"
 
 "@theia/metrics@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/metrics/-/metrics-1.7.0.tgz#b18539154b35d4c0206eedca3398325e88a41e01"
-  integrity sha512-LOMIc1z1M6tfQk+dBbd1F+uRdyLDdQUhnnKkhi0PnetbbHsDTzJut6I6mYMJcxQV6W2dxcB0TppQym/t8lNDnw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/metrics/-/metrics-1.8.0.tgz#abb5474c1c7b7fa016cce2cb3cf7be69b476b1cf"
+  integrity sha512-Rl4F5iS8r5IaBn7h8GneluGct+uXEt33T2G24W67Rmpl7OY4xd2z1OkQN2AO88fE5PIHHvqVb0rrxAGwNygH5w==
   dependencies:
-    "@theia/application-package" "^1.7.0"
-    "@theia/core" "^1.7.0"
+    "@theia/application-package" "^1.8.0"
+    "@theia/core" "^1.8.0"
     prom-client "^10.2.0"
 
-"@theia/mini-browser@^1.7.0", "@theia/mini-browser@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.7.0.tgz#aca579e1e57e34d10f856f7ca19d6ddbec196c49"
-  integrity sha512-CaidcW7POWuI+XBhR/zIdS0pmkovd6sSPQelEE7nSTchx2801HVTcTNWdhXwIELg7MCt/Q+9v6nT8HkrPabCPw==
+"@theia/mini-browser@^1.8.0", "@theia/mini-browser@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.8.0.tgz#f8e77d3fc4d9af671c8c33578fe988efc02780e2"
+  integrity sha512-r/elEFBW4D6Fm/sLbrtE31DnKXvdwrBqcWdaJztUUtXDhpa8VCp5+NDcSMYw9Xbf8Osbq/7Fw10J14CRpsNBKA==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
     "@types/mime-types" "^2.1.0"
     mime-types "^2.1.18"
     pdfobject "^2.0.201604172"
@@ -1327,18 +1318,18 @@
   resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz#0f3cdfd6d1278bbcc3df0224471fc967a4d901c5"
   integrity sha512-6QDOrZRW3dE0RgyD/hXMlVla49ACNjwIX+u9+i/qY+OqaZ1u/QdgdnHy4QO6g4J0lQCyr7nXgqF1BAc+Xbxx2g==
 
-"@theia/monaco@^1.7.0", "@theia/monaco@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.7.0.tgz#b9bf0931f33ef8d23a35c53c8da917a82f16aa21"
-  integrity sha512-qvlM0rhbVIrLl+PRbiE/UGrHs9wgiZJmSWRZNrIl5Yhtp+XhUJLvSANzHPk/Xkru4vJDrqVJJpInYhfj/5L84g==
+"@theia/monaco@^1.8.0", "@theia/monaco@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.8.0.tgz#35c6286ff0ea3067edb825742e847899d1b1183b"
+  integrity sha512-gCAycSH15lFqT2v9ixOv5oNQkUm2AyiKFGdZQJd2cJwKfIRO9cFUOqjXHPKhiena2PSo22lAAiSXMbxhKWzJhA==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/markers" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/markers" "^1.8.0"
     "@theia/monaco-editor-core" "^0.20.0"
-    "@theia/outline-view" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+    "@theia/outline-view" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     deepmerge "2.0.1"
     fast-plist "^0.1.2"
     idb "^4.0.5"
@@ -1346,14 +1337,14 @@
     onigasm "^2.2.0"
     vscode-textmate "^4.4.0"
 
-"@theia/navigator@^1.7.0", "@theia/navigator@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.7.0.tgz#ea576e935178cc1c4f7260ff2dd0dd5b2df6b0e3"
-  integrity sha512-APpJPuLFb0qSzoxTmQoB+sG7tvNYfaJ2ArlRetMuuUD6tpw26R6iJKQYKMPnJuFEAPRbAHOnp7gMLl39BNQIog==
+"@theia/navigator@^1.8.0", "@theia/navigator@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.8.0.tgz#877833624311b5aad575acdf93d41a0091acb4bf"
+  integrity sha512-K4uLTcyGZmH3DeX/kNNpHI1BTIpvvk92xX7zytuxexzmBRRS+7tTKk/3nSPTmO2oCJgeVxdTkKLJUisEFcOIzA==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     fuzzy "^0.1.3"
     minimatch "^3.0.4"
 
@@ -1364,64 +1355,64 @@
   dependencies:
     nan "^2.14.0"
 
-"@theia/outline-view@^1.7.0", "@theia/outline-view@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.7.0.tgz#8c32bb5f9ee0b6ce8eb3eadd29d57c2fdf65eb3a"
-  integrity sha512-ScakzK21HxPnzSUuy0VZouQixtQbUJhW5G2zo3fB8EfsjjEebwACMuq/ZoCttSnTfJ99Xd95vMNR6NDhQpaZAg==
+"@theia/outline-view@^1.8.0", "@theia/outline-view@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.8.0.tgz#63393cc53da435a0856e0c70741fb027819fc28e"
+  integrity sha512-X5sC7kF4KMyLHxMCMKRJnipsw5Egyr/ymDRi2sshAtgE53cV6jLvKJmt0WoxA8StLeYcAkI5WzVFuwcXhZH3Kw==
   dependencies:
-    "@theia/core" "^1.7.0"
+    "@theia/core" "^1.8.0"
 
-"@theia/output@^1.7.0", "@theia/output@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.7.0.tgz#2b32aa4aa3c7f78b137d7cda181a55593391f035"
-  integrity sha512-0CDjfRXqawtt7XCIAKuRWeDkgxkNuqKmsLqnrxNh10t80I3Vk/5H2dXUvqAZAap5bYGKEiS156K6Mr92Ub7tLg==
+"@theia/output@^1.8.0", "@theia/output@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.8.0.tgz#927d209ebf5f882258f0c1c63957a1eeb2edebba"
+  integrity sha512-8cldJTyPzorbSPaJ1fidmxJAgw+0mApb98PCGT6oDCD0JDFtdErweAtgsXtSbpDX7+ROORmbQeiYd5EeqIF8pg==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
     "@types/p-queue" "^2.3.1"
     p-queue "^2.4.2"
 
-"@theia/plugin-ext-vscode@^1.7.0", "@theia/plugin-ext-vscode@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.7.0.tgz#f91cd480fd21346815f90e9843d81070e29457c3"
-  integrity sha512-jkjq/dsMPcG5rNp5WEdlp1wvMkem3fVBt/O8T/xwzDSBa0PSY7wKbL+tZ7ZYFkViRK/a6uZki/+yLHCTOI969Q==
-  dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    "@theia/plugin" "^1.7.0"
-    "@theia/plugin-ext" "^1.7.0"
-    "@theia/userstorage" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/plugin-ext-vscode@^1.8.0", "@theia/plugin-ext-vscode@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.8.0.tgz#a4ce3cd0598078d248d4e0c9d676004cc55bdd7b"
+  integrity sha512-fnB1JhJuZ1VboknP4ZL4hGAM96hJ6zpr21ZyPYhHstdXG7F13sntpObPBkqlHzdRoald3+eej0lSfdL/NESxDA==
+  dependencies:
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    "@theia/plugin" "^1.8.0"
+    "@theia/plugin-ext" "^1.8.0"
+    "@theia/userstorage" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     "@types/request" "^2.0.3"
     filenamify "^4.1.0"
     request "^2.82.0"
 
-"@theia/plugin-ext@^1.7.0", "@theia/plugin-ext@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.7.0.tgz#0b91515a7bb828e543d1d833e71b41492d37791f"
-  integrity sha512-8rWYBAUpvszIG0XcjT70ty/lsWJjqAlBfaMWv/kCRA/YqW7d3GtNtt19cW41gsh4FYnxfAUbkw5rWx7TAOBoZA==
-  dependencies:
-    "@theia/callhierarchy" "^1.7.0"
-    "@theia/core" "^1.7.0"
-    "@theia/debug" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/file-search" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/markers" "^1.7.0"
-    "@theia/messages" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    "@theia/navigator" "^1.7.0"
-    "@theia/output" "^1.7.0"
-    "@theia/plugin" "^1.7.0"
-    "@theia/preferences" "^1.7.0"
-    "@theia/scm" "^1.7.0"
-    "@theia/search-in-workspace" "^1.7.0"
-    "@theia/task" "^1.7.0"
-    "@theia/terminal" "^1.7.0"
-    "@theia/timeline" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/plugin-ext@^1.8.0", "@theia/plugin-ext@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.8.0.tgz#0d90d88faa46057dc05527946b6126e2ef031f5d"
+  integrity sha512-FwOSspt9nmteLR7bPGk0FjdfZGDIP2Sq4b35gmPr5Qd3M+E5h1lKah/EBDoBRqdWH+VzEsVcpLtiA6+ygg0xPg==
+  dependencies:
+    "@theia/callhierarchy" "^1.8.0"
+    "@theia/core" "^1.8.0"
+    "@theia/debug" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/file-search" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/markers" "^1.8.0"
+    "@theia/messages" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    "@theia/navigator" "^1.8.0"
+    "@theia/output" "^1.8.0"
+    "@theia/plugin" "^1.8.0"
+    "@theia/preferences" "^1.8.0"
+    "@theia/scm" "^1.8.0"
+    "@theia/search-in-workspace" "^1.8.0"
+    "@theia/task" "^1.8.0"
+    "@theia/terminal" "^1.8.0"
+    "@theia/timeline" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     "@types/connect" "^3.4.32"
     "@types/dompurify" "^2.0.2"
     "@types/mime" "^2.0.1"
@@ -1443,33 +1434,33 @@
     vscode-debugprotocol "^1.32.0"
     vscode-textmate "^4.0.1"
 
-"@theia/plugin@^1.7.0", "@theia/plugin@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.7.0.tgz#19108d993341d5ad58c4a7f7e8897c1a46cf711e"
-  integrity sha512-K0obci25Y9M3zaKvtFJOMBSE3e0aq1AaZJq2ucM8wf82PCB2dF57BUwhMjusB31pt4z4tm6TTtBtScFWjf233A==
+"@theia/plugin@^1.8.0", "@theia/plugin@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.8.0.tgz#b3a2a5d874a4105f0d20ff333818b72f8e966597"
+  integrity sha512-/nrX2prLpJgKcecH1xdg+v2HJcxaePbScA7k/Z/t8outKZatO0odX2F04wAWgwOLfDLq6POyuyGQ/L9XExsd/Q==
 
-"@theia/preferences@^1.7.0", "@theia/preferences@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.7.0.tgz#304625f02df59c7345adcf8b09bd8fe1b8645fcf"
-  integrity sha512-7nZxPI8/EJXmmM9MCuw+Ah+mlAQ4ugtKsWmb353cjNkdAGVf9BRJDXSfwcvXpzLaAdvroyj+3H9fZ87moWPxQw==
-  dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    "@theia/userstorage" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/preferences@^1.8.0", "@theia/preferences@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.8.0.tgz#fecf99ac290f778f0f8f648f3da259e96fedd324"
+  integrity sha512-AuK9jKzQg5fWG8iuJNksFCAMsVRg4/01XELanOCDOeegPW7fwqz+SSFJMYN1e/Dhw762u+aVpWy39OmBV8qVfA==
+  dependencies:
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    "@theia/userstorage" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     jsonc-parser "^2.2.0"
 
 "@theia/preview@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/preview/-/preview-1.7.0.tgz#37dde32060e47ba527794fefa68d6a1bf81abb05"
-  integrity sha512-L6z1kfbmm9ErHIon54uo7BE9sWCb/OBRYYZb8vYJEn35LcWEsU+aZAaahq0ffHhxlPPEZMf3w9cdTKd9XrG7hQ==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/preview/-/preview-1.8.0.tgz#3664b1b9b4eb3ac0506f6144e0d5d4e424e8ba53"
+  integrity sha512-UiHp3qPnncG/+0b/p5//aW5fSn3U3qTyXtFepMqlOU+uGAqhxLfSKAmGx/kMKerP2nqHFyGxxptbJRZR9bnXmg==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/mini-browser" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/mini-browser" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
     "@types/dompurify" "^2.0.2"
     "@types/highlight.js" "^9.12.2"
     "@types/markdown-it" "*"
@@ -1479,126 +1470,127 @@
     markdown-it "^8.4.0"
     markdown-it-anchor "~5.0.0"
 
-"@theia/process@^1.7.0", "@theia/process@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.7.0.tgz#f72e6dd1b36bd08f45aa2e148dd9a886c9742849"
-  integrity sha512-lLJSe2YjRXA/gjC9Jg35XDPrUs/yZzJGGaUgYjZGEbmLS1jFvQh9fIMPoYHHWx5uOuAbceIHlgjEy9deJb35BA==
+"@theia/process@^1.8.0", "@theia/process@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.8.0.tgz#9285534182d90fcc6602d02d6d21e3293dfd2902"
+  integrity sha512-PfbaXPJhHMyDoEbk7WRWOj8otbjNOgZGLCSxgfr3tGMOlN8ZPwcYZuRk9+McfbfcL6IFbA3O6FjGc1K4BKEcmg==
   dependencies:
-    "@theia/core" "^1.7.0"
+    "@theia/core" "^1.8.0"
     "@theia/node-pty" "0.9.0-theia.6"
     string-argv "^0.1.1"
 
-"@theia/scm-extra@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.7.0.tgz#4f48f98ecff7813bf1a4140b454304bef19bf9b4"
-  integrity sha512-RSfCw2w5tKp6QM807atWY+6qX6KetZDl+8jzH/16HlI5a/I0z/41gZhhg9aOI0CaBKWYS5vYCFxYSwOINlYJIA==
+"@theia/scm-extra@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.8.0.tgz#923aff6ff8c625c7cbc8652344e6bcd995e2ea75"
+  integrity sha512-xAsS+/b7F9wvGLgifb9DnCYrlc96A/Y9ftfgu+v11RpAMA1SkT3MA9O9qNOvkfJWusLbbJRTG6moA7qqVQLkaQ==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/navigator" "^1.7.0"
-    "@theia/scm" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/navigator" "^1.8.0"
+    "@theia/scm" "^1.8.0"
 
-"@theia/scm@^1.7.0", "@theia/scm@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.7.0.tgz#434b04e8d4fc045b2008ec0b28519b73b165a717"
-  integrity sha512-hs3SIxkRRWDWSONrXlbEGkSSDv2Scn1kJJ9X3Dwu0iqQjXCxK5Alsbe4dkGDD5+SdVGIm4TtWi3s7yZj48oDGA==
+"@theia/scm@^1.8.0", "@theia/scm@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.8.0.tgz#6bd7754f2b51c30bcecfe6c9fc1f37c49b257c29"
+  integrity sha512-MbIlW7vwhm61c89n835ZcrmHttORw4kdgPz/30g5Rn8CxZJK1pygKmGeMDp4j4YkRTYJ2hhpPcP902PZbZIGfQ==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/navigator" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/navigator" "^1.8.0"
     "@types/diff" "^3.2.2"
     diff "^3.4.0"
     p-debounce "^2.1.0"
     react-autosize-textarea "^7.0.0"
     ts-md5 "^1.2.2"
 
-"@theia/search-in-workspace@^1.7.0", "@theia/search-in-workspace@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.7.0.tgz#f899bbb2566df1dd086af28984365492aed38f7a"
-  integrity sha512-qIa6jEqKcicTOZfp41Za0O78dMi1GCQ73iwy85LoVZuyn+2D41xGt32Lu+NWl2xWCjMSy87oxVxC5WDfiEdUaA==
-  dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/navigator" "^1.7.0"
-    "@theia/process" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/search-in-workspace@^1.8.0", "@theia/search-in-workspace@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.8.0.tgz#eccb408eb99b1dcacef2a71fa2e410d4a4807a6a"
+  integrity sha512-pJNqHzPqb83nNtxcP0ubN4AyB2XFV+Y8Zo2HbCKxtLmtFUjUHZ+OykpjR88znQfe/WeRfQlKBSnrep4cEypXng==
+  dependencies:
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/navigator" "^1.8.0"
+    "@theia/process" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
+    minimatch "^3.0.4"
     vscode-ripgrep "^1.2.4"
 
-"@theia/task@^1.7.0", "@theia/task@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.7.0.tgz#1b604c035054b0d332a7dac394c5c1a443d0caab"
-  integrity sha512-8j7i5UQmKI5XmVQ+icKcqKph7ME4yW3LlClgPZf31UimoqxK6PAsrvZmEV8kmVq+ORL2rMgljiPV9joa6Meg8A==
-  dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/markers" "^1.7.0"
-    "@theia/monaco" "^1.7.0"
-    "@theia/preferences" "^1.7.0"
-    "@theia/process" "^1.7.0"
-    "@theia/terminal" "^1.7.0"
-    "@theia/variable-resolver" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/task@^1.8.0", "@theia/task@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.8.0.tgz#8741b7308318977736c28f2d60486ab6f8e7deca"
+  integrity sha512-V9MRCGjWPLcvVsp4pFVl0GLYKDj+syAZT5YVNt7BdZ1utsNzqd/RoPZD1cJ48pb5F2dTbupVkGMfeM9RxJRlFQ==
+  dependencies:
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/markers" "^1.8.0"
+    "@theia/monaco" "^1.8.0"
+    "@theia/preferences" "^1.8.0"
+    "@theia/process" "^1.8.0"
+    "@theia/terminal" "^1.8.0"
+    "@theia/variable-resolver" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     ajv "^6.5.3"
     jsonc-parser "^2.2.0"
     p-debounce "^2.1.0"
 
-"@theia/terminal@^1.7.0", "@theia/terminal@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.7.0.tgz#19401598c7e38072781e643b0a06162503ecd589"
-  integrity sha512-zv/ns6smV3trJDaYtTlAXGT2J5LeGQPUvOOgnTQ14taTyAQnfEBnujTjqt64Mb2s4RdtREkOCvhjuNlOCAxmig==
-  dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/process" "^1.7.0"
-    "@theia/workspace" "^1.7.0"
+"@theia/terminal@^1.8.0", "@theia/terminal@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.8.0.tgz#f44c5991b7643b1aab10acb00c1a8a33256e37d3"
+  integrity sha512-iQJnovTn6HKvO3PJbcD6bmadHhu7oYjzvAn2fKpxmcdTiGitEjdFzP0YeYIw/fAkvRPvUJzLHyBaGZ49ezQ0Dg==
+  dependencies:
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/process" "^1.8.0"
+    "@theia/workspace" "^1.8.0"
     xterm "^4.4.0"
     xterm-addon-fit "^0.3.0"
     xterm-addon-search "^0.5.0"
 
-"@theia/timeline@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.7.0.tgz#5cc2959866a4def62e29ba8af980c04aad7a16a2"
-  integrity sha512-fvhETGtPzuyzyV7xEKfbBq4xj8sUuCJh2RF/sI9g2azzj/x+LPLXIwcITiWqpvq0r4L0tPethH41HQ0gqAYZKQ==
+"@theia/timeline@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.8.0.tgz#d07ddd5718eee68dfc238210802ce596a29d7ccb"
+  integrity sha512-/kDhxHX070yFGUTeYo7hVMN+HOmRQNQNGqYS/IY8v8CqeLNXN+qq0JkXJDekpSdK6XIKPG26IaARbHtayATxnA==
   dependencies:
-    "@theia/core" "^1.7.0"
+    "@theia/core" "^1.8.0"
 
 "@theia/typehierarchy@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/typehierarchy/-/typehierarchy-1.7.0.tgz#c020e845fbcca057278076532a317d2243d15dce"
-  integrity sha512-cC4vsxYeB7IM4vHkG64a37RPCmktYTCkSwL5bXTPlvnc7KWzsK+HKnq2sUiSl2U6wFCIUg6K3SdjAwQVy8/feA==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/typehierarchy/-/typehierarchy-1.8.0.tgz#1babb4c4018d2f207a5ed13d161745b55671901b"
+  integrity sha512-6zPDI5RezLHAQnlN1CzT++nLS87+o7RI7aPJH+L5vVoMAfHYg74oeWHqkZ9fENF60q+5uY4SA2SLq2kr+Vwekg==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/editor" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/editor" "^1.8.0"
     "@types/uuid" "^7.0.3"
     uuid "^8.0.0"
 
-"@theia/userstorage@^1.7.0", "@theia/userstorage@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.7.0.tgz#06e91bdf830edd9069cc65efdc93cd68578078e6"
-  integrity sha512-UzZbkykCxPWb0rna5UtleMO+SGtR/KCCH8I5shBv/+o9CyrHmEhNN9aFa00OI/ygjGn+4PwNOxnDF9i4GDKL3Q==
+"@theia/userstorage@^1.8.0", "@theia/userstorage@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.8.0.tgz#5bdaafbd7b816d3564205170b686b704005db72f"
+  integrity sha512-1F/VuSPd7yQaiebey2hIcaz+jPPVyidfhSEK64BrsmkmflRWALg2hwfFFu2RC1FiQ0K5L62cjJ1T39oL93NJqw==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
 
-"@theia/variable-resolver@^1.7.0", "@theia/variable-resolver@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.7.0.tgz#318cd57c0ac90495a37bced3170e0ef6c9f2a86d"
-  integrity sha512-BvTQROh/oX6E/6wmDk8yuj8Q4108ybQxKjR3wVuum2VauxT2eqW4uKhN2liRk+EJYHqso+KNcNiyU530vnyyeg==
+"@theia/variable-resolver@^1.8.0", "@theia/variable-resolver@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.8.0.tgz#884f3ef4490f90eee8543c4d1f7e8cae361e303a"
+  integrity sha512-T1ylznZDO4Eb0/mpF1ddEt1ZDJu+9yFjOmpvLxvpvtXE7tGNQwnKm7p4BgL3ZYUuW6NX6HodJrsJSJEo+W28fg==
   dependencies:
-    "@theia/core" "^1.7.0"
+    "@theia/core" "^1.8.0"
 
 "@theia/vsx-registry@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/vsx-registry/-/vsx-registry-1.7.0.tgz#8c0d6795f9df4bc52c50dfe4b54cb7bdd148e625"
-  integrity sha512-zSRA7X1+qApg37uKDgkjZdBBo6SehYFbhVl0PcBh3f1hrIw4zadDF4Vn89T+8Sucr6Lues/X+LDygOJh5hVEHg==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/vsx-registry/-/vsx-registry-1.8.0.tgz#8d72845932162410108a109cd6096e6bb327a533"
+  integrity sha512-k9xOYk0Xq/8Squj2F0XThpylpwjGi39WGte7WvK5CvtN8Z1rWT3EDEXFHk9BGXltznVeMPt+oIxz8I32G6Jm5Q==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/plugin-ext-vscode" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/plugin-ext-vscode" "^1.8.0"
     "@types/bent" "^7.0.1"
     "@types/sanitize-html" "^1.13.31"
     "@types/showdown" "^1.7.1"
@@ -1610,14 +1602,14 @@
     showdown "^1.9.1"
     uuid "^8.0.0"
 
-"@theia/workspace@^1.7.0", "@theia/workspace@latest":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.7.0.tgz#1da8cf0d13c0c7c5a0d31cd31ccef5cc4beab04c"
-  integrity sha512-qGxSlTGsRYAKStcoqu0Ep3avXikdcqWzbuXpP2TP0pf58OvT7iRjFmIYmWu50AF9FqaEtm+pLFQFAjrrXeCmrw==
+"@theia/workspace@^1.8.0", "@theia/workspace@latest":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.8.0.tgz#e8b40d1a1b3acaf1fb6ce38ea3e4c9685620e5db"
+  integrity sha512-s3pPqoo2cUVM4dfcvwP+AV0xxqK7Xq6y1NfIKNmx6tynykISK/HM68ikAzrdSHvWXc+4mYEB5CoqcPUNDhV6xg==
   dependencies:
-    "@theia/core" "^1.7.0"
-    "@theia/filesystem" "^1.7.0"
-    "@theia/variable-resolver" "^1.7.0"
+    "@theia/core" "^1.8.0"
+    "@theia/filesystem" "^1.8.0"
+    "@theia/variable-resolver" "^1.8.0"
     ajv "^6.5.3"
     jsonc-parser "^2.2.0"
     moment "2.24.0"
@@ -1688,18 +1680,18 @@
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
 "@types/express-serve-static-core@*":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084"
-  integrity sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz#cabf91debeeb3cb04b798e2cff908864e89b6106"
+  integrity sha512-uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
 "@types/express@^4.16.0":
-  version "4.17.8"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.8.tgz#3df4293293317e61c60137d273a2e96cd8d5f27a"
-  integrity sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==
+  version "4.17.9"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz#f5f2df6add703ff28428add52bdec8a1091b0a78"
+  integrity sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -1721,7 +1713,7 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/highlight.js@^9.12.2":
+"@types/highlight.js@^9.12.2", "@types/highlight.js@^9.7.0":
   version "9.12.4"
   resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.4.tgz#8c3496bd1b50cc04aeefd691140aa571d4dbfa34"
   integrity sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==
@@ -1751,9 +1743,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*":
-  version "4.14.163"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.163.tgz#6026f73c8267a0b7d41c7c8aadacfa2a5255774f"
-  integrity sha512-BeZM/FZaV53emqyHxn9L39Oz6XbHMBRLA1b1quROku48J/1kYYxPmVOJ/qSQheb81on4BI7H6QDo6bkUuRaDNQ==
+  version "4.14.165"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.165.tgz#74d55d947452e2de0742bad65270433b63a8c30f"
+  integrity sha512-tjSSOTHhI5mCHTy/OOXYIhi2Wt1qcbHmuXD1Ha7q70CgI/I71afO4XtLb/cVexki1oVYchpul/TOuu3Arcdxrg==
 
 "@types/markdown-it-anchor@^4.0.1":
   version "4.0.4"
@@ -1763,12 +1755,14 @@
     "@types/markdown-it" "*"
 
 "@types/markdown-it@*":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-10.0.2.tgz#f93334b9c7821ddb19865dfd91ecf688094c2626"
-  integrity sha512-FGKiVW1UgeIEAChYAuHcfCd0W4LsMEyrSyTVaZiuJhwR4BwSVUD8JKnzmWAMK2FHNLZSPGUaEkpa/dkZj2uq1w==
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-10.0.3.tgz#a9800d14b112c17f1de76ec33eff864a4815eec7"
+  integrity sha512-daHJk22isOUvNssVGF2zDnnSyxHhFYhtjeX4oQaKD6QzL3ZR1QSgiD1g+Q6/WSWYVogNXYDXODtbgW/WiFCtyw==
   dependencies:
+    "@types/highlight.js" "^9.7.0"
     "@types/linkify-it" "*"
     "@types/mdurl" "*"
+    highlight.js "^9.7.0"
 
 "@types/mdurl@*":
   version "1.0.2"
@@ -1818,14 +1812,14 @@
     form-data "^3.0.0"
 
 "@types/node@*":
-  version "14.14.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f"
-  integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==
+  version "14.14.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
+  integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
 
 "@types/node@^10.14.22":
-  version "10.17.44"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.44.tgz#3945e6b702cb6403f22b779c8ea9e5c3f44ead40"
-  integrity sha512-vHPAyBX1ffLcy4fQHmDyIUMUb42gHZjPHU66nhvbMzAWJqHnySGZ6STwN3rwrnSd1FHB0DI/RWgGELgKSYRDmw==
+  version "10.17.47"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.47.tgz#cc88a242a835789456cfcf374928400d9f4b291c"
+  integrity sha512-YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1860,11 +1854,11 @@
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
 "@types/react-dom@^16.8.0":
-  version "16.9.9"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.9.tgz#d2d0a6f720a0206369ccbefff752ba37b9583136"
-  integrity sha512-jE16FNWO3Logq/Lf+yvEAjKzhpST/Eac8EMd1i4dgZdMczfgqC8EjpxwNgEe3SExHYLliabXDh9DEhhqnlXJhg==
+  version "16.9.10"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.10.tgz#4485b0bec3d41f856181b717f45fd7831101156f"
+  integrity sha512-ItatOrnXDMAYpv6G8UCk2VhbYVTjZT9aorLtA/OzDN9XJ2GKcfam68jutoAcILdRjsRUO8qb7AmyObF77Q8QFw==
   dependencies:
-    "@types/react" "*"
+    "@types/react" "^16"
 
 "@types/react-virtualized@^9.18.3":
   version "9.21.10"
@@ -1874,10 +1868,18 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.8.0":
-  version "16.9.55"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.55.tgz#47078587f5bfe028a23b6b46c7b94ac0d436acff"
-  integrity sha512-6KLe6lkILeRwyyy7yG9rULKJ0sXplUsl98MGoCfpteXf9sPWFWWMknDcsvubcpaTdBuxtsLF6HDUwdApZL/xIg==
+"@types/react@*":
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8"
+  integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^3.0.2"
+
+"@types/react@^16", "@types/react@^16.8.0":
+  version "16.14.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c"
+  integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ==
   dependencies:
     "@types/prop-types" "*"
     csstype "^3.0.2"
@@ -1933,9 +1935,9 @@
   integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
 "@types/serve-static@*", "@types/serve-static@^1.13.3":
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.6.tgz#866b1b8dec41c36e28c7be40ac725b88be43c5c1"
-  integrity sha512-nuRJmv7jW7VmCVTn+IgYDkkbbDGyIINOeu/G0d74X3lm6E5KfMeQPJhxIt1ayQeQB3cSxvYs1RA/wipYoFB4EA==
+  version "1.13.8"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.8.tgz#851129d434433c7082148574ffec263d58309c46"
+  integrity sha512-MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA==
   dependencies:
     "@types/mime" "*"
     "@types/node" "*"
@@ -1971,9 +1973,9 @@
     "@types/node" "*"
 
 "@types/tar@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-4.0.3.tgz#e2cce0b8ff4f285293243f5971bd7199176ac489"
-  integrity sha512-Z7AVMMlkI8NTWF0qGhC4QIX0zkV/+y0J8x7b/RsHrN0310+YNjoJd8UrApCiGBCWtKjxS9QhNqLi2UJNToh5hA==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-4.0.4.tgz#d680de60855e7778a51c672b755869a3b8d2889f"
+  integrity sha512-0Xv+xcmkTsOZdIF4yCnd7RkOOyfyqPaqJ7RZFKnwdxfDbkN3eAAE9sHl8zJFqBz4VhxolW9EErbjR1oyH7jK2A==
   dependencies:
     "@types/minipass" "*"
     "@types/node" "*"
@@ -2010,9 +2012,9 @@
     source-map "^0.7.3"
 
 "@types/webpack@^4.41.2":
-  version "4.41.24"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.24.tgz#75b664abe3d5bcfe54e64313ca3b43e498550422"
-  integrity sha512-1A0MXPwZiMOD3DPMuOKUKcpkdPo8Lq33UGggZ7xio6wJ/jV1dAu5cXDrOfGDnldUroPIRLsr/DT43/GqOA4RFQ==
+  version "4.41.25"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz#4d3b5aecc4e44117b376280fbfd2dc36697968c4"
+  integrity sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -2039,10 +2041,17 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/yargs@^11.1.0":
-  version "11.1.7"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.7.tgz#a5be4a5f0f4b77b8accdd476004ce911f4241e8f"
-  integrity sha512-ynyKD3/wNHw9/vwYpiVqsrkDZjezXH7aVkg+Xp73irK0WzYYHkBOogiiM6/+eufAxmZxew3aZhAkrrjsOKbLOA==
+"@types/yargs-parser@*":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+
+"@types/yargs@^15":
+  version "15.0.10"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz#0fe3c8173a0d5c3e780b389050140c3f5ea6ea74"
+  integrity sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==
+  dependencies:
+    "@types/yargs-parser" "*"
 
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
@@ -2270,10 +2279,10 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-anser@^1.4.7:
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b"
-  integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww==
+anser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/anser/-/anser-2.0.1.tgz#8d9069291fee18306ffaf2e364a690dcc8ed78ad"
+  integrity sha512-4g5Np4CVD3c5c/36Mj0jllEA5bQcuXF0dqakZcuHGeubBzw93EAhwRuQCzgFm4/ZwvyBMzFdtn9BcihOjnxIdQ==
 
 ansi-colors@3.2.3:
   version "3.2.3"
@@ -2576,9 +2585,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
-  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 axios@^0.18.0:
   version "0.18.1"
@@ -2769,14 +2778,13 @@ babel-helpers@^6.24.1:
     babel-template "^6.24.1"
 
 babel-loader@^8.0.6:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
-  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-messages@^6.23.0:
@@ -3289,9 +3297,9 @@ base64-arraybuffer@^0.1.5:
   integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2, base64-js@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base@^0.11.1:
   version "0.11.2"
@@ -3394,7 +3402,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
-bn.js@^5.1.1:
+bn.js@^5.0.0, bn.js@^5.1.1:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
   integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
@@ -3497,11 +3505,11 @@ browserify-des@^1.0.0:
     safe-buffer "^5.1.2"
 
 browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
   dependencies:
-    bn.js "^4.1.0"
+    bn.js "^5.0.0"
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
@@ -3534,15 +3542,16 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.14.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
-  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
+browserslist@^4.14.5, browserslist@^4.14.7:
+  version "4.14.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
+  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
   dependencies:
-    caniuse-lite "^1.0.30001135"
-    electron-to-chromium "^1.3.571"
-    escalade "^3.1.0"
-    node-releases "^1.1.61"
+    caniuse-lite "^1.0.30001157"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.591"
+    escalade "^3.1.1"
+    node-releases "^1.1.66"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
@@ -3587,9 +3596,9 @@ buffer@^4.3.0:
     isarray "^1.0.0"
 
 buffer@^5.2.1, buffer@^5.5.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.0.tgz#88afbd29fc89fa7b58e82b39206f31f2cf34feed"
-  integrity sha512-cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
@@ -3707,6 +3716,14 @@ cacheable-request@^2.1.1:
     normalize-url "2.0.1"
     responselike "1.0.2"
 
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -3733,14 +3750,14 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30001154"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001154.tgz#73dae05b83defef08c0c939948c04fed9d40b549"
-  integrity sha512-eTsn/+IG2LfKTnKcRRpnUyl4IMxKBEiJqocSsc2ez51rtAYHz4yenJM/DFm6zg11R85X3YzyZNv6fWvhCcMWGQ==
+  version "1.0.30001161"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001161.tgz#69de68582cbd3c57c24034debc4be8c5a4663474"
+  integrity sha512-wF8lcUGCKT+Od+27u4z5ahGSI5lB/xSTf/V8sEU5inDsORj0B4zGzs8YVdd76EIjA5muAjhfrkSTclXUb7MDFw==
 
-caniuse-lite@^1.0.30001135:
-  version "1.0.30001154"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz#f3bbc245ce55e4c1cd20fa731b097880181a7f17"
-  integrity sha512-y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==
+caniuse-lite@^1.0.30001157:
+  version "1.0.30001161"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz#64f7ffe79ee780b8c92843ff34feb36cea4651e0"
+  integrity sha512-JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"
@@ -3910,9 +3927,9 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     safe-buffer "^5.0.1"
 
 circular-dependency-plugin@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93"
-  integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600"
+  integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==
 
 clap@^1.0.9:
   version "1.2.3"
@@ -4129,6 +4146,11 @@ color@^0.11.0:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -4285,18 +4307,18 @@ copy-webpack-plugin@^4.5.0:
     p-limit "^1.0.0"
     serialize-javascript "^1.4.0"
 
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
-  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+core-js-compat@^3.7.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.0.tgz#3248c6826f4006793bd637db608bca6e4cd688b1"
+  integrity sha512-o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.14.7"
     semver "7.0.0"
 
 core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -4500,9 +4522,9 @@ csso@~2.3.1:
     source-map "^0.5.3"
 
 csstype@^3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.4.tgz#b156d7be03b84ff425c9a0a4b1e5f4da9c5ca888"
-  integrity sha512-xc8DUsCLmjvCfoD7LTGE0ou2MIWLx0K9RCZwSHMOdynqRsP4MtUcLeqh1HcQ2dInwDTqn+3CE0/FZh1et+p4jA==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"
+  integrity sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==
 
 cyclist@^1.0.1:
   version "1.0.1"
@@ -4543,7 +4565,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.5.1, debug@^2.6.8, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.1.0:
+debug@3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -4551,9 +4573,9 @@ debug@3.2.6, debug@^3.1.0:
     ms "^2.1.1"
 
 debug@4, debug@^4.1.0, debug@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
-  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
     ms "2.1.2"
 
@@ -4564,6 +4586,13 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@^3.1.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@~0.8.0:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-0.8.1.tgz#20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"
@@ -4823,9 +4852,9 @@ domhandler@^3.0.0, domhandler@^3.3.0:
     domelementtype "^2.0.1"
 
 dompurify@^2.0.11:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.0.tgz#51d34e76faa38b5d6b4e83a0678530f27fe3965c"
-  integrity sha512-bqFOQ7XRmmozp0VsKdIEe8UwZYxj0yttz7l80GBtBqdVRY48cOpXH2J/CVO7AEkV51qY0EBVXfilec18mdmQ/w==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz#cb8c2b1a2f3c8a0b565127504ae4eedec176a972"
+  integrity sha512-BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg==
 
 domutils@^2.0.0:
   version "2.4.2"
@@ -4846,9 +4875,9 @@ download-stats@^0.3.4:
     moment "^2.15.1"
 
 drivelist@^9.0.2:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/drivelist/-/drivelist-9.1.0.tgz#d42c8e12fe81e4c77882c87ad11d4b349c500488"
-  integrity sha512-F7bUv8vYmCCSj5uy657y4WuMF2LOQoC2AiDoshUhgCqeSFthFlVy9SrvFGhdl/bj/KVfJ0Mfbj3iGE13C+dG+g==
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/drivelist/-/drivelist-9.2.1.tgz#d838ea1f947492b4e70f5d3b815a57571b6212a6"
+  integrity sha512-oiMDLWUOhoqvVWDvjSrWcz2I42dNuH0Pf1SZlEr86I413n7XoY/YANnqipSynpe86arBW4EbNur7VAl5h8QQ3Q==
   dependencies:
     bindings "^1.3.0"
     debug "^3.1.0"
@@ -4945,10 +4974,10 @@ electron-rebuild@^1.8.6:
     spawn-rx "^3.0.0"
     yargs "^14.2.0"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.571:
-  version "1.3.584"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.584.tgz#506cf7ba5895aafa8241876ab028654b61fd9ceb"
-  integrity sha512-NB3DzrTzJFhWkUp+nl2KtUtoFzrfGXTir2S+BU4tXGyXH9vlluPuFpE3pTKeH7+PY460tHLjKzh6K2+TWwW+Ww==
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.591:
+  version "1.3.609"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.609.tgz#938735afa300ebf4eaec7e3fff96b7f3d74ac5f0"
+  integrity sha512-kcmRWmlHsUKKLfsSKSf7VqeTX4takM5ndjVTM3et3qpDCceITYI1DixvIfSDIngALoaTnpoMXD3SXSMpzHkYKA==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -5050,24 +5079,7 @@ error@^7.0.2:
   dependencies:
     string-template "~0.2.1"
 
-es-abstract@^1.17.0-next.1:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
-  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
+es-abstract@^1.18.0-next.1:
   version "1.18.0-next.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
   integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
@@ -5099,7 +5111,7 @@ es6-promise@^4.2.4:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
-escalade@^3.1.0:
+escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
@@ -5455,9 +5467,9 @@ figures@^3.0.0:
     escape-string-regexp "^1.0.5"
 
 file-icons-js@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/file-icons-js/-/file-icons-js-1.0.3.tgz#d0765dc1d86aba4b2d7664a39e4ef7af9f12c5af"
-  integrity sha512-n4zoKEpMaAxBTUB7wtgrFBa4dM3b7mBLLA1VI/Q5Cdk/k2UA8S8oaxvnECp3QOzg0Dn+KKRzfIHF7qSdRkA65Q==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/file-icons-js/-/file-icons-js-1.1.0.tgz#da5e0679a58ab661abf9ec6c2a47c5f14f638ab6"
+  integrity sha512-EwR5RJoNIp5Wnzc+AF1oyBYZhOqPuPm0QHzfCaeh5KJpLB5lWIsxswiAwj3m8lIj7ddBzYBJDDnIr6IVrRCy8Q==
 
 file-loader@^1.1.11:
   version "1.1.11"
@@ -5572,7 +5584,7 @@ find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.0.0:
+find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
   integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
@@ -5639,9 +5651,9 @@ flatten@^1.0.2:
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
 flow-parser@^0.*:
-  version "0.137.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.137.0.tgz#8c05612ff9344648d8bcdeaa4c58d131e875d842"
-  integrity sha512-i3KXJZ8lhlQI0n+BoZzIeH/rv+fNvAiu1i9/s64MklBV+HuhFbycUML7367J2eng0gapLnwvYPFNaPZys8POsA==
+  version "0.138.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.138.0.tgz#2d9818f6b804d66f90949dfa8b4892f3a0af546d"
+  integrity sha512-LFnTyjrv39UvCWl8NOcpByr/amj8a5k5z7isO2wv4T43nNrUnHQwX3rarTz9zcpHXkDAQv6X4MfQ4ZzJUptpbw==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"
@@ -5848,6 +5860,15 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
+get-intrinsic@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -6257,10 +6278,10 @@ he@1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-highlight.js@^9.12.0:
-  version "9.18.3"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.3.tgz#a1a0a2028d5e3149e2380f8a865ee8516703d634"
-  integrity sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==
+highlight.js@^9.12.0, highlight.js@^9.7.0:
+  version "9.18.5"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
+  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -6616,19 +6637,19 @@ is-buffer@^1.1.5:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-buffer@^2.0.2, is-buffer@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
 is-callable@^1.1.4, is-callable@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
   integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
 
-is-core-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
-  integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
   dependencies:
     has "^1.0.3"
 
@@ -7458,7 +7479,7 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -7506,9 +7527,9 @@ markdown-it@^8.4.0:
     uc.micro "^1.0.5"
 
 math-expression-evaluator@^1.2.14:
-  version "1.2.22"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz#c14dcb3d8b4d150e5dcea9c68c8dad80309b0d5e"
-  integrity sha512-L0j0tFVZBQQLeEjmWOvDLoRciIY8gQGWahvkztXUal8jH8R5Rlqo9GCvgqvXcy9LQhEWdQCVvzqAbxgYNt4blQ==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.3.3.tgz#8b61badc2aadffb166c3847707057ca955c1684f"
+  integrity sha512-geKTlqoxnjqHoWqB71h0kchWIC23a3yfwwbZu4E2amjvGLF+fTjCCwBQOHkE0/oHc6KdnSVmMt3QB82KaPmKEA==
 
 math-random@^1.0.1:
   version "1.0.4"
@@ -7990,9 +8011,9 @@ nice-try@^1.0.4:
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-abi@^2.11.0, node-abi@^2.7.0:
-  version "2.19.1"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.1.tgz#6aa32561d0a5e2fdb6810d8c25641b657a8cea85"
-  integrity sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==
+  version "2.19.3"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d"
+  integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==
   dependencies:
     semver "^5.4.1"
 
@@ -8060,10 +8081,10 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^1.1.61:
-  version "1.1.65"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.65.tgz#52d9579176bd60f23eba05c4438583f341944b81"
-  integrity sha512-YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==
+node-releases@^1.1.66:
+  version "1.1.67"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
+  integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
 
 nomnom@^1.8.1:
   version "1.8.1"
@@ -8239,22 +8260,23 @@ object.assign@4.1.0:
     object-keys "^1.0.11"
 
 object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
 object.getownpropertydescriptors@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
+  integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 object.omit@^2.0.0:
   version "2.0.1"
@@ -9580,9 +9602,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.2.1, regenerate@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
-  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
@@ -9773,11 +9795,11 @@ resolve-url@^0.2.1:
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
-  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
-    is-core-module "^2.0.0"
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 responselike@1.0.2:
@@ -10447,20 +10469,20 @@ string-width@^4.1.0, string-width@^4.2.0:
     strip-ansi "^6.0.0"
 
 string.prototype.trimend@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
-  integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
 
 string.prototype.trimstart@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
-  integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
 
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
@@ -10664,14 +10686,14 @@ tar-fs@^1.16.2:
     tar-stream "^1.1.2"
 
 tar-fs@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz#d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5"
-  integrity sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
     pump "^3.0.0"
-    tar-stream "^2.0.0"
+    tar-stream "^2.1.4"
 
 tar-stream@^1.1.2, tar-stream@^1.5.2:
   version "1.6.2"
@@ -10686,7 +10708,7 @@ tar-stream@^1.1.2, tar-stream@^1.5.2:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
-tar-stream@^2.0.0:
+tar-stream@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
   integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
@@ -10725,9 +10747,9 @@ temp@^0.8.1:
     rimraf "~2.6.2"
 
 temp@^0.9.1:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.2.tgz#06728e6e4b847e3ea5579c69c44bcc3ee6a47100"
-  integrity sha512-KLVd6CXeUYsqmI/LBWDLg3bFkdZPg0Xr/Gn79GUuPNiISzp6v/EKUaCOrxqeH1w/wVNmrljyDRgKxhZV9JzyJA==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
+  integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
   dependencies:
     mkdirp "^0.5.1"
     rimraf "~2.6.2"
@@ -11283,9 +11305,9 @@ vscode-languageserver-types@3.15.1, vscode-languageserver-types@^3.15.1:
   integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
 
 vscode-ripgrep@^1.2.4:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.9.0.tgz#d6cdea4d290f3c2919472cdcfe2440d5fb1f99db"
-  integrity sha512-7jyAC/NNfvMPZgCVkyqIn0STYJ7wIk3PF2qA2cX1sEutx1g/e2VtgKAodXnfpreJq4993JT/BSIigOv/0lBSzg==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.11.1.tgz#9fa3c0a96c2939d5a2389f71218bd1bb6eaa8679"
+  integrity sha512-oHJfpqeXuTQhOO+szqIObYOddwQ9o+lzd4PQLlTQN+sQ7ex8D1qqFip207O2iJyFc5oWE8Bekf4YHTibdbW66w==
   dependencies:
     https-proxy-agent "^4.0.0"
     proxy-from-env "^1.1.0"
@@ -11309,23 +11331,23 @@ vscode-ws-jsonrpc@^0.2.0:
   dependencies:
     vscode-jsonrpc "^5.0.0"
 
-watchpack-chokidar2@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
-  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
   dependencies:
     chokidar "^2.1.8"
 
 watchpack@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
-  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
     chokidar "^3.4.1"
-    watchpack-chokidar2 "^2.0.0"
+    watchpack-chokidar2 "^2.0.1"
 
 wcwidth@^1.0.1:
   version "1.0.1"
@@ -11548,9 +11570,9 @@ ws@^6.1.0:
     async-limiter "~1.0.0"
 
 ws@^7.1.2:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
+  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
 
 xdg-basedir@^2.0.0:
   version "2.0.0"
@@ -11666,7 +11688,7 @@ yargs@13.3.2, yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^11.0.0, yargs@^11.1.0:
+yargs@^11.0.0:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
   integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==

stack/nxdtest.cfg

@@ -32,7 +32,7 @@
 [buildout]
 extends =
     slapos.cfg
-    ../component/git/buildout.cfg
+    ../component/nxdtest/buildout.cfg
     nxdtest/buildout.hash.cfg
 
 [jinja2-template]
@@ -52,25 +52,5 @@ context =
   section nxdtest   nxdtest
 
 
-[nxdtest]
-recipe  = zc.recipe.egg:scripts
-eggs    = ${nxdtest-egg:egg}
-scripts = nxdtest
-# convenience for nxdtest users
-exe     = ${buildout:bin-directory}/nxdtest
-
-[nxdtest-egg]
-recipe  = zc.recipe.egg:develop
-setup   = ${nxdtest-repository:location}
-egg     = nxdtest
-
-[nxdtest-repository]
-recipe  = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/nxdtest.git
-revision = bd91f6f1579a
-location = ${buildout:parts-directory}/nxdtest
-git-executable = ${git:location}/bin/git
-
-
 [versions]
 slapos.recipe.template = 4.4

stack/slapos.cfg

@@ -164,6 +164,7 @@ dateparser = 0.7.6
 decorator = 4.3.0
 funcsigs = 1.0.2
 gevent = 20.9.0
+geventmp = 0.0.1
 greenlet = 0.4.17
 idna = 2.9
 importlib-metadata = 1.7.0
@@ -191,7 +192,7 @@ setuptools-dso = 1.7
 rubygemsrecipe  = 0.3.0
 six = 1.12.0
 slapos.cookbook = 1.0.167
-slapos.core = 1.6.2
+slapos.core = 1.6.3
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.20
@@ -247,7 +248,7 @@ croniter = 0.3.25
 
 # Required by:
 # slapos.toolbox==0.94
-dnspython = 1.15.0
+dnspython = 1.16.0
 
 # Required by:
 # cryptography==1.8.1