From ba851ae72e88960256e1e944e9523f909ea5e500 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Tue, 16 Aug 2022 16:16:25 +0000
Subject: [PATCH] wasm: move another file and update testing1/testing2 to
 account for [e38d00c2b82d]. Disable wasmfs by default as it breaks the
 worker-based module loader (reason as yet unknown).

FossilOrigin-Name: 6dad5e0573ee866657ee10b43e55b86fc9caac7a66c13bdbd35c3625a4783f14
---
 ext/wasm/GNUmakefile                 |  2 +-
 ext/wasm/{api => }/sqlite3-worker.js |  0
 ext/wasm/testing2.js                 |  2 +-
 manifest                             | 18 +++++++++---------
 manifest.uuid                        |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename ext/wasm/{api => }/sqlite3-worker.js (100%)

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 9522ab72a5..8a9adb75f5 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -183,7 +183,7 @@ emcc.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory # wasmMemory==>for -sIM
 emcc.jsflags += -sUSE_CLOSURE_COMPILER=0
 emcc.jsflags += -sIMPORTED_MEMORY
 emcc.environment := -sENVIRONMENT=web
-ENABLE_WASMFS ?= 1
+ENABLE_WASMFS ?= 0
 ifneq (0,$(ENABLE_WASMFS))
   emcc.cflags += -pthread
   emcc.jsflags += -pthread -sWASMFS -sPTHREAD_POOL_SIZE=2
diff --git a/ext/wasm/api/sqlite3-worker.js b/ext/wasm/sqlite3-worker.js
similarity index 100%
rename from ext/wasm/api/sqlite3-worker.js
rename to ext/wasm/sqlite3-worker.js
diff --git a/ext/wasm/testing2.js b/ext/wasm/testing2.js
index f6792955f8..bc578bb792 100644
--- a/ext/wasm/testing2.js
+++ b/ext/wasm/testing2.js
@@ -15,7 +15,7 @@
 'use strict';
 (function(){
   const T = self.SqliteTestUtil;
-  const SW = new Worker("api/sqlite3-worker.js");
+  const SW = new Worker("sqlite3-worker.js");
   const DbState = {
     id: undefined
   };
diff --git a/manifest b/manifest
index 24170d04b4..c19c285c0d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\saccommodate\smoving\sgenerated\ssqlite3.js\sin\sthe\sprevious\scheckin.
-D 2022-08-16T16:11:20.050
+C wasm:\smove\sanother\sfile\sand\supdate\stesting1/testing2\sto\saccount\sfor\s[e38d00c2b82d].\sDisable\swasmfs\sby\sdefault\sas\sit\sbreaks\sthe\sworker-based\smodule\sloader\s(reason\sas\syet\sunknown).
+D 2022-08-16T16:16:25.326
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile e3f2a8ce484eea0f087b31f5580b83c136fb6237da26f33f2c1d69f0f31ab94b
+F ext/wasm/GNUmakefile b5b34ee01efcf7c3d6c53d54a332545f2670e7a5a0c63d6de847d3726e5bc521
 F ext/wasm/README.md 4b00ae7c7d93c4591251245f0996a319e2651361013c98d2efb0b026771b7331
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -489,7 +489,6 @@ F ext/wasm/api/sqlite3-api-prologue.js c0f335bf8b44071da0204b8fa95ce78fd737033b1
 F ext/wasm/api/sqlite3-api-worker.js 1124f404ecdf3c14d9f829425cef778cd683911a9883f0809a463c3c7773c9fd
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0e78035045e3328fb050ec9580c6bfb714c756a1d3b917259e58baf9b0332c98
-F ext/wasm/api/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f
 F ext/wasm/common/SqliteTestUtil.js e41a1406f18da9224523fad0c48885caf995b56956a5b9852909c0989e687e90
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -506,11 +505,12 @@ F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b
 F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2df2e0707d4d69af6cb1
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
-F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689 w ext/wasm/api/scratchpad-opfs-worker.js
+F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689
+F ext/wasm/sqlite3-worker.js 1325ca8d40129a82531902a3a077b795db2eeaee81746e5a0c811a04b415fa7f w ext/wasm/api/sqlite3-worker.js
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
-F ext/wasm/testing2.js 1cd14be666e40da41d7eea5723b1953ce54f1077c199887a73d3d5cfb71dbd05
+F ext/wasm/testing2.js dbb825174878716fab42c340962c0c1b32bfbe26dd16c7b082d30d35f510466c
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -2004,8 +2004,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
-R 9311647d4bd948f09c1d1ad00326a894
+P 41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
+R 8ceb5e9180bc147ed0af56485cecdca6
 U stephan
-Z a8a2ceb6325a77f43310bbc5ef685064
+Z 7a0a645037fbcb33d5a75b781a0d284d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f535932813..3e6aa5a962 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
\ No newline at end of file
+6dad5e0573ee866657ee10b43e55b86fc9caac7a66c13bdbd35c3625a4783f14
\ No newline at end of file