From de7966b88b1e357a3e267f20aa89599da4de6f5d Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Tue, 27 Sep 2022 12:14:18 +0200
Subject: [PATCH 01/12] Replace fswatch in npm script with cross-platform
 solution

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f3f9df1ed3..9206555f00 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "dev:web:html": "fswatch -o ./src/web/*.html | xargs -n1 -I{} cp src/web/*.html dist-web/",
+    "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:app": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --watch --external:xmlhttprequest",
     "dev:web:web-worker": "esbuild --bundle src/web/web-worker.js --outfile=dist-web/web-worker.js --watch --external:xmlhttprequest",
@@ -38,6 +38,7 @@
   },
   "devDependencies": {
     "@wordpress/eslint-plugin": "^13.0.0",
+    "chokidar-cli": "^3.0.0",
     "esbuild": "^0.15.5",
     "eslint": "^8.23.0",
     "eslint-config-airbnb": "^19.0.4",

From baa19d05129d2cb62f85a5255f1626eb0e107a1a Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Thu, 29 Sep 2022 17:14:36 +0200
Subject: [PATCH 02/12] Replace shell expansion with for loop

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9206555f00..d3d104bcb4 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,8 @@
     "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/webworker-* 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/"
+    "publish:wp:web": "cp wasm-build/wordpress-data/docker-output/* dist-web/ && cp wasm-build/wordpress-data/preload/wp-lazy-files.js dist-web/ && for folder in wp-admin wp-content wp-includes; do rm -rf dist-web/$folder && cp -r wasm-build/wordpress-data/preload/wordpress-static/$folder dist-web/; done",
+    "publish:wp:node": "rm -rf src/node/wordpress/* && for folder in wp-admin wp-content wp-includes; do cp -r wasm-build/wordpress-data/preload/wordpress-static/$folder src/node/wordpress/; done && cp -r wasm-build/wordpress-data/preload/wordpress/* src/node/wordpress/"
   },
   "author": "Adam Zielinski",
   "license": "ISC",

From f854d978354dbbc59e546c80efcb1e696017470d Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Thu, 29 Sep 2022 17:59:31 +0200
Subject: [PATCH 03/12] Consolidate build and publish scripts

---
 package.json                              | 12 ++++--------
 wasm-build/php/node-publish.sh            |  6 ++++++
 wasm-build/php/web-publish.sh             |  9 +++++++++
 wasm-build/wordpress-data/node-publish.sh | 14 ++++++++++++++
 wasm-build/wordpress-data/web-publish.sh  | 14 ++++++++++++++
 5 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 wasm-build/php/node-publish.sh
 create mode 100644 wasm-build/php/web-publish.sh
 create mode 100644 wasm-build/wordpress-data/node-publish.sh
 create mode 100644 wasm-build/wordpress-data/web-publish.sh

diff --git a/package.json b/package.json
index d3d104bcb4..9ac545b843 100644
--- a/package.json
+++ b/package.json
@@ -13,19 +13,15 @@
     "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 webworker-build-wasm.sh",
-    "build:php:node": "cd wasm-build/php && bash node-build-wasm.sh",
+    "build:php:web": "cd wasm-build/php && bash webworker-build-wasm.sh && bash web-publish.sh",
+    "build:php:node": "cd wasm-build/php && bash node-build-wasm.sh && bash node-publish.sh",
     "build:php": "npm-run-all build:php:*",
-    "build:wp": "cd wasm-build/wordpress-data && bash prepare-wordpress.sh && bash bundle-data.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: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:*",
     "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/webworker-* 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/ && for folder in wp-admin wp-content wp-includes; do rm -rf dist-web/$folder && cp -r wasm-build/wordpress-data/preload/wordpress-static/$folder dist-web/; done",
-    "publish:wp:node": "rm -rf src/node/wordpress/* && for folder in wp-admin wp-content wp-includes; do cp -r wasm-build/wordpress-data/preload/wordpress-static/$folder src/node/wordpress/; done && cp -r wasm-build/wordpress-data/preload/wordpress/* src/node/wordpress/"
+    "clean:wp": "rm -rf dist-web/wasm-build/wordpress/docker-output/* dist-web/wasm-build/wordpress/preload/*"
   },
   "author": "Adam Zielinski",
   "license": "ISC",
diff --git a/wasm-build/php/node-publish.sh b/wasm-build/php/node-publish.sh
new file mode 100644
index 0000000000..e079441bbb
--- /dev/null
+++ b/wasm-build/php/node-publish.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e;
+
+root_dir=../..
+cp ./docker-output/node-* $root_dir/src/node/
diff --git a/wasm-build/php/web-publish.sh b/wasm-build/php/web-publish.sh
new file mode 100644
index 0000000000..a1683918ef
--- /dev/null
+++ b/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/webworker-* $dest_dir/
+cp $root_dir/src/shared/etc/php.ini $dest_dir/etc/
diff --git a/wasm-build/wordpress-data/node-publish.sh b/wasm-build/wordpress-data/node-publish.sh
new file mode 100644
index 0000000000..a6d2677400
--- /dev/null
+++ b/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/
diff --git a/wasm-build/wordpress-data/web-publish.sh b/wasm-build/wordpress-data/web-publish.sh
new file mode 100644
index 0000000000..b37e6e450c
--- /dev/null
+++ b/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

