diff --git a/package-lock.json b/package-lock.json index eb5f4971..ca2f2781 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "stroke", - "version": "2.10.6", + "version": "2.17.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "stroke", - "version": "2.10.6", + "version": "2.17.9", "license": "SEE LICENSE IN LICENSE", "dependencies": { "@codemirror/autocomplete": "^6.20.3", @@ -52,7 +52,7 @@ "canvas-confetti": "^1.9.4", "chart.js": "^4.5.1", "clsx": "^2.1.1", - "echarts": "^5.6.0", + "echarts": "^6.1.0", "echarts-wordcloud": "^2.1.0", "elkjs": "^0.11.1", "idb": "^8.0.3", @@ -3278,13 +3278,13 @@ } }, "node_modules/echarts": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.6.0.tgz", - "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-6.1.0.tgz", + "integrity": "sha512-q0yaFPggC9FUdsWH4blavRWFmxdrIodbkoKNAjJudAI6CA9gNPxHtV2RcZNEepZVlk4yvBYkOkbk6HIVpIyHZA==", "license": "Apache-2.0", "dependencies": { "tslib": "2.3.0", - "zrender": "5.6.1" + "zrender": "6.1.0" } }, "node_modules/echarts-wordcloud": { @@ -6007,9 +6007,9 @@ "license": "MIT" }, "node_modules/zrender": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz", - "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-6.1.0.tgz", + "integrity": "sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==", "license": "BSD-3-Clause", "dependencies": { "tslib": "2.3.0" diff --git a/package.json b/package.json index 3550fa98..d35149a8 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "canvas-confetti": "^1.9.4", "chart.js": "^4.5.1", "clsx": "^2.1.1", - "echarts": "^5.6.0", + "echarts": "^6.1.0", "echarts-wordcloud": "^2.1.0", "elkjs": "^0.11.1", "idb": "^8.0.3", @@ -116,6 +116,9 @@ }, "overrides": { "dompurify": "^3.4.13", - "katex": "^0.18.2" + "katex": "^0.18.2", + "echarts-wordcloud": { + "echarts": "$echarts" + } } } diff --git a/src/lib/chart-utils.js b/src/lib/chart-utils.js index f3354c83..660302c9 100644 --- a/src/lib/chart-utils.js +++ b/src/lib/chart-utils.js @@ -13,6 +13,15 @@ import { resolveColor } from '$lib/geo-basemap.js' /** @typedef {unknown[][]} Rows */ /** @param {ColInfo} col */ +/** + * The echarts theme every chart is created with. echarts 6 changed its + * defaults (palette, visualMap ramp, treemap and sankey colors); its bundled + * `v5` theme (echarts/theme/v5) keeps charts looking as they did on 5, so the + * upgrade (for the XSS fix) changes nothing on screen. Import that theme + * before `init(dom, ECHARTS_THEME)`. + */ +export const ECHARTS_THEME = 'v5' + export function colType(col) { const dt = (col.dataType ?? col.data_type ?? '').toLowerCase().replace(/\(.+\)$/, '').trim() if (/^(int|integer|bigint|smallint|numeric|decimal|real|double|float|serial|money|number)/.test(dt)) return 'number' diff --git a/src/lib/components/AiChartRenderer.svelte b/src/lib/components/AiChartRenderer.svelte index 87db211a..5f40b3ad 100644 --- a/src/lib/components/AiChartRenderer.svelte +++ b/src/lib/components/AiChartRenderer.svelte @@ -1,4 +1,5 @@