@explorable-viz/fluid 0.7.43 → 0.7.44

package/dist/fluid/puppeteer.js

@@ -5,7 +5,7 @@ require('http-shutdown').extend();
 
 const app = express();
 
-const root = __dirname + '/dist/' + process.argv[3];
+const root = process.cwd() + '/dist/' + process.argv[3];
 app.use(serve(root));
 
 const server = app.listen(8080, function() {
@@ -15,7 +15,7 @@ const server = app.listen(8080, function() {
 (async () => {
   try {
     if (process.argv.length == 5 && process.argv[4] == "-l") {
-      module = __dirname + '/' + process.argv[2]
+      module = process.cwd() + '/dist/' + process.argv[2]
     } else {
       module = process.argv[2]
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.7.43",
+  "version": "0.7.44",
   "description": "Fluid is an experimental programming language which integrates a bidirectional dynamic analysis to connect outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
   "main": "index.js",
   "repository": {
@@ -79,7 +79,7 @@
   },
   "bin": {
     "fluid": "./dist/fluid/fluid.mjs",
-    "puppeteer": "./dist/fluid/puppeteer.js"
+    "test-website": "./dist/fluid/puppeteer.js"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

package/script/bundle-page.sh

@@ -2,13 +2,19 @@
 # run from project root
 set -xe
 
+PREFIX=""
+
+if [ -n "${2:-}" ]; then
+   PREFIX=$2
+fi
+
 MODULE=$1
 SRC_PATH=${MODULE//./\/}
-SRC_PATH_LISP_CASE=$(./script/util/lisp-case.sh "$SRC_PATH")
+SRC_PATH_LISP_CASE=$(./$PREFIX/script/util/lisp-case.sh "$SRC_PATH")
 echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
 
 if [[ -e "website/$SRC_PATH.purs" ]]; then
-   ./script/util/bundle.sh $SRC_PATH_LISP_CASE Website.$MODULE
+   . "${PREFIX:+$PREFIX}/script/util/bundle.sh" $SRC_PATH_LISP_CASE Website.$MODULE
 
    if [[ -e "website/$SRC_PATH.html" ]]; then
       cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html

package/script/bundle-website.sh

@@ -14,7 +14,7 @@ WEBSITE_LISP_CASE=$(./$PREFIX/script/util/lisp-case.sh "$WEBSITE")
 echo "$WEBSITE -> $WEBSITE_LISP_CASE"
 mkdir -p "dist/$WEBSITE_LISP_CASE"
 
-. "${PREFIX:+$PREFIX/}script/bundle-page.sh" $WEBSITE
+. "${PREFIX:+$PREFIX/}script/bundle-page.sh" $WEBSITE ${PREFIX:+$PREFIX}
 
 shopt -s nullglob
 
@@ -26,7 +26,7 @@ done | sort -u))
 set -x
 
 for PAGE in "${PAGES[@]}"; do
-   . "${PREFIX:+$PREFIX/}script/bundle-page.sh" $WEBSITE.$PAGE
+   . "${PREFIX:+$PREFIX/}script/bundle-page.sh" $WEBSITE.$PAGE ${PREFIX:+$PREFIX}
 done
 
 echo "Processing other static files:"
@@ -47,7 +47,7 @@ for CHILD in "${TO_COPY[@]}"; do
 done
 
 echo "Processing load-figure.js:"
-cp ${PREFIX}dist/fluid/load-figure.js dist/$WEBSITE_LISP_CASE/shared
+cp "${PREFIX:+$PREFIX/}dist/fluid/load-figure.js" dist/$WEBSITE_LISP_CASE/shared
 
 cp -r fluid dist/$WEBSITE_LISP_CASE
 echo "Bundled website $WEBSITE"