theia: WIP fonts + css

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = a5c23358b8435b516e9e78bd71b5b819
+md5sum = 310dd1d78df8ab74ac7b8e8ee139c5b8
 
 [yarn.lock]
 filename = yarn.lock
@@ -27,4 +27,8 @@ md5sum = d2ce161244ce9ebce5295302a1b2a7df
 
 [preloadTemplate.html]
 filename = preloadTemplate.html
-md5sum = 8f5758f2e0ff7c4600c73ce54c9a70aa
+md5sum = b6e5ebd004c6336ae8d9d4ee24412b8a
+
+[slapos.css.in]
+filename = slapos.css.in
+md5sum = 3ed13872f1c540e170075c7535e69fb3

software/theia/instance.cfg.in

@@ -54,7 +54,7 @@ template = inline:
     root $${directory:frontend-static}
     browse
     proxy / $${theia-instance:base-url} {
-      except $${frontend-instance-fonts:folder-name} public $${favicon.ico:filename}
+      except $${frontend-instance-fonts:folder-name} $${frontend-instance-slapos.css:folder-name} public $${favicon.ico:filename}
     }
     proxy /services $${theia-instance:base-url} {
       websocket
@@ -84,6 +84,7 @@ pidfile = $${directory:pidfiles}/$${:_buildout_section_name_}.pid
 url = https://$${:hostname}:$${:port}/
 
 [frontend-instance-fonts]
+; TODO: this is ugly
 recipe = plone.recipe.command
 location = $${directory:frontend-static}/$${:folder-name}
 folder-name = fonts
@@ -93,6 +94,13 @@ command =
   ln -s ${jetbrains-mono-fonts:location} $${:location}/jetbrains-mono
 stop-on-error = true
 
+[frontend-instance-slapos.css]
+; TODO: do we need a template recipe ? we don't subsitute anything here
+recipe = slapos.recipe.template:jinja2
+template = ${slapos.css.in:output}
+rendered = $${directory:frontend-static}/$${:folder-name}/slapos.css
+folder-name = css
+
 [frontend-reload]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
@@ -333,3 +341,4 @@ project = $${:srv}/project
 slapos = $${:srv}/slapos
 frontend-static = $${:srv}/frontend-static
 frontend-static-public = $${:frontend-static}/public
+frontend-static-css = $${:frontend-static}/css

software/theia/software.cfg

@@ -117,6 +117,12 @@ eggs =
   supervisor
   setuptools
 
+[template-base]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:parts-directory}/${:_buildout_section_name_}
+mode = 0644
+
 [python-language-server]
 version = 0.19.0
 recipe = plone.recipe.command
@@ -128,10 +134,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 stop-on-error = true
 
 [python-language-server-requirements.txt]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 0644
+<= template-base
 # TODO: file
 
 [theia]
@@ -153,16 +156,13 @@ uses = ${yarn.lock:recipe}
 THEIA_DEFAULT_PLUGINS = ${:location}/plugins/
 
 [yarn.lock]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 0644
+<= template-base
 
 [preloadTemplate.html]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 0644
+<= template-base
+
+[slapos.css.in]
+<= template-base
 
 [package.json]
 recipe = slapos.recipe.template:jinja2
@@ -357,9 +357,7 @@ template =
 
 
 [instance]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-mode = 0644
+<= template-base
 output = ${buildout:directory}/instance.cfg
 
 [versions]