make forest assets static

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "theme"]
-	path = theme
-	url = https://git.sr.ht/~jonsterling/forester-base-theme

app/Main.hs

@@ -347,6 +347,11 @@ buildGithubIdentityClaim = do
   outputFolder <- ask
   lift $ copyFileChanged "site/github.html" $ outputFolder <> "github.html"
 
+buildForestXSLT :: SiteM ()
+buildForestXSLT = do
+  outputFolder <- ask
+  lift $ copyFileChanged "site/forest.xsl" $ outputFolder <> "forest.xsl"
+
 {------------------------------------------------
                  Shake Build
  ------------------------------------------------}
@@ -360,6 +365,7 @@ buildRules = do
   buildFeed allPosts
   buildCNAME
   buildGithubIdentityClaim
+  buildForestXSLT
   copyStaticFiles
 
 main :: IO ()

mprocs.yaml

@@ -2,5 +2,5 @@ procs:
   server:
     cmd: ["serve", "build"]
   builder:
-    cmd: ["watchexec", "cabal run"]
+    cmd: ["watchexec", "build-all"]
 

scripts/build-forest.sh

@@ -1,7 +1,10 @@
 forester build \
   --root=jdll-0001 \
   --no-assets \
-  --base-url=https://jonathanlorimer.dev/trees \
+  --no-theme \
   trees/ 
 
-cp -r output build/trees
+# Hacky mangling for setting forest as subroute
+mv output/index.xml output/trees.xml
+ruplacer index.xml trees.xml ./output --go --quiet
+cp -r output/* build

scripts/build.sh

@@ -1,7 +1,11 @@
 OUTPUT_DIR="build/"
 cabal run
-forester build --dev --root=jdll-0001 trees/ --no-assets
-cp -r output "$OUTPUT_DIR/trees"
+forester build --dev --root=jdll-0001 trees/ --no-assets --no-theme
+
+# Hacky mangling for setting forest as subroute
+mv output/index.xml output/trees.xml
+ruplacer index.xml trees.xml ./output --go --quiet
+cp -r output/* "$OUTPUT_DIR"
 
 
 

scripts/default.nix

@@ -12,12 +12,12 @@
   };
   buildAll = pkgs.writeShellApplication {
     name = "build-all";
-    runtimeInputs = [ forester texlive cabal-install ];
+    runtimeInputs = with pkgs; [ forester texlive cabal-install ruplacer ];
     text = builtins.readFile ./build.sh;
   };
   buildForest = pkgs.writeShellApplication {
     name = "build-forest";
-    runtimeInputs = [ forester texlive ];
+    runtimeInputs = with pkgs; [ forester texlive ruplacer ];
     text = builtins.readFile ./build-forest.sh;
   };