From 0fc7dea2c422d8102562b27f59d6c5545e542ea1 Mon Sep 17 00:00:00 2001 From: xile611 Date: Mon, 19 Jan 2026 13:15:55 +0800 Subject: [PATCH 1/2] fix: upgrade vrender and fix env --- common/config/rush/pnpm-lock.yaml | 116 ++++++++++++------------- docs/package.json | 6 +- packages/openinula-vchart/package.json | 6 +- packages/react-vchart/package.json | 4 +- packages/vchart-extension/package.json | 10 +-- packages/vchart/package.json | 10 +-- packages/vchart/src/env/env.ts | 23 +++-- tools/story-player/package.json | 8 +- 8 files changed, 91 insertions(+), 92 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 738700a67c..89fb7d40da 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -37,11 +37,11 @@ importers: specifier: 1.2.4-alpha.5 version: 1.2.4-alpha.5 '@visactor/vrender': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-kits': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vtable': specifier: 1.19.0-alpha.0 version: 1.19.0-alpha.0 @@ -203,11 +203,11 @@ importers: specifier: workspace:2.0.13 version: link:../vchart '@visactor/vrender-core': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-kits': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -294,11 +294,11 @@ importers: specifier: workspace:2.0.13 version: link:../vchart-extension '@visactor/vrender-core': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-kits': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -529,17 +529,17 @@ importers: specifier: ~1.0.12 version: 1.0.21 '@visactor/vrender-animate': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-components': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-core': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-kits': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vscale': specifier: ~1.0.12 version: 1.0.21 @@ -692,17 +692,17 @@ importers: specifier: ~1.0.12 version: 1.0.21 '@visactor/vrender-animate': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-components': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-core': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-kits': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -1260,14 +1260,14 @@ importers: specifier: workspace:2.0.13 version: link:../../packages/vchart '@visactor/vrender': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-core': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vrender-kits': - specifier: ~1.0.37 - version: 1.0.37 + specifier: 1.1.0-alpha.0 + version: 1.1.0-alpha.0 '@visactor/vutils': specifier: ~1.0.12 version: 1.0.21 @@ -3073,29 +3073,29 @@ packages: '@visactor/vrender-animate@1.0.0-alpha.18': resolution: {integrity: sha512-9kTtvp1ef+1t+AtUiza6A7qBQP7SmvOu3/ILGrqs/HGdZVj1XGjbYvD/X/zwKJ3LEb7gGV5fa8x95e4czTvRSA==} - '@visactor/vrender-animate@1.0.37': - resolution: {integrity: sha512-DoCZcJLsQ7jLxXl/T2BJU8Md/SyEc8OEowYPDOInjBvLUDhohpdY2Et9XzjqOSXEN68lxqlB4dmowSjpMCHZGw==} + '@visactor/vrender-animate@1.1.0-alpha.0': + resolution: {integrity: sha512-mDZFxx5LVMmAybmXb+OJCcqqiRQnHjxWg/j7V7iCzWkpJbstKq6E6wj/kzxzDgBl1Uinfgwv2kT6hScRcB3nVQ==} '@visactor/vrender-components@1.0.0-alpha.18': resolution: {integrity: sha512-7Euq+ZfswL74n2pgkaqZSsPxoSa5SPIGyXatN1eUrdzM2Z0kX6U0RcJg01fctvRs4op6WhcecRLqGvnHcBeb9Q==} - '@visactor/vrender-components@1.0.37': - resolution: {integrity: sha512-/fevliN94goYwSjSfC9sYkox8QgxP3/o4msIHDsEeVL+9xlt0vkdduPfdgosTJqVcO2X6uZlBMK6hCiH0S3+ww==} + '@visactor/vrender-components@1.1.0-alpha.0': + resolution: {integrity: sha512-QVXCAUSu6nu18AXp9DsmkXYjJQBIEHher0cinWnFo/8sjMHe9qwvEF6HjZ13rtZe39GHw5qeRBgrcVnulN4GmQ==} '@visactor/vrender-core@1.0.0-alpha.18': resolution: {integrity: sha512-0ihtNvCyNkOsWPFgRqowHzq0IcQgS2Wl/nPpKbVtxWKveenwlhA+ZKoQvam6VJyBY7jeNe1pROy0mJMDyVAJQw==} - '@visactor/vrender-core@1.0.37': - resolution: {integrity: sha512-BxjGgTydlkzgAqRtNjFYgrHcGKCAzryGM56SxaSmjZYVRxBp/sz6Xh0q/+Pv5J/+yFKP5PEo9y/DL6quvGJ/Fg==} + '@visactor/vrender-core@1.1.0-alpha.0': + resolution: {integrity: sha512-XcxM3uSLdKxacDogl9nGIYw5NSBHWjPRQUK8w6jl2L1fnwhtEsOjbIGxuD7nKtE2EzjDGEd3CgOgXHnH6e4LkA==} '@visactor/vrender-kits@1.0.0-alpha.18': resolution: {integrity: sha512-Tvolkq+4G8qiPFZo0Aj8M//Yr6jR2h8FNkFEyWM9gbQbEiTkjpmHAJOYnoSsaPtPrcMSlG4EhJSFDk6ymANHVg==} - '@visactor/vrender-kits@1.0.37': - resolution: {integrity: sha512-H03R5E4uTuWlKtg91cyRvcePC4Qow+jkP4yRGDAG84TWAJRQonXmXU4c7UeISMXugSz5+9wurD0UiyAhR+1nbg==} + '@visactor/vrender-kits@1.1.0-alpha.0': + resolution: {integrity: sha512-5F8cg13/fqJ/ESqSdluXLO4dO9j3btgckjOpP+RPlWxBj9Jqvuk0tg2jzaFEzSi+LiVYsATByAsshyhrKMQmjQ==} - '@visactor/vrender@1.0.37': - resolution: {integrity: sha512-xWrIVv6fTb9t+X8+phm5w93117XMGCnronFmP5JTye9vK98cIUTL1WLJ3+i03o/1BlI+jLR0dltp6S0IUXxD+g==} + '@visactor/vrender@1.1.0-alpha.0': + resolution: {integrity: sha512-cBeBEXQJSV9PuHifPuDqORwWspOhx6sEwiC09CbaJ9DpG99A3EcjggqXySrYYBC1xR7DiLNEHFtNtv9tK386WQ==} '@visactor/vscale@0.18.18': resolution: {integrity: sha512-iRG4kv+5Fv4KX3AxEfV95XU3I6OmF0QizyAhqHxKa7L1MaT+MRvDDk5zHWf1E8gialLbL2xDe3GnT6g/4u5jhA==} @@ -15026,9 +15026,9 @@ snapshots: '@visactor/vrender-core': 1.0.0-alpha.18 '@visactor/vutils': 1.0.4 - '@visactor/vrender-animate@1.0.37': + '@visactor/vrender-animate@1.1.0-alpha.0': dependencies: - '@visactor/vrender-core': 1.0.37 + '@visactor/vrender-core': 1.1.0-alpha.0 '@visactor/vutils': 1.0.21 '@visactor/vrender-components@1.0.0-alpha.18': @@ -15039,11 +15039,11 @@ snapshots: '@visactor/vscale': 1.0.4 '@visactor/vutils': 1.0.4 - '@visactor/vrender-components@1.0.37': + '@visactor/vrender-components@1.1.0-alpha.0': dependencies: - '@visactor/vrender-animate': 1.0.37 - '@visactor/vrender-core': 1.0.37 - '@visactor/vrender-kits': 1.0.37 + '@visactor/vrender-animate': 1.1.0-alpha.0 + '@visactor/vrender-core': 1.1.0-alpha.0 + '@visactor/vrender-kits': 1.1.0-alpha.0 '@visactor/vscale': 1.0.21 '@visactor/vutils': 1.0.21 @@ -15052,7 +15052,7 @@ snapshots: '@visactor/vutils': 1.0.4 color-convert: 2.0.1 - '@visactor/vrender-core@1.0.37': + '@visactor/vrender-core@1.1.0-alpha.0': dependencies: '@visactor/vutils': 1.0.21 color-convert: 2.0.1 @@ -15066,21 +15066,21 @@ snapshots: lottie-web: 5.13.0 roughjs: 4.5.2 - '@visactor/vrender-kits@1.0.37': + '@visactor/vrender-kits@1.1.0-alpha.0': dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 1.0.37 + '@visactor/vrender-core': 1.1.0-alpha.0 '@visactor/vutils': 1.0.21 gifuct-js: 2.1.2 lottie-web: 5.13.0 roughjs: 4.6.6 - '@visactor/vrender@1.0.37': + '@visactor/vrender@1.1.0-alpha.0': dependencies: - '@visactor/vrender-animate': 1.0.37 - '@visactor/vrender-components': 1.0.37 - '@visactor/vrender-core': 1.0.37 - '@visactor/vrender-kits': 1.0.37 + '@visactor/vrender-animate': 1.1.0-alpha.0 + '@visactor/vrender-components': 1.1.0-alpha.0 + '@visactor/vrender-core': 1.1.0-alpha.0 + '@visactor/vrender-kits': 1.1.0-alpha.0 '@visactor/vscale@0.18.18': dependencies: diff --git a/docs/package.json b/docs/package.json index 922d9f3033..5f8c09dc9e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,8 +19,8 @@ "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", "@visactor/vutils": "~1.0.12", - "@visactor/vrender": "~1.0.37", - "@visactor/vrender-kits": "~1.0.37", + "@visactor/vrender": "1.1.0-alpha.0", + "@visactor/vrender-kits": "1.1.0-alpha.0", "@visactor/vtable": "1.19.0-alpha.0", "@visactor/vtable-editors": "1.19.0-alpha.0", "@visactor/vtable-gantt": "1.19.0-alpha.0", @@ -58,4 +58,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 2e2cd41c01..41ae726155 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -30,8 +30,8 @@ "dependencies": { "@visactor/vchart": "workspace:2.0.13", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.37", - "@visactor/vrender-kits": "~1.0.37", + "@visactor/vrender-core": "1.1.0-alpha.0", + "@visactor/vrender-kits": "1.1.0-alpha.0", "react-is": "^18.2.0" }, "devDependencies": { @@ -78,4 +78,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 5aed59fb4c..3cffce699f 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -31,8 +31,8 @@ "@visactor/vchart": "workspace:2.0.13", "@visactor/vchart-extension": "workspace:2.0.13", "@visactor/vutils": "~1.0.12", - "@visactor/vrender-core": "~1.0.37", - "@visactor/vrender-kits": "~1.0.37", + "@visactor/vrender-core": "1.1.0-alpha.0", + "@visactor/vrender-kits": "1.1.0-alpha.0", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index d781ba7117..9903ad0f8a 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -21,10 +21,10 @@ "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser" }, "dependencies": { - "@visactor/vrender-core": "~1.0.37", - "@visactor/vrender-kits": "~1.0.37", - "@visactor/vrender-components": "~1.0.37", - "@visactor/vrender-animate": "~1.0.37", + "@visactor/vrender-core": "1.1.0-alpha.0", + "@visactor/vrender-kits": "1.1.0-alpha.0", + "@visactor/vrender-components": "1.1.0-alpha.0", + "@visactor/vrender-animate": "1.1.0-alpha.0", "@visactor/vchart": "workspace:2.0.13", "@visactor/vutils": "~1.0.12", "@visactor/vdataset": "~1.0.12", @@ -66,4 +66,4 @@ "directory": "packages/vchart-extension" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/vchart/package.json b/packages/vchart/package.json index da9b223060..84cc079945 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -122,14 +122,14 @@ "@visactor/vdataset": "~1.0.12", "@visactor/vscale": "~1.0.12", "@visactor/vlayouts": "~1.0.12", - "@visactor/vrender-core": "~1.0.37", - "@visactor/vrender-kits": "~1.0.37", - "@visactor/vrender-components": "~1.0.37", - "@visactor/vrender-animate": "~1.0.37", + "@visactor/vrender-core": "1.1.0-alpha.0", + "@visactor/vrender-kits": "1.1.0-alpha.0", + "@visactor/vrender-components": "1.1.0-alpha.0", + "@visactor/vrender-animate": "1.1.0-alpha.0", "@visactor/vutils-extension": "workspace:2.0.13" }, "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" } -} +} \ No newline at end of file diff --git a/packages/vchart/src/env/env.ts b/packages/vchart/src/env/env.ts index 5ef0bf49ea..7cce42fd04 100644 --- a/packages/vchart/src/env/env.ts +++ b/packages/vchart/src/env/env.ts @@ -1,28 +1,27 @@ import { - initAllEnv, + loadAllEnv, loadBrowserEnv, loadFeishuEnv, loadLynxEnv, loadNodeEnv, loadTaroEnv, loadWxEnv, - loadTTEnv, + loadTtEnv, loadHarmonyEnv } from '@visactor/vrender-kits'; -import { container } from '@visactor/vrender-core'; /** * 加载所有环境兼容代码 */ export const registerAllEnv = () => { - initAllEnv(); + loadAllEnv(); }; /** * 加载浏览器环境代码 */ export const registerBrowserEnv = () => { - loadBrowserEnv(container); + loadBrowserEnv(); }; /** @@ -30,45 +29,45 @@ export const registerBrowserEnv = () => { */ export const registerLarkEnv = () => { // TODO: 后续统一为 loadLarkEnv - loadFeishuEnv(container); + loadFeishuEnv(); }; /** * 加载 Lynx 环境代码 */ export const registerLynxEnv = () => { - loadLynxEnv(container); + loadLynxEnv(); }; /** * 加载 Node 环境代码 */ export const registerNodeEnv = () => { - loadNodeEnv(container); + loadNodeEnv(); }; /** * 加载 Taro 环境代码 */ export const registerTaroEnv = () => { - loadTaroEnv(container); + loadTaroEnv(); }; /** * 加载微信小程序环境代码 */ export const registerWXEnv = () => { - loadWxEnv(container); + loadWxEnv(); }; /** * 加载TT小程序环境代码 */ export const registerTTEnv = () => { - loadTTEnv(container); + loadTtEnv(); }; /** * 加载Harmony环境代码 */ export const registerHarmonyEnv = () => { - loadHarmonyEnv(container); + loadHarmonyEnv(); }; diff --git a/tools/story-player/package.json b/tools/story-player/package.json index 4dda142ba9..a452a79e50 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": "~1.0.37", - "@visactor/vrender-kits": "~1.0.37", + "@visactor/vrender-core": "1.1.0-alpha.0", + "@visactor/vrender-kits": "1.1.0-alpha.0", "@visactor/vchart": "workspace:2.0.13", - "@visactor/vrender": "~1.0.37", + "@visactor/vrender": "1.1.0-alpha.0", "@visactor/vutils": "~1.0.12" } -} +} \ No newline at end of file From f598ae3c192d910499fb3551745a605f93e5c930 Mon Sep 17 00:00:00 2001 From: xile611 Date: Mon, 19 Jan 2026 13:27:01 +0800 Subject: [PATCH 2/2] docs: update changlog of rush --- ...ix-upgrade-vrender-remove-di_2026-01-19-05-27.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@visactor/vchart/fix-upgrade-vrender-remove-di_2026-01-19-05-27.json diff --git a/common/changes/@visactor/vchart/fix-upgrade-vrender-remove-di_2026-01-19-05-27.json b/common/changes/@visactor/vchart/fix-upgrade-vrender-remove-di_2026-01-19-05-27.json new file mode 100644 index 0000000000..a4d14c24ab --- /dev/null +++ b/common/changes/@visactor/vchart/fix-upgrade-vrender-remove-di_2026-01-19-05-27.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "fix: upgrade vrender and fix env\n\n", + "type": "none", + "packageName": "@visactor/vchart" + } + ], + "packageName": "@visactor/vchart", + "email": "dingling112@gmail.com" +} \ No newline at end of file