Website infrastructure, WIP

.github/workflows/deploy.yml

@@ -42,13 +42,13 @@ jobs:
     - name: build
       run: |
         yarn install
-        yarn build-website
+        yarn build-fluid-org
     - name: gh-pages
       uses: peaceiris/actions-gh-pages@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: dist/website
-        keep_files: true # student-projects and internships folders may exist in "release"
+        publish_dir: dist/fluid-org
+        keep_files: false
 
   deploy-ESOP-artifact:
     runs-on: ubuntu-22.04
@@ -59,10 +59,10 @@ jobs:
     - name: build
       run: |
         yarn install
-        yarn build-ESOP-artifact
+        yarn build-esop2025-artifact
     - name: gh-pages
       uses: peaceiris/actions-gh-pages@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: dist/ESOP-artifact
+        publish_dir: dist/esop2025-artifact
         keep_files: false

package.json

@@ -22,17 +22,15 @@
     "tidy": "./script/tidy.sh",
     "build": "./script/build.sh",
     "build-test": "./script/build-test.sh",
-    "bundle-article": "./script/bundle-article.sh",
-    "bundle-bench": "./script/bundle-bench.sh",
-    "bundle-ESOP-artifact": "./script/bundle-ESOP-artifact.sh",
-    "bundle-standalone-all": "./script/bundle-standalone-all.sh",
-    "bundle-standalone": "./script/bundle-standalone.sh",
-    "serve-website": "./script/serve.sh website",
-    "serve-bench": "./script/serve.sh bench",
+    "bundle-page": "./script/bundle-page.sh",
+    "bundle-website": "./script/bundle-website.sh",
+    "bundle-website-all": "./script/bundle-website-all.sh",
+    "serve": "./script/serve.sh",
     "test": "./script/test.sh",
     "test-browser": "./script/test.sh --browsers=Chrome --singleRun=false",
-    "test-standalone": "./script/test-standalone.sh",
-    "test-standalone-all": "./script/test-standalone-all.sh",
+    "test-page": "./script/test-page.sh",
+    "test-website": "./script/test-website.sh",
+    "test-website-all": "./script/test-website-all.sh",
     "test-all": "./script/test-all.sh",
     "npm-publish": "./script/npm-publish.sh"
   },

puppeteer.js

@@ -4,16 +4,18 @@ require('http-shutdown').extend();
 
 const app = express();
 
-app.use(serve(__dirname + '/dist/' + process.argv[3]));
+const root = __dirname + '/dist/' + process.argv[3];
+app.use(serve(root));
 
 const server = app.listen(8080, function() {
-  console.log("Server running");
+  console.log("Serving content from " + root);
 }).withShutdown();
 
 (async () => {
   try {
-    const testFile = process.argv[2]
-    import('./output-es/' + testFile + '/index.js').then(({ main }) => {
+    const module = process.argv[2]
+    console.log('Loading Puppeteer test module:', module);
+    import('./output-es/' + module + '/index.js').then(({ main }) => {
       main().then(serverDown);
     }).catch(err => {
       console.error("Failed to load PureScript output:", err);

script/build-test.sh

@@ -2,5 +2,6 @@
 set -xe
 
 yarn build
-yarn bundle-standalone-all
+yarn bundle-website Esop2025Artifact
+yarn bundle-website Misc
 yarn test-all

script/build.sh

@@ -1,13 +1,7 @@
 #!/usr/bin/env bash
 set -xe
 
-WEBSITE=website
-
 rm -rf dist/
-./script/compile.sh
-./script/bundle-website.sh
+./script/util/compile.sh
 ./script/bundle.sh test Test.Test
-./script/util/copy-static.sh $WEBSITE
-cp -r web/pdf dist/$WEBSITE
-
-# Don't include standalone examples yet as they take a long time
+./script/bundle-fluid-org.sh

script/bundle-fluid-org.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -xe
+
+WEBSITE=FluidOrg
+yarn bundle-website $WEBSITE
+
+WEBSITE_LISP_CASE=$(./script/util/lisp-case.sh "$WEBSITE")
+unzip archive/0.3.1.zip -d dist/$WEBSITE_LISP_CASE > /dev/null # already has 0.3.1 as top-level folder
+unzip archive/0.6.1.zip -d dist/$WEBSITE_LISP_CASE/0.6.1 > /dev/null
+cp -r web/pdf dist/$WEBSITE_LISP_CASE

script/bundle-page.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# run from project root
+set -xe
+
+MODULE=$1
+SRC_PATH=${MODULE//./\/}
+SRC_PATH_LISP_CASE=$(./script/util/lisp-case.sh "$SRC_PATH")
+echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
+
+if [[ ! -e "src/Website/$SRC_PATH.purs" ]]; then
+   ./script/util/clean.sh $SRC_PATH_LISP_CASE
+   cp src/Website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
+else
+   ./script/util/bundle.sh $SRC_PATH_LISP_CASE Website.$MODULE
+
+   if [[ -e "src/Website/$SRC_PATH.html" ]]; then
+      cp src/Website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
+   else
+      cp web/template.html dist/$SRC_PATH_LISP_CASE/index.html
+   fi
+fi

script/bundle-website-all.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# run from project root
+# set -x
+set -e
+
+WEBSITES=($(for FILE in src/Website/*.{purs,html}; do
+   basename "$FILE" | sed 's/\.[^.]*$//'
+done | sort -u))
+
+echo "Bundling websites: ${WEBSITES[@]}"
+
+for WEBSITE in "${WEBSITES[@]}"; do
+   . script/bundle-website.sh $WEBSITE
+   done

script/bundle-website.sh

@@ -1,12 +1,27 @@
 #!/usr/bin/env bash
+# run from project root
 set -xe
 
-WEBSITE=website
+WEBSITE=$1
+. script/bundle-page.sh $WEBSITE
 
-./script/bundle.sh $WEBSITE Standalone.Website
+# Only support one level of nesting for now
+shopt -s nullglob
 
-unzip archive/0.3.1.zip -d dist/$WEBSITE # already has 0.3.1 as top-level folder
-unzip archive/0.6.1.zip -d dist/$WEBSITE/0.6.1
+set +x
+PAGES=($(for FILE in src/Website/$WEBSITE/*.{purs,html}; do
+   basename "$FILE" | sed 's/\.[^.]*$//'
+done | sort -u))
+set -x
 
-# until we have a more uniform structure:
-cp src/Standalone/Website.html dist/$WEBSITE/index.html
+echo "Processing ${WEBSITE} pages: ${PAGES[@]}"
+
+for PAGE in "${PAGES[@]}"; do
+   . script/bundle-page.sh $WEBSITE.$PAGE
+   done
+shopt -u nullglob
+
+WEBSITE_LISP_CASE=$(./script/util/lisp-case.sh "$WEBSITE")
+./script/util/copy-static.sh $WEBSITE_LISP_CASE
+
+echo "Bundled website $WEBSITE"

script/bundle.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -xe
 
-. script/clean.sh $1
+. script/util/clean.sh $1
 . script/util/bundle.sh ${@:1}

script/npm-publish.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # run from project root
-set -xe #propagate errors to parent script
+set -xe
 
 yarn build-article
 yarn config set registry "https://registry.npmjs.org/" #yarn command sets registry to https://registry.yarnpkg.com; re-set to npm

script/test-all.sh

@@ -2,4 +2,4 @@
 set -xe
 
 . script/test.sh
-. script/test-standalone-all.sh website
+. script/test-website-all.sh

script/test-page.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+yarn puppeteer browsers install chrome
+yarn puppeteer browsers install firefox
+
+WEBSITE=$1
+MODULE=$2
+
+SRC_PATH=${MODULE//./\/}
+if [ ! -e "src/Website/$SRC_PATH.purs" ]; then
+  echo "Error: 'Website/$SRC_PATH.purs' not found."
+  exit 1
+fi
+
+# don't need to have "deployed" this to dist/
+# instead the following just picks up from output-es/
+WEBSITE_LISP_CASE=$(./script/util/lisp-case.sh "$WEBSITE")
+node puppeteer.js Website.Test.$MODULE $WEBSITE_LISP_CASE

script/test-website-all.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# run from project root
+set -xe
+
+set +x
+WEBSITES=($(for FILE in src/Website/*.{purs,html}; do
+   basename "$FILE" | sed 's/\.[^.]*$//'
+done | sort -u))
+set -x
+
+echo "Checking for website tests: ${WEBSITES[@]}"
+
+for WEBSITE in "${WEBSITES[@]}"; do
+   . script/test-website.sh $WEBSITE
+   done

script/test-website.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# run from project root
+set -e
+
+WEBSITE=$1
+
+if [ -e "src/Website/Test/$WEBSITE" ] || [ -e "src/Website/Test/$WEBSITE.purs" ]; then
+   echo "Testing website: ${WEBSITE}"
+
+   if [ -e "src/Website/Test/$WEBSITE.purs" ]; then
+      . script/test-page.sh $WEBSITE $WEBSITE
+   fi
+
+   if [ -e "src/Website/Test/$WEBSITE" ]; then
+      PAGES=($(for FILE in src/Website/Test/$WEBSITE/*.purs; do
+         basename "$FILE" | sed 's/\.[^.]*$//'
+      done | sort -u))
+   else
+      PAGES=()
+   fi
+
+   echo "Processing ${#PAGES[@]} additional Test/${WEBSITE} pages: ${PAGES[@]}"
+
+   for PAGE in "${PAGES[@]}"; do
+      . script/test-page.sh $WEBSITE $WEBSITE.$PAGE
+      done
+else
+   echo "No tests found for: ${WEBSITE}"
+fi

script/tidy.sh

@@ -2,4 +2,4 @@
 set -xe
 
 # Got bored of trying to make recursive globs work cross-platform way
-yarn purs-tidy format-in-place src/*.purs src/**/*.purs src/App/**/*.purs src/App/View/**/*.purs test/*.purs test/**/*.purs
+yarn purs-tidy format-in-place src/*.purs src/**/*.purs src/App/**/*.purs src/App/View/**/*.purs test/*.purs test/**/*.purs > /dev/null

script/util/bundle.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 set -xe
-yarn purs-backend-es bundle-app --main $2 --to dist/$1/fluid.js ${@:3}
+yarn purs-backend-es bundle-app --main $2 --to dist/$1/fluid.js ${@:3} > /dev/null

script/util/lisp-case.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+toLispCase() {
+   INPUT="$1"
+   RESULT=$(echo "$INPUT" | sed -E 's/([a-z0-9])([A-Z])/\1-\2/g' | tr '[:upper:]' '[:lower:]')
+   echo "$RESULT"
+}
+
+toLispCase "$1"