From 9e38c43b84617d569357c32c69b21276ed5daad9 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Thu, 22 Sep 2022 16:46:32 +0800 Subject: [PATCH] refactor: move api-client to core Signed-off-by: Ryan Wang --- package.json | 2 ++ packages/shared/package.json | 5 +---- packages/shared/src/composables/index.ts | 1 - packages/shared/src/index.ts | 3 --- pnpm-lock.yaml | 20 +++++++++---------- .../composables/use-setting-form.ts | 0 src/main.ts | 2 +- .../contents/attachments/AttachmentList.vue | 2 +- .../components/AttachmentDetailModal.vue | 2 +- .../AttachmentGroupEditingModal.vue | 2 +- .../components/AttachmentPoliciesModal.vue | 2 +- .../AttachmentPolicyEditingModal.vue | 3 ++- .../components/AttachmentUploadModal.vue | 2 +- .../UploadSelectorProvider.vue | 3 ++- .../composables/use-attachment-group.ts | 2 +- .../composables/use-attachment-policy.ts | 2 +- .../attachments/composables/use-attachment.ts | 3 ++- src/modules/contents/comments/CommentList.vue | 2 +- .../comments/components/CommentListItem.vue | 2 +- .../components/ReplyCreationModal.vue | 2 +- .../comments/components/ReplyListItem.vue | 2 +- .../contents/pages/SinglePageEditor.vue | 2 +- src/modules/contents/pages/SinglePageList.vue | 2 +- .../components/SinglePageSettingModal.vue | 2 +- src/modules/contents/posts/PostEditor.vue | 2 +- src/modules/contents/posts/PostList.vue | 2 +- .../posts/categories/CategoryList.vue | 2 +- .../components/CategoryEditingModal.vue | 2 +- .../composables/use-post-category.ts | 2 +- .../posts/components/PostSettingModal.vue | 2 +- src/modules/contents/posts/tags/TagList.vue | 2 +- .../posts/tags/components/TagEditingModal.vue | 2 +- .../posts/tags/composables/use-post-tag.ts | 2 +- .../dashboard/widgets/PostStatsWidget.vue | 2 +- .../widgets/RecentPublishedWidget.vue | 2 +- src/modules/interface/menus/Menus.vue | 2 +- .../menus/components/MenuEditingModal.vue | 2 +- .../menus/components/MenuItemEditingModal.vue | 2 +- .../interface/menus/components/MenuList.vue | 2 +- src/modules/interface/themes/ThemeSetting.vue | 2 +- .../themes/components/ThemeInstallModal.vue | 2 +- .../themes/components/ThemeListModal.vue | 2 +- .../interface/themes/composables/use-theme.ts | 2 +- .../interface/themes/layouts/ThemeLayout.vue | 3 ++- src/modules/system/plugins/PluginDetail.vue | 2 +- src/modules/system/plugins/PluginList.vue | 2 +- src/modules/system/plugins/PluginSetting.vue | 3 ++- .../plugins/components/PluginInstallModal.vue | 2 +- .../system/plugins/composables/use-plugin.ts | 2 +- .../system/plugins/layouts/PluginLayout.vue | 4 ++-- src/modules/system/roles/RoleDetail.vue | 2 +- src/modules/system/roles/RoleList.vue | 2 +- .../system/roles/composables/use-role.ts | 2 +- src/modules/system/settings/SystemSetting.vue | 2 +- .../settings/layouts/SystemSettingsLayout.vue | 3 ++- .../system/users/PersonalAccessTokens.vue | 2 +- src/modules/system/users/UserList.vue | 2 +- .../users/components/UserEditingModal.vue | 2 +- .../components/UserPasswordChangeModal.vue | 2 +- .../system/users/composables/use-user.ts | 2 +- .../users/layouts/UserProfileLayout.vue | 3 ++- .../shared/src => src}/utils/api-client.ts | 0 62 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 packages/shared/src/composables/index.ts rename {packages/shared/src => src}/composables/use-setting-form.ts (100%) rename {packages/shared/src => src}/utils/api-client.ts (100%) diff --git a/package.json b/package.json index 6bc480938..c84581418 100644 --- a/package.json +++ b/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", diff --git a/packages/shared/package.json b/packages/shared/package.json index 6d4abb1a5..02d85a759 100644 --- a/packages/shared/package.json +++ b/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:*", - "axios": "^0.27.2", - "lodash.merge": "^4.6.2" + "@halo-dev/components": "workspace:*" }, "devDependencies": { - "@types/lodash.merge": "^4.6.7", "vite-plugin-dts": "^1.5.0" }, "peerDependencies": { diff --git a/packages/shared/src/composables/index.ts b/packages/shared/src/composables/index.ts deleted file mode 100644 index dccb74e72..000000000 --- a/packages/shared/src/composables/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { useSettingForm } from "./use-setting-form"; diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index b86deb253..03234b789 100644 --- a/packages/shared/src/index.ts +++ b/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"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 642d3c544..7b7565ac3 100644 --- a/pnpm-lock.yaml +++ b/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==} diff --git a/packages/shared/src/composables/use-setting-form.ts b/src/composables/use-setting-form.ts similarity index 100% rename from packages/shared/src/composables/use-setting-form.ts rename to src/composables/use-setting-form.ts diff --git a/src/main.ts b/src/main.ts index 866e73ea6..307690651 100644 --- a/src/main.ts +++ b/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"; diff --git a/src/modules/contents/attachments/AttachmentList.vue b/src/modules/contents/attachments/AttachmentList.vue index 27b84acf2..065f0ac5a 100644 --- a/src/modules/contents/attachments/AttachmentList.vue +++ b/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"; diff --git a/src/modules/contents/attachments/components/AttachmentDetailModal.vue b/src/modules/contents/attachments/components/AttachmentDetailModal.vue index b0261c557..a74f64f9c 100644 --- a/src/modules/contents/attachments/components/AttachmentDetailModal.vue +++ b/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"; diff --git a/src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue b/src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue index d5b914ee9..dbcbbfa76 100644 --- a/src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue +++ b/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"; diff --git a/src/modules/contents/attachments/components/AttachmentPoliciesModal.vue b/src/modules/contents/attachments/components/AttachmentPoliciesModal.vue index 0af57ca5e..f75a46572 100644 --- a/src/modules/contents/attachments/components/AttachmentPoliciesModal.vue +++ b/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"; diff --git a/src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue b/src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue index 9a4d31f93..cb5799ee9 100644 --- a/src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue +++ b/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, diff --git a/src/modules/contents/attachments/components/AttachmentUploadModal.vue b/src/modules/contents/attachments/components/AttachmentUploadModal.vue index 88dbb73a1..9dfb38324 100644 --- a/src/modules/contents/attachments/components/AttachmentUploadModal.vue +++ b/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"; diff --git a/src/modules/contents/attachments/components/selector-providers/UploadSelectorProvider.vue b/src/modules/contents/attachments/components/selector-providers/UploadSelectorProvider.vue index 31708e03f..cd1150a39 100644 --- a/src/modules/contents/attachments/components/selector-providers/UploadSelectorProvider.vue +++ b/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"; diff --git a/src/modules/contents/attachments/composables/use-attachment-group.ts b/src/modules/contents/attachments/composables/use-attachment-group.ts index 03c1d57da..dd31efbc3 100644 --- a/src/modules/contents/attachments/composables/use-attachment-group.ts +++ b/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; diff --git a/src/modules/contents/attachments/composables/use-attachment-policy.ts b/src/modules/contents/attachments/composables/use-attachment-policy.ts index 77d6819e5..6731c7b01 100644 --- a/src/modules/contents/attachments/composables/use-attachment-policy.ts +++ b/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; diff --git a/src/modules/contents/attachments/composables/use-attachment.ts b/src/modules/contents/attachments/composables/use-attachment.ts index 8c8bff8eb..d57b8d682 100644 --- a/src/modules/contents/attachments/composables/use-attachment.ts +++ b/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"; diff --git a/src/modules/contents/comments/CommentList.vue b/src/modules/contents/comments/CommentList.vue index 3b88cacb3..da4e3074c 100644 --- a/src/modules/contents/comments/CommentList.vue +++ b/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(); diff --git a/src/modules/contents/comments/components/CommentListItem.vue b/src/modules/contents/comments/components/CommentListItem.vue index 712e5aefb..d1eb18fd7 100644 --- a/src/modules/contents/comments/components/CommentListItem.vue +++ b/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"; diff --git a/src/modules/contents/comments/components/ReplyCreationModal.vue b/src/modules/contents/comments/components/ReplyCreationModal.vue index baf4e5958..9708f314f 100644 --- a/src/modules/contents/comments/components/ReplyCreationModal.vue +++ b/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<{ diff --git a/src/modules/contents/comments/components/ReplyListItem.vue b/src/modules/contents/comments/components/ReplyListItem.vue index c57c4f091..8bf950c9f 100644 --- a/src/modules/contents/comments/components/ReplyListItem.vue +++ b/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"; diff --git a/src/modules/contents/pages/SinglePageEditor.vue b/src/modules/contents/pages/SinglePageEditor.vue index aad6066ce..7ddd0fc97 100644 --- a/src/modules/contents/pages/SinglePageEditor.vue +++ b/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"; diff --git a/src/modules/contents/pages/SinglePageList.vue b/src/modules/contents/pages/SinglePageList.vue index f59658f58..87c92d318 100644 --- a/src/modules/contents/pages/SinglePageList.vue +++ b/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"; diff --git a/src/modules/contents/pages/components/SinglePageSettingModal.vue b/src/modules/contents/pages/components/SinglePageSettingModal.vue index 68da3d7bf..ff95999ee 100644 --- a/src/modules/contents/pages/components/SinglePageSettingModal.vue +++ b/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 = { diff --git a/src/modules/contents/posts/PostEditor.vue b/src/modules/contents/posts/PostEditor.vue index 0ea5d103b..5eed2e0e4 100644 --- a/src/modules/contents/posts/PostEditor.vue +++ b/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 { diff --git a/src/modules/contents/posts/PostList.vue b/src/modules/contents/posts/PostList.vue index 47a4979e4..60d48b5fb 100644 --- a/src/modules/contents/posts/PostList.vue +++ b/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"; diff --git a/src/modules/contents/posts/categories/CategoryList.vue b/src/modules/contents/posts/categories/CategoryList.vue index 0689ff2d8..e1416454d 100644 --- a/src/modules/contents/posts/categories/CategoryList.vue +++ b/src/modules/contents/posts/categories/CategoryList.vue @@ -1,7 +1,7 @@