From 1dd89f8dab483b7fda939593048959009c23e1de Mon Sep 17 00:00:00 2001 From: xile611 Date: Thu, 15 May 2025 19:37:11 +0800 Subject: [PATCH 1/2] fix: upgrade vgrammar to 0.16.7, fix #3965 --- common/config/rush/pnpm-lock.yaml | 120 ++++++++++++------------- docs/package.json | 4 +- packages/openinula-vchart/package.json | 4 +- packages/react-vchart/package.json | 4 +- packages/vchart-extension/package.json | 4 +- packages/vchart/package.json | 18 ++-- 6 files changed, 77 insertions(+), 77 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index fbb6013f67..df04204f98 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -21,7 +21,7 @@ importers: '@visactor/vchart': workspace:1.13.9 '@visactor/vchart-extension': workspace:1.13.9 '@visactor/vchart-theme': ~1.6.6 - '@visactor/vgrammar': 0.16.6 + '@visactor/vgrammar': 0.16.7 '@visactor/vmind': 1.2.4-alpha.5 '@visactor/vrender': 0.22.10 '@visactor/vrender-kits': 0.22.10 @@ -59,7 +59,7 @@ importers: '@visactor/vchart': link:../packages/vchart '@visactor/vchart-extension': link:../packages/vchart-extension '@visactor/vchart-theme': 1.6.9 - '@visactor/vgrammar': 0.16.6 + '@visactor/vgrammar': 0.16.7 '@visactor/vmind': 1.2.4-alpha.5 '@visactor/vrender': 0.22.10 '@visactor/vrender-kits': 0.22.10 @@ -146,7 +146,7 @@ importers: '@types/offscreencanvas': 2019.6.4 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.9 - '@visactor/vgrammar-core': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': ~0.19.5 @@ -167,7 +167,7 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vgrammar-core': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': 0.19.5 @@ -211,7 +211,7 @@ importers: '@types/react-dom': ^18.0.0 '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.13.9 - '@visactor/vgrammar-core': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': ~0.19.5 @@ -233,7 +233,7 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../vchart - '@visactor/vgrammar-core': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': 0.19.5 @@ -372,14 +372,14 @@ importers: '@types/node': '*' '@types/offscreencanvas': 2019.6.4 '@visactor/vdataset': ~0.19.5 - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-hierarchy': 0.16.6 - '@visactor/vgrammar-projection': 0.16.6 - '@visactor/vgrammar-sankey': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 - '@visactor/vgrammar-venn': 0.16.6 - '@visactor/vgrammar-wordcloud': 0.16.6 - '@visactor/vgrammar-wordcloud-shape': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-hierarchy': 0.16.7 + '@visactor/vgrammar-projection': 0.16.7 + '@visactor/vgrammar-sankey': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 + '@visactor/vgrammar-venn': 0.16.7 + '@visactor/vgrammar-wordcloud': 0.16.7 + '@visactor/vgrammar-wordcloud-shape': 0.16.7 '@visactor/vrender-components': 0.22.10 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 @@ -420,14 +420,14 @@ importers: vite: 3.2.6 dependencies: '@visactor/vdataset': 0.19.5 - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-hierarchy': 0.16.6 - '@visactor/vgrammar-projection': 0.16.6 - '@visactor/vgrammar-sankey': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 - '@visactor/vgrammar-venn': 0.16.6 - '@visactor/vgrammar-wordcloud': 0.16.6 - '@visactor/vgrammar-wordcloud-shape': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-hierarchy': 0.16.7 + '@visactor/vgrammar-projection': 0.16.7 + '@visactor/vgrammar-sankey': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 + '@visactor/vgrammar-venn': 0.16.7 + '@visactor/vgrammar-wordcloud': 0.16.7 + '@visactor/vgrammar-wordcloud-shape': 0.16.7 '@visactor/vrender-components': 0.22.10 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 @@ -491,7 +491,7 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/vchart': workspace:1.13.9 '@visactor/vdataset': ~0.19.5 - '@visactor/vgrammar-core': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 '@visactor/vrender-components': 0.22.10 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 @@ -515,7 +515,7 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vdataset': 0.19.5 - '@visactor/vgrammar-core': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 '@visactor/vrender-components': 0.22.10 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 @@ -4861,19 +4861,19 @@ packages: topojson-client: 3.1.0 dev: false - /@visactor/vgrammar-coordinate/0.16.6: - resolution: {integrity: sha512-stLKmcoz+qLnHxrQVpMNL6wtc53Sd5+mGXLo+56KG7DDxwAUg/p5rWEJW84tfYW1QvfC3xJxiC1iWHK+KkfFPg==} + /@visactor/vgrammar-coordinate/0.16.7: + resolution: {integrity: sha512-iVLTgoMeB4a6AyOlzi3Zz/33wzJnVvZeQDxbKm74iQEAqwrdiQjTVCazFlZhFgx/kNCWh4gFVmIcsz4A0K7yyA==} dependencies: - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-core/0.16.6: - resolution: {integrity: sha512-+K3mP/VQyNzsLtnf21Y9hmGU5gyRmaiLMIhVOvaSd0+vlSVB2rJKCVe9wSj3Q2IZXtLHI9mXe7nFV0m1AUVXkA==} + /@visactor/vgrammar-core/0.16.7: + resolution: {integrity: sha512-bBcys8VVI6AtFmkan0Uy/77iUmkE652a6kmAMxI6eUU86qSEHIMgHuB0Q6JwXuBPhFQ2YaZ0cEKMeVzwG2rMSw==} dependencies: '@visactor/vdataset': 0.19.5 - '@visactor/vgrammar-coordinate': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-coordinate': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vrender-components': 0.22.10 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 @@ -4881,77 +4881,77 @@ packages: '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-hierarchy/0.16.6: - resolution: {integrity: sha512-aekYeT5Z6CUeztLf3OpjBj+plyM8s6AzwlTNlEw3UIiluofARli+jlRRYHdXZuvSk2yGhL7q1DK7WTw/6hZ+Nw==} + /@visactor/vgrammar-hierarchy/0.16.7: + resolution: {integrity: sha512-YaMR/0gvgS463pv3WUbp2t/AAahnGwVdiZRwoaaPRYwgW3sLj5bM8F6kI5UAT1g4las+WTb/OqC/J7p7xl1yMg==} dependencies: - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-projection/0.16.6: - resolution: {integrity: sha512-RsE4lgWVBKGlCGI/IIApAZAbGDd8fnGK/1iNk+afaTW9nTmCMyqakZ/d1s0iSiVHYZMY7XPAJzv1bkoFr7za8A==} + /@visactor/vgrammar-projection/0.16.7: + resolution: {integrity: sha512-ql1q0fbvwsBAHdqKq0lNc0eqWPTXclVWUVmaiWXDTHGdIaQadIVxbSN4c1ZF+PjQZqlHANvMedE+H3NkH86sUQ==} dependencies: - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vutils': 0.19.5 d3-geo: 1.12.1 dev: false - /@visactor/vgrammar-sankey/0.16.6: - resolution: {integrity: sha512-ijGkm26s7oI4xvV2EhE9lH8SsutM+b6Pn3M34nO5dH7M+kIrFfF70RRPz1xSb+dXf9Es/cm7K935YtUwoqfE/A==} + /@visactor/vgrammar-sankey/0.16.7: + resolution: {integrity: sha512-1e+6T1CYdr5325iHx0nYdbziJCTSzFZD+YPNci/aqDeVYioCKLFM3aHsXvZDVYkSf1LWAadZKmTIyMeY8/iLbw==} dependencies: - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-util/0.16.6: - resolution: {integrity: sha512-E6X7w6DXm6oee4wfVFbiBpy+BUY1UcCMexMxMuPI2FFVgaZbsKAh2bbMwwSpVvCFZp4gUEwMRYUetoJXJ+hdSw==} + /@visactor/vgrammar-util/0.16.7: + resolution: {integrity: sha512-TSUMaWDF+icwmeLFKJc3JJNVi+VrCtNgh9mHzetZx7xdIU1N4ezYZ6dT+PRNIXVETXlhB/WhJwEv9CWiUh23Mw==} dependencies: '@visactor/vrender-core': 0.22.10 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-venn/0.16.6: - resolution: {integrity: sha512-/fObOTB/dZ8P2cD/lgnB//bs3Wv4ivpcM3bf7TIEE0KvO6Sf91Kc5ajH/ld2feWyS7bogW/Qm2jESc/KYd3J7g==} + /@visactor/vgrammar-venn/0.16.7: + resolution: {integrity: sha512-d8ezA0f92wUmm/BgG9hUpDX1mpiW6Vb3RSJPyJIs62Qg243OUU4mfhKnmYeggFG1q/B2RCD+H+Slkk2nPlWH3Q==} dependencies: - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-wordcloud-shape/0.16.6: - resolution: {integrity: sha512-XF6qnwvvw1EocAYuUMnObgL32aVzC2scEyb0CYy7Fw285cghoAYMRiw99Jgntsvy22fNENJjzzGWC36w71te7Q==} + /@visactor/vgrammar-wordcloud-shape/0.16.7: + resolution: {integrity: sha512-vaAlS8GoZ57Ny2FRc3vSSUeC99t33tDDji99OLb8dmKYcVv4HPzsd3UOo+rSp+fkARiutrnJ75gTC/U55zlv2A==} dependencies: - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vscale': 0.19.5 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar-wordcloud/0.16.6: - resolution: {integrity: sha512-bdLHriR6YHIT37gKXhufPSrJgH5tDciDRkO/R1V26yMpJ/jQKmte8xL5YRC25/ah4txKexuCTyloQj5qTiynTQ==} + /@visactor/vgrammar-wordcloud/0.16.7: + resolution: {integrity: sha512-fWaxIHxs0w/xeskZNRQnK4pNIsoCOEADHI1rS/WeQboHh+3NeAAtGaxvVd1d1VFbVA5TFk4iWe9w+JLv34GxSQ==} dependencies: - '@visactor/vgrammar-core': 0.16.6 - '@visactor/vgrammar-util': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 + '@visactor/vgrammar-util': 0.16.7 '@visactor/vrender-core': 0.22.10 '@visactor/vrender-kits': 0.22.10 '@visactor/vutils': 0.19.5 dev: false - /@visactor/vgrammar/0.16.6: - resolution: {integrity: sha512-0+oxCRqlIjFUUK5n/OBeVxNhOk9h2dsFV5q2MSHKlunEX5tQYJE+Q51/pU8ygwuGVzCPzuMizJDyaNl1nRXV8w==} + /@visactor/vgrammar/0.16.7: + resolution: {integrity: sha512-VimGF2npJeqVm0Hk900h7JwAmErM7irAeuCgejXGMYGvx6Jh0ddNsV8Cc00Rrs5zHbqF64B9SJEhUZfDdb09IA==} dependencies: - '@visactor/vgrammar-core': 0.16.6 + '@visactor/vgrammar-core': 0.16.7 dev: false /@visactor/vmind/1.2.4-alpha.5: diff --git a/docs/package.json b/docs/package.json index 006551c58f..613e63395a 100644 --- a/docs/package.json +++ b/docs/package.json @@ -21,7 +21,7 @@ "@visactor/vutils": "~0.19.5", "@visactor/vrender": "0.22.10", "@visactor/vrender-kits": "0.22.10", - "@visactor/vgrammar": "0.16.6", + "@visactor/vgrammar": "0.16.7", "@visactor/vtable": "1.12.0", "@visactor/vtable-editors": "1.12.0", "@visactor/vtable-gantt": "1.12.0", @@ -59,4 +59,4 @@ "react-device-detect": "^2.2.2", "minimist": "1.2.8" } -} +} \ No newline at end of file diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index 7e63990ac1..b3c3b24fd1 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -32,7 +32,7 @@ "@visactor/vutils": "~0.19.5", "@visactor/vrender-core": "0.22.10", "@visactor/vrender-kits": "0.22.10", - "@visactor/vgrammar-core": "0.16.6", + "@visactor/vgrammar-core": "0.16.7", "react-is": "^18.2.0" }, "devDependencies": { @@ -79,4 +79,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index 4cc7f32846..4a8ff0272d 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -32,7 +32,7 @@ "@visactor/vutils": "~0.19.5", "@visactor/vrender-core": "0.22.10", "@visactor/vrender-kits": "0.22.10", - "@visactor/vgrammar-core": "0.16.6", + "@visactor/vgrammar-core": "0.16.7", "react-is": "^18.2.0" }, "devDependencies": { @@ -83,4 +83,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index 9cbebaa70f..205b690258 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -24,7 +24,7 @@ "@visactor/vrender-core": "0.22.10", "@visactor/vrender-kits": "0.22.10", "@visactor/vrender-components": "0.22.10", - "@visactor/vgrammar-core": "0.16.6", + "@visactor/vgrammar-core": "0.16.7", "@visactor/vutils": "~0.19.5", "@visactor/vdataset": "~0.19.5", "@visactor/vchart": "workspace:1.13.9" @@ -60,4 +60,4 @@ "registry": "https://registry.npmjs.org/" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 312f261969..2e618f32bc 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -124,18 +124,18 @@ "@visactor/vrender-core": "0.22.10", "@visactor/vrender-kits": "0.22.10", "@visactor/vrender-components": "0.22.10", - "@visactor/vgrammar-core": "0.16.6", - "@visactor/vgrammar-projection": "0.16.6", - "@visactor/vgrammar-wordcloud": "0.16.6", - "@visactor/vgrammar-wordcloud-shape": "0.16.6", - "@visactor/vgrammar-hierarchy": "0.16.6", - "@visactor/vgrammar-sankey": "0.16.6", - "@visactor/vgrammar-venn": "0.16.6", - "@visactor/vgrammar-util": "0.16.6", + "@visactor/vgrammar-core": "0.16.7", + "@visactor/vgrammar-projection": "0.16.7", + "@visactor/vgrammar-wordcloud": "0.16.7", + "@visactor/vgrammar-wordcloud-shape": "0.16.7", + "@visactor/vgrammar-hierarchy": "0.16.7", + "@visactor/vgrammar-sankey": "0.16.7", + "@visactor/vgrammar-venn": "0.16.7", + "@visactor/vgrammar-util": "0.16.7", "@visactor/vutils-extension": "workspace:1.13.9" }, "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file From fad6bb3a5a650fb436761b6c02dca243174e7f49 Mon Sep 17 00:00:00 2001 From: xile611 Date: Thu, 15 May 2025 19:41:00 +0800 Subject: [PATCH 2/2] docs: update changlog of rush --- .../fix-upgrade-vgrammar-0.16.7_2025-05-15-11-40.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vchart/fix-upgrade-vgrammar-0.16.7_2025-05-15-11-40.json diff --git a/common/changes/@visactor/vchart/fix-upgrade-vgrammar-0.16.7_2025-05-15-11-40.json b/common/changes/@visactor/vchart/fix-upgrade-vgrammar-0.16.7_2025-05-15-11-40.json new file mode 100644 index 0000000000..7034443283 --- /dev/null +++ b/common/changes/@visactor/vchart/fix-upgrade-vgrammar-0.16.7_2025-05-15-11-40.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: upgrade vgrammar to 0.16.7, fix #3965\n\n", + "type": "none", + "packageName": "@visactor/vchart" + } + ], + "packageName": "@visactor/vchart", + "email": "dingling112@gmail.com" +} \ No newline at end of file