refactor: move api-client to core

Signed-off-by: Ryan Wang <i@ryanc.cc>

package.json

@@ -49,6 +49,7 @@
     "floating-vue": "2.0.0-beta.20",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
+    "lodash.merge": "^4.6.2",
     "path-browserify": "^1.0.1",
     "pinia": "^2.0.22",
     "pretty-bytes": "^6.0.0",
@@ -71,6 +72,7 @@
     "@types/jsdom": "^20.0.0",
     "@types/lodash.clonedeep": "4.5.7",
     "@types/lodash.isequal": "^4.5.6",
+    "@types/lodash.merge": "^4.6.7",
     "@types/node": "^17.0.45",
     "@types/qs": "^6.9.7",
     "@types/uuid": "^8.3.4",

packages/shared/package.json

@@ -38,12 +38,9 @@
   "homepage": "https://github.com/halo-dev/halo-admin/tree/next/shared/components#readme",
   "license": "MIT",
   "dependencies": {
-    "@halo-dev/components": "workspace:*",
+    "@halo-dev/components": "workspace:*"
-    "axios": "^0.27.2",
-    "lodash.merge": "^4.6.2"
   },
   "devDependencies": {
-    "@types/lodash.merge": "^4.6.7",
     "vite-plugin-dts": "^1.5.0"
   },
   "peerDependencies": {

packages/shared/src/composables/index.ts

@@ -1 +0,0 @@
-export { useSettingForm } from "./use-setting-form";

packages/shared/src/index.ts

@@ -4,6 +4,3 @@ export * from "./core/plugins";
 export * from "./states/pages";
 export * from "./states/attachment-selector";
 export * from "./layouts";
-
-export * from "./utils/api-client";
-export * from "./composables";

pnpm-lock.yaml

@@ -25,6 +25,7 @@ importers:
       '@types/jsdom': ^20.0.0
       '@types/lodash.clonedeep': 4.5.7
       '@types/lodash.isequal': ^4.5.6
+      '@types/lodash.merge': ^4.6.7
       '@types/node': ^17.0.45
       '@types/qs': ^6.9.7
       '@types/uuid': ^8.3.4
@@ -55,6 +56,7 @@ importers:
       jsdom: ^20.0.0
       lodash.clonedeep: ^4.5.0
       lodash.isequal: ^4.5.0
+      lodash.merge: ^4.6.2
       path-browserify: ^1.0.1
       pinia: ^2.0.22
       postcss: ^8.4.16
@@ -111,6 +113,7 @@ importers:
       floating-vue: 2.0.0-beta.20_vue@3.2.39
       lodash.clonedeep: 4.5.0
       lodash.isequal: 4.5.0
+      lodash.merge: 4.6.2
       path-browserify: 1.0.1
       pinia: 2.0.22_uxrvejtcwrakwzzo6hlouuo2vq
       pretty-bytes: 6.0.0
@@ -132,6 +135,7 @@ importers:
       '@types/jsdom': 20.0.0
       '@types/lodash.clonedeep': 4.5.7
       '@types/lodash.isequal': 4.5.6
+      '@types/lodash.merge': 4.6.7
       '@types/node': 17.0.45
       '@types/qs': 6.9.7
       '@types/uuid': 8.3.4
@@ -201,16 +205,10 @@ importers:
   packages/shared:
     specifiers:
       '@halo-dev/components': workspace:*
-      '@types/lodash.merge': ^4.6.7
-      axios: ^0.27.2
-      lodash.merge: ^4.6.2
       vite-plugin-dts: ^1.5.0
     dependencies:
       '@halo-dev/components': link:../components
-      axios: 0.27.2
-      lodash.merge: 4.6.2
     devDependencies:
-      '@types/lodash.merge': 4.6.7
       vite-plugin-dts: 1.5.0
 
 packages:
@@ -3737,7 +3735,7 @@ packages:
   /axios/0.21.4_debug@4.3.2:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
     dependencies:
-      follow-redirects: 1.14.9_debug@4.3.2
+      follow-redirects: 1.14.9
     transitivePeerDependencies:
       - debug
     dev: true
@@ -3745,7 +3743,7 @@ packages:
   /axios/0.27.2:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
-      follow-redirects: 1.14.9_debug@4.3.2
+      follow-redirects: 1.14.9
       form-data: 4.0.0
     transitivePeerDependencies:
       - debug
@@ -4444,6 +4442,7 @@ packages:
         optional: true
     dependencies:
       ms: 2.1.2
+    dev: true
 
   /debug/4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
@@ -5401,7 +5400,7 @@ packages:
       vue-resize: 2.0.0-alpha.1_vue@3.2.39
     dev: false
 
-  /follow-redirects/1.14.9_debug@4.3.2:
+  /follow-redirects/1.14.9:
     resolution: {integrity: sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -5409,8 +5408,6 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
-    dependencies:
-      debug: 4.3.2
 
   /foreground-child/2.0.0:
     resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
@@ -6773,6 +6770,7 @@ packages:
 
   /ms/2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+    dev: true
 
   /ms/2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}

src/main.ts

@@ -8,7 +8,7 @@ import type {
   MenuItemType,
   Plugin,
 } from "@halo-dev/admin-shared";
-import { apiClient, setApiUrl } from "@halo-dev/admin-shared";
+import { apiClient, setApiUrl } from "@/utils/api-client";
 import { menus, minimenus, registerMenu } from "./router/menus.config";
 // setup
 import "./setup/setupStyles";

src/modules/contents/attachments/AttachmentList.vue

@@ -33,7 +33,7 @@ import prettyBytes from "pretty-bytes";
 import { useFetchAttachmentPolicy } from "./composables/use-attachment-policy";
 import { useAttachmentControl } from "./composables/use-attachment";
 import AttachmentFileTypeIcon from "./components/AttachmentFileTypeIcon.vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import cloneDeep from "lodash.clonedeep";
 import { isImage } from "@/utils/image";
 import { useRouteQuery } from "@vueuse/router";

src/modules/contents/attachments/components/AttachmentDetailModal.vue

@@ -4,7 +4,7 @@ import LazyImage from "@/components/image/LazyImage.vue";
 import type { Attachment, Policy } from "@halo-dev/api-client";
 import prettyBytes from "pretty-bytes";
 import { ref, watch, watchEffect } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { isImage } from "@/utils/image";
 import { formatDatetime } from "@/utils/date";
 import { useFetchAttachmentGroup } from "../composables/use-attachment-group";

src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue

@@ -4,7 +4,7 @@ import type { Group } from "@halo-dev/api-client";
 import { v4 as uuid } from "uuid";
 import { computed, ref, watch, watchEffect } from "vue";
 import cloneDeep from "lodash.clonedeep";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { reset, submitForm } from "@formkit/core";
 import { useMagicKeys } from "@vueuse/core";
 import { setFocus } from "@/formkit/utils/focus";

src/modules/contents/attachments/components/AttachmentPoliciesModal.vue

@@ -10,7 +10,7 @@ import {
 import AttachmentPolicyEditingModal from "./AttachmentPolicyEditingModal.vue";
 import { ref, watch } from "vue";
 import type { Policy, PolicyTemplate } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { v4 as uuid } from "uuid";
 import { formatDatetime } from "@/utils/date";
 import { useFetchAttachmentPolicy } from "../composables/use-attachment-policy";

src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue

@@ -3,7 +3,8 @@ import { VButton, VModal, VSpace } from "@halo-dev/components";
 import type { Policy, PolicyTemplate } from "@halo-dev/api-client";
 import cloneDeep from "lodash.clonedeep";
 import { computed, ref, watch, watchEffect } from "vue";
-import { apiClient, useSettingForm } from "@halo-dev/admin-shared";
+import { useSettingForm } from "@/composables/use-setting-form";
+import { apiClient } from "@/utils/api-client";
 import { v4 as uuid } from "uuid";
 import {
   reset,

src/modules/contents/attachments/components/AttachmentUploadModal.vue

@@ -2,7 +2,7 @@
 import { VModal } from "@halo-dev/components";
 import FilePondUpload from "@/components/upload/FilePondUpload.vue";
 import { computed, ref, watch, watchEffect } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { Policy, Group } from "@halo-dev/api-client";
 import { useFetchAttachmentPolicy } from "../composables/use-attachment-policy";
 import AttachmentPoliciesModal from "./AttachmentPoliciesModal.vue";

src/modules/contents/attachments/components/selector-providers/UploadSelectorProvider.vue

@@ -7,7 +7,8 @@ import {
   useDialog,
 } from "@halo-dev/components";
 
-import { apiClient, type AttachmentLike } from "@halo-dev/admin-shared";
+import type { AttachmentLike } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import LazyImage from "@/components/image/LazyImage.vue";
 import type { Attachment } from "@halo-dev/api-client";
 import FilePondUpload from "@/components/upload/FilePondUpload.vue";

src/modules/contents/attachments/composables/use-attachment-group.ts

@@ -1,6 +1,6 @@
 import { onMounted, ref, type Ref } from "vue";
 import type { Group } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 interface useFetchAttachmentGroupReturn {
   groups: Ref<Group[]>;

src/modules/contents/attachments/composables/use-attachment-policy.ts

@@ -1,7 +1,7 @@
 import { onMounted, ref } from "vue";
 import type { Ref } from "vue";
 import type { Policy } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 interface useFetchAttachmentPolicyReturn {
   policies: Ref<Policy[]>;

src/modules/contents/attachments/composables/use-attachment.ts

@@ -7,7 +7,8 @@ import type {
 } from "@halo-dev/api-client";
 import type { Ref } from "vue";
 import { ref, watch } from "vue";
-import { apiClient, type AttachmentLike } from "@halo-dev/admin-shared";
+import type { AttachmentLike } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { useDialog } from "@halo-dev/components";
 import type { Content, Editor } from "@halo-dev/richtext-editor";
 

src/modules/contents/comments/CommentList.vue

@@ -19,7 +19,7 @@ import type {
   User,
 } from "@halo-dev/api-client";
 import { onMounted, ref, watch } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 const dialog = useDialog();
 

src/modules/contents/comments/components/CommentListItem.vue

@@ -22,7 +22,7 @@ import type {
 import { formatDatetime } from "@/utils/date";
 import { computed, provide, ref, watch, type Ref } from "vue";
 import ReplyListItem from "./ReplyListItem.vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { RouteLocationRaw } from "vue-router";
 import cloneDeep from "lodash.clonedeep";
 

src/modules/contents/comments/components/ReplyCreationModal.vue

@@ -14,7 +14,7 @@ import { reset, submitForm } from "@formkit/core";
 import cloneDeep from "lodash.clonedeep";
 import { useMagicKeys } from "@vueuse/core";
 import { setFocus } from "@/formkit/utils/focus";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 const props = withDefaults(
   defineProps<{

src/modules/contents/comments/components/ReplyListItem.vue

@@ -11,7 +11,7 @@ import {
 } from "@halo-dev/components";
 import type { ListedReply } from "@halo-dev/api-client";
 import { formatDatetime } from "@/utils/date";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { computed, inject, type Ref } from "vue";
 import cloneDeep from "lodash.clonedeep";
 

src/modules/contents/pages/SinglePageEditor.vue

@@ -17,7 +17,7 @@ import {
 import type { SinglePageRequest } from "@halo-dev/api-client";
 import { v4 as uuid } from "uuid";
 import { computed, onMounted, ref, watch } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { useRouteQuery } from "@vueuse/router";
 import cloneDeep from "lodash.clonedeep";
 import { useAttachmentSelect } from "../attachments/composables/use-attachment";

src/modules/contents/pages/SinglePageList.vue

@@ -28,7 +28,7 @@ import type {
   SinglePageRequest,
   User,
 } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { formatDatetime } from "@/utils/date";
 import { RouterLink } from "vue-router";
 import cloneDeep from "lodash.clonedeep";

src/modules/contents/pages/components/SinglePageSettingModal.vue

@@ -3,7 +3,7 @@ import { VButton, VModal, VSpace, VTabItem, VTabs } from "@halo-dev/components";
 import { computed, ref, watchEffect } from "vue";
 import type { SinglePageRequest } from "@halo-dev/api-client";
 import cloneDeep from "lodash.clonedeep";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { v4 as uuid } from "uuid";
 
 const initialFormState: SinglePageRequest = {

src/modules/contents/posts/PostEditor.vue

@@ -18,7 +18,7 @@ import AttachmentSelectorModal from "../attachments/components/AttachmentSelecto
 import type { PostRequest } from "@halo-dev/api-client";
 import { computed, onMounted, ref, watch } from "vue";
 import cloneDeep from "lodash.clonedeep";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { useRouteQuery } from "@vueuse/router";
 import { v4 as uuid } from "uuid";
 import {

src/modules/contents/posts/PostList.vue

@@ -33,7 +33,7 @@ import type {
   PostRequest,
   Tag,
 } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { formatDatetime } from "@/utils/date";
 import { usePostCategory } from "@/modules/contents/posts/categories/composables/use-post-category";
 import { usePostTag } from "@/modules/contents/posts/tags/composables/use-post-tag";

src/modules/contents/posts/categories/CategoryList.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 // core libs
 import { ref } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 // components
 import {

src/modules/contents/posts/categories/components/CategoryEditingModal.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 // core libs
 import { computed, ref, watch, watchEffect } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 // components
 import { VButton, VModal, VSpace } from "@halo-dev/components";

src/modules/contents/posts/categories/composables/use-post-category.ts

@@ -1,4 +1,4 @@
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { Category } from "@halo-dev/api-client";
 import type { Ref } from "vue";
 import { onMounted, ref } from "vue";

src/modules/contents/posts/components/PostSettingModal.vue

@@ -5,7 +5,7 @@ import type { PostRequest } from "@halo-dev/api-client";
 import cloneDeep from "lodash.clonedeep";
 import { usePostTag } from "@/modules/contents/posts/tags/composables/use-post-tag";
 import { usePostCategory } from "@/modules/contents/posts/categories/composables/use-post-category";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { v4 as uuid } from "uuid";
 
 const initialFormState: PostRequest = {

src/modules/contents/posts/tags/TagList.vue

@@ -27,7 +27,7 @@ import { usePostTag } from "./composables/use-post-tag";
 import { formatDatetime } from "@/utils/date";
 
 import { useRouteQuery } from "@vueuse/router";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 const viewTypes = [
   {

src/modules/contents/posts/tags/components/TagEditingModal.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 // core libs
 import { computed, ref, watch, watchEffect } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 // components
 import {

src/modules/contents/posts/tags/composables/use-post-tag.ts

@@ -1,4 +1,4 @@
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { Tag } from "@halo-dev/api-client";
 import type { Ref } from "vue";
 import { onMounted, ref } from "vue";

src/modules/dashboard/widgets/PostStatsWidget.vue

@@ -1,7 +1,7 @@
 <script lang="ts" name="PostStatsWidget" setup>
 import { VCard } from "@halo-dev/components";
 import { onMounted, ref } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 const postTotal = ref<number>(0);
 

src/modules/dashboard/widgets/RecentPublishedWidget.vue

@@ -2,7 +2,7 @@
 import { VCard, VSpace } from "@halo-dev/components";
 import { onMounted, ref } from "vue";
 import type { Post } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { formatDatetime } from "@/utils/date";
 
 const posts = ref<Post[]>([] as Post[]);

src/modules/interface/menus/Menus.vue

@@ -13,7 +13,7 @@ import MenuItemEditingModal from "./components/MenuItemEditingModal.vue";
 import MenuItemListItem from "./components/MenuItemListItem.vue";
 import MenuList from "./components/MenuList.vue";
 import { ref } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { Menu, MenuItem } from "@halo-dev/api-client";
 import cloneDeep from "lodash.clonedeep";
 import type { MenuTreeItem } from "./utils";

src/modules/interface/menus/components/MenuEditingModal.vue

@@ -3,7 +3,7 @@ import { VButton, VModal, VSpace } from "@halo-dev/components";
 import type { Menu } from "@halo-dev/api-client";
 import { v4 as uuid } from "uuid";
 import { computed, ref, watch, watchEffect } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { reset, submitForm } from "@formkit/core";
 import cloneDeep from "lodash.clonedeep";
 import { useMagicKeys } from "@vueuse/core";

src/modules/interface/menus/components/MenuItemEditingModal.vue

@@ -3,7 +3,7 @@ import { VButton, VModal, VSpace } from "@halo-dev/components";
 import { computed, ref, watch, watchEffect } from "vue";
 import type { MenuItem, Post, SinglePage } from "@halo-dev/api-client";
 import { v4 as uuid } from "uuid";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { reset, submitForm } from "@formkit/core";
 import cloneDeep from "lodash.clonedeep";
 import { useMagicKeys } from "@vueuse/core";

src/modules/interface/menus/components/MenuList.vue

@@ -12,7 +12,7 @@ import {
 import MenuEditingModal from "./MenuEditingModal.vue";
 import { defineExpose, onMounted, ref } from "vue";
 import type { Menu } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { useRouteQuery } from "@vueuse/router";
 
 const props = withDefaults(

src/modules/interface/themes/ThemeSetting.vue

@@ -10,7 +10,7 @@ import type { Ref } from "vue";
 import type { Theme } from "@halo-dev/api-client";
 
 // hooks
-import { useSettingForm } from "@halo-dev/admin-shared";
+import { useSettingForm } from "@/composables/use-setting-form";
 import { useRouteParams } from "@vueuse/router";
 import type { FormKitSchemaCondition, FormKitSchemaNode } from "@formkit/core";
 

src/modules/interface/themes/components/ThemeInstallModal.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { VModal } from "@halo-dev/components";
 import FilePondUpload from "@/components/upload/FilePondUpload.vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { computed, ref } from "vue";
 
 withDefaults(

src/modules/interface/themes/components/ThemeListModal.vue

@@ -13,7 +13,7 @@ import {
 import ThemeInstallModal from "./ThemeInstallModal.vue";
 import { ref, watch } from "vue";
 import type { Theme } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 const props = withDefaults(
   defineProps<{

src/modules/interface/themes/composables/use-theme.ts

@@ -1,7 +1,7 @@
 import type { ComputedRef, Ref } from "vue";
 import { computed, onMounted, ref } from "vue";
 import type { Theme } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { useDialog } from "@halo-dev/components";
 
 interface useThemeLifeCycleReturn {

src/modules/interface/themes/layouts/ThemeLayout.vue

@@ -10,7 +10,8 @@ import cloneDeep from "lodash.clonedeep";
 // hooks
 import { useThemeLifeCycle } from "../composables/use-theme";
 // types
-import { BasicLayout, useSettingForm } from "@halo-dev/admin-shared";
+import { BasicLayout } from "@halo-dev/admin-shared";
+import { useSettingForm } from "@/composables/use-setting-form";
 
 // components
 import {

src/modules/system/plugins/PluginDetail.vue

@@ -2,7 +2,7 @@
 import { VSwitch, VTag } from "@halo-dev/components";
 import type { Ref } from "vue";
 import { computed, inject, ref, watchEffect } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { Plugin, Role } from "@halo-dev/api-client";
 import { pluginLabels } from "@/constants/labels";
 import { rbacAnnotations } from "@/constants/annotations";

src/modules/system/plugins/PluginList.vue

@@ -14,7 +14,7 @@ import {
 import PluginListItem from "./components/PluginListItem.vue";
 import PluginInstallModal from "./components/PluginInstallModal.vue";
 import { onMounted, ref, watch } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { Plugin } from "@halo-dev/api-client";
 
 const plugins = ref<Plugin[]>([] as Plugin[]);

src/modules/system/plugins/PluginSetting.vue

@@ -3,7 +3,8 @@
 import { computed, ref } from "vue";
 
 // hooks
-import { apiClient, useSettingForm } from "@halo-dev/admin-shared";
+import { useSettingForm } from "@/composables/use-setting-form";
+import { apiClient } from "@/utils/api-client";
 
 // components
 import { VButton } from "@halo-dev/components";

src/modules/system/plugins/components/PluginInstallModal.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useDialog, VModal } from "@halo-dev/components";
 import FilePondUpload from "@/components/upload/FilePondUpload.vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { Plugin } from "@halo-dev/api-client";
 import { computed, ref } from "vue";
 import type { AxiosResponse } from "axios";

src/modules/system/plugins/composables/use-plugin.ts

@@ -2,7 +2,7 @@ import type { ComputedRef, Ref } from "vue";
 import { computed } from "vue";
 import type { Plugin } from "@halo-dev/api-client";
 import cloneDeep from "lodash.clonedeep";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { useDialog } from "@halo-dev/components";
 
 interface usePluginLifeCycleReturn {

src/modules/system/plugins/layouts/PluginLayout.vue

@@ -2,13 +2,13 @@
 // core libs
 import { computed, nextTick, onMounted, provide, ref, watch } from "vue";
 import { RouterView, useRoute, useRouter } from "vue-router";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 // libs
 import cloneDeep from "lodash.clonedeep";
 
 // hooks
-import { useSettingForm } from "@halo-dev/admin-shared";
+import { useSettingForm } from "@/composables/use-setting-form";
 
 // components
 import { VButton, VCard, VPageHeader, VTabbar } from "@halo-dev/components";

src/modules/system/roles/RoleDetail.vue

@@ -11,7 +11,7 @@ import {
 } from "@halo-dev/components";
 import { useRoute } from "vue-router";
 import { onMounted, ref, watch } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { pluginLabels } from "@/constants/labels";
 import { rbacAnnotations } from "@/constants/annotations";
 import {

src/modules/system/roles/RoleList.vue

@@ -30,7 +30,7 @@ import { useFetchRole } from "@/modules/system/roles/composables/use-role";
 
 // libs
 import cloneDeep from "lodash.clonedeep";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 const editingModal = ref<boolean>(false);
 const selectedRole = ref<Role | null>(null);

src/modules/system/roles/composables/use-role.ts

@@ -3,7 +3,7 @@ import type { ComputedRef, Ref } from "vue";
 import { computed, onMounted, ref } from "vue";
 import { roleLabels } from "@/constants/labels";
 import { rbacAnnotations } from "@/constants/annotations";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 interface RoleTemplateGroup {
   module: string | null | undefined;

src/modules/system/settings/SystemSetting.vue

@@ -6,7 +6,7 @@ import { computed, ref } from "vue";
 import { VButton } from "@halo-dev/components";
 
 // hooks
-import { useSettingForm } from "@halo-dev/admin-shared";
+import { useSettingForm } from "@/composables/use-setting-form";
 import { useRouteParams } from "@vueuse/router";
 import type { FormKitSchemaCondition, FormKitSchemaNode } from "@formkit/core";
 

src/modules/system/settings/layouts/SystemSettingsLayout.vue

@@ -5,7 +5,8 @@ import { ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 // types
-import { BasicLayout, useSettingForm } from "@halo-dev/admin-shared";
+import { BasicLayout } from "@halo-dev/admin-shared";
+import { useSettingForm } from "@/composables/use-setting-form";
 
 // components
 import {

src/modules/system/users/PersonalAccessTokens.vue

@@ -10,7 +10,7 @@ import {
   VTabs,
 } from "@halo-dev/components";
 import { onMounted, ref } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { PersonalAccessToken } from "@halo-dev/api-client";
 
 const createVisible = ref(false);

src/modules/system/users/UserList.vue

@@ -19,7 +19,7 @@ import {
 import UserEditingModal from "./components/UserEditingModal.vue";
 import UserPasswordChangeModal from "./components/UserPasswordChangeModal.vue";
 import { inject, onMounted, ref, watch } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { User, UserList } from "@halo-dev/api-client";
 import { rbacAnnotations } from "@/constants/annotations";
 import { formatDatetime } from "@/utils/date";

src/modules/system/users/components/UserEditingModal.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 // core libs
 import { computed, ref, watch, watchEffect } from "vue";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import type { User } from "@halo-dev/api-client";
 
 // components

src/modules/system/users/components/UserPasswordChangeModal.vue

@@ -2,7 +2,7 @@
 import { VButton, VModal, VSpace } from "@halo-dev/components";
 import { inject, ref, watch, watchEffect } from "vue";
 import type { User } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import cloneDeep from "lodash.clonedeep";
 import { reset, submitForm } from "@formkit/core";
 import { useMagicKeys } from "@vueuse/core";

src/modules/system/users/composables/use-user.ts

@@ -1,7 +1,7 @@
 import type { Ref } from "vue";
 import { onMounted, ref } from "vue";
 import type { User } from "@halo-dev/api-client";
-import { apiClient } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 
 interface useUserFetchReturn {
   users: Ref<User[]>;

src/modules/system/users/layouts/UserProfileLayout.vue

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { apiClient, BasicLayout } from "@halo-dev/admin-shared";
+import { BasicLayout } from "@halo-dev/admin-shared";
+import { apiClient } from "@/utils/api-client";
 import { IconUpload, VButton, VSpace, VTabbar } from "@halo-dev/components";
 import { onMounted, provide, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";