From 618b6af209a82f0fee63bfb28326ec02453bc282 Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Thu, 29 Sep 2022 18:04:26 +0200
Subject: [PATCH 04/12] Remove previous WordPress installation: wordpress and
 wordpress-static

---
 wasm-build/wordpress-data/prepare-wordpress.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wasm-build/wordpress-data/prepare-wordpress.sh b/wasm-build/wordpress-data/prepare-wordpress.sh
index c6d7e952c3..23a558a605 100644
--- a/wasm-build/wordpress-data/prepare-wordpress.sh
+++ b/wasm-build/wordpress-data/prepare-wordpress.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-# Remove previous WordPress installation
-rm -rf volume/*
-
 # set -e;
 
 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

From c5fa88cdd0ce81a758644a75f53f3c37f52213e0 Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Thu, 29 Sep 2022 18:17:22 +0200
Subject: [PATCH 05/12] Download latest version of WordPress

---
 wasm-build/wordpress-data/prepare-wordpress.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wasm-build/wordpress-data/prepare-wordpress.sh b/wasm-build/wordpress-data/prepare-wordpress.sh
index 23a558a605..d85024f43c 100644
--- a/wasm-build/wordpress-data/prepare-wordpress.sh
+++ b/wasm-build/wordpress-data/prepare-wordpress.sh
@@ -8,10 +8,11 @@ cd preload;
 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 latest version of WordPress
+wp_tarfile=wordpress-latest.tar.gz
+wget https://wordpress.org/$wp_tarfile -O $wp_tarfile
+tar -xzf $wp_tarfile
+rm $wp_tarfile
 
 # Patch WordPress with sqlite support
 # https://github.com/aaemnnosttv/wp-sqlite-integration

From 6894e246b232127e6464885ae36eccec9c840efa Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Thu, 29 Sep 2022 18:18:17 +0200
Subject: [PATCH 06/12] Remove ESBuild watch option for build task

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9ac545b843..fd46458d8a 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "build:php:node": "cd wasm-build/php && bash node-build-wasm.sh && bash node-publish.sh",
     "build:php": "npm-run-all build:php:*",
     "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:web": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --watch --external:xmlhttprequest",
+    "build:app:web": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --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:*",
     "clean:php": "rm -rf dist-web/wasm-build/php/docker-output/*",

From 81c0f33f1e0863048e1b726fd75dee8ae9c3daa3 Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Fri, 30 Sep 2022 14:12:28 +0200
Subject: [PATCH 07/12] Remove unnecessary semicolons from shell scripts

---
 wasm-build/php/node-publish.sh                |  2 +-
 wasm-build/php/web-publish.sh                 |  2 +-
 wasm-build/wordpress-data/node-publish.sh     |  4 +--
 .../wordpress-data/prepare-wordpress.sh       | 30 +++++++++----------
 wasm-build/wordpress-data/web-publish.sh      |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/wasm-build/php/node-publish.sh b/wasm-build/php/node-publish.sh
index e079441bbb..ab130c032c 100644
--- a/wasm-build/php/node-publish.sh
+++ b/wasm-build/php/node-publish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e;
+set -e
 
 root_dir=../..
 cp ./docker-output/node-* $root_dir/src/node/
diff --git a/wasm-build/php/web-publish.sh b/wasm-build/php/web-publish.sh
index a1683918ef..d2d0458cba 100644
--- a/wasm-build/php/web-publish.sh
+++ b/wasm-build/php/web-publish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e;
+set -e
 
 root_dir=../..
 dest_dir=$root_dir/dist-web
diff --git a/wasm-build/wordpress-data/node-publish.sh b/wasm-build/wordpress-data/node-publish.sh
index a6d2677400..947f99f135 100644
--- a/wasm-build/wordpress-data/node-publish.sh
+++ b/wasm-build/wordpress-data/node-publish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e;
+set -e
 
 root_dir=../..
 dest_dir=$root_dir/src/node/wordpress
@@ -8,7 +8,7 @@ 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/;
+  cp -r ./preload/wordpress-static/$dir $dest_dir/
 done
 
 cp -r ./preload/wordpress/* $dest_dir/
diff --git a/wasm-build/wordpress-data/prepare-wordpress.sh b/wasm-build/wordpress-data/prepare-wordpress.sh
index d85024f43c..c3d28a7144 100644
--- a/wasm-build/wordpress-data/prepare-wordpress.sh
+++ b/wasm-build/wordpress-data/prepare-wordpress.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# set -e;
+# set -e
 
-cd preload;
+cd preload
 
 # Remove previous WordPress installation
 rm -rf wordpress
@@ -25,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
@@ -84,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 ) {
@@ -108,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&admin_email=admin@localhost.com")
 pkill php
 if [ $http_response != "200" ]; then
-    exit 'WordPress installation failed';
-    cat debug.txt;
-fi;
+    exit 'WordPress installation failed'
+    cat debug.txt
+fi
diff --git a/wasm-build/wordpress-data/web-publish.sh b/wasm-build/wordpress-data/web-publish.sh
index b37e6e450c..f6621e1fce 100644
--- a/wasm-build/wordpress-data/web-publish.sh
+++ b/wasm-build/wordpress-data/web-publish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e;
+set -e
 
 root_dir=../..
 dest_dir=$root_dir/dist-web

From 0d3c0fefdaac53cd40cbf1f59bb2bbefb9b35024 Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Mon, 3 Oct 2022 13:37:50 +0200
Subject: [PATCH 08/12] Download specific version of WordPress instead of
 latest

---
 wasm-build/wordpress-data/prepare-wordpress.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wasm-build/wordpress-data/prepare-wordpress.sh b/wasm-build/wordpress-data/prepare-wordpress.sh
index c3d28a7144..63e11fcf98 100644
--- a/wasm-build/wordpress-data/prepare-wordpress.sh
+++ b/wasm-build/wordpress-data/prepare-wordpress.sh
@@ -8,9 +8,9 @@ cd preload
 rm -rf wordpress
 rm -rf wordpress-static
 
-# Download latest version of WordPress
-wp_tarfile=wordpress-latest.tar.gz
-wget https://wordpress.org/$wp_tarfile -O $wp_tarfile
+# 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
 

From 6733446ecce9fef65fc2b860fe3d666e793c79e6 Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Thu, 6 Oct 2022 17:56:30 +0200
Subject: [PATCH 09/12] Consolidate dev and build scripts with shared tasks and
 consistent naming

---
 package.json | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index fd46458d8a..37cca34fd1 100644
--- a/package.json
+++ b/package.json
@@ -4,24 +4,29 @@
   "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:app": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --watch --external:xmlhttprequest",
-    "dev:web:web-worker": "esbuild --bundle src/web/web-worker.js --outfile=dist-web/web-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",
+    "dev:web:service-worker": "npm run build:web:service-worker -- --watch",
+    "dev:web:web-worker": "npm run build:web:web-worker -- --watch",
+    "dev:node": "node ./src/node/command.mjs",
+    "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:web-worker": "esbuild --bundle src/web/web-worker.js --outfile=dist-web/web-worker.js --external:xmlhttprequest",
+    "build:php": "npm-run-all build:php:*",
     "build:php:web": "cd wasm-build/php && bash webworker-build-wasm.sh && bash web-publish.sh",
     "build:php:node": "cd wasm-build/php && bash node-build-wasm.sh && bash node-publish.sh",
-    "build:php": "npm-run-all build:php:*",
     "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:web": "esbuild --bundle src/web/app.mjs --outfile=dist-web/app.js --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: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: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/*"
+    "clean:wp": "rm -rf dist-web/wasm-build/wordpress/docker-output/* dist-web/wasm-build/wordpress/preload/*",
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Adam Zielinski",
   "license": "ISC",

From 70a629ebd595e9a1ef80ed1c9e6f5e747ca60f3e Mon Sep 17 00:00:00 2001
From: eliot-akira <me@eliotakira.com>
Date: Thu, 6 Oct 2022 18:12:10 +0200
Subject: [PATCH 10/12] Add build script "clean"

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 37cca34fd1..f7af348b4c 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "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/*",
     "test": "echo \"Error: no test specified\" && exit 1"

From 9923fe6009ab10dc71d0f7592dd531de16e64f23 Mon Sep 17 00:00:00 2001
From: Adam Zielinski <adam@adamziel.com>
Date: Tue, 11 Oct 2022 12:10:47 -1000
Subject: [PATCH 11/12] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 783a8d859a..938b847cbc 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "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:php:web": "cd wasm-build/php && bash webworker-build-wasm.sh && bash web-publish.sh",
+    "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",

From 23e4b982026862d286b5a8f8a46c831f21fd059a Mon Sep 17 00:00:00 2001
From: Adam Zielinski <adam@adamziel.com>
Date: Tue, 11 Oct 2022 12:19:29 -1000
Subject: [PATCH 12/12] Update wasm-build/php/web-publish.sh

---
 wasm-build/php/web-publish.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wasm-build/php/web-publish.sh b/wasm-build/php/web-publish.sh
index d2d0458cba..bcf1055147 100644
--- a/wasm-build/php/web-publish.sh
+++ b/wasm-build/php/web-publish.sh
@@ -5,5 +5,5 @@ set -e
 root_dir=../..
 dest_dir=$root_dir/dist-web
 
-cp ./docker-output/webworker-* $dest_dir/
+cp ./docker-output/php* $dest_dir/
 cp $root_dir/src/shared/etc/php.ini $dest_dir/etc/