Refactor deployment script

Author: stfnkth

.github/workflows/deploy.yml

@@ -24,8 +24,9 @@ jobs:
       - name: Build the Shinylive site
         run: |
           # shinylive export getting-started dist
-          shinylive export --subdir getting-started --template-dir templates/app --template-params '{"title": "MapLibre for Python Getting Started"}' getting-started dist
-          python ./scripts/rendersite.py > dist/index.html
+          # shinylive export --subdir getting-started --template-dir templates/app --template-params '{"title": "MapLibre for Python Getting Started"}' getting-started dist
+          python ./scripts/deploy.py export
+          python ./scripts/deploy.py render > dist/index.html
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:

config/site.toml

@@ -1,3 +1,4 @@
 [site]
 title = "MapLibre for Python"
+subtitle = "Shinylive"
 apps = [{ title = "Getting Started", dir = "getting-started" }]

getting-started/app.py

@@ -1,17 +1,16 @@
-from shiny import reactive
-from shiny.express import input, render, ui
-
 from maplibre import Layer, LayerType, Map, MapLibreRenderer, MapOptions
 from maplibre.basemaps import OpenFreeMap
 from maplibre.controls import GlobeControl, NavigationControl
 from maplibre.sources import GeoJSONSource
+from shiny import reactive
+from shiny.express import input, render, ui
 
 data = "https://docs.mapbox.com/mapbox-gl-js/assets/earthquakes.geojson"
 layer_id = "earthquakes"
 
-earthquakes = Layer(id=layer_id, type=LayerType.CIRCLE, source=GeoJSONSource(data=data)).set_paint_props(
-    circle_color="yellow"
-)
+earthquakes = Layer(
+    id=layer_id, type=LayerType.CIRCLE, source=GeoJSONSource(data=data)
+).set_paint_props(circle_color="yellow")
 
 
 @MapLibreRenderer

scripts/rendersite.py scripts/deploy.pyscripts/rendersite.py renamed to scripts/deploy.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-import sys
+import json
+import subprocess
 import tomllib
 
 import typer
@@ -17,7 +18,8 @@ class App(BaseModel):
 
 class Site(BaseModel):
     title: str = "MapLibre for Python"
-    apps: list[App] = [App(title="Getting started", dir="getting-started")]
+    subtitle: str = "Shinylive"
+    apps: list[App]  # = [App(title="Getting started", dir="getting-started")]
 
     @classmethod
     def read_config(cls, filename: str) -> Site:
@@ -41,5 +43,28 @@ def render(
     print(site.render(input))
 
 
+@app.command(help="Export apps")
+def export(config: str = "config/site.toml") -> None:
+    site = Site.read_config(config)
+    print(site)
+    for app in site.apps:
+        cmd = [
+            "shinylive",
+            "export",
+            "--subdir",
+            app.dir,
+            "--template-dir",
+            "templates/app",
+            "--template-params",
+            json.dumps(dict(title=app.title)),
+            app.dir,
+            "dist",
+        ]
+        # print(cmd)
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        print(result.args)
+        print(result.stderr)
+
+
 if __name__ == "__main__":
     app()