chore: Resolve merge conflicts

2025-08-27 09:18:33 +08:00 · 2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/packages/effects/request/src/index.ts
+++ b/packages/effects/request/src/index.ts
@@ -1,3 +1,2 @@
 export * from './request-client';
-export * from './use-request';
 export * from 'axios';
--- a/packages/effects/request/src/use-request.ts
+++ b/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';