Merge remote-tracking branch 'origin/dev' into dev

打包
2026-06-26 16:22:25 +08:00 · 2026-06-26 16:22:10 +08:00
4 changed files with 617 additions and 17481 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -57,12 +57,10 @@
    "style-loader": "^3.3.3",
    "typescript": "^5.9.3"
  },
-  "pnpm": {
-    "overrides": {
-      "history": "^4.10.1",
-      "path-to-regexp": "^1.9.0",
-      "react": "$react",
-      "react-dom": "$react-dom"
-    }
+  "resolutions": {
+    "history": "^4.10.1",
+    "path-to-regexp": "^1.9.0",
+    "react": "$react",
+    "react-dom": "$react-dom"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@ -1,3 +0,0 @@
-allowBuilds:
-  es5-ext: false
-  zy-react-library: false
Author	SHA1	Message	Date
huwei	4500684a55	Merge remote-tracking branch 'origin/dev' into dev	2026-06-26 16:22:25 +08:00
huwei	441cc47765	打包	2026-06-26 16:22:10 +08:00