Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions demos/gallery/samples/geospatial/Choropleth/Layered.js

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

3 changes: 0 additions & 3 deletions demos/gallery/samples/geospatial/Leaflet/Pin Path.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { Leaflet } from "@hpcc-js/map";

import "@hpcc-js/common/dist/index.css";
import "@hpcc-js/map/dist/index.css";

const path = new Leaflet.Path()
.columns(["latitude", "longitude", "color", "icon"])
.data([
Expand Down
3,084 changes: 1,397 additions & 1,687 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 3 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,14 @@
"rimraf": "6.1.3",
"typescript": "6.0.3",
"typescript-eslint": "8.60.0",
"vite": "7.3.3",
"vite": "8.0.14",
"vitepress": "1.6.4",
"vitest": "4.1.7"
},
"overrides": {
"@nx/devkit": {
"minimatch": "10.2.3"
},
"@xmldom/xmldom": "0.9.10",
"axios": "1.15.2",
"d3-color": "3.1.0",
"eslint-plugin-react-hooks": {
"eslint": "$eslint"
},
"fast-uri": "3.1.2",
"nx": {
"minimatch": "10.2.3"
},
"yaml": "2.8.3",
"tar": "7.5.11",
"tmp": "0.2.6"
"esbuild": "0.28.0",
"tmp": "0.2.7"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/comms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,20 @@
"dependencies": {
"@hpcc-js/util": "^3.5.8",
"@xmldom/xmldom": "0.9.10",
"undici": "7.26.0"
"undici": "8.3.0"
},
"devDependencies": {
"@hpcc-js/ddl-shim": "^3.3.8",
"@hpcc-js/esbuild-plugins": "^1.8.10",
"@kubernetes/client-node": "1.4.0",
"@types/d3-request": "1.0.9",
"@types/d3-time-format": "2.3.4",
"@types/node": "^18",
"@types/node": "^24",
"@types/xmldom": "0.1.34",
"d3-array": "^1",
"d3-format": "^1",
"d3-time-format": "^2",
"data-uri-to-buffer": "6.0.2",
"data-uri-to-buffer": "8.0.0",
"soap": "1.9.3",
"typescript-formatter": "^7.2.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ddl-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"update-major": "npx --yes npm-check-updates -u"
},
"dependencies": {
"ajv": "6.15.0"
"ajv": "8.20.0"
},
"devDependencies": {
"@hpcc-js/esbuild-plugins": "^1.8.10",
"@rodrigoff/ajv-cli": "5.2.0",
"ts-json-schema-generator": "0.98.0"
"ts-json-schema-generator": "2.9.0"
},
"repository": {
"type": "git",
Expand Down
3 changes: 1 addition & 2 deletions packages/ddl-shim/src/validate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export const ddl2Schema: object = _ddl2Schema;

const options: _Ajv.Options = {
allErrors: false,
verbose: true,
jsonPointers: false
verbose: true
};

function doValidate(ddl: DDL.DDLSchema | DDL2.Schema, schema: DDL.DDLSchema | DDL2.Schema) {
Expand Down
2 changes: 1 addition & 1 deletion packages/dgrid-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dojo-webpack-plugin": "3.0.9",
"dojox": "1.17.3",
"string-replace-loader": "3.3.0",
"terser-webpack-plugin": "5.6.0",
"terser-webpack-plugin": "5.6.1",
"typescript": "5.9.3",
"webpack": "5.107.2",
"webpack-cli": "5.1.4",
Expand Down
14 changes: 14 additions & 0 deletions packages/dgrid2/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,20 @@
"!**/node_modules/**"
]
},
{
"name": "index-dark.html",
"request": "launch",
"type": "msedge",
"url": "http://localhost:5507/index-dark.html",
"runtimeArgs": [
"--disable-web-security"
],
"webRoot": "${workspaceFolder}",
"outFiles": [
"${workspaceFolder}/**/*.js",
"!**/node_modules/**"
]
},
{
"name": "index-preview.html",
"request": "launch",
Expand Down
77 changes: 77 additions & 0 deletions packages/dgrid2/index-dark.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<!DOCTYPE html>
<html>

<head>
<title>Home (Dark)</title>
<style>
body {
font-family: Arial, sans-serif;
margin: 0;
padding: 0;
background-color: #1a1a1a;
color: #ddd;
}

h1 {
text-align: center;
margin-top: 50px;
}

#placeholder {
width: 100%;
height: 500px;
background-color: #212121;
margin-top: 20px;
}
</style>
</head>

<body onresize="doResize()">
<h1>ESM Quick Test (Dark)</h1>
<div id="placeholder"></div>
<script type="module">
import { Table } from "./src/index.ts";

window.__widget = new Table()
.target("placeholder")
.darkMode(true)
.columns(["Category", "Series-1", "Series-2", "Series-3", "Series-4"])
.data([
["A", -25, -23, -25, -22],
["B", -20, -21, -25, -21],
["C", -18, -20, -25, -19],
["D", -17, -17, -25, -18],
["E", -16, -15, -19, -18],
["F", -15, -14, -16, -16],
["G", -12, -10, -14, -15],
["H", -12, -8, -13, -15],
["I", -11, -6, -12, -12],
["J", -11, -6, -8, -12],
["K", -9, 0, -5, -10],
["L", -5, 1, -5, -9],
["M", -5, 2, -4, -8],
["N", -1, 4, -2, -7],
["O", 3, 7, 0, -5],
["P", 3, 8, 0, -3],
["Q", 4, 8, 7, 0],
["R", 6, 9, 11, 1],
["S", 9, 11, 11, 5],
["T", 10, 20, 12, 6],
["U", 12, 20, 16, 8],
["V", 12, 21, 18, 14],
["W", 14, 21, 18, 18],
["X", 15, 23, 21, 18],
["Y", 21, 23, 23, 21],
["Z", 23, 24, 24, 24]
])
.render()
;
</script>
<script>
function doResize() {
window.__widget?.resize()?.render();
}
</script>
</body>

</html>
2 changes: 1 addition & 1 deletion packages/dgrid2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@hpcc-js/esbuild-plugins": "^1.8.10",
"@types/react": "19.2.15",
"@types/react-dom": "19.2.3",
"@vitejs/plugin-react": "4.7.0",
"@vitejs/plugin-react": "6.0.2",
"react": "19.2.6",
"react-data-grid": "7.0.0-beta.59",
"react-dom": "19.2.6",
Expand Down
12 changes: 12 additions & 0 deletions packages/dgrid2/src/table.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
:root {
--lightningcss-light: initial;
--lightningcss-dark: ;
}

@media (prefers-color-scheme: light) {
:root {
--lightningcss-light: ;
--lightningcss-dark: initial;
}
}

.dgrid2_Table .rdg {
font-family: monospace, 'Courier New', Courier;
}
Expand Down
3 changes: 3 additions & 0 deletions packages/dgrid2/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import pkg from "./package.json" with { type: "json" };
export default createHpccViteConfig(pkg, {
plugins: [react()],
configOverrides: {
resolve: {
dedupe: ["react", "react-dom"]
},
define: {
"process.env.NODE_ENV": JSON.stringify("production")
}
Expand Down
6 changes: 3 additions & 3 deletions packages/esbuild-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"esbuild-plugin-inline-css": "0.0.1",
"esbuild-plugin-umd-wrapper": "3.0.0",
"fzstd": "0.1.1",
"vite": "7.3.3",
"vite-plugin-css-injected-by-js": "3.5.2",
"vite-plugin-static-copy": "3.4.0"
"vite": "8.0.14",
"vite-plugin-css-injected-by-js": "5.0.1",
"vite-plugin-static-copy": "4.1.0"
},
"devDependencies": {
"@hpcc-js/wasm-base91": "1.13.7",
Expand Down
21 changes: 5 additions & 16 deletions packages/esbuild-plugins/src/vite-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,38 +223,27 @@ export function createHpccViteConfig(pkg: any, options: ViteHpccConfigOptions =
...defaultLibConfig,
...(configOverrides.build?.lib || {})
},
rollupOptions: {
rolldownOptions: {
external: allExternals,
output: {
globals,
keepNames: true,
},
...(configOverrides.build?.rollupOptions || {})
},
// Preserve class names and function names in minified output
minify: "terser",
terserOptions: {
keep_classnames: true,
mangle: {
keep_classnames: true,
}
...(configOverrides.build?.rolldownOptions || {})
},
sourcemap: true,
...(configOverrides.build ? Object.fromEntries(Object.entries(configOverrides.build).filter(([key]) => key !== "lib" && key !== "rollupOptions")) : {})
...(configOverrides.build ? Object.fromEntries(Object.entries(configOverrides.build).filter(([key]) => key !== "lib" && key !== "rolldownOptions")) : {})
},
resolve: {
alias,
...(configOverrides.resolve || {})
},
esbuild: {
keepNames: true,
...(configOverrides.esbuild || {})
},
plugins: allPlugins,
test: {
projects: [nodeConfig, browserConfig],
...(configOverrides.test || {})
},
...Object.fromEntries(Object.entries(configOverrides).filter(([key]) => !["build", "resolve", "esbuild", "plugins"].includes(key)))
...Object.fromEntries(Object.entries(configOverrides).filter(([key]) => !["build", "resolve", "plugins"].includes(key)))
};

return defineConfig(config);
Expand Down
2 changes: 1 addition & 1 deletion packages/map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"d3-request": "^1",
"d3-selection": "^1",
"d3-tile": "^1",
"google-maps": "3.3.0",
"google-maps": "4.3.3",
"leaflet-draw": "1.0.4",
"leaflet.heat": "0.2.0",
"leaflet.markercluster": "1.5.3",
Expand Down
12 changes: 6 additions & 6 deletions packages/map/src/GMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import { HTMLWidget } from "@hpcc-js/common";
import { AbsoluteSurface } from "@hpcc-js/layout";
import { promiseTimeout } from "@hpcc-js/util";
import { map as d3Map } from "d3-collection";
import * as _GoogleMapsLoader from "google-maps";

const GoogleMapsLoader = _GoogleMapsLoader.default || _GoogleMapsLoader;
import { Loader } from "google-maps";

import "../src/GMap.css";

Expand All @@ -31,11 +29,13 @@ export function requireGoogleMap(customGoogle?: any) {
console.warn("__hpcc_gmap_apikey does not contain a valid API key, reverting to developers key (expect limited performance)");
}
try {
GoogleMapsLoader.KEY = window.__hpcc_gmap_apikey || "AIzaSyDwGn2i1i_pMZvnqYJN1BksD_tjYaCOWKg";
GoogleMapsLoader.LIBRARIES = ["geometry", "drawing"];
GoogleMapsLoader.load(function (_google) {
const loader = new Loader(window.__hpcc_gmap_apikey || "AIzaSyDwGn2i1i_pMZvnqYJN1BksD_tjYaCOWKg", { libraries: ["geometry", "drawing"] });
loader.load().then(function (_google) {
google = _google;
resolve();
}).catch(function (e) {
console.warn(`Failed to initialize Google Map API: ${e.message}`);
resolve();
});
} catch (e) {
console.warn(`Failed to initialize Google Map API: ${e.message}`);
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-it-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@hpcc-js/esbuild-plugins": "^1.8.10",
"d3-dsv": "3.0.1",
"d3-fetch": "3.0.1",
"dotenv": "16.6.1",
"dotenv": "17.4.2",
"tsx": "4.22.3"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/marshaller/src/ddl2/ddleditor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class DDLEditor extends SplitPanel {
if (success) {
this._errorTable.data([]);
} else {
this._errorTable.data(errors.map(error => [error.dataPath, error.keyword, error.message, JSON.stringify(error.params)]));
this._errorTable.data(errors.map(error => [error.instancePath, error.keyword, error.message, JSON.stringify(error.params)]));
}
} catch (e) {
this._errorTable.data([["", "Validation Failed", "", ""]]);
Expand Down
2 changes: 1 addition & 1 deletion packages/observablehq-compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
"devDependencies": {
"@hpcc-js/esbuild-plugins": "^1.8.10",
"@observablehq/notebook-kit": "1.8.0",
"@observablehq/notebook-kit": "1.9.1",
"@observablehq/parser": "6.1.0",
"@observablehq/inspector": "5.0.1",
"@observablehq/stdlib": "5.8.8",
Expand Down
Loading