Consolidate build and publish scripts

package.json

@@ -4,29 +4,31 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "npm run dev:web",
+    "dev:web": "npm-run-all --parallel dev:web:*",
+    "dev:web:app": "npm run build:web:app -- --watch",
     "dev:web:html": "chokidar --initial --silent \"./src/web/*.html\" -c \"cp src/web/*.html dist-web/\"",
     "dev:web:serve": "npx live-server ./dist-web --port=8777 --open=index.html",
-    "dev:web:serve-worker": "npx live-server ./dist-web --port=8778 --open=index.html",
-    "dev:web:app": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --watch --external:xmlhttprequest",
-    "dev:web:wasm-worker": "esbuild --bundle src/web/wasm-worker.js --outfile=dist-web/wasm-worker.js --watch --external:xmlhttprequest",
-    "dev:web:service-worker": "esbuild --bundle src/web/service-worker.js --outfile=dist-web/service-worker.js --watch --external:xmlhttprequest",
-    "dev:web": "npm-run-all --parallel dev:web:*",
-    "dev:node": "node ./src/node/command.mjs ",
-    "dev": "npm run dev:web",
-    "build:php:web": "cd wasm-build/php && bash web-build-wasm.sh",
-    "build:php:node": "cd wasm-build/php && bash node-build-wasm.sh",
+    "dev:web:serve-iframe-worker": "npx live-server ./dist-web --port=8778 --no-browser",
+    "dev:web:service-worker": "npm run build:web:service-worker -- --watch",
+    "dev:node": "node ./src/node/command.mjs",
+    "dev:web:wasm-worker": "npm run build:web:wasm-worker -- --watch",
+    "build": "npm run build:web",
+    "build:web": "npm-run-all --parallel build:web:*",
+    "build:web:app": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --external:xmlhttprequest",
+    "build:web:html": "cp src/web/*.html dist-web/",
+    "build:web:service-worker": "esbuild --bundle src/web/service-worker.js --outfile=dist-web/service-worker.js --external:xmlhttprequest",
+    "build:web:wasm-worker": "esbuild --bundle src/web/wasm-worker.js --outfile=dist-web/wasm-worker.js --external:xmlhttprequest",
     "build:php": "npm-run-all build:php:*",
-    "build:wp": "cd wasm-build/wordpress-data && bash prepare-wordpress.sh && bash bundle-data.sh",
-    "build:app:web": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --watch --external:xmlhttprequest",
-    "build:app:node": "rm -rf dist-node/* && esbuild --bundle src/node/index.mjs --outfile=dist-node/index.mjs --platform=node --external:express --external:yargs --external:body-parser --external:cookie-parser --external:./src/node/node-php.js --target=node14.19.0 --format=esm && perl -pi.bak -e 's/\\.\\.\\/shared\\///g' dist-node/index.mjs && perl -pi.bak -e 's/\\.\\.\\/src\\/node\\//.\\//g' dist-node/index.mjs && cp -r src/node/node-php.* src/node/base64-encoded-database src/node/wordpress src/shared/etc dist-node/ && rm dist-node/*.bak",
-    "build:app": "npm-run-all build:app:*",
+    "build:php:web": "cd wasm-build/php && bash web-build-wasm.sh && bash web-publish.sh",
+    "build:php:node": "cd wasm-build/php && bash node-build-wasm.sh && bash node-publish.sh",
+    "build:wp": "cd wasm-build/wordpress-data && bash prepare-wordpress.sh && bash bundle-data.sh && bash web-publish.sh && bash node-publish.sh",
+    "build:app": "npm-run-all build:web build:node",
+    "build:node": "rm -rf dist-node/* && esbuild --bundle src/node/index.mjs --outfile=dist-node/index.mjs --platform=node --external:express --external:yargs --external:body-parser --external:cookie-parser --external:./src/node/node-php.js --target=node14.19.0 --format=esm && perl -pi.bak -e 's/\\.\\.\\/shared\\///g' dist-node/index.mjs && perl -pi.bak -e 's/\\.\\.\\/src\\/node\\//.\\//g' dist-node/index.mjs && cp -r src/node/node-php.* src/node/base64-encoded-database src/node/wordpress src/shared/etc dist-node/ && rm dist-node/*.bak",
+    "clean": "npm-run-all --parallel clean:*",
     "clean:php": "rm -rf dist-web/wasm-build/php/docker-output/*",
     "clean:wp": "rm -rf dist-web/wasm-build/wordpress/docker-output/* dist-web/wasm-build/wordpress/preload/*",
-    "publish:php:web": "cp wasm-build/php/docker-output/php* dist-web/ && cp src/shared/etc/php.ini dist-web/etc/",
-    "publish:php:node": "cp wasm-build/php/docker-output/node-* src/node/",
-    "publish:wp:web": "cp wasm-build/wordpress-data/docker-output/* dist-web/ && cp wasm-build/wordpress-data/preload/wp-lazy-files.js dist-web/ && rm -rf dist-web/{wp-admin,wp-content,wp-includes} && cp -r wasm-build/wordpress-data/preload/wordpress-static/{wp-admin,wp-content,wp-includes} dist-web/",
-    "publish:wp:node": "rm -rf src/node/wordpress/* && cp -r wasm-build/wordpress-data/preload/wordpress-static/{wp-admin,wp-content,wp-includes} src/node/wordpress/ && cp -r wasm-build/wordpress-data/preload/wordpress/* src/node/wordpress/"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Adam Zielinski",
   "license": "ISC",

wasm-build/php/node-publish.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+root_dir=../..
+cp ./docker-output/node-* $root_dir/src/node/

wasm-build/php/web-publish.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+root_dir=../..
+dest_dir=$root_dir/dist-web
+
+cp ./docker-output/php* $dest_dir/
+cp $root_dir/src/shared/etc/php.ini $dest_dir/etc/

wasm-build/wordpress-data/node-publish.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+root_dir=../..
+dest_dir=$root_dir/src/node/wordpress
+
+rm -rf $dest_dir/*
+
+for dir in wp-admin wp-content wp-includes; do
+  cp -r ./preload/wordpress-static/$dir $dest_dir/
+done
+
+cp -r ./preload/wordpress/* $dest_dir/

wasm-build/wordpress-data/prepare-wordpress.sh

@@ -1,16 +1,18 @@
 #!/bin/bash
 
-# Remove previous WordPress installation
-rm -rf volume/*
+# set -e
 
-# set -e;
+cd preload
 
-cd preload;
+# Remove previous WordPress installation
+rm -rf wordpress
+rm -rf wordpress-static
 
-# Download WordPress
-wget https://wordpress.org/wordpress-6.0.1.tar.gz
-tar -xzf wordpress-6.0.1.tar.gz
-rm wordpress-6.0.1.tar.gz
+# Download specific version of WordPress
+wp_tarfile=wordpress-6.0.2.tar.gz
+wget https://wordpress.org/$wp_tarfile
+tar -xzf $wp_tarfile
+rm $wp_tarfile
 
 # Patch WordPress with sqlite support
 # https://github.com/aaemnnosttv/wp-sqlite-integration
@@ -23,10 +25,10 @@ curl https://raw.githubusercontent.com/aaemnnosttv/wp-sqlite-db/master/src/db.ph
 cp -r wordpress wordpress-static
 cd wordpress-static
 find ./ -name '*.php' | xargs rm
-cd ..;
+cd ..
 
 # Install WordPress
-cd wordpress;
+cd wordpress
 
 # Remove non-default themes
 rm -r wp-content/themes/twentytwenty wp-content/themes/twentytwentyone
@@ -82,16 +84,16 @@ if [ "$LAZY_FILES" == "true" ]; then
         # match is something like ./wp-includes/js/dist/block-library/script.js
 
         # filename is script.js
-        filename=$(echo $match | awk -F'/' '{print $NF}');
+        filename=$(echo $match | awk -F'/' '{print $NF}')
 
         # filepath is /wp-includes/js/dist/block-library
-        filepath=$(echo ${match:1} | rev | cut -d '/' -f 2- | rev);
+        filepath=$(echo ${match:1} | rev | cut -d '/' -f 2- | rev)
 
         echo "sa.push( [ '/preload/wordpress$filepath', '$filename', '$filepath/$filename' ] );" >> ../wp-lazy-files.js
-    done;
+    done
 
     find ./ -type f -name '*.js' | xargs rm 2> /dev/null
-fi;
+fi
 
 echo "
 return sa.map( function( a ) {
@@ -106,17 +108,17 @@ return sa.map( function( a ) {
 
 # Remove whitespace from PHP files
 for phpfile in $(find ./ -type f -name '*.php'); do
-    php -w $phpfile > $phpfile.small;
-    mv $phpfile.small $phpfile;
-done;
+    php -w $phpfile > $phpfile.small
+    mv $phpfile.small $phpfile
+done
 
 # Let the WordPress installer do its magic
 cp wp-config-sample.php wp-config.php # Required by the drop-in SQLite integration plugin
 php -S 127.0.0.1:8000&
-sleep 6;
+sleep 6
 http_response=$(curl -o ./debug.txt -s -w "%{http_code}\n" -XPOST http://127.0.0.1:8000/wp-admin/install.php\?step\=2 --data "language=en&prefix=wp_&weblog_title=My WordPress Website&user_name=admin&admin_password=password&admin_password2=password&Submit=Install WordPress&pw_weak=1&[email protected]")
 pkill php
 if [ $http_response != "200" ]; then
-    exit 'WordPress installation failed';
-    cat debug.txt;
-fi;
+    exit 'WordPress installation failed'
+    cat debug.txt
+fi

wasm-build/wordpress-data/web-publish.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+root_dir=../..
+dest_dir=$root_dir/dist-web
+
+cp ./docker-output/* $dest_dir/
+cp ./preload/wp-lazy-files.js $dest_dir/
+
+for dir in wp-admin wp-content wp-includes; do
+  rm -rf $dest_dir/$dir
+  cp -r ./preload/wordpress-static/$dir $dest_dir/
+done