@explorable-viz/fluid 0.7.23 → 0.7.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.7.23",
+  "version": "0.7.25",
   "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": {
@@ -19,7 +19,7 @@
   "homepage": "https://f.luid.org",
   "files": [
     "dist/fluid/",
-    "script/rebundle-website.sh",
+    "script/bundle-website.sh",
     "script/util/clean.sh",
     "script/util/lisp_case.sh"
   ],

package/script/{rebundle-website.sh → bundle-website.sh}

@@ -2,15 +2,29 @@
 set -xe
 
 WEBSITE="Misc"
+SCRIPT_ROOT=false
 
-while getopts "w:" opt; do
+
+while getopts "w:r:" opt; do
    case $opt in
       w) WEBSITE="$OPTARG";;
+      r) SCRIPT_ROOT="$OPTARG";;
    esac
 done
 
+if [[ "$SCRIPT_ROOT" = true ]]; then
+    CLEAN=./node_modules/@explorable-viz/fluid/script/util/clean.sh
+    LISP_CASE=./node_modules/@explorable-viz/fluid/script/util/lisp-case.sh
+    DIST="node_modules/@explorable-viz/fluid/dist"
+else
+    CLEAN=./script/util/clean.sh
+    LISP_CASE=./script/util/lisp-case.sh
+    DIST="dist"
+fi
+
+
 SRC_PATH=${WEBSITE//./\/}
-SRC_PATH_LISP_CASE=$(./script/util/lisp-case.sh "$SRC_PATH")
+SRC_PATH_LISP_CASE=$($LISP_CASE "$SRC_PATH")
 echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
 
 shopt -s nullglob
@@ -23,33 +37,26 @@ set -x
 for PAGE in "${PAGES[@]}"; do
     MODULE=$WEBSITE.$PAGE
     SRC_PATH=${MODULE//./\/}
-    SRC_PATH_LISP_CASE=$(./script/util/lisp-case.sh "$SRC_PATH")
+    SRC_PATH_LISP_CASE=$($LISP_CASE "$SRC_PATH")
     echo "$SRC_PATH -> $SRC_PATH_LISP_CASE"
 
-    if [[ ! -e "website/$SRC_PATH.purs" ]]; then
-        ./script/util/clean.sh $SRC_PATH_LISP_CASE
-
-        cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
+    if [[ -e "website/$SRC_PATH.purs" ]]; then
+        . script/bundle-page.sh $WEBSITE.$PAGE
     else
         if [[ -e "website/$SRC_PATH.html" ]]; then
-            ./script/util/clean.sh $SRC_PATH_LISP_CASE
+            $CLEAN $SRC_PATH_LISP_CASE
 
             cp website/$SRC_PATH.html dist/$SRC_PATH_LISP_CASE/index.html
         fi
     fi
     
     if [[ -e "website/$SRC_PATH.json" ]]; then
-        echo "exists"
         cp website/$SRC_PATH.json dist/$SRC_PATH_LISP_CASE/spec.json
-    else
-        if [[ ! -e "website/$SRC_PATH.json" ]]; then
-            echo "doesn't exist"
-        fi
     fi
 done
 
 
-WEBSITE_LISP_CASE=$(./script/util/lisp-case.sh "$WEBSITE")
+WEBSITE_LISP_CASE=$($LISP_CASE "$WEBSITE")
 
 set +x
 TO_COPY=()
@@ -62,12 +69,12 @@ done
 set -x
 
 echo "Processing shared files:"
-cp -r dist/fluid/shared dist/$WEBSITE_LISP_CASE/shared
-cp dist/fluid/load-fig.js dist/$WEBSITE_LISP_CASE/shared/load-fig.js
+cp -r $DIST/fluid/shared dist/$WEBSITE_LISP_CASE/shared
+cp $DIST/fluid/load-fig.js dist/$WEBSITE_LISP_CASE/shared/load-fig.js
 
-cp -r dist/fluid/font dist/$WEBSITE_LISP_CASE/font
-cp -r dist/fluid/css dist/$WEBSITE_LISP_CASE/css
-cp dist/fluid/favicon.ico dist/$WEBSITE_LISP_CASE/favicon.ico
+cp -r $DIST/fluid/font dist/$WEBSITE_LISP_CASE/font
+cp -r $DIST/fluid/css dist/$WEBSITE_LISP_CASE/css
+cp $DIST/fluid/favicon.ico dist/$WEBSITE_LISP_CASE/favicon.ico
 
 echo "Processing static files:"