From e8220056842ea6f71822cbe227fc1ce973f4ad0d Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 20 Jan 2026 18:01:56 +0000 Subject: [PATCH] wasm: make pre-js.c-pp.js a no-op in bundler-friendly builds. FossilOrigin-Name: 982a91abc0c97e7e785d3ba69a4d0516a899f4d6cd462027ebdf7115e577e8c3 --- ext/wasm/api/pre-js.c-pp.js | 2 ++ manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ext/wasm/api/pre-js.c-pp.js b/ext/wasm/api/pre-js.c-pp.js index 59dc907d16..aa29608629 100644 --- a/ext/wasm/api/pre-js.c-pp.js +++ b/ext/wasm/api/pre-js.c-pp.js @@ -31,6 +31,7 @@ environments are supported and tested. */ //#endif +//#if not target:es6-bundler-friendly (function(Module){ const sIMS = globalThis.sqlite3InitModuleState/*from extern-post-js.c-pp.js*/ @@ -146,4 +147,5 @@ }.bind(sIMS); //#endif Module.instantiateWasm and not wasmfs })(Module); +//#endif not target:es6-bundler-friendly /* END FILE: api/pre-js.js. */ diff --git a/manifest b/manifest index a8b12dcc3e..325b57934a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C wasm:\sa\spotential\sworkaround\sfor\scases\ssuch\sas\s[forum:1eec339854c935bd|forum\spost\s1eec339854c935bd],\swhere\sclient-local\sneeds\srequire\soverriding\sEmscripten\sconfig\sdefaults\s(which\swe\svery\sintentionally\sdo\snot\sdocument\sor\ssupport\sfor\sreasons\sexplained\sin\sthat\sthread).\sThis\sis\suntested\sbecause\sit\srequires\sa\sspecial-needs\ssetup,\sbut\sit\sdoesn't\sbreak\sanything\sfor\srun-of-the-mill\scases. -D 2026-01-20T17:10:22.413 +C wasm:\smake\spre-js.c-pp.js\sa\sno-op\sin\sbundler-friendly\sbuilds. +D 2026-01-20T18:01:56.243 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -595,7 +595,7 @@ F ext/wasm/api/extern-post-js.c-pp.js d9f42ecbedc784c0d086bc37800e52946a14f7a216 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41 F ext/wasm/api/post-js-footer.js a50c1a2c4d008aede7b2aa1f18891a7ee71437c2f415b8aeb3db237ddce2935b F ext/wasm/api/post-js-header.js d24bd0d065f3489c8b78ddf3ead6321e5d047187a162cd503c41700e03dd1f06 -F ext/wasm/api/pre-js.c-pp.js 4452b674f1ad74c02a787edcc5449c4d60937ecf4ed31edcba3c74f0ac1253d5 +F ext/wasm/api/pre-js.c-pp.js 2265320d104328df13e14c2c8dc5c61476f0339c4cfd15af63f74681c6d811e2 F ext/wasm/api/sqlite3-api-glue.c-pp.js 9b33e3ee467791dec4fd1b444b12a8545dfbb6c8b28ac651c7bdc7661a3b5a5c F ext/wasm/api/sqlite3-api-oo1.c-pp.js 45454631265d9ce82685f1a64e1650ee19c8e121c41db98a22b534c15e543cfa F ext/wasm/api/sqlite3-api-prologue.js 1fefd40ab21e3dbf46f43b6fafb07f13eb13cc157a884f7c1134caf631ddb3f2 @@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 346ad366a8ebed1e7936c59f8a40e9c8e7e31d0153bc4f654a47b2ddc39b18ca -R 70e9be57b67a2088ac3d3ac3838ccb2f +P c8e6be9241e3e17898c451baad109b75dc8a97a91ff1e43c67a6c962b75af8f3 +R 64b92ee9f3ebdd62b37d8760f9ff1ae5 U stephan -Z 2bae166b43650196aaa0f91b2a88e5d9 +Z c99f4290f82a6286724ccab8a2f76e6a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5f5826cba2..d19650162a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c8e6be9241e3e17898c451baad109b75dc8a97a91ff1e43c67a6c962b75af8f3 +982a91abc0c97e7e785d3ba69a4d0516a899f4d6cd462027ebdf7115e577e8c3 -- 2.47.3