From 96ab0863e6157cb95527ebf5ea935697bb712da1 Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Fri, 8 Sep 2023 16:32:34 +0800 Subject: [PATCH 1/2] chore: upgrade vrender to 0.15.0-alpha.15 --- common/config/rush/pnpm-lock.yaml | 53 +++++++++++++++++--------- docs/package.json | 2 +- packages/react-vchart/package.json | 2 +- packages/vchart-editor/package.json | 2 +- packages/vchart/package.json | 4 +- packages/vutils-extension/package.json | 2 +- tools/story-player/package.json | 2 +- 7 files changed, 43 insertions(+), 24 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 8c17f2976f..710819cb3a 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: '@types/react-dom': ^18.0.0 '@visactor/vchart': workspace:1.3.1 '@visactor/vgrammar': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': ~0.15.11 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 @@ -41,7 +41,7 @@ importers: '@arco-design/web-react': 2.46.1_vnxzf5c44dqo4vncfl2mrh2gwm '@visactor/vchart': link:../packages/vchart '@visactor/vgrammar': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': 0.15.11 axios: 1.5.0 highlight.js: 11.8.0 @@ -119,7 +119,7 @@ importers: '@types/react-is': ^17.0.3 '@visactor/vchart': workspace:1.3.1 '@visactor/vgrammar': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': ~0.15.11 '@vitejs/plugin-react': 3.1.0 eslint: ~8.18.0 @@ -140,7 +140,7 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vgrammar': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': 0.15.11 react-is: 18.2.0 devDependencies: @@ -279,8 +279,8 @@ importers: '@visactor/vgrammar-util': 0.7.0-alpha.3 '@visactor/vgrammar-wordcloud': 0.7.0-alpha.3 '@visactor/vgrammar-wordcloud-shape': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 - '@visactor/vrender-components': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 + '@visactor/vrender-components': 0.15.0-alpha.15 '@visactor/vscale': ~0.15.11 '@visactor/vutils': ~0.15.11 '@visactor/vutils-extension': workspace:0.0.1 @@ -322,8 +322,8 @@ importers: '@visactor/vgrammar-util': 0.7.0-alpha.3 '@visactor/vgrammar-wordcloud': 0.7.0-alpha.3 '@visactor/vgrammar-wordcloud-shape': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 - '@visactor/vrender-components': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 + '@visactor/vrender-components': 0.15.0-alpha.15 '@visactor/vscale': 0.15.11 '@visactor/vutils': 0.15.11 '@visactor/vutils-extension': link:../vutils-extension @@ -379,7 +379,7 @@ importers: '@types/offscreencanvas': 2019.6.4 '@visactor/vchart': workspace:1.3.1 '@visactor/vdataset': ~0.15.11 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': ~0.15.11 eslint: ~8.18.0 husky: 7.0.4 @@ -399,7 +399,7 @@ importers: dependencies: '@visactor/vchart': link:../vchart '@visactor/vdataset': 0.15.11 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': 0.15.11 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -462,7 +462,7 @@ importers: '@types/jest': ^26.0.0 '@types/node': '*' '@types/offscreencanvas': 2019.6.4 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vscale': ~0.15.11 '@visactor/vutils': ~0.15.11 eslint: ~8.18.0 @@ -481,7 +481,7 @@ importers: typescript: 4.9.5 vite: 3.2.6 dependencies: - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vscale': 0.15.11 '@visactor/vutils': 0.15.11 devDependencies: @@ -688,7 +688,7 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.0 '@typescript-eslint/parser': 5.30.0 '@visactor/vchart': workspace:1.3.1 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': ~0.15.11 cross-env: ^7.0.3 eslint: ~8.18.0 @@ -701,7 +701,7 @@ importers: vite: 3.2.6 dependencies: '@visactor/vchart': link:../../packages/vchart - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': 0.15.11 devDependencies: '@internal/bundler': link:../bundler @@ -4447,6 +4447,15 @@ packages: inversify: 6.0.1 dev: false + /@visactor/vrender-components/0.15.0-alpha.15: + resolution: {integrity: sha512-sEZDSH3bTCCi7k3xKSFCitlYVa4BgkBj64igaweqC0b9IpaAcVJvdd1Z8K5PCglCSN7tugmwqWCB5ZpYRLtt9A==} + dependencies: + '@visactor/vrender': 0.15.0-alpha.15 + '@visactor/vscale': 0.15.11 + '@visactor/vutils': 0.15.11 + inversify: 6.0.1 + dev: false + /@visactor/vrender/0.15.0-alpha.14: resolution: {integrity: sha512-AwbpF2Yv21B961368U5JwS+y4iy7XoErqec4OgCt4Ujifet7g3ZphGKkw5RCnGtOP/2rqWl+syd8abmU8FdsMA==} dependencies: @@ -4457,6 +4466,16 @@ packages: inversify: 6.0.1 dev: false + /@visactor/vrender/0.15.0-alpha.15: + resolution: {integrity: sha512-9bk2BOYAMZjzn0S1lKivqfFVP2XjGbHRI46CqrWcT/WAaP55tGg/Myw9ToIs+PhIQ4Zn6wHNBCmS8Xu6xmmoSQ==} + dependencies: + '@visactor/vutils': 0.15.11 + color-convert: 2.0.1 + core-js: 3.31.1 + fast-xml-parser: 4.2.7 + inversify: 6.0.1 + dev: false + /@visactor/vscale/0.15.11: resolution: {integrity: sha512-cHgTxDQq6wz6n/4ZxdaB4hKw3Si7QY3MaQIhBqNUFOY+zK4Vjuslt4LtVrHHMROs3QGJ0TORGL/y2HOdNj16SQ==} dependencies: @@ -12995,7 +13014,7 @@ packages: jest: ^24.0.0 dependencies: electron: 11.5.0 - jest: 26.6.3_xxvpynkn5i4ehycnunrxxsezu4 + jest: 26.6.3_ts-node@10.9.0 jest-haste-map: 24.9.0 jest-message-util: 24.9.0 jest-mock: 24.9.0 @@ -14962,7 +14981,7 @@ packages: decamelize: 1.2.0 loud-rejection: 1.6.0 map-obj: 1.0.1 - minimist: 1.2.5 + minimist: 1.2.8 normalize-package-data: 2.5.0 object-assign: 4.1.1 read-pkg-up: 1.0.1 @@ -17361,7 +17380,7 @@ packages: dependencies: deep-extend: 0.6.0 ini: 1.3.8 - minimist: 1.2.5 + minimist: 1.2.8 strip-json-comments: 2.0.1 dev: true diff --git a/docs/package.json b/docs/package.json index 8f56349f29..b3810e230f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -14,7 +14,7 @@ "@visactor/vchart": "workspace:1.3.1", "@visactor/vutils": "~0.15.11", "@visactor/vgrammar": "0.7.0-alpha.3", - "@visactor/vrender": "0.15.0-alpha.14", + "@visactor/vrender": "0.15.0-alpha.15", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", "axios": "^1.4.0", diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index a4cb9bb78f..c479c9cbda 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -31,7 +31,7 @@ "@visactor/vchart": "workspace:1.3.1", "@visactor/vutils": "~0.15.11", "@visactor/vgrammar": "0.7.0-alpha.3", - "@visactor/vrender": "0.15.0-alpha.14", + "@visactor/vrender": "0.15.0-alpha.15", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/vchart-editor/package.json b/packages/vchart-editor/package.json index 554b84d9bc..4a89a820d5 100644 --- a/packages/vchart-editor/package.json +++ b/packages/vchart-editor/package.json @@ -33,7 +33,7 @@ "@visactor/vchart": "workspace:1.3.1", "@visactor/vutils": "~0.15.11", "@visactor/vdataset": "~0.15.11", - "@visactor/vrender": "0.15.0-alpha.14" + "@visactor/vrender": "0.15.0-alpha.15" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vchart/package.json b/packages/vchart/package.json index ea6f6f8552..7864d75400 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -115,8 +115,8 @@ "@visactor/vgrammar-hierarchy": "0.7.0-alpha.3", "@visactor/vgrammar-sankey": "0.7.0-alpha.3", "@visactor/vgrammar-util": "0.7.0-alpha.3", - "@visactor/vrender": "0.15.0-alpha.14", - "@visactor/vrender-components": "0.15.0-alpha.14", + "@visactor/vrender": "0.15.0-alpha.15", + "@visactor/vrender-components": "0.15.0-alpha.15", "@visactor/vutils-extension": "workspace:0.0.1" }, "publishConfig": { diff --git a/packages/vutils-extension/package.json b/packages/vutils-extension/package.json index fb2e5686b3..0c76e4b7e0 100644 --- a/packages/vutils-extension/package.json +++ b/packages/vutils-extension/package.json @@ -24,7 +24,7 @@ "dependencies": { "@visactor/vutils": "~0.15.11", "@visactor/vscale": "~0.15.11", - "@visactor/vrender": "0.15.0-alpha.14" + "@visactor/vrender": "0.15.0-alpha.15" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/tools/story-player/package.json b/tools/story-player/package.json index 6697f38aaf..887a17d2db 100644 --- a/tools/story-player/package.json +++ b/tools/story-player/package.json @@ -57,7 +57,7 @@ }, "dependencies": { "@visactor/vchart": "workspace:1.3.1", - "@visactor/vrender": "0.15.0-alpha.14", + "@visactor/vrender": "0.15.0-alpha.15", "@visactor/vutils": "~0.15.11" } } From 7ce43e6ac3bab3dd1ab605bc142b6059324d3773 Mon Sep 17 00:00:00 2001 From: kkxxkk2019 Date: Fri, 8 Sep 2023 17:53:31 +0800 Subject: [PATCH 2/2] chore: lock vrender version --- common/config/rush/pnpm-config.json | 4 ++-- common/config/rush/pnpm-lock.yaml | 37 +++++++++-------------------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/common/config/rush/pnpm-config.json b/common/config/rush/pnpm-config.json index dd575d232a..0dfcd38eda 100644 --- a/common/config/rush/pnpm-config.json +++ b/common/config/rush/pnpm-config.json @@ -89,8 +89,8 @@ * PNPM documentation: https://pnpm.io/package_json#pnpmoverrides */ "globalOverrides": { - // "@visactor/vrender": "0.14.8", - // "@visactor/vrender-components": "0.14.8" + "@visactor/vrender": "0.15.0-alpha.15", + "@visactor/vrender-components": "0.15.0-alpha.15" }, /** diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 710819cb3a..3dc03da3f1 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: 5.4 +overrides: + '@visactor/vrender': 0.15.0-alpha.15 + '@visactor/vrender-components': 0.15.0-alpha.15 + importers: .: @@ -4379,7 +4383,7 @@ packages: dependencies: '@visactor/vgrammar': 0.7.0-alpha.3 '@visactor/vgrammar-util': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': 0.15.11 dev: false @@ -4397,7 +4401,7 @@ packages: dependencies: '@visactor/vgrammar': 0.7.0-alpha.3 '@visactor/vgrammar-util': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': 0.15.11 dev: false @@ -4412,7 +4416,7 @@ packages: dependencies: '@visactor/vgrammar': 0.7.0-alpha.3 '@visactor/vgrammar-util': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vscale': 0.15.11 '@visactor/vutils': 0.15.11 dev: false @@ -4422,7 +4426,7 @@ packages: dependencies: '@visactor/vgrammar': 0.7.0-alpha.3 '@visactor/vgrammar-util': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 '@visactor/vutils': 0.15.11 dev: false @@ -4432,21 +4436,12 @@ packages: '@visactor/vdataset': 0.15.11 '@visactor/vgrammar-coordinate': 0.7.0-alpha.3 '@visactor/vgrammar-util': 0.7.0-alpha.3 - '@visactor/vrender': 0.15.0-alpha.14 - '@visactor/vrender-components': 0.15.0-alpha.14 + '@visactor/vrender': 0.15.0-alpha.15 + '@visactor/vrender-components': 0.15.0-alpha.15 '@visactor/vscale': 0.15.11 '@visactor/vutils': 0.15.11 dev: false - /@visactor/vrender-components/0.15.0-alpha.14: - resolution: {integrity: sha512-oRsxMhXBVRkbZcHVgtKUuZe0Mik5vaQvBvumO6rQNXmyyGaZlUEIbnsMK4mjnSmnNw/39hBS5yLpLzqRmfD9xw==} - dependencies: - '@visactor/vrender': 0.15.0-alpha.14 - '@visactor/vscale': 0.15.11 - '@visactor/vutils': 0.15.11 - inversify: 6.0.1 - dev: false - /@visactor/vrender-components/0.15.0-alpha.15: resolution: {integrity: sha512-sEZDSH3bTCCi7k3xKSFCitlYVa4BgkBj64igaweqC0b9IpaAcVJvdd1Z8K5PCglCSN7tugmwqWCB5ZpYRLtt9A==} dependencies: @@ -4456,16 +4451,6 @@ packages: inversify: 6.0.1 dev: false - /@visactor/vrender/0.15.0-alpha.14: - resolution: {integrity: sha512-AwbpF2Yv21B961368U5JwS+y4iy7XoErqec4OgCt4Ujifet7g3ZphGKkw5RCnGtOP/2rqWl+syd8abmU8FdsMA==} - dependencies: - '@visactor/vutils': 0.15.11 - color-convert: 2.0.1 - core-js: 3.31.1 - fast-xml-parser: 4.2.7 - inversify: 6.0.1 - dev: false - /@visactor/vrender/0.15.0-alpha.15: resolution: {integrity: sha512-9bk2BOYAMZjzn0S1lKivqfFVP2XjGbHRI46CqrWcT/WAaP55tGg/Myw9ToIs+PhIQ4Zn6wHNBCmS8Xu6xmmoSQ==} dependencies: @@ -13014,7 +12999,7 @@ packages: jest: ^24.0.0 dependencies: electron: 11.5.0 - jest: 26.6.3_ts-node@10.9.0 + jest: 26.6.3_xxvpynkn5i4ehycnunrxxsezu4 jest-haste-map: 24.9.0 jest-message-util: 24.9.0 jest-mock: 24.9.0