fix: umd loading not working 100%

Signed-off-by: Gordon Smith <[email protected]>

Author: GordonSmith

.vscode/launch.json

@@ -97,7 +97,8 @@
         {
             "name": "esbuild",
             "type": "node",
-            "program": "${workspaceFolder}/esbuild.mjs",
+            "program": "${workspaceFolder}/packages/wasm/esbuild.js",
+            "cwd": "${workspaceFolder}/packages/wasm",
             "request": "launch",
             "args": [],
             "skipFiles": [

CMakeLists.txt

@@ -17,7 +17,7 @@ set(EM_LINK_FLAGS
     "-sINVOKE_RUN=0"
     "-sALLOW_MEMORY_GROWTH=1"
     # "-sWASM=1"
-    "-sENVIRONMENT=web"
+    "-sENVIRONMENT=webview"
     "-sFILESYSTEM=0"
     # "-sMINIMAL_RUNTIME=1"
     "-sMODULARIZE=1" 

index.html

@@ -71,7 +71,7 @@ <h3>UMD 1</h3>
     <script src="https://cdn.jsdelivr.net/npm/@hpcc-js/wasm/dist/graphviz.umd.js"></script>
     <!-- <script src="./packages/wasm/dist/graphviz.umd.js"></script> -->
     <script>
-        var hpccWasm = window["@hpcc-js/wasm"];
+        var hpccWasm = window["@hpcc-js/wasm/graphviz"];
         hpccWasm.Graphviz.load().then(graphviz => {
             var svg = graphviz.layout(dot, "svg", "dot");
             document.getElementById("UMD1").innerHTML = svg;

package-lock.json

@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "@eslint/js": "9.30.1",
-    "@hpcc-js/esbuild-plugins": "1.4.7",
+    "@hpcc-js/esbuild-plugins": "1.4.8",
     "@types/emscripten": "1.40.1",
     "@types/node": "24.0.10",
     "@types/yargs": "17.0.33",

package.json

@@ -2,10 +2,10 @@ import { bothTpl } from "@hpcc-js/esbuild-plugins";
 
 //  config  ---
 await Promise.all([
-    bothTpl("src/base91.ts", "dist/base91", undefined, "@hpcc-js/wasm"),
-    bothTpl("src/duckdb.ts", "dist/duckdb", undefined, "@hpcc-js/wasm"),
-    bothTpl("src/graphviz.ts", "dist/graphviz", undefined, "@hpcc-js/wasm"),
-    bothTpl("src/expat.ts", "dist/expat", undefined, "@hpcc-js/wasm"),
-    bothTpl("src/zstd.ts", "dist/zstd", undefined, "@hpcc-js/wasm")
+    bothTpl("src/base91.ts", "dist/base91", { libraryName: "@hpcc-js/wasm/base91" }),
+    bothTpl("src/duckdb.ts", "dist/duckdb", { libraryName: "@hpcc-js/wasm/duckdb" }),
+    bothTpl("src/graphviz.ts", "dist/graphviz", { libraryName: "@hpcc-js/wasm/graphviz" }),
+    bothTpl("src/expat.ts", "dist/expat", { libraryName: "@hpcc-js/wasm/expat" }),
+    bothTpl("src/zstd.ts", "dist/zstd", { libraryName: "@hpcc-js/wasm/zstd" })
 ]);
-await bothTpl("src/index.ts", "dist/index", undefined, "@hpcc-js/wasm", ["./base91.js", "./duckdb.js", "./expat.js", "./graphviz.js", "./zstd.js"]);
+await bothTpl("src/index.ts", "dist/index", { libraryName: "@hpcc-js/wasm", external: ["./base91.js", "./duckdb.js", "./expat.js", "./graphviz.js", "./zstd.js"] });

packages/wasm/esbuild.js

@@ -1,6 +1,6 @@
 export namespace Base91 {
     export function load() {
-        return import("./base91.ts").then(mod => mod.Base91.load());
+        return import("./base91.js").then(mod => mod.Base91.load());
     }
 }
 export namespace DuckDB {
@@ -10,16 +10,16 @@ export namespace DuckDB {
 }
 export namespace Expat {
     export function load() {
-        return import("./expat.ts").then(mod => mod.Expat.load());
+        return import("./expat.js").then(mod => mod.Expat.load());
     }
 }
 export namespace Graphviz {
     export function load() {
-        return import("./graphviz.ts").then(mod => mod.Graphviz.load());
+        return import("./graphviz.js").then(mod => mod.Graphviz.load());
     }
 }
 export namespace Zstd {
     export function load() {
-        return import("./zstd.ts").then(mod => mod.Zstd.load());
+        return import("./zstd.js").then(mod => mod.Zstd.load());
     }
 }