fix: Graphviz not including html table support (#252)

GordonSmith · web-flow · commit 11fd7e7d20b2 · 2024-08-15T15:50:17.000+01:00
fix: UMD files were not backward compatible

Signed-off-by: Gordon Smith &lt;GordonJSmith@gmail.com&gt;
diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -67,3 +67,12 @@ jobs:
         run: |
           npm run coverage
           npm run coverage-report
+
+      - name: Upload error logs
+        if: ${{ failure() || cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.node }}-logs
+          path: |
+            ./vcpkg/buildtrees/**/*.log
+            ./build/**/*.log
diff --git a/index-worker.js b/index-worker.js
diff --git a/index.html b/index.html
@@ -58,7 +58,7 @@ <h3>ESM</h3>
     <div id="ESM"></div>
     <script type="module">
         import { Graphviz } from "https://cdn.jsdelivr.net/npm/@hpcc-js/wasm/dist/index.js";
-        //  import { Graphviz } from "./dist/index.js";
+        // import { Graphviz } from "./packages/wasm/dist/index.js";
         if (Graphviz) {
             const graphviz = await Graphviz.load();
             const svg = graphviz.layout(dot, "svg", "dot");
@@ -69,7 +69,7 @@ <h3>ESM</h3>
     <h3>UMD 1</h3>
     <div id="UMD1"></div>
     <script src="https://cdn.jsdelivr.net/npm/@hpcc-js/wasm/dist/graphviz.umd.js"></script>
-    <!-- <script src="./dist/graphviz.umd.js"></script> -->
+    <!-- <script src="./packages/wasm/dist/graphviz.umd.js"></script> -->
     <script>
         var hpccWasm = window["@hpcc-js/wasm"];
         hpccWasm.Graphviz.load().then(graphviz => {
@@ -81,7 +81,7 @@ <h3>UMD 1</h3>
     <h3>UMD 2</h3>
     <div id="UMD2"></div>
     <script src="https://cdn.jsdelivr.net/npm/@hpcc-js/wasm/dist/index.umd.js"></script>
-    <!-- <script src="./dist/index.umd.js"></script> -->
+    <!-- <script src="./packages/wasm/dist/index.umd.js"></script> -->
     <script>
         var hpccWasm = window["@hpcc-js/wasm"];
         hpccWasm.Graphviz.load().then(graphviz => {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@eslint/js": "^9.9.0",
+    "@eslint/js": "9.9.0",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@types/chai": "4.3.17",
     "@types/emscripten": "1.39.13",
@@ -83,6 +83,7 @@
     "chai": "5.1.1",
     "coveralls": "3.1.1",
     "c8": "10.1.2",
+    "@hpcc-js/esbuild-plugins": "1.0.10",
     "eslint": "9.9.0",
     "globals": "15.9.0",
     "karma": "6.4.4",
diff --git a/packages/base91/package.json b/packages/base91/package.json
@@ -36,9 +36,7 @@
     "update-major": "npx -y npm-check-updates -u"
   },
   "dependencies": {},
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/duckdb/package.json b/packages/duckdb/package.json
@@ -40,8 +40,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@duckdb/duckdb-wasm": "1.28.1-dev99.0",
-    "@hpcc-js/esbuild-plugins": "1.0.7"
+    "@duckdb/duckdb-wasm": "1.28.1-dev106.0"
   },
   "keywords": [
     "graphviz",
diff --git a/packages/expat/package.json b/packages/expat/package.json
@@ -35,9 +35,7 @@
     "update": "npx -y npm-check-updates -u -t minor",
     "update-major": "npx -y npm-check-updates -u"
   },
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/graphviz-cli/package.json b/packages/graphviz-cli/package.json
@@ -38,9 +38,7 @@
     "@hpcc-js/wasm-graphviz": "1.1.0",
     "yargs": "17.7.2"
   },
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/graphviz/package.json b/packages/graphviz/package.json
@@ -36,9 +36,7 @@
     "update-major": "npx -y npm-check-updates -u"
   },
   "dependencies": {},
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/wasm/esbuild.mjs b/packages/wasm/esbuild.mjs
@@ -2,17 +2,16 @@ import { bothTpl, browserBoth, nodeBoth } from "@hpcc-js/esbuild-plugins";
 
 //  config  ---
 await Promise.all([
-    bothTpl("src/base91.ts", "dist/base91", 'window["@hpcc-js/wasm"]'),
-    bothTpl("src/graphviz.ts", "dist/graphviz", 'window["@hpcc-js/wasm"]'),
-    bothTpl("src/expat.ts", "dist/expat", 'window["@hpcc-js/wasm"]'),
-    bothTpl("src/zstd.ts", "dist/zstd", 'window["@hpcc-js/wasm"]')
+    bothTpl("src/base91.ts", "dist/base91", 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")
 ]);
-await bothTpl("src/index.ts", "dist/index", 'window["@hpcc-js/wasm"]', ["./base91.js", "./duckdb.js", "./expat.js", "./graphviz.js", "./zstd.js"]);
+await bothTpl("src/index.ts", "dist/index", undefined, "@hpcc-js/wasm", ["./base91.js", "./duckdb.js", "./expat.js", "./graphviz.js", "./zstd.js"]);
 
-browserBoth("test/index-browser.ts", "dist-test/index.browser", 'window["@hpcc-js/wasm-test"]');
-browserBoth("test/worker-browser.ts", "dist-test/worker.browser", 'window["@hpcc-js/wasm-test"]');
+browserBoth("test/index-browser.ts", "dist-test/index.browser");
+browserBoth("test/worker-browser.ts", "dist-test/worker.browser");
 nodeBoth("test/index-node.ts", "dist-test/index.node");
 nodeBoth("test/worker-node.ts", "dist-test/worker.node");
 
 // nodeTpl("src/__bin__/dot-wasm.ts", "bin/dot-wasm", "esm", ["@hpcc-js/wasm/graphviz"]);
-
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
@@ -78,7 +78,6 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7",
     "@hpcc-js/wasm-base91": "1.1.0",
     "@hpcc-js/wasm-duckdb": "1.1.0",
     "@hpcc-js/wasm-expat": "1.1.0",
diff --git a/packages/zstd/package.json b/packages/zstd/package.json
@@ -36,9 +36,7 @@
     "update-major": "npx -y npm-check-updates -u"
   },
   "dependencies": {},
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/vcpkg-overlays/graphviz/CMakeLists.txt b/vcpkg-overlays/graphviz/CMakeLists.txt
diff --git a/vcpkg-overlays/graphviz/portfile.cmake b/vcpkg-overlays/graphviz/portfile.cmake
diff --git a/vcpkg-overlays/graphviz/vcpkg.json b/vcpkg-overlays/graphviz/vcpkg.json
