Skip to content

Commit

Permalink
fix: Graphviz not including html table support
Browse files Browse the repository at this point in the history
fix: UMD files were not backward compatible

Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Aug 15, 2024
1 parent ca67fa1 commit 4723978
Show file tree
Hide file tree
Showing 14 changed files with 315 additions and 161 deletions.
File renamed without changes.
6 changes: 3 additions & 3 deletions packages/wasm/index.html → index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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 => {
Expand All @@ -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 => {
Expand Down
53 changes: 21 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions packages/base91/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions packages/duckdb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions packages/expat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions packages/graphviz-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions packages/graphviz/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
15 changes: 7 additions & 8 deletions packages/wasm/esbuild.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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"]);

1 change: 0 additions & 1 deletion packages/wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions packages/zstd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 4723978

Please sign in to comment.