Merge pull request #1679 from VisActor/sync/main-0.21.10

[Auto Sync] Sync the code from branch main to branch develop after release 0.21.10
VisActor · Jan 15, 2025 · 86d9998 · 86d9998
2 parents 0391116 + a0cb818
commit 86d9998
Show file tree

Hide file tree

Showing 24 changed files with 121 additions and 59 deletions.
diff --git a/common/changes/@visactor/vrender-components/fix-marker-area-position_2025-01-14-18-46.json b/common/changes/@visactor/vrender-components/fix-marker-area-position_2025-01-14-18-46.json
diff --git a/common/changes/@visactor/vrender-kits/fix-wx-getcontext-duplicate_2025-01-14-07-40.json b/common/changes/@visactor/vrender-kits/fix-wx-getcontext-duplicate_2025-01-14-07-40.json
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.9","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.10","nextBump":"patch"}]
diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "@visactor/vchart": "1.3.0",
     "@visactor/vutils": "~0.19.3",
     "@visactor/vgrammar": "~0.5.7",
-    "@visactor/vrender": "workspace:0.21.9",
+    "@visactor/vrender": "workspace:0.21.10",
     "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
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender-utils",
   "entries": [
+    {
+      "version": "0.21.10",
+      "tag": "@visactor/react-vrender-utils_v0.21.10",
+      "date": "Wed, 15 Jan 2025 03:14:32 GMT",
+      "comments": {}
+    },
     {
       "version": "0.21.9",
       "tag": "@visactor/react-vrender-utils_v0.21.9",

diff --git 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 Mon, 13 Jan 2025 03:23:50 GMT and should not be manually modified.
+This log was last generated on Wed, 15 Jan 2025 03:14:32 GMT and should not be manually modified.
+
+## 0.21.10
+Wed, 15 Jan 2025 03:14:32 GMT
+
+_Version update only_
 
 ## 0.21.9
 Mon, 13 Jan 2025 03:23:50 GMT

diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender-utils",
-  "version": "0.21.9",
+  "version": "0.21.10",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.21.9",
-    "@visactor/react-vrender": "workspace:0.21.9",
+    "@visactor/vrender": "workspace:0.21.10",
+    "@visactor/react-vrender": "workspace:0.21.10",
     "@visactor/vutils": "~0.19.3",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender",
   "entries": [
+    {
+      "version": "0.21.10",
+      "tag": "@visactor/react-vrender_v0.21.10",
+      "date": "Wed, 15 Jan 2025 03:14:32 GMT",
+      "comments": {}
+    },
     {
       "version": "0.21.9",
       "tag": "@visactor/react-vrender_v0.21.9",

diff --git 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 Mon, 13 Jan 2025 03:23:50 GMT and should not be manually modified.
+This log was last generated on Wed, 15 Jan 2025 03:14:32 GMT and should not be manually modified.
+
+## 0.21.10
+Wed, 15 Jan 2025 03:14:32 GMT
+
+_Version update only_
 
 ## 0.21.9
 Mon, 13 Jan 2025 03:23:50 GMT

diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender",
-  "version": "0.21.9",
+  "version": "0.21.10",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -23,7 +23,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.21.9",
+    "@visactor/vrender": "workspace:0.21.10",
     "@visactor/vutils": "~0.19.3",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@visactor/vrender-components",
   "entries": [
+    {
+      "version": "0.21.10",
+      "tag": "@visactor/vrender-components_v0.21.10",
+      "date": "Wed, 15 Jan 2025 03:14:32 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: marker area support more position"
+          }
+        ]
+      }
+    },
     {
       "version": "0.21.9",
       "tag": "@visactor/vrender-components_v0.21.9",

diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @visactor/vrender-components
 
-This log was last generated on Mon, 13 Jan 2025 03:23:50 GMT and should not be manually modified.
+This log was last generated on Wed, 15 Jan 2025 03:14:32 GMT and should not be manually modified.
+
+## 0.21.10
+Wed, 15 Jan 2025 03:14:32 GMT
+
+### Updates
+
+- fix: marker area support more position
 
 ## 0.21.9
 Mon, 13 Jan 2025 03:23:50 GMT

diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "0.21.9",
+  "version": "0.21.10",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -27,8 +27,8 @@
   "dependencies": {
     "@visactor/vutils": "~0.19.3",
     "@visactor/vscale": "~0.19.3",
-    "@visactor/vrender-core": "workspace:0.21.9",
-    "@visactor/vrender-kits": "workspace:0.21.9"
+    "@visactor/vrender-core": "workspace:0.21.10",
+    "@visactor/vrender-kits": "workspace:0.21.10"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-core",
   "entries": [
+    {
+      "version": "0.21.10",
+      "tag": "@visactor/vrender-core_v0.21.10",
+      "date": "Wed, 15 Jan 2025 03:14:32 GMT",
+      "comments": {}
+    },
     {
       "version": "0.21.9",
       "tag": "@visactor/vrender-core_v0.21.9",

diff --git 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 Mon, 13 Jan 2025 03:23:50 GMT and should not be manually modified.
+This log was last generated on Wed, 15 Jan 2025 03:14:32 GMT and should not be manually modified.
+
+## 0.21.10
+Wed, 15 Jan 2025 03:14:32 GMT
+
+_Version update only_
 
 ## 0.21.9
 Mon, 13 Jan 2025 03:23:50 GMT

diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-core",
-  "version": "0.21.9",
+  "version": "0.21.10",
   "description": "",
   "sideEffects": [
     "./src/modules.ts",

diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@visactor/vrender-kits",
   "entries": [
+    {
+      "version": "0.21.10",
+      "tag": "@visactor/vrender-kits_v0.21.10",
+      "date": "Wed, 15 Jan 2025 03:14:32 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: fix issue with duplicate getContext in wx env"
+          }
+        ]
+      }
+    },
     {
       "version": "0.21.9",
       "tag": "@visactor/vrender-kits_v0.21.9",

diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @visactor/vrender-kits
 
-This log was last generated on Mon, 13 Jan 2025 03:23:50 GMT and should not be manually modified.
+This log was last generated on Wed, 15 Jan 2025 03:14:32 GMT and should not be manually modified.
+
+## 0.21.10
+Wed, 15 Jan 2025 03:14:32 GMT
+
+### Updates
+
+- fix: fix issue with duplicate getContext in wx env
 
 ## 0.21.9
 Mon, 13 Jan 2025 03:23:50 GMT

diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-kits",
-  "version": "0.21.9",
+  "version": "0.21.10",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@visactor/vutils": "~0.19.3",
-    "@visactor/vrender-core": "workspace:0.21.9",
+    "@visactor/vrender-core": "workspace:0.21.10",
     "@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
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender",
   "entries": [
+    {
+      "version": "0.21.10",
+      "tag": "@visactor/vrender_v0.21.10",
+      "date": "Wed, 15 Jan 2025 03:14:32 GMT",
+      "comments": {}
+    },
     {
       "version": "0.21.9",
       "tag": "@visactor/vrender_v0.21.9",

diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender
 
-This log was last generated on Mon, 13 Jan 2025 03:23:50 GMT and should not be manually modified.
+This log was last generated on Wed, 15 Jan 2025 03:14:32 GMT and should not be manually modified.
+
+## 0.21.10
+Wed, 15 Jan 2025 03:14:32 GMT
+
+_Version update only_
 
 ## 0.21.9
 Mon, 13 Jan 2025 03:23:50 GMT

diff --git a/packages/vrender/package.json b/packages/vrender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender",
-  "version": "0.21.9",
+  "version": "0.21.10",
   "description": "",
   "sideEffects": true,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "test-watch": "cross-env DEBUG_MODE=1 jest --watch"
   },
   "dependencies": {
-    "@visactor/vrender-core": "workspace:0.21.9",
-    "@visactor/vrender-kits": "workspace:0.21.9"
+    "@visactor/vrender-core": "workspace:0.21.10",
+    "@visactor/vrender-kits": "workspace:0.21.10"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/tools/bugserver-trigger/package.json b/tools/bugserver-trigger/package.json
@@ -8,10 +8,10 @@
     "ci": "ts-node --transpileOnly --skipProject ./scripts/trigger-test.ts"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.21.9",
-    "@visactor/vrender-core": "workspace:0.21.9",
-    "@visactor/vrender-kits": "workspace:0.21.9",
-    "@visactor/vrender-components": "workspace:0.21.9"
+    "@visactor/vrender": "workspace:0.21.10",
+    "@visactor/vrender-core": "workspace:0.21.10",
+    "@visactor/vrender-kits": "workspace:0.21.10",
+    "@visactor/vrender-components": "workspace:0.21.10"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "~1.1.4",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.9","nextBump":"patch"}]
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.21.10","nextBump":"patch"}]