chore: Resolve merge conflicts

packages/effects/access/package.json

@@ -24,6 +24,6 @@
     "@vben/stores": "workspace:*",
     "@vben/types": "workspace:*",
     "@vben/utils": "workspace:*",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
   }
 }

packages/effects/chart-ui/package.json

@@ -23,6 +23,6 @@
     "@vben/preferences": "workspace:*",
     "@vueuse/core": "^10.11.0",
     "echarts": "^5.5.1",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
   }
 }

packages/effects/common-ui/package.json

@@ -28,7 +28,7 @@
     "@vben/types": "workspace:*",
     "@vueuse/integrations": "^10.11.0",
     "qrcode": "^1.5.3",
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
     "vue-router": "^4.4.0"
   },
   "devDependencies": {

packages/effects/hooks/package.json

@@ -24,7 +24,7 @@
     "@vben/preferences": "workspace:*",
     "@vben/stores": "workspace:*",
     "@vben/types": "workspace:*",
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
     "vue-router": "^4.4.0",
     "watermark-js-plus": "^1.5.2"
   }

packages/effects/layouts/package.json

@@ -33,7 +33,7 @@
     "@vben/types": "workspace:*",
     "@vben/utils": "workspace:*",
     "@vueuse/core": "^10.11.0",
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
     "vue-router": "^4.4.0"
   }
 }

packages/effects/request/package.json

@@ -22,8 +22,7 @@
   "dependencies": {
     "@vben/locales": "workspace:*",
     "@vben/utils": "workspace:*",
-    "axios": "^1.7.2",
-    "vue-request": "^2.0.4"
+    "axios": "^1.7.2"
   },
   "devDependencies": {
     "axios-mock-adapter": "^1.22.0"

packages/effects/request/src/index.ts

@@ -1,3 +1,2 @@
 export * from './request-client';
-export * from './use-request';
 export * from 'axios';

packages/effects/request/src/use-request.ts

@@ -1,11 +0,0 @@
-// import { setGlobalOptions, } from 'vue-request';
-
-// setGlobalOptions({
-//   manual: true,
-//   // ...
-// });
-
-/**
- * @see https://www.attojs.com/guide/documentation/globalOptions.html
- */
-export * from 'vue-request';