chore: Resolve merge conflicts

2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/packages/@core/base/icons/package.json
+++ b/packages/@core/base/icons/package.json
@@ -36,6 +36,6 @@
  "dependencies": {
    "@iconify/vue": "^4.1.2",
    "lucide-vue-next": "^0.417.0",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/base/shared/package.json
+++ b/packages/@core/base/shared/package.json
@@ -56,7 +56,7 @@
  },
  "dependencies": {
    "@ctrl/tinycolor": "^4.1.0",
-    "@vue/shared": "^3.4.34",
+    "@vue/shared": "^3.4.35",
    "clsx": "^2.1.1",
    "defu": "^6.1.4",
    "lodash.clonedeep": "^4.5.0",
--- a/packages/@core/base/typings/package.json
+++ b/packages/@core/base/typings/package.json
@@ -38,7 +38,7 @@
    }
  },
  "dependencies": {
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
    "vue-router": "^4.4.0"
  }
 }
--- a/packages/@core/composables/package.json
+++ b/packages/@core/composables/package.json
@@ -39,7 +39,7 @@
    "@vueuse/core": "^10.11.0",
    "radix-vue": "^1.9.2",
    "sortablejs": "^1.15.2",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  },
  "devDependencies": {
    "@types/sortablejs": "^1.15.8"
--- a/packages/@core/preferences/package.json
+++ b/packages/@core/preferences/package.json
@@ -32,6 +32,6 @@
    "@vben-core/shared": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^10.11.0",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/ui-kit/layout-ui/package.json
+++ b/packages/@core/ui-kit/layout-ui/package.json
@@ -42,6 +42,6 @@
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^10.11.0",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/ui-kit/menu-ui/package.json
+++ b/packages/@core/ui-kit/menu-ui/package.json
@@ -43,6 +43,6 @@
    "@vben-core/shared": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^10.11.0",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/ui-kit/shadcn-ui/package.json
+++ b/packages/@core/ui-kit/shadcn-ui/package.json
@@ -50,6 +50,6 @@
    "class-variance-authority": "^0.7.0",
    "lucide-vue-next": "^0.417.0",
    "radix-vue": "^1.9.2",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/ui-kit/tabs-ui/package.json
+++ b/packages/@core/ui-kit/tabs-ui/package.json
@@ -41,6 +41,6 @@
    "@vben-core/icons": "workspace:*",
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/typings": "workspace:*",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/effects/access/package.json
+++ b/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"
  }
 }
--- a/packages/effects/chart-ui/package.json
+++ b/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"
  }
 }
--- a/packages/effects/common-ui/package.json
+++ b/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": {
--- a/packages/effects/hooks/package.json
+++ b/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"
  }
--- a/packages/effects/layouts/package.json
+++ b/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"
  }
 }
--- a/packages/effects/request/package.json
+++ b/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"
--- 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';
--- a/packages/locales/package.json
+++ b/packages/locales/package.json
@@ -21,7 +21,7 @@
  },
  "dependencies": {
    "@intlify/core-base": "^9.13.1",
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
    "vue-i18n": "^9.13.1"
  }
 }
--- a/packages/stores/package.json
+++ b/packages/stores/package.json
@@ -24,7 +24,7 @@
    "@vben-core/typings": "workspace:*",
    "pinia": "2.1.7",
    "pinia-plugin-persistedstate": "^3.2.1",
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
    "vue-router": "^4.4.0"
  }
 }
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -21,7 +21,7 @@
  },
  "dependencies": {
    "@vben-core/typings": "workspace:*",
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
    "vue-router": "^4.4.0"
  }
 }