From 1d091e6270090f3583dc8e8920cb562e84910914 Mon Sep 17 00:00:00 2001 From: xiaoluoHe Date: Fri, 27 Sep 2024 11:52:25 +0800 Subject: [PATCH] chore: upgrade vrender for test --- common/config/rush/pnpm-config.json | 3 + common/config/rush/pnpm-lock.yaml | 139 ++++++++++++++----------- docs/package.json | 6 +- packages/openinula-vchart/package.json | 6 +- packages/react-vchart/package.json | 6 +- packages/vchart-extension/package.json | 6 +- packages/vchart/package.json | 8 +- packages/vstory/package.json | 8 +- tools/story-player/package.json | 8 +- 9 files changed, 106 insertions(+), 84 deletions(-) diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json index c8c5fe3ef..bdce10df7 100644 --- a/common/config/rush/pnpm-config.json +++ b/common/config/rush/pnpm-config.json @@ -83,6 +83,9 @@ * PNPM documentation: https://pnpm.io/package_json#pnpmoverrides */ "globalOverrides": { + "@visactor/vrender-core": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", + "@visactor/vrender-components": "0.20.7-alpha.1" // "@visactor/vutils": "~0.18.15", // "@visactor/vscale": "~0.18.15", // "@visactor/vdataset": "~0.18.15" diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 98c70f7ab..adde9f6a4 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,5 +1,10 @@ lockfileVersion: 5.4 +overrides: + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 + '@visactor/vrender-components': 0.20.7-alpha.1 + importers: .: @@ -22,8 +27,8 @@ importers: '@visactor/vchart-theme': ~1.6.6 '@visactor/vgrammar': 0.14.7 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': ~0.18.16 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 @@ -55,8 +60,8 @@ importers: '@visactor/vchart-theme': 1.6.9 '@visactor/vgrammar': 0.14.7 '@visactor/vmind': 1.2.4-alpha.5 - '@visactor/vrender': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 axios: 1.7.7 buble: 0.20.0 @@ -137,8 +142,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.12.6 '@visactor/vgrammar-core': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': ~0.18.16 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -158,8 +163,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vgrammar-core': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 react-is: 18.3.1 devDependencies: @@ -202,8 +207,8 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.12.6 '@visactor/vgrammar-core': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': ~0.18.16 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -224,8 +229,8 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vgrammar-core': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 react-is: 18.3.1 devDependencies: @@ -370,9 +375,9 @@ importers: '@visactor/vgrammar-venn': 0.14.7 '@visactor/vgrammar-wordcloud': 0.14.7 '@visactor/vgrammar-wordcloud-shape': 0.14.7 - '@visactor/vrender-components': 0.20.5 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-components': 0.20.7-alpha.1 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vscale': ~0.18.16 '@visactor/vutils': ~0.18.16 '@visactor/vutils-extension': workspace:1.12.6 @@ -418,9 +423,9 @@ importers: '@visactor/vgrammar-venn': 0.14.7 '@visactor/vgrammar-wordcloud': 0.14.7 '@visactor/vgrammar-wordcloud-shape': 0.14.7 - '@visactor/vrender-components': 0.20.5 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-components': 0.20.7-alpha.1 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vscale': 0.18.16 '@visactor/vutils': 0.18.16 '@visactor/vutils-extension': link:../vutils-extension @@ -480,8 +485,8 @@ importers: '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 '@visactor/vchart': workspace:1.12.6 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': ~0.18.16 '@vitejs/plugin-react': 3.1.0 canvas: 2.11.2 @@ -500,8 +505,8 @@ importers: typescript: 4.9.5 vite: 3.2.6 dependencies: - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -841,9 +846,9 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:1.12.6 - '@visactor/vrender': 0.20.5 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender': 0.20.7-alpha.1 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': ~0.18.16 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -856,9 +861,9 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 0.20.5 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender': 0.20.7-alpha.1 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 devDependencies: '@internal/bundler': link:../bundler @@ -4836,9 +4841,9 @@ packages: '@visactor/vdataset': 0.18.16 '@visactor/vgrammar-coordinate': 0.14.7 '@visactor/vgrammar-util': 0.14.7 - '@visactor/vrender-components': 0.20.5 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-components': 0.20.7-alpha.1 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vscale': 0.18.16 '@visactor/vutils': 0.18.16 dev: false @@ -4848,8 +4853,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.14.7 '@visactor/vgrammar-util': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 dev: false @@ -4867,15 +4872,15 @@ packages: dependencies: '@visactor/vgrammar-core': 0.14.7 '@visactor/vgrammar-util': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 dev: false /@visactor/vgrammar-util/0.14.7: resolution: {integrity: sha512-56i0P50mwEWlK1SUvgwrrPeww5xsYyB5DuV84Y+e+4WzLzwe1g2R2ZPBRSc8RGH7rkGv7v9ZINjzY7HVIK+UuQ==} dependencies: - '@visactor/vrender-core': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 dev: false @@ -4884,8 +4889,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.14.7 '@visactor/vgrammar-util': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 dev: false @@ -4894,8 +4899,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.14.7 '@visactor/vgrammar-util': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vscale': 0.18.16 '@visactor/vutils': 0.18.16 dev: false @@ -4905,8 +4910,8 @@ packages: dependencies: '@visactor/vgrammar-core': 0.14.7 '@visactor/vgrammar-util': 0.14.7 - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 '@visactor/vutils': 0.18.16 dev: false @@ -4934,36 +4939,36 @@ packages: - debug dev: false - /@visactor/vrender-components/0.20.5: - resolution: {integrity: sha512-xAknwgg/tZmSdCy5+JXh2hAC+dXGtOA2L3yV/j4AcNPXV5bjHYOJ5kDc7fGKUZQ+oAxu4bCTWipSy5S0TpvTZg==} + /@visactor/vrender-components/0.20.7-alpha.1: + resolution: {integrity: sha512-HPNG7FI6zUBIZP0OYiIWaDcgsBLrpQSf+zCA0SlJSDgJXvlU2+JFiGcKzCQH5MxvoR1OLhJ/1F9OdyN9tOxOPA==} dependencies: - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 - '@visactor/vscale': 0.18.16 - '@visactor/vutils': 0.18.16 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 + '@visactor/vscale': 0.18.17 + '@visactor/vutils': 0.18.17 dev: false - /@visactor/vrender-core/0.20.5: - resolution: {integrity: sha512-ZWiTbeeLWGvFk+5nyQebDavznnOkTUrjpo5Dy3THYxTZ87rV6CJxEHnYd2vEYN15Ee083cmUR88/LdwOgcZn1w==} + /@visactor/vrender-core/0.20.7-alpha.1: + resolution: {integrity: sha512-5F0suofHUuBv1QW/lo3MAFruxmnLjq/BrbVe0OF//9L3LpAOVnAT0WZBa1gkqV/WxM3V5cANc7jzsBpfFr9C9A==} dependencies: - '@visactor/vutils': 0.18.16 + '@visactor/vutils': 0.18.17 color-convert: 2.0.1 dev: false - /@visactor/vrender-kits/0.20.5: - resolution: {integrity: sha512-MEyXvgEF+dkmXDGFqAKhxUO67Hk0+Ewmrj9PHJIOAtDb9a2mL+6tsTy4CNXATh60VXZwy7DmN1uUtYcEqZKzpA==} + /@visactor/vrender-kits/0.20.7-alpha.1: + resolution: {integrity: sha512-A2wd1baV01kmaJuE/xI5PCazjr4iu7+zh7Dv2XHBVUjWkfvdnKsxRUCK9j21e4ShSAqJt2UWLEGq8CHOPHxBPg==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.20.5 - '@visactor/vutils': 0.18.16 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vutils': 0.18.17 roughjs: 4.5.2 dev: false - /@visactor/vrender/0.20.5: - resolution: {integrity: sha512-nfoTdMK5mXnwnnpNZrdJgU3PQ29AI+dzNt7kG0Kgv/n8jYNt85VY5FS4h78QtW11GKDU0evqvltZ/tVMgcHAAw==} + /@visactor/vrender/0.20.7-alpha.1: + resolution: {integrity: sha512-KlchYw0zlUvqZsloR72EZQ2UaNpMN1lS9NE5ZoYQCC6hFwI1G1z1kS/dUxwa2FsgiTrByJ/QpmQTUmrMGZXrbA==} dependencies: - '@visactor/vrender-core': 0.20.5 - '@visactor/vrender-kits': 0.20.5 + '@visactor/vrender-core': 0.20.7-alpha.1 + '@visactor/vrender-kits': 0.20.7-alpha.1 dev: false /@visactor/vscale/0.18.16: @@ -4972,6 +4977,12 @@ packages: '@visactor/vutils': 0.18.16 dev: false + /@visactor/vscale/0.18.17: + resolution: {integrity: sha512-jChQ7kq2CN/i+BtQ9wA2B8Xqmlw2xQDARDrmiUszXtuki07zNvq39UiNiQLQQjPq1qXb5hHNY4h4Wsp6fUa/RQ==} + dependencies: + '@visactor/vutils': 0.18.17 + dev: false + /@visactor/vutils/0.17.5: resolution: {integrity: sha512-HFN6Pk1Wc1RK842g02MeKOlvdri5L7/nqxMVTqxIvi0XMhHXpmoqN4+/9H+h8LmJpVohyrI/MT85TRBV/rManw==} dependencies: @@ -4988,6 +4999,14 @@ packages: eventemitter3: 4.0.7 dev: false + /@visactor/vutils/0.18.17: + resolution: {integrity: sha512-V9KZTlqyjyKEnKqmH8n2VjxOKlR7bX07R7W8tgEV4andfCYG8ufbx+xniR3jYXxCtca4USAks2KwyJBj2H+Kww==} + dependencies: + '@turf/helpers': 6.5.0 + '@turf/invariant': 6.5.0 + eventemitter3: 4.0.7 + dev: false + /@vitejs/plugin-react/3.1.0_vite@3.2.6: resolution: {integrity: sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==} engines: {node: ^14.18.0 || >=16.0.0} @@ -4999,7 +5018,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.24.7_@babel+core@7.20.12 magic-string: 0.27.0 react-refresh: 0.14.2 - vite: 3.2.6_@types+node@22.5.4 + vite: 3.2.6 transitivePeerDependencies: - supports-color dev: true diff --git a/docs/package.json b/docs/package.json index a28e62eb4..d23ca6038 100644 --- a/docs/package.json +++ b/docs/package.json @@ -18,8 +18,8 @@ "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", "@visactor/vutils": "~0.18.16", - "@visactor/vrender": "0.20.5", - "@visactor/vrender-kits": "0.20.5", + "@visactor/vrender": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", "@visactor/vgrammar": "0.14.7", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", @@ -54,4 +54,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 4cbe1f1b7..fcdd7fc75 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:1.12.6", "@visactor/vutils": "~0.18.16", - "@visactor/vrender-core": "0.20.5", - "@visactor/vrender-kits": "0.20.5", + "@visactor/vrender-core": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", "@visactor/vgrammar-core": "0.14.7", "react-is": "^18.2.0" }, @@ -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 8fbbdb05b..e26ed441f 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:1.12.6", "@visactor/vutils": "~0.18.16", - "@visactor/vrender-core": "0.20.5", - "@visactor/vrender-kits": "0.20.5", + "@visactor/vrender-core": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", "@visactor/vgrammar-core": "0.14.7", "react-is": "^18.2.0" }, @@ -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 fa355c88a..8abf62d0d 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -22,8 +22,8 @@ "@visactor/vchart": "^1.11.11" }, "dependencies": { - "@visactor/vrender-core": "0.20.5", - "@visactor/vrender-kits": "0.20.5", + "@visactor/vrender-core": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", "@visactor/vutils": "~0.18.16" }, "devDependencies": { @@ -57,4 +57,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 607fabae5..34ae7d394 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -121,9 +121,9 @@ "@visactor/vutils": "~0.18.16", "@visactor/vdataset": "~0.18.16", "@visactor/vscale": "~0.18.16", - "@visactor/vrender-core": "0.20.5", - "@visactor/vrender-kits": "0.20.5", - "@visactor/vrender-components": "0.20.5", + "@visactor/vrender-core": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", + "@visactor/vrender-components": "0.20.7-alpha.1", "@visactor/vgrammar-core": "0.14.7", "@visactor/vgrammar-projection": "0.14.7", "@visactor/vgrammar-wordcloud": "0.14.7", @@ -138,4 +138,4 @@ "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vstory/package.json b/packages/vstory/package.json index 86812708f..b961d66c2 100644 --- a/packages/vstory/package.json +++ b/packages/vstory/package.json @@ -21,9 +21,9 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.11.0", - "@visactor/vrender-core": "0.20.5", - "@visactor/vrender-kits": "0.20.5", - "@visactor/vrender-components": "0.20.5", + "@visactor/vrender-core": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", + "@visactor/vrender-components": "0.20.7-alpha.1", "@visactor/vutils": "~0.18.16" }, "devDependencies": { @@ -42,4 +42,4 @@ "vite": "3.2.6", "typescript": "4.9.5" } -} +} \ No newline at end of file diff --git a/tools/story-player/package.json b/tools/story-player/package.json index 92f0ef72a..79246bfe1 100644 --- a/tools/story-player/package.json +++ b/tools/story-player/package.json @@ -56,10 +56,10 @@ "vite": "3.2.6" }, "dependencies": { - "@visactor/vrender-core": "0.20.5", - "@visactor/vrender-kits": "0.20.5", + "@visactor/vrender-core": "0.20.7-alpha.1", + "@visactor/vrender-kits": "0.20.7-alpha.1", "@visactor/vchart": "workspace:1.12.6", - "@visactor/vrender": "0.20.5", + "@visactor/vrender": "0.20.7-alpha.1", "@visactor/vutils": "~0.18.16" } -} +} \ No newline at end of file