🧩 [consolidate]: Separate build and bundle steps.

.github/workflows/build.yml

@@ -23,7 +23,8 @@ jobs:
         yarn install
         set -x -e
         yarn purs-tidy check src/**/*.purs test/**/*.purs
-        yarn build-website
-        yarn build
-        yarn build-standalone-all
+        ./script/compile.sh
+        ./script/bundle-website.sh
+        ./script/bundle.sh test Test.Test
+        ./script/bundle-standalone-all.sh
         yarn test-all

package.json

@@ -21,7 +21,7 @@
   "scripts": {
     "tidy": "./script/tidy.sh",
     "build-website": "./script/build-website.sh",
-    "build": "./script/build.sh test Test.Test",
+    "build-test": "./script/build.sh test Test.Test",
     "build-article": "./script/build-article.sh",
     "build-bench": "./script/build.sh bench Test.Benchmark",
     "build-ESOP-artifact": "./script/build-ESOP-artifact.sh",

script/build-ESOP-artifact.sh → script/bundle-ESOP-artifact.sh

@@ -6,7 +6,7 @@ mkdir -p dist
 cp -r fluid dist
 cp -r web/css dist
 
-./script/build-standalone.sh EsopFig2
-./script/build-standalone.sh EsopFig4
+./script/bundle-standalone.sh EsopFig2
+./script/bundle-standalone.sh EsopFig4
 
 cp -r web/ESOP-artifact.html dist/index.html

script/bundle-article.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# run from project root
+set -xe
+
+rm -rf dist/article
+mkdir -p dist/article
+
+cp -r fluid dist/article
+cp -r web/css dist/article
+cp web/template.html dist/article/index.html
+
+./script/util/bundle.sh article Standalone.Article

script/build-standalone-all.sh → script/bundle-standalone-all.sh

@@ -5,5 +5,5 @@ set -e
 
 for FILE in src/Standalone/*.purs; do
    NAME=$(basename $FILE .purs)
-   . script/build-standalone.sh $NAME
+   . script/bundle-standalone.sh $NAME
    done

script/build-standalone.sh → script/bundle-standalone.sh

@@ -10,7 +10,6 @@ if [[ ! -e "src/Standalone/$NAME.purs" ]]; then
   exit 1
 fi
 
-# Could factor this through build.sh but currently these are shared by all standalone figures
 cp -r fluid dist
 cp -r web/css dist
 
@@ -20,8 +19,7 @@ echo "$1 -> $NAME_LISP_CASE"
 rm -rf dist/$NAME_LISP_CASE
 mkdir -p dist/$NAME_LISP_CASE
 
-# ./script/compile.sh
-./script/bundle.sh $NAME_LISP_CASE Standalone.$NAME
+./script/util/bundle.sh $NAME_LISP_CASE Standalone.$NAME
 
 if [[ -e "src/Standalone/$NAME.html" ]]; then
   cp src/Standalone/$NAME.html dist/$NAME_LISP_CASE/index.html

script/build-website.sh → script/bundle-website.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -xe
 
-./script/build.sh / Standalone.Website
+./script/bundle.sh / Standalone.Website
 
 # TODO: run build-standalone.sh for each separate page that features on the website
 

script/bundle.sh

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

script/util/bundle.sh

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