optimize: fix npmjs conflicts (apache#6793)

funky-eyes · Aug 28, 2024 · 9483430 · 9483430
1 parent dadaa6b
commit 9483430
Show file tree

Hide file tree

Showing 4 changed files with 410 additions and 1,303 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -69,6 +69,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6784](https://github.com/apache/incubator-seata/pull/6784)] upgrade axios to 1.7.4
 - [[#6787](https://github.com/apache/incubator-seata/pull/6787)] upgrade elliptic to 6.5.7
 - [[#6783](https://github.com/apache/incubator-seata/pull/6783)] rename the server naming/v1 api to vgroup/v1
+- [[#6793](https://github.com/apache/incubator-seata/pull/6793)] fix npmjs conflicts
 
 ### refactor:
 

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -70,6 +70,7 @@
 - [[#6784](https://github.com/apache/incubator-seata/pull/6784)] 升级 axios 至 1.7.4 版本
 - [[#6787](https://github.com/apache/incubator-seata/pull/6787)] 升级 elliptic 至 6.5.7 版本
 - [[#6783](https://github.com/apache/incubator-seata/pull/6783)] 将server事务分组修改接口改为/vgroup/v1
+- [[#6793](https://github.com/apache/incubator-seata/pull/6793)] 修复 npmjs 依赖冲突问题
 
 
 ### refactor: