diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2bb0245c..279ca8c14 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,12 +63,12 @@ jobs: - name: Build vrender-animate run: node common/scripts/install-run-rush.js build --only @visactor/vrender-animate - - name: Build vrender - run: node common/scripts/install-run-rush.js build --only @visactor/vrender - - name: Build vrender-components run: node common/scripts/install-run-rush.js build --only @visactor/vrender-components + - name: Build vrender + run: node common/scripts/install-run-rush.js build --only @visactor/vrender + - name: Build bugserver run: node common/scripts/install-run-rush.js build --only @internal/bugserver-trigger diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 112cd4551..cecb0b921 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: specifier: ~0.5.7 version: 0.5.7 '@visactor/vrender': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../packages/vrender '@visactor/vutils': specifier: 1.0.6 @@ -95,7 +95,7 @@ importers: ../../packages/react-vrender: dependencies: '@visactor/vrender': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender '@visactor/vutils': specifier: 1.0.6 @@ -153,10 +153,10 @@ importers: ../../packages/react-vrender-utils: dependencies: '@visactor/react-vrender': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../react-vrender '@visactor/vrender': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender '@visactor/vutils': specifier: 1.0.6 @@ -211,13 +211,16 @@ importers: ../../packages/vrender: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-animate + '@visactor/vrender-components': + specifier: workspace:1.0.18 + version: link:../vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-kits devDependencies: '@internal/bundler': @@ -284,7 +287,7 @@ importers: ../../packages/vrender-animate: dependencies: '@visactor/vrender-core': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-core '@visactor/vutils': specifier: 1.0.6 @@ -342,13 +345,13 @@ importers: ../../packages/vrender-components: dependencies: '@visactor/vrender-animate': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-animate '@visactor/vrender-core': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-kits '@visactor/vscale': specifier: 1.0.6 @@ -467,7 +470,7 @@ importers: specifier: 2.4.1 version: 2.4.1 '@visactor/vrender-core': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../vrender-core '@visactor/vutils': specifier: 1.0.6 @@ -583,19 +586,19 @@ importers: ../../tools/bugserver-trigger: dependencies: '@visactor/vrender': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../../packages/vrender '@visactor/vrender-animate': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../../packages/vrender-animate '@visactor/vrender-components': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../../packages/vrender-components '@visactor/vrender-core': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../../packages/vrender-core '@visactor/vrender-kits': - specifier: workspace:1.0.17 + specifier: workspace:1.0.18 version: link:../../packages/vrender-kits devDependencies: '@internal/bundler': diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 94b601b91..a29aae6c2 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.17","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.18","nextBump":"patch"}] diff --git a/docs/package.json b/docs/package.json index f36ad1a28..bb2a6b425 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "@visactor/vchart": "1.3.0", "@visactor/vutils": "1.0.6", "@visactor/vgrammar": "~0.5.7", - "@visactor/vrender": "workspace:1.0.17", + "@visactor/vrender": "workspace:1.0.18", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", "axios": "^1.4.0", diff --git a/packages/react-vrender-utils/CHANGELOG.json b/packages/react-vrender-utils/CHANGELOG.json index 4688b593a..f0d5aa215 100644 --- a/packages/react-vrender-utils/CHANGELOG.json +++ b/packages/react-vrender-utils/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender-utils", "entries": [ + { + "version": "1.0.18", + "tag": "@visactor/react-vrender-utils_v1.0.18", + "date": "Mon, 13 Oct 2025 09:26:25 GMT", + "comments": {} + }, { "version": "1.0.17", "tag": "@visactor/react-vrender-utils_v1.0.17", diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md index bba9c23fe..756dad296 100644 --- a/packages/react-vrender-utils/CHANGELOG.md +++ b/packages/react-vrender-utils/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender-utils -This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. +This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified. + +## 1.0.18 +Mon, 13 Oct 2025 09:26:25 GMT + +_Version update only_ ## 1.0.17 Wed, 24 Sep 2025 07:38:57 GMT diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json index 83eda08a1..b911b7d32 100644 --- a/packages/react-vrender-utils/package.json +++ b/packages/react-vrender-utils/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender-utils", - "version": "1.0.17", + "version": "1.0.18", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -24,8 +24,8 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.17", - "@visactor/react-vrender": "workspace:1.0.17", + "@visactor/vrender": "workspace:1.0.18", + "@visactor/react-vrender": "workspace:1.0.18", "@visactor/vutils": "1.0.6", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json index 0f52ed2d3..54b6b433d 100644 --- a/packages/react-vrender/CHANGELOG.json +++ b/packages/react-vrender/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/react-vrender", "entries": [ + { + "version": "1.0.18", + "tag": "@visactor/react-vrender_v1.0.18", + "date": "Mon, 13 Oct 2025 09:26:25 GMT", + "comments": {} + }, { "version": "1.0.17", "tag": "@visactor/react-vrender_v1.0.17", diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md index 681f657a3..158c1790a 100644 --- a/packages/react-vrender/CHANGELOG.md +++ b/packages/react-vrender/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/react-vrender -This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. +This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified. + +## 1.0.18 +Mon, 13 Oct 2025 09:26:25 GMT + +_Version update only_ ## 1.0.17 Wed, 24 Sep 2025 07:38:57 GMT diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json index 038ec9e3d..096cf8d7e 100644 --- a/packages/react-vrender/package.json +++ b/packages/react-vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/react-vrender", - "version": "1.0.17", + "version": "1.0.18", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -23,7 +23,7 @@ "react": "^18.2.0" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.17", + "@visactor/vrender": "workspace:1.0.18", "@visactor/vutils": "1.0.6", "react-reconciler": "^0.29.0", "tslib": "^2.3.1" diff --git a/packages/vrender-animate/CHANGELOG.json b/packages/vrender-animate/CHANGELOG.json index 8de284ea4..77f61effe 100644 --- a/packages/vrender-animate/CHANGELOG.json +++ b/packages/vrender-animate/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-animate", "entries": [ + { + "version": "1.0.18", + "tag": "@visactor/vrender-animate_v1.0.18", + "date": "Mon, 13 Oct 2025 09:26:25 GMT", + "comments": {} + }, { "version": "1.0.17", "tag": "@visactor/vrender-animate_v1.0.17", diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md index 659c73b1d..44f0d67ef 100644 --- a/packages/vrender-animate/CHANGELOG.md +++ b/packages/vrender-animate/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-animate -This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. +This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified. + +## 1.0.18 +Mon, 13 Oct 2025 09:26:25 GMT + +_Version update only_ ## 1.0.17 Wed, 24 Sep 2025 07:38:57 GMT diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json index 5b3c34d87..190da2305 100644 --- a/packages/vrender-animate/package.json +++ b/packages/vrender-animate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-animate", - "version": "1.0.17", + "version": "1.0.18", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.17" + "@visactor/vrender-core": "workspace:1.0.18" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-animate/src/executor/animate-executor.ts b/packages/vrender-animate/src/executor/animate-executor.ts index dda98cd9f..7042fff60 100644 --- a/packages/vrender-animate/src/executor/animate-executor.ts +++ b/packages/vrender-animate/src/executor/animate-executor.ts @@ -1,4 +1,4 @@ -import type { IGraphic, EasingType, IAnimate } from '@visactor/vrender-core'; +import { type IGraphic, type EasingType, type IAnimate, AnimateStatus } from '@visactor/vrender-core'; import type { IAnimationConfig, IAnimationTimeline, @@ -746,10 +746,12 @@ export class AnimateExecutor implements IAnimateExecutor { /** * 停止所有由该执行器管理的动画 */ - stop(type?: 'start' | 'end' | Record): void { + stop(type?: 'start' | 'end' | Record, callEnd: boolean = true): void { // animate.stop会从数组里删除,所以需要while循环,不能forEach while (this._animates.length > 0) { const animate = this._animates.pop(); + // 不执行回调时 标记动画为结束状态 + callEnd === false && (animate.status = AnimateStatus.END); animate?.stop(type); } @@ -760,7 +762,7 @@ export class AnimateExecutor implements IAnimateExecutor { // 如果动画正在运行,触发结束回调 if (this._started) { this._started = false; - this.onEnd(); + callEnd && this.onEnd(); } } } diff --git a/packages/vrender-animate/src/state/animation-state.ts b/packages/vrender-animate/src/state/animation-state.ts index ebee5df7b..cfb133c42 100644 --- a/packages/vrender-animate/src/state/animation-state.ts +++ b/packages/vrender-animate/src/state/animation-state.ts @@ -122,8 +122,9 @@ export class AnimationStateManager { } // 停止动画 + // 停止的动画应该不触发回调 shouldStopState.forEach(state => { - state.executor.stop(); + state.executor.stop(null, false); }); // 立即应用动画,串行的应用 @@ -225,8 +226,9 @@ export class AnimationStateManager { clearState(): void { // 清空状态 + // 清空状态时,不触发回调 this.stateList?.forEach(state => { - state.executor.stop(); + state.executor.stop(null, false); }); this.stateList = null; } diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json index b6e07c834..1e8e2d3fe 100644 --- a/packages/vrender-components/CHANGELOG.json +++ b/packages/vrender-components/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-components", "entries": [ + { + "version": "1.0.18", + "tag": "@visactor/vrender-components_v1.0.18", + "date": "Mon, 13 Oct 2025 09:26:25 GMT", + "comments": {} + }, { "version": "1.0.17", "tag": "@visactor/vrender-components_v1.0.17", diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md index a0bd351e7..4c5bdbf8e 100644 --- a/packages/vrender-components/CHANGELOG.md +++ b/packages/vrender-components/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-components -This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. +This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified. + +## 1.0.18 +Mon, 13 Oct 2025 09:26:25 GMT + +_Version update only_ ## 1.0.17 Wed, 24 Sep 2025 07:38:57 GMT diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json index 3ed57a064..9d3179970 100644 --- a/packages/vrender-components/package.json +++ b/packages/vrender-components/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-components", - "version": "1.0.17", + "version": "1.0.18", "description": "components library for dp visualization", "sideEffects": false, "main": "cjs/index.js", @@ -27,9 +27,9 @@ "dependencies": { "@visactor/vutils": "1.0.6", "@visactor/vscale": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.17", - "@visactor/vrender-kits": "workspace:1.0.17", - "@visactor/vrender-animate": "workspace:1.0.17" + "@visactor/vrender-core": "workspace:1.0.18", + "@visactor/vrender-kits": "workspace:1.0.18", + "@visactor/vrender-animate": "workspace:1.0.18" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts index 11fde5829..c8240ffac 100644 --- a/packages/vrender-components/src/label/base.ts +++ b/packages/vrender-components/src/label/base.ts @@ -566,7 +566,7 @@ export class LabelBase extends AnimateComponent { const text = result[i]; const bounds = text.AABBBounds; const range = boundToRange(bmpTool, bounds, true); - if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) { + if (canPlace(bmpTool, bitmap, bounds, clampForce || hideOnOverflow, overlapPadding)) { bitmap.setRange(range); } else { if (hideOnOverflow) { @@ -678,7 +678,7 @@ export class LabelBase extends AnimateComponent { continue; } // 默认位置可以放置 - if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce, overlapPadding)) { + if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce || hideOnOverflow, overlapPadding)) { // 如果配置了限制在图形内部,需要提前判断; if (!checkBounds) { bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true)); diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json index c906ad296..2de1a2ab9 100644 --- a/packages/vrender-core/CHANGELOG.json +++ b/packages/vrender-core/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-core", "entries": [ + { + "version": "1.0.18", + "tag": "@visactor/vrender-core_v1.0.18", + "date": "Mon, 13 Oct 2025 09:26:25 GMT", + "comments": {} + }, { "version": "1.0.17", "tag": "@visactor/vrender-core_v1.0.17", diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md index c4e226a49..eac07d168 100644 --- a/packages/vrender-core/CHANGELOG.md +++ b/packages/vrender-core/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-core -This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. +This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified. + +## 1.0.18 +Mon, 13 Oct 2025 09:26:25 GMT + +_Version update only_ ## 1.0.17 Wed, 24 Sep 2025 07:38:57 GMT diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json index 8fff209b2..015ae013f 100644 --- a/packages/vrender-core/package.json +++ b/packages/vrender-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-core", - "version": "1.0.17", + "version": "1.0.18", "description": "", "sideEffects": [ "./src/modules.ts", diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json index b94e462fd..c3aa6d066 100644 --- a/packages/vrender-kits/CHANGELOG.json +++ b/packages/vrender-kits/CHANGELOG.json @@ -1,6 +1,12 @@ { "name": "@visactor/vrender-kits", "entries": [ + { + "version": "1.0.18", + "tag": "@visactor/vrender-kits_v1.0.18", + "date": "Mon, 13 Oct 2025 09:26:25 GMT", + "comments": {} + }, { "version": "1.0.17", "tag": "@visactor/vrender-kits_v1.0.17", diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md index 76f6fa82d..4c26648b3 100644 --- a/packages/vrender-kits/CHANGELOG.md +++ b/packages/vrender-kits/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @visactor/vrender-kits -This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. +This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified. + +## 1.0.18 +Mon, 13 Oct 2025 09:26:25 GMT + +_Version update only_ ## 1.0.17 Wed, 24 Sep 2025 07:38:57 GMT diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json index 970437d90..f0a9fe72e 100644 --- a/packages/vrender-kits/package.json +++ b/packages/vrender-kits/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender-kits", - "version": "1.0.17", + "version": "1.0.18", "description": "", "sideEffects": false, "main": "cjs/index.js", @@ -21,7 +21,7 @@ }, "dependencies": { "@visactor/vutils": "1.0.6", - "@visactor/vrender-core": "workspace:1.0.17", + "@visactor/vrender-core": "workspace:1.0.18", "@resvg/resvg-js": "2.4.1", "roughjs": "4.5.2", "gifuct-js": "2.1.2", diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json index a88eaf836..188c4b98e 100644 --- a/packages/vrender/CHANGELOG.json +++ b/packages/vrender/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@visactor/vrender", "entries": [ + { + "version": "1.0.18", + "tag": "@visactor/vrender_v1.0.18", + "date": "Mon, 13 Oct 2025 09:26:25 GMT", + "comments": { + "none": [ + { + "comment": "feat: export \"@visactor/vrender-components\" in \"@visactor/vrender\"" + } + ] + } + }, { "version": "1.0.17", "tag": "@visactor/vrender_v1.0.17", diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md index d9c54e027..4d9365179 100644 --- a/packages/vrender/CHANGELOG.md +++ b/packages/vrender/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @visactor/vrender -This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified. +This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified. + +## 1.0.18 +Mon, 13 Oct 2025 09:26:25 GMT + +### Updates + +- feat: export "@visactor/vrender-components" in "@visactor/vrender" ## 1.0.17 Wed, 24 Sep 2025 07:38:57 GMT diff --git a/packages/vrender/jest.config.js b/packages/vrender/jest.config.js index 809c0c42c..816900eca 100644 --- a/packages/vrender/jest.config.js +++ b/packages/vrender/jest.config.js @@ -46,6 +46,7 @@ module.exports = { moduleNameMapper: { '@visactor/vrender-kits': path.resolve(__dirname, '../vrender-kits/src/index.ts'), '@visactor/vrender-core': path.resolve(__dirname, '../vrender-core/src/index.ts'), - '@visactor/vrender-animate': path.resolve(__dirname, '../vrender-animate/src/index.ts') + '@visactor/vrender-animate': path.resolve(__dirname, '../vrender-animate/src/index.ts'), + '@visactor/vrender-components': path.resolve(__dirname, '../vrender-components/src/index.ts') } }; diff --git a/packages/vrender/package.json b/packages/vrender/package.json index 4a63034b2..b16af8b2c 100644 --- a/packages/vrender/package.json +++ b/packages/vrender/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vrender", - "version": "1.0.17", + "version": "1.0.18", "description": "", "sideEffects": true, "main": "cjs/index.js", @@ -24,9 +24,10 @@ "test-watch": "cross-env DEBUG_MODE=1 jest --watch" }, "dependencies": { - "@visactor/vrender-core": "workspace:1.0.17", - "@visactor/vrender-kits": "workspace:1.0.17", - "@visactor/vrender-animate": "workspace:1.0.17" + "@visactor/vrender-core": "workspace:1.0.18", + "@visactor/vrender-kits": "workspace:1.0.18", + "@visactor/vrender-animate": "workspace:1.0.18", + "@visactor/vrender-components": "workspace:1.0.18" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vrender/src/index.ts b/packages/vrender/src/index.ts index 1c5e5e8a4..36973c6ff 100644 --- a/packages/vrender/src/index.ts +++ b/packages/vrender/src/index.ts @@ -76,3 +76,8 @@ registerAnimate(); export * from '@visactor/vrender-core'; export * from '@visactor/vrender-kits'; export * from '@visactor/vrender-animate'; +export * from '@visactor/vrender-components'; + +// avoid naming conflicts with 'State' & 'Direction' in '@visactor/vrender-components' +export { State } from '@visactor/vrender-animate'; +export { Direction } from '@visactor/vrender-core'; diff --git a/packages/vrender/tsconfig.json b/packages/vrender/tsconfig.json index 95836238d..a51114424 100644 --- a/packages/vrender/tsconfig.json +++ b/packages/vrender/tsconfig.json @@ -1,15 +1,23 @@ { "extends": "@internal/ts-config/tsconfig.base.json", "compilerOptions": { - "lib": ["DOM", "ESNext"], + "lib": [ + "DOM", + "ESNext" + ], "baseUrl": "./", "rootDir": "./src", "outDir": "./es", - "typeRoots": ["./node_modules/@types", "./src/types"], + "typeRoots": [ + "./node_modules/@types", + "./src/types" + ], "composite": true, "target": "ES2016" }, - "include": ["src"], + "include": [ + "src" + ], "references": [ { "path": "../vrender-core" @@ -19,6 +27,9 @@ }, { "path": "../vrender-animate" + }, + { + "path": "../vrender-components" } ] -} +} \ No newline at end of file diff --git a/packages/vrender/tsconfig.test.json b/packages/vrender/tsconfig.test.json index bb1aab707..3b30f473b 100644 --- a/packages/vrender/tsconfig.test.json +++ b/packages/vrender/tsconfig.test.json @@ -2,10 +2,19 @@ "extends": "./tsconfig.json", "compilerOptions": { "paths": { - "@visactor/vrender-core": ["../vrender-core/src"], - "@visactor/vrender-kits": ["../vrender-kits/src"], - "@visactor/vrender-animate": ["../vrender-animate/src"] + "@visactor/vrender-core": [ + "../vrender-core/src" + ], + "@visactor/vrender-kits": [ + "../vrender-kits/src" + ], + "@visactor/vrender-animate": [ + "../vrender-animate/src" + ], + "@visactor/vrender-components": [ + "../vrender-components/src" + ] } }, "references": [] -} +} \ No newline at end of file diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json index 699092ad6..69b1dbdb6 100644 --- a/tools/bugserver-trigger/package.json +++ b/tools/bugserver-trigger/package.json @@ -8,11 +8,11 @@ "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts" }, "dependencies": { - "@visactor/vrender": "workspace:1.0.17", - "@visactor/vrender-core": "workspace:1.0.17", - "@visactor/vrender-kits": "workspace:1.0.17", - "@visactor/vrender-components": "workspace:1.0.17", - "@visactor/vrender-animate": "workspace:1.0.17" + "@visactor/vrender": "workspace:1.0.18", + "@visactor/vrender-core": "workspace:1.0.18", + "@visactor/vrender-kits": "workspace:1.0.18", + "@visactor/vrender-components": "workspace:1.0.18", + "@visactor/vrender-animate": "workspace:1.0.18" }, "devDependencies": { "@rushstack/eslint-patch": "~1.1.4",