Skip to content

Commit c37c597

Browse files
GordonSmithGordonSmith
committed
feat: embed dgrid-shim as a self loading resource (#4531)
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
1 parent 4be0025 commit c37c597

40 files changed

+216
-165
lines changed

‎packages/chart/index-preview.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
}
3838
}
3939
</script>
40-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
4140
</head>
4241

4342
<body onresize="doResize()">

‎packages/chart/index.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959
margin-top: 20px;
6060
}
6161
</style>
62-
63-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
6462
</head>
6563

6664
<body onresize="doResize()">

‎packages/codemirror/demo.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656
}
5757
</style>
5858

59-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
60-
6159
</head>
6260

6361
<body onresize="doResize()">

‎packages/codemirror/index-preview.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
}
3838
}
3939
</script>
40-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
4140
</head>
4241

4342
<body onresize="doResize()">

‎packages/codemirror/index.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
margin-top: 20px;
2424
}
2525
</style>
26-
27-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
2826
</head>
2927

3028
<body onresize="doResize()">

‎packages/comms/index.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
border-radius: 4px;
3333
}
3434
</style>
35-
36-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
3735
</head>
3836

3937
<body>

‎packages/composite/index-preview.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
margin-top: 20px;
2424
}
2525
</style>
26-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim/dist/index.min.js"></script>
2726
<script type="importmap">
2827
{
2928
"imports": {
@@ -33,6 +32,7 @@
3332
"@hpcc-js/api": "../api/dist/index.js",
3433
"@hpcc-js/chart": "../chart/dist/index.js",
3534
"@hpcc-js/comms": "../comms/dist/index.js",
35+
"@hpcc-js/dgrid": "../dgrid/dist/index.js",
3636
"@hpcc-js/dgrid2": "../dgrid2/dist/index.js",
3737
"@hpcc-js/form": "../form/dist/index.js",
3838
"@hpcc-js/other": "../other/dist/index.js",
@@ -84,7 +84,11 @@ <h1>ESM Quick Test</h1>
8484

8585
setTimeout(() => {
8686
window.__widget.chartType("PIE").render();
87-
}, 3000);
87+
}, 1000);
88+
89+
setTimeout(() => {
90+
window.__widget.chartType("TABLE").render();
91+
}, 2000);
8892
</script>
8993
<script>
9094
function doResize() {

‎packages/composite/index.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
margin-top: 20px;
2525
}
2626
</style>
27-
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim/dist/index.min.js"></script>
2827
</head>
2928

3029
<body onresize="doResize()">
@@ -67,7 +66,11 @@ <h1>ESM Quick Test</h1>
6766

6867
setTimeout(() => {
6968
window.__widget.chartType("PIE").render();
70-
}, 3000);
69+
}, 1000);
70+
71+
setTimeout(() => {
72+
window.__widget.chartType("TABLE").render();
73+
}, 2000);
7174
</script>
7275
<script>
7376
function doResize() {

‎packages/composite/tests/composite.browser.spec.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Class, HTMLWidget, SVGWidget } from "@hpcc-js/common";
22
import { describe, it, expect } from "vitest";
33
import { classDef, data, render } from "../../common/tests/index.ts";
4-
import { load_dgrid_shim } from "../../dgrid/tests/index.ts";
54

65
const urlSearch: string = "";
76
const simple = {
@@ -28,12 +27,6 @@ const simple = {
2827
}
2928
};
3029
describe("@hpcc-js/composite", async () => {
31-
await load_dgrid_shim();
32-
33-
it("Shim Loaded", () => {
34-
expect(globalThis["@hpcc-js/dgrid-shim"]).to.exist;
35-
});
36-
3730
const composite = await import("@hpcc-js/composite");
3831
const { MultiChart, Dermatology, MegaChart, MultiChartPanel } = composite;
3932
for (const key in composite) {
@@ -55,6 +48,11 @@ describe("@hpcc-js/composite", async () => {
5548
.data(data.Pivot.subjects.data)
5649
.chartType("COLUMN")
5750
);
51+
render(new MultiChart()
52+
.columns(data.Pivot.subjects.columns)
53+
.data(data.Pivot.subjects.data)
54+
.chartType("TABLE")
55+
);
5856
case Dermatology:
5957
case MegaChart:
6058
case MultiChartPanel:

‎packages/ddl-shim/index-preview.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
}
3838
}
3939
</script>
40-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@hpcc-js/dgrid-shim@2.26.0/dist/index.min.js"></script>
4140
</head>
4241

4342
<body onresize="doResize()">

0 commit comments

Comments
 (0)