From 4b217e6b89d13d6d91f9cbf8254ed9589cda92bf Mon Sep 17 00:00:00 2001 From: EYHN Date: Tue, 2 Jan 2024 08:05:46 +0000 Subject: [PATCH] refactor(core): move hooks to core (#5458) * move @toeverything/hooks -> @affine/core/hooks * delete @toeverything/hooks hooks are all business-related logic and are deeply coupled with other parts. Move them into the core and then reconstruct them by feature. --- .eslintrc.js | 1 - .github/labeler.yml | 5 -- packages/frontend/component/tsconfig.json | 3 - .../core/src/commands/affine-updates.tsx | 2 +- .../error-basic/error-detail.tsx | 2 +- .../affine/auth/after-sign-in-send-email.tsx | 2 +- .../affine/auth/after-sign-up-send-email.tsx | 2 +- .../src/components/affine/auth/send-email.tsx | 2 +- .../affine/auth/sign-in-with-password.tsx | 2 +- .../src/components/affine/auth/sign-in.tsx | 2 +- .../affine/auth/subscription-redirect.tsx | 2 +- .../affine/create-workspace-modal/index.tsx | 2 +- .../affine/page-history-modal/data.ts | 4 +- .../page-history-modal/history-modal.tsx | 2 +- .../setting-modal/account-setting/index.tsx | 2 +- .../general-setting/about/index.tsx | 2 +- .../about/update-check-section.tsx | 4 +- .../general-setting/billing/index.tsx | 2 +- .../general-setting/plans/actions.tsx | 2 +- .../general-setting/plans/plan-card.tsx | 2 +- .../setting-modal/setting-sidebar/index.tsx | 4 +- .../delete-leave-workspace/delete/index.tsx | 2 +- .../delete-leave-workspace/index.tsx | 2 +- .../enable-cloud.tsx | 4 +- .../new-workspace-setting-detail/export.tsx | 2 +- .../new-workspace-setting-detail/index.tsx | 4 +- .../new-workspace-setting-detail/profile.tsx | 6 +- .../affine/share-page-modal/index.tsx | 2 +- .../block-suite-header-title/index.tsx | 4 +- .../operation-menu.tsx | 2 +- .../block-suite-mode-switch/index.tsx | 2 +- .../block-suite-page-list/utils.tsx | 6 +- .../share-header-left-item/user-avatar.tsx | 2 +- .../src/components/page-detail-editor.tsx | 4 +- .../core/src/components/pure/cmdk/data.tsx | 8 +- .../core/src/components/pure/cmdk/main.tsx | 2 +- .../core/src/components/pure/header/index.tsx | 2 +- .../pure/trash-page-footer/index.tsx | 2 +- .../collections/collections-list.tsx | 2 +- .../workspace-slider-bar/collections/page.tsx | 2 +- .../components/postfix-item.tsx | 2 +- .../components/reference-page.tsx | 2 +- .../favorite/add-favourite-button.tsx | 4 +- .../favorite/favorite-list.tsx | 2 +- .../favorite/favourite-page.tsx | 2 +- .../workspace-list/index.tsx | 8 +- .../workspace-card/index.tsx | 4 +- .../src/components/root-app-sidebar/index.tsx | 2 +- .../root-app-sidebar/updater-button.tsx | 2 +- .../frontend/core/src/components/top-tip.tsx | 2 +- .../components/workspace-upgrade/upgrade.tsx | 4 +- .../use-block-suite-workspace-helper.spec.ts | 0 ...-block-suite-workspace-page-title.spec.ts} | 0 .../src/hooks}/affine-async-hooks.ts | 0 .../hooks/affine/use-all-page-list-config.tsx | 2 +- .../affine/use-block-suite-meta-helper.ts | 6 +- .../src/hooks/affine/use-language-helper.ts | 2 +- ...se-register-blocksuite-editor-commands.tsx | 2 +- .../core/src/hooks/affine/use-sidebar-drag.ts | 2 +- .../src/hooks/current/use-current-page.ts | 2 +- .../src => core/src/hooks}/use-app-updater.ts | 0 .../src/hooks}/use-block-suite-editor.ts | 0 .../src/hooks}/use-block-suite-page-meta.ts | 0 .../hooks}/use-block-suite-page-references.ts | 0 .../use-block-suite-workspace-helper.ts | 0 .../use-block-suite-workspace-page-title.ts | 0 .../hooks}/use-block-suite-workspace-page.ts | 0 .../src/hooks}/use-data-source-status.ts | 0 .../core/src/hooks/use-get-page-info.ts | 2 +- .../src/hooks}/use-is-tiny-screen.ts | 2 +- .../core/src/hooks/use-subscription.ts | 2 +- .../src/hooks}/use-workspace-blob.ts | 0 .../src/hooks}/use-workspace-info.ts | 0 .../src/hooks}/use-workspace-status.ts | 0 .../src => core/src/hooks}/use-workspace.ts | 0 .../core/src/layouts/workspace-layout.tsx | 4 +- packages/frontend/core/src/pages/404.tsx | 2 +- .../src/pages/workspace/all-page/all-page.tsx | 2 +- .../core/src/pages/workspace/collection.tsx | 2 +- .../workspace/detail-page/detail-page.tsx | 4 +- .../editor-sidebar/extensions/copilot.tsx | 2 +- .../editor-sidebar/extensions/frame.tsx | 2 +- .../editor-sidebar/extensions/outline.tsx | 2 +- .../core/src/pages/workspace/index.tsx | 2 +- .../core/src/pages/workspace/trash-page.tsx | 2 +- .../core/src/providers/modal-provider.tsx | 2 +- .../core/src/providers/session-provider.tsx | 7 +- packages/frontend/core/tsconfig.json | 6 +- packages/frontend/hooks/package.json | 70 ---------------- packages/frontend/hooks/project.json | 6 -- .../hooks/src/use-affine-ipc-renderer.ts | 60 -------------- packages/frontend/hooks/tsconfig.json | 17 ---- .../quick-search-main.stories.tsx | 2 +- tsconfig.json | 4 - yarn.lock | 81 ------------------- 95 files changed, 99 insertions(+), 347 deletions(-) rename packages/frontend/{hooks/src => core/src/hooks}/__tests__/use-block-suite-workspace-helper.spec.ts (100%) rename packages/frontend/{hooks/src/__tests__/index.spec.ts => core/src/hooks/__tests__/use-block-suite-workspace-page-title.spec.ts} (100%) rename packages/frontend/{hooks/src => core/src/hooks}/affine-async-hooks.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-app-updater.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-block-suite-editor.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-block-suite-page-meta.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-block-suite-page-references.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-block-suite-workspace-helper.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-block-suite-workspace-page-title.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-block-suite-workspace-page.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-data-source-status.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-is-tiny-screen.ts (97%) rename packages/frontend/{hooks/src => core/src/hooks}/use-workspace-blob.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-workspace-info.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-workspace-status.ts (100%) rename packages/frontend/{hooks/src => core/src/hooks}/use-workspace.ts (100%) delete mode 100644 packages/frontend/hooks/package.json delete mode 100644 packages/frontend/hooks/project.json delete mode 100644 packages/frontend/hooks/src/use-affine-ipc-renderer.ts delete mode 100644 packages/frontend/hooks/tsconfig.json diff --git a/.eslintrc.js b/.eslintrc.js index 3d6b4d2cb..240f89f93 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -61,7 +61,6 @@ const allPackages = [ 'packages/frontend/core', 'packages/frontend/electron', 'packages/frontend/graphql', - 'packages/frontend/hooks', 'packages/frontend/i18n', 'packages/frontend/native', 'packages/frontend/templates', diff --git a/.github/labeler.yml b/.github/labeler.yml index 6f0259a3a..1e233e629 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -44,11 +44,6 @@ mod:env: - any-glob-to-any-file: - 'packages/common/env/**/*' -mod:hooks: - - changed-files: - - any-glob-to-any-file: - - 'packages/frontend/hooks/**/*' - mod:component: - changed-files: - any-glob-to-any-file: diff --git a/packages/frontend/component/tsconfig.json b/packages/frontend/component/tsconfig.json index ab884ed08..67e47712d 100644 --- a/packages/frontend/component/tsconfig.json +++ b/packages/frontend/component/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../../frontend/i18n" }, - { - "path": "../../frontend/hooks" - }, { "path": "../../frontend/electron-api" }, diff --git a/packages/frontend/core/src/commands/affine-updates.tsx b/packages/frontend/core/src/commands/affine-updates.tsx index 39a409147..c93fbe82c 100644 --- a/packages/frontend/core/src/commands/affine-updates.tsx +++ b/packages/frontend/core/src/commands/affine-updates.tsx @@ -1,7 +1,7 @@ +import { updateReadyAtom } from '@affine/core/hooks/use-app-updater'; import { apis } from '@affine/electron-api'; import type { useAFFiNEI18N } from '@affine/i18n/hooks'; import { ResetIcon } from '@blocksuite/icons'; -import { updateReadyAtom } from '@toeverything/hooks/use-app-updater'; import { registerAffineCommand } from '@toeverything/infra/command'; import type { createStore } from 'jotai'; diff --git a/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsx b/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsx index 0e5ffc1e7..658427fa1 100644 --- a/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsx +++ b/packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/error-detail.tsx @@ -1,7 +1,7 @@ import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useTheme } from 'next-themes'; import { type FC, diff --git a/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsx b/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsx index e9e578d1a..e3bdcf220 100644 --- a/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsx +++ b/packages/frontend/core/src/components/affine/auth/after-sign-in-send-email.tsx @@ -5,9 +5,9 @@ import { ModalHeader, } from '@affine/component/auth-components'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import React, { useCallback } from 'react'; import { useCurrentLoginStatus } from '../../../hooks/affine/use-current-login-status'; diff --git a/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsx b/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsx index dd5dd74b4..fd7c754bb 100644 --- a/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsx +++ b/packages/frontend/core/src/components/affine/auth/after-sign-up-send-email.tsx @@ -5,8 +5,8 @@ import { ModalHeader, } from '@affine/component/auth-components'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { type FC, useCallback } from 'react'; import { useCurrentLoginStatus } from '../../../hooks/affine/use-current-login-status'; diff --git a/packages/frontend/core/src/components/affine/auth/send-email.tsx b/packages/frontend/core/src/components/affine/auth/send-email.tsx index bd3527f8a..c96d7934a 100644 --- a/packages/frontend/core/src/components/affine/auth/send-email.tsx +++ b/packages/frontend/core/src/components/affine/auth/send-email.tsx @@ -7,13 +7,13 @@ import { } from '@affine/component/auth-components'; import { pushNotificationAtom } from '@affine/component/notification-center'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { sendChangeEmailMutation, sendChangePasswordEmailMutation, sendSetPasswordEmailMutation, } from '@affine/graphql'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useSetAtom } from 'jotai/react'; import { useCallback, useState } from 'react'; diff --git a/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsx b/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsx index 8bea5bd67..2d4e3312f 100644 --- a/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsx +++ b/packages/frontend/core/src/components/affine/auth/sign-in-with-password.tsx @@ -5,8 +5,8 @@ import { ModalHeader, } from '@affine/component/auth-components'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; // eslint-disable-next-line @typescript-eslint/no-restricted-imports import { useSession } from 'next-auth/react'; import type { FC } from 'react'; diff --git a/packages/frontend/core/src/components/affine/auth/sign-in.tsx b/packages/frontend/core/src/components/affine/auth/sign-in.tsx index fb525d390..f3885a157 100644 --- a/packages/frontend/core/src/components/affine/auth/sign-in.tsx +++ b/packages/frontend/core/src/components/affine/auth/sign-in.tsx @@ -4,11 +4,11 @@ import { ModalHeader, } from '@affine/component/auth-components'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { type GetUserQuery, getUserQuery } from '@affine/graphql'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { ArrowDownBigIcon, GoogleDuotoneIcon } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { GraphQLError } from 'graphql'; import { type FC, useState } from 'react'; import { useCallback } from 'react'; diff --git a/packages/frontend/core/src/components/affine/auth/subscription-redirect.tsx b/packages/frontend/core/src/components/affine/auth/subscription-redirect.tsx index 341d38bcf..36b225455 100644 --- a/packages/frontend/core/src/components/affine/auth/subscription-redirect.tsx +++ b/packages/frontend/core/src/components/affine/auth/subscription-redirect.tsx @@ -2,6 +2,7 @@ import { SignUpPage } from '@affine/component/auth-components'; import { AffineShapeIcon } from '@affine/component/page-list'; import { Button } from '@affine/component/ui/button'; import { Loading } from '@affine/component/ui/loading'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import type { SubscriptionRecurring } from '@affine/graphql'; import { changePasswordMutation, @@ -9,7 +10,6 @@ import { subscriptionQuery, } from '@affine/graphql'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { nanoid } from 'nanoid'; import { Suspense, useCallback, useEffect, useMemo } from 'react'; diff --git a/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx b/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx index 801898f1a..5f33f4cb6 100644 --- a/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx +++ b/packages/frontend/core/src/components/affine/create-workspace-modal/index.tsx @@ -4,12 +4,12 @@ import { type ConfirmModalProps, Modal, } from '@affine/component/ui/modal'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { DebugLogger } from '@affine/debug'; import { apis } from '@affine/electron-api'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { workspaceManagerAtom } from '@affine/workspace/atom'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { getCurrentStore } from '@toeverything/infra/atom'; import { buildShowcaseWorkspace, diff --git a/packages/frontend/core/src/components/affine/page-history-modal/data.ts b/packages/frontend/core/src/components/affine/page-history-modal/data.ts index 93f0a8d9c..d2a572fb7 100644 --- a/packages/frontend/core/src/components/affine/page-history-modal/data.ts +++ b/packages/frontend/core/src/components/affine/page-history-modal/data.ts @@ -1,3 +1,5 @@ +import { usePageMetaHelper } from '@affine/core/hooks/use-block-suite-page-meta'; +import { useBlockSuiteWorkspacePage } from '@affine/core/hooks/use-block-suite-workspace-page'; import { DebugLogger } from '@affine/debug'; import { fetchWithTraceReport, @@ -11,8 +13,6 @@ import { } from '@affine/workspace'; import { assertEquals } from '@blocksuite/global/utils'; import { Workspace } from '@blocksuite/store'; -import { usePageMetaHelper } from '@toeverything/hooks/use-block-suite-page-meta'; -import { useBlockSuiteWorkspacePage } from '@toeverything/hooks/use-block-suite-workspace-page'; import { revertUpdate } from '@toeverything/y-indexeddb'; import { useMemo } from 'react'; import useSWRImmutable from 'swr/immutable'; diff --git a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx index 2f2a58763..12b977f8c 100644 --- a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx +++ b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx @@ -6,13 +6,13 @@ import { import { Button } from '@affine/component/ui/button'; import { ConfirmModal, Modal } from '@affine/component/ui/modal'; import type { PageMode } from '@affine/core/atoms'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import { ToggleCollapseIcon } from '@blocksuite/icons'; import type { Page, Workspace } from '@blocksuite/store'; import * as Collapsible from '@radix-ui/react-collapsible'; import type { DialogContentProps } from '@radix-ui/react-dialog'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useAtom, useAtomValue } from 'jotai'; import { Fragment, diff --git a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx index 534be8e44..3df2cde6a 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/account-setting/index.tsx @@ -7,6 +7,7 @@ import { } from '@affine/component/setting-components'; import { Avatar } from '@affine/component/ui/avatar'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { allBlobSizesQuery, removeAvatarMutation, @@ -15,7 +16,6 @@ import { } from '@affine/graphql'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { ArrowRightSmallIcon, CameraIcon } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import bytes from 'bytes'; import { useSetAtom } from 'jotai'; import { diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx index f25edc500..ba9e864fb 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/index.tsx @@ -2,9 +2,9 @@ import { Switch } from '@affine/component'; import { SettingHeader } from '@affine/component/setting-components'; import { SettingRow } from '@affine/component/setting-components'; import { SettingWrapper } from '@affine/component/setting-components'; +import { useAppUpdater } from '@affine/core/hooks/use-app-updater'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { ArrowRightSmallIcon, OpenInNewIcon } from '@blocksuite/icons'; -import { useAppUpdater } from '@toeverything/hooks/use-app-updater'; import { useCallback } from 'react'; import { useAppSettingHelper } from '../../../../../hooks/affine/use-app-setting-helper'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/update-check-section.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/update-check-section.tsx index ceb942128..acb6520b0 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/update-check-section.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/about/update-check-section.tsx @@ -1,9 +1,9 @@ import { Loading } from '@affine/component'; import { SettingRow } from '@affine/component/setting-components'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { useAppUpdater } from '@affine/core/hooks/use-app-updater'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; -import { useAppUpdater } from '@toeverything/hooks/use-app-updater'; import clsx from 'clsx'; import { useCallback, useMemo, useState } from 'react'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx index 57dc7c898..4fb381ee2 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/billing/index.tsx @@ -7,6 +7,7 @@ import { } from '@affine/component/setting-components'; import { Button, IconButton } from '@affine/component/ui/button'; import { Loading } from '@affine/component/ui/loading'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { createCustomerPortalMutation, getInvoicesCountQuery, @@ -21,7 +22,6 @@ import { import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { ArrowRightSmallIcon } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useSetAtom } from 'jotai'; import { Suspense, useCallback, useMemo, useState } from 'react'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/actions.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/actions.tsx index 4b88f1e74..f71032a19 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/actions.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/actions.tsx @@ -1,9 +1,9 @@ +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import type { SubscriptionMutator } from '@affine/core/hooks/use-subscription'; import { cancelSubscriptionMutation, resumeSubscriptionMutation, } from '@affine/graphql'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { nanoid } from 'nanoid'; import type { PropsWithChildren } from 'react'; import { useState } from 'react'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx index ceb6ff961..440f49b74 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/plan-card.tsx @@ -1,5 +1,6 @@ import { Button } from '@affine/component/ui/button'; import { Tooltip } from '@affine/component/ui/tooltip'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import type { Subscription, SubscriptionMutator, @@ -14,7 +15,6 @@ import { import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { DoneIcon } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useSetAtom } from 'jotai'; import { useAtom } from 'jotai'; import { nanoid } from 'nanoid'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx index dab578509..42be1a06f 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx @@ -4,6 +4,8 @@ import { } from '@affine/component/setting-components'; import { Avatar } from '@affine/component/ui/avatar'; import { Tooltip } from '@affine/component/ui/tooltip'; +import { useWorkspaceBlobObjectUrl } from '@affine/core/hooks/use-workspace-blob'; +import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info'; import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { WorkspaceMetadata } from '@affine/workspace'; @@ -12,8 +14,6 @@ import { workspaceListAtom, } from '@affine/workspace/atom'; import { Logo1Icon } from '@blocksuite/icons'; -import { useWorkspaceBlobObjectUrl } from '@toeverything/hooks/use-workspace-blob'; -import { useWorkspaceInfo } from '@toeverything/hooks/use-workspace-info'; import clsx from 'clsx'; import { useAtom, useAtomValue } from 'jotai/react'; import { type ReactElement, Suspense, useCallback } from 'react'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx index 0a0239f71..a07ee40be 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx @@ -3,12 +3,12 @@ import { ConfirmModal, type ConfirmModalProps, } from '@affine/component/ui/modal'; +import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info'; import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { WorkspaceMetadata } from '@affine/workspace/metadata'; -import { useWorkspaceInfo } from '@toeverything/hooks/use-workspace-info'; import { useCallback, useState } from 'react'; import * as styles from './style.css'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx index 9c0abd06b..ce1c1787a 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx @@ -1,6 +1,7 @@ import { pushNotificationAtom } from '@affine/component/notification-center'; import { SettingRow } from '@affine/component/setting-components'; import { ConfirmModal } from '@affine/component/ui/modal'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { WorkspaceSubPath } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { @@ -9,7 +10,6 @@ import { workspaceManagerAtom, } from '@affine/workspace/atom'; import { ArrowRightSmallIcon } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useAtomValue, useSetAtom } from 'jotai'; import { useCallback, useState } from 'react'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx index a20935ec9..63ac79123 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx @@ -1,12 +1,12 @@ import { SettingRow } from '@affine/component/setting-components'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info'; import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant'; import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { Workspace } from '@affine/workspace'; import { workspaceManagerAtom } from '@affine/workspace/atom'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; -import { useWorkspaceInfo } from '@toeverything/hooks/use-workspace-info'; import { useAtomValue, useSetAtom } from 'jotai'; import { useState } from 'react'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/export.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/export.tsx index cdf7d0c54..691ed8244 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/export.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/export.tsx @@ -1,10 +1,10 @@ import { pushNotificationAtom } from '@affine/component/notification-center'; import { SettingRow } from '@affine/component/setting-components'; import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { apis } from '@affine/electron-api'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { Workspace, WorkspaceMetadata } from '@affine/workspace'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useSetAtom } from 'jotai'; import { useState } from 'react'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx index 003e1079b..8e9708f18 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/index.tsx @@ -4,10 +4,10 @@ import { SettingWrapper, } from '@affine/component/setting-components'; import { useSelfHosted } from '@affine/core/hooks/affine/use-server-config'; +import { useWorkspace } from '@affine/core/hooks/use-workspace'; +import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info'; import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useWorkspace } from '@toeverything/hooks/use-workspace'; -import { useWorkspaceInfo } from '@toeverything/hooks/use-workspace-info'; import { DeleteLeaveWorkspace } from './delete-leave-workspace'; import { EnableCloudPanel } from './enable-cloud'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx index c07bf177c..78aa8c3e8 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx @@ -3,15 +3,15 @@ import { pushNotificationAtom } from '@affine/component/notification-center'; import { Avatar } from '@affine/component/ui/avatar'; import { Button } from '@affine/component/ui/button'; import { Upload } from '@affine/core/components/pure/file-upload'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { useWorkspaceBlobObjectUrl } from '@affine/core/hooks/use-workspace-blob'; +import { useWorkspaceStatus } from '@affine/core/hooks/use-workspace-status'; import { validateAndReduceImage } from '@affine/core/utils/reduce-image'; import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { Workspace } from '@affine/workspace'; import { SyncPeerStep } from '@affine/workspace'; import { CameraIcon } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; -import { useWorkspaceBlobObjectUrl } from '@toeverything/hooks/use-workspace-blob'; -import { useWorkspaceStatus } from '@toeverything/hooks/use-workspace-status'; import { useSetAtom } from 'jotai'; import { type KeyboardEvent, diff --git a/packages/frontend/core/src/components/affine/share-page-modal/index.tsx b/packages/frontend/core/src/components/affine/share-page-modal/index.tsx index f957f4856..caca30b37 100644 --- a/packages/frontend/core/src/components/affine/share-page-modal/index.tsx +++ b/packages/frontend/core/src/components/affine/share-page-modal/index.tsx @@ -1,8 +1,8 @@ +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { WorkspaceFlavour } from '@affine/env/workspace'; import type { Workspace } from '@affine/workspace'; import { workspaceManagerAtom } from '@affine/workspace/atom'; import type { Page } from '@blocksuite/store'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useAtomValue } from 'jotai'; import { useState } from 'react'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header-title/index.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header-title/index.tsx index a35660564..15d71090a 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-header-title/index.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-header-title/index.tsx @@ -1,8 +1,8 @@ -import type { Workspace as BlockSuiteWorkspace } from '@blocksuite/store'; import { useBlockSuitePageMeta, usePageMetaHelper, -} from '@toeverything/hooks/use-block-suite-page-meta'; +} from '@affine/core/hooks/use-block-suite-page-meta'; +import type { Workspace as BlockSuiteWorkspace } from '@blocksuite/store'; import { type FocusEvent, type InputHTMLAttributes, diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-header-title/operation-menu.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-header-title/operation-menu.tsx index 7bb2979a4..91aa8269b 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-header-title/operation-menu.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-header-title/operation-menu.tsx @@ -5,6 +5,7 @@ import { MenuItem, MenuSeparator, } from '@affine/component/ui/menu'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; @@ -19,7 +20,6 @@ import { ImportIcon, PageIcon, } from '@blocksuite/icons'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useAtomValue } from 'jotai'; import { useCallback, useState } from 'react'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx index 255880670..dd6f3158f 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx @@ -1,6 +1,6 @@ import { Tooltip } from '@affine/component/ui/tooltip'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useAtomValue } from 'jotai'; import type { CSSProperties } from 'react'; import { useCallback, useEffect } from 'react'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx index 66ace961b..e3ac93c4a 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx @@ -1,8 +1,8 @@ import { toast } from '@affine/component'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { usePageMetaHelper } from '@affine/core/hooks/use-block-suite-page-meta'; +import { useBlockSuiteWorkspaceHelper } from '@affine/core/hooks/use-block-suite-workspace-helper'; import { WorkspaceSubPath } from '@affine/env/workspace'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; -import { usePageMetaHelper } from '@toeverything/hooks/use-block-suite-page-meta'; -import { useBlockSuiteWorkspaceHelper } from '@toeverything/hooks/use-block-suite-workspace-helper'; import { initEmptyPage } from '@toeverything/infra/blocksuite'; import { useAtomValue, useSetAtom } from 'jotai'; import { useCallback, useMemo } from 'react'; diff --git a/packages/frontend/core/src/components/cloud/share-header-left-item/user-avatar.tsx b/packages/frontend/core/src/components/cloud/share-header-left-item/user-avatar.tsx index e63da0f7e..7b6716aae 100644 --- a/packages/frontend/core/src/components/cloud/share-header-left-item/user-avatar.tsx +++ b/packages/frontend/core/src/components/cloud/share-header-left-item/user-avatar.tsx @@ -1,8 +1,8 @@ import { Avatar } from '@affine/component/ui/avatar'; import { Menu, MenuIcon, MenuItem } from '@affine/component/ui/menu'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { SignOutIcon } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useMemo } from 'react'; import { useLocation } from 'react-router-dom'; diff --git a/packages/frontend/core/src/components/page-detail-editor.tsx b/packages/frontend/core/src/components/page-detail-editor.tsx index 6924a35ed..7b859912e 100644 --- a/packages/frontend/core/src/components/page-detail-editor.tsx +++ b/packages/frontend/core/src/components/page-detail-editor.tsx @@ -1,10 +1,10 @@ import './page-detail-editor.css'; +import { useActiveBlocksuiteEditor } from '@affine/core/hooks/use-block-suite-editor'; +import { useBlockSuiteWorkspacePage } from '@affine/core/hooks/use-block-suite-workspace-page'; import { assertExists, DisposableGroup } from '@blocksuite/global/utils'; import type { AffineEditorContainer } from '@blocksuite/presets'; import type { Page, Workspace } from '@blocksuite/store'; -import { useActiveBlocksuiteEditor } from '@toeverything/hooks/use-block-suite-editor'; -import { useBlockSuiteWorkspacePage } from '@toeverything/hooks/use-block-suite-workspace-page'; import { fontStyleOptions } from '@toeverything/infra/atom'; import clsx from 'clsx'; import { useAtomValue } from 'jotai'; diff --git a/packages/frontend/core/src/components/pure/cmdk/data.tsx b/packages/frontend/core/src/components/pure/cmdk/data.tsx index 612824d78..e6b7e14c7 100644 --- a/packages/frontend/core/src/components/pure/cmdk/data.tsx +++ b/packages/frontend/core/src/components/pure/cmdk/data.tsx @@ -1,5 +1,9 @@ import { commandScore } from '@affine/cmdk'; import { useCollectionManager } from '@affine/component/page-list'; +import { + useBlockSuitePageMeta, + usePageMetaHelper, +} from '@affine/core/hooks/use-block-suite-page-meta'; import type { Collection } from '@affine/env/filter'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { @@ -8,10 +12,6 @@ import { } from '@affine/workspace/atom'; import { EdgelessIcon, PageIcon, ViewLayersIcon } from '@blocksuite/icons'; import type { Page, PageMeta } from '@blocksuite/store'; -import { - useBlockSuitePageMeta, - usePageMetaHelper, -} from '@toeverything/hooks/use-block-suite-page-meta'; import { getCurrentStore } from '@toeverything/infra/atom'; import { type AffineCommand, diff --git a/packages/frontend/core/src/components/pure/cmdk/main.tsx b/packages/frontend/core/src/components/pure/cmdk/main.tsx index f91e57849..ced65792e 100644 --- a/packages/frontend/core/src/components/pure/cmdk/main.tsx +++ b/packages/frontend/core/src/components/pure/cmdk/main.tsx @@ -1,9 +1,9 @@ import { Command } from '@affine/cmdk'; import { useCommandState } from '@affine/cmdk'; import { formatDate } from '@affine/component/page-list'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { PageMeta } from '@blocksuite/store'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import type { CommandCategory } from '@toeverything/infra/command'; import clsx from 'clsx'; import { useAtom, useAtomValue } from 'jotai'; diff --git a/packages/frontend/core/src/components/pure/header/index.tsx b/packages/frontend/core/src/components/pure/header/index.tsx index 4856a3397..b3478a990 100644 --- a/packages/frontend/core/src/components/pure/header/index.tsx +++ b/packages/frontend/core/src/components/pure/header/index.tsx @@ -3,7 +3,7 @@ import { appSidebarOpenAtom, SidebarSwitch, } from '@affine/component/app-sidebar'; -import { useIsTinyScreen } from '@toeverything/hooks/use-is-tiny-screen'; +import { useIsTinyScreen } from '@affine/core/hooks/use-is-tiny-screen'; import clsx from 'clsx'; import { useAtomValue } from 'jotai'; import type { ReactNode } from 'react'; diff --git a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx index 382820106..f0e7ee6d3 100644 --- a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx +++ b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx @@ -1,12 +1,12 @@ import { Button } from '@affine/component/ui/button'; import { ConfirmModal } from '@affine/component/ui/modal'; import { Tooltip } from '@affine/component/ui/tooltip'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { WorkspaceSubPath } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import { assertExists } from '@blocksuite/global/utils'; import { DeleteIcon, ResetIcon } from '@blocksuite/icons'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useAtomValue } from 'jotai'; import { useCallback, useState } from 'react'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx index 7e4d36607..5f40e87fe 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx @@ -9,13 +9,13 @@ import { } from '@affine/component/page-list'; import { RenameModal } from '@affine/component/rename-modal'; import { Button, IconButton } from '@affine/component/ui/button'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import type { Collection, DeleteCollectionInfo } from '@affine/env/filter'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { MoreHorizontalIcon, ViewLayersIcon } from '@blocksuite/icons'; import type { PageMeta, Workspace } from '@blocksuite/store'; import { useDroppable } from '@dnd-kit/core'; import * as Collapsible from '@radix-ui/react-collapsible'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useCallback, useMemo, useState } from 'react'; import { useLocation } from 'react-router-dom'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/page.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/page.tsx index bf6239301..169c8762a 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/page.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/collections/page.tsx @@ -1,10 +1,10 @@ import { MenuItem as CollectionItem } from '@affine/component/app-sidebar'; +import { useBlockSuitePageReferences } from '@affine/core/hooks/use-block-suite-page-references'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { EdgelessIcon, PageIcon } from '@blocksuite/icons'; import type { PageMeta, Workspace } from '@blocksuite/store'; import { useDraggable } from '@dnd-kit/core'; import * as Collapsible from '@radix-ui/react-collapsible'; -import { useBlockSuitePageReferences } from '@toeverything/hooks/use-block-suite-page-references'; import { useAtomValue } from 'jotai/index'; import React, { useCallback, useMemo } from 'react'; import { useParams } from 'react-router-dom'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/postfix-item.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/postfix-item.tsx index fd2ed694c..9f8198b76 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/postfix-item.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/postfix-item.tsx @@ -1,8 +1,8 @@ import { toast } from '@affine/component'; import { RenameModal } from '@affine/component/rename-modal'; +import { usePageMetaHelper } from '@affine/core/hooks/use-block-suite-page-meta'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { Workspace } from '@blocksuite/store'; -import { usePageMetaHelper } from '@toeverything/hooks/use-block-suite-page-meta'; import { useCallback, useState } from 'react'; import { AddFavouriteButton } from '../favorite/add-favourite-button'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx index 767909bd3..9d7e13756 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx @@ -1,9 +1,9 @@ import { MenuLinkItem } from '@affine/component/app-sidebar'; +import { useBlockSuitePageReferences } from '@affine/core/hooks/use-block-suite-page-references'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { EdgelessIcon, PageIcon } from '@blocksuite/icons'; import { type PageMeta, type Workspace } from '@blocksuite/store'; import * as Collapsible from '@radix-ui/react-collapsible'; -import { useBlockSuitePageReferences } from '@toeverything/hooks/use-block-suite-page-references'; import { useAtomValue } from 'jotai/react'; import { useMemo, useState } from 'react'; import { useParams } from 'react-router-dom'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx index 931e9c910..2bebff646 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/add-favourite-button.tsx @@ -1,8 +1,8 @@ import { IconButton } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { usePageMetaHelper } from '@affine/core/hooks/use-block-suite-page-meta'; import { PlusIcon } from '@blocksuite/icons'; import type { Workspace } from '@blocksuite/store'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; -import { usePageMetaHelper } from '@toeverything/hooks/use-block-suite-page-meta'; import { usePageHelper } from '../../../blocksuite/block-suite-page-list/utils'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favorite-list.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favorite-list.tsx index 6875ffb95..04e7a3ece 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favorite-list.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favorite-list.tsx @@ -1,6 +1,6 @@ +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import type { PageMeta } from '@blocksuite/store'; import { useDroppable } from '@dnd-kit/core'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useMemo } from 'react'; import { getDropItemId } from '../../../../hooks/affine/use-sidebar-drag'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-page.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-page.tsx index bc32f778c..f6b4d6d2a 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-page.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-page.tsx @@ -1,9 +1,9 @@ import { MenuLinkItem } from '@affine/component/app-sidebar'; +import { useBlockSuitePageReferences } from '@affine/core/hooks/use-block-suite-page-references'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { EdgelessIcon, PageIcon } from '@blocksuite/icons'; import { useDraggable } from '@dnd-kit/core'; import * as Collapsible from '@radix-ui/react-collapsible'; -import { useBlockSuitePageReferences } from '@toeverything/hooks/use-block-suite-page-references'; import { useAtomValue } from 'jotai/index'; import { useMemo, useState } from 'react'; import { useParams } from 'react-router-dom'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx index 0a5211d26..f3e9cb00a 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx @@ -1,6 +1,10 @@ import { ScrollableContainer } from '@affine/component'; import { Divider } from '@affine/component/ui/divider'; import { WorkspaceList } from '@affine/component/workspace-list'; +import { + useWorkspaceAvatar, + useWorkspaceName, +} from '@affine/core/hooks/use-workspace-info'; import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { WorkspaceMetadata } from '@affine/workspace'; @@ -9,10 +13,6 @@ import { workspaceListAtom, } from '@affine/workspace/atom'; import type { DragEndEvent } from '@dnd-kit/core'; -import { - useWorkspaceAvatar, - useWorkspaceName, -} from '@toeverything/hooks/use-workspace-info'; import { useAtomValue, useSetAtom } from 'jotai'; // eslint-disable-next-line @typescript-eslint/no-restricted-imports import { useSession } from 'next-auth/react'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx index ddaa00e08..bc6bbe034 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/workspace-card/index.tsx @@ -1,6 +1,8 @@ import { Avatar } from '@affine/component/ui/avatar'; import { Loading } from '@affine/component/ui/loading'; import { Tooltip } from '@affine/component/ui/tooltip'; +import { useWorkspaceBlobObjectUrl } from '@affine/core/hooks/use-workspace-blob'; +import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info'; import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { type SyncEngineStatus, SyncEngineStep } from '@affine/workspace'; @@ -12,8 +14,6 @@ import { NoNetworkIcon, UnsyncIcon, } from '@blocksuite/icons'; -import { useWorkspaceBlobObjectUrl } from '@toeverything/hooks/use-workspace-blob'; -import { useWorkspaceInfo } from '@toeverything/hooks/use-workspace-info'; import { useAtomValue } from 'jotai'; import { debounce, mean } from 'lodash-es'; import { diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx index 051516570..19dafd5f2 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx @@ -19,6 +19,7 @@ import { } from '@affine/component/page-list'; import { Menu } from '@affine/component/ui/menu'; import { collectionsCRUDAtom } from '@affine/core/atoms/collections'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { apis, events } from '@affine/electron-api'; import { WorkspaceSubPath } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; @@ -26,7 +27,6 @@ import type { Workspace } from '@affine/workspace'; import { FolderIcon, SettingsIcon } from '@blocksuite/icons'; import { type Page } from '@blocksuite/store'; import { useDroppable } from '@dnd-kit/core'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useAtom, useAtomValue } from 'jotai'; import { nanoid } from 'nanoid'; import type { HTMLAttributes, ReactElement } from 'react'; diff --git a/packages/frontend/core/src/components/root-app-sidebar/updater-button.tsx b/packages/frontend/core/src/components/root-app-sidebar/updater-button.tsx index 3170c14cf..0c70996fe 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/updater-button.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/updater-button.tsx @@ -1,5 +1,5 @@ import { AppUpdaterButton } from '@affine/component/app-sidebar/app-updater-button'; -import { useAppUpdater } from '@toeverything/hooks/use-app-updater'; +import { useAppUpdater } from '@affine/core/hooks/use-app-updater'; export const UpdaterButton = () => { const appUpdater = useAppUpdater(); diff --git a/packages/frontend/core/src/components/top-tip.tsx b/packages/frontend/core/src/components/top-tip.tsx index daaa2ecde..695c56c10 100644 --- a/packages/frontend/core/src/components/top-tip.tsx +++ b/packages/frontend/core/src/components/top-tip.tsx @@ -1,11 +1,11 @@ import { BrowserWarning } from '@affine/component/affine-banner'; import { LocalDemoTips } from '@affine/component/affine-banner'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { Workspace } from '@affine/workspace'; import { workspaceManagerAtom } from '@affine/workspace/atom'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useAtomValue, useSetAtom } from 'jotai'; import { useCallback, useState } from 'react'; diff --git a/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx b/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx index d37051501..87f083472 100644 --- a/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx +++ b/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx @@ -1,13 +1,13 @@ import { AffineShapeIcon } from '@affine/component/page-list'; // TODO: import from page-list temporarily, need to defined common svg icon/images management. import { Button } from '@affine/component/ui/button'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { useWorkspaceStatus } from '@affine/core/hooks/use-workspace-status'; import { WorkspaceSubPath } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom, workspaceManagerAtom, } from '@affine/workspace/atom'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; -import { useWorkspaceStatus } from '@toeverything/hooks/use-workspace-status'; import { useAtomValue } from 'jotai'; import { useState } from 'react'; diff --git a/packages/frontend/hooks/src/__tests__/use-block-suite-workspace-helper.spec.ts b/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-helper.spec.ts similarity index 100% rename from packages/frontend/hooks/src/__tests__/use-block-suite-workspace-helper.spec.ts rename to packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-helper.spec.ts diff --git a/packages/frontend/hooks/src/__tests__/index.spec.ts b/packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-page-title.spec.ts similarity index 100% rename from packages/frontend/hooks/src/__tests__/index.spec.ts rename to packages/frontend/core/src/hooks/__tests__/use-block-suite-workspace-page-title.spec.ts diff --git a/packages/frontend/hooks/src/affine-async-hooks.ts b/packages/frontend/core/src/hooks/affine-async-hooks.ts similarity index 100% rename from packages/frontend/hooks/src/affine-async-hooks.ts rename to packages/frontend/core/src/hooks/affine-async-hooks.ts diff --git a/packages/frontend/core/src/hooks/affine/use-all-page-list-config.tsx b/packages/frontend/core/src/hooks/affine/use-all-page-list-config.tsx index e869cb9a1..c1f3a13fe 100644 --- a/packages/frontend/core/src/hooks/affine/use-all-page-list-config.tsx +++ b/packages/frontend/core/src/hooks/affine/use-all-page-list-config.tsx @@ -3,10 +3,10 @@ import { type AllPageListConfig, FavoriteTag, } from '@affine/component/page-list'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import type { PageMeta } from '@blocksuite/store'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useAtomValue } from 'jotai'; import { useCallback, useMemo } from 'react'; diff --git a/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts b/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts index 2898844a4..9b6a4de9b 100644 --- a/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts +++ b/packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts @@ -1,9 +1,9 @@ -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { useBlockSuitePageMeta, usePageMetaHelper, -} from '@toeverything/hooks/use-block-suite-page-meta'; -import { useBlockSuiteWorkspaceHelper } from '@toeverything/hooks/use-block-suite-workspace-helper'; +} from '@affine/core/hooks/use-block-suite-page-meta'; +import { useBlockSuiteWorkspaceHelper } from '@affine/core/hooks/use-block-suite-workspace-helper'; import { useAtomValue, useSetAtom } from 'jotai'; import { useCallback } from 'react'; import { applyUpdate, encodeStateAsUpdate } from 'yjs'; diff --git a/packages/frontend/core/src/hooks/affine/use-language-helper.ts b/packages/frontend/core/src/hooks/affine/use-language-helper.ts index 9ddfca62f..f179187ca 100644 --- a/packages/frontend/core/src/hooks/affine/use-language-helper.ts +++ b/packages/frontend/core/src/hooks/affine/use-language-helper.ts @@ -1,5 +1,5 @@ +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { LOCALES, useI18N } from '@affine/i18n'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useMemo } from 'react'; export function useLanguageHelper() { diff --git a/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx b/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx index 302f34ad0..8e632d34b 100644 --- a/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx +++ b/packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx @@ -1,10 +1,10 @@ import { toast } from '@affine/component'; +import { usePageMetaHelper } from '@affine/core/hooks/use-block-suite-page-meta'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import { assertExists } from '@blocksuite/global/utils'; import { EdgelessIcon, HistoryIcon, PageIcon } from '@blocksuite/icons'; -import { usePageMetaHelper } from '@toeverything/hooks/use-block-suite-page-meta'; import { PreconditionStrategy, registerAffineCommand, diff --git a/packages/frontend/core/src/hooks/affine/use-sidebar-drag.ts b/packages/frontend/core/src/hooks/affine/use-sidebar-drag.ts index 89b1d0ead..b4c657a8c 100644 --- a/packages/frontend/core/src/hooks/affine/use-sidebar-drag.ts +++ b/packages/frontend/core/src/hooks/affine/use-sidebar-drag.ts @@ -1,9 +1,9 @@ import { toast } from '@affine/component'; import type { DraggableTitleCellData } from '@affine/component/page-list'; +import { usePageMetaHelper } from '@affine/core/hooks/use-block-suite-page-meta'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import type { DragEndEvent, UniqueIdentifier } from '@dnd-kit/core'; -import { usePageMetaHelper } from '@toeverything/hooks/use-block-suite-page-meta'; import { useAtomValue } from 'jotai'; import { useCallback } from 'react'; diff --git a/packages/frontend/core/src/hooks/current/use-current-page.ts b/packages/frontend/core/src/hooks/current/use-current-page.ts index 66095003d..11dcf8079 100644 --- a/packages/frontend/core/src/hooks/current/use-current-page.ts +++ b/packages/frontend/core/src/hooks/current/use-current-page.ts @@ -1,5 +1,5 @@ +import { useBlockSuiteWorkspacePage } from '@affine/core/hooks/use-block-suite-workspace-page'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; -import { useBlockSuiteWorkspacePage } from '@toeverything/hooks/use-block-suite-workspace-page'; import { useAtomValue } from 'jotai'; import { currentPageIdAtom } from '../../atoms/mode'; diff --git a/packages/frontend/hooks/src/use-app-updater.ts b/packages/frontend/core/src/hooks/use-app-updater.ts similarity index 100% rename from packages/frontend/hooks/src/use-app-updater.ts rename to packages/frontend/core/src/hooks/use-app-updater.ts diff --git a/packages/frontend/hooks/src/use-block-suite-editor.ts b/packages/frontend/core/src/hooks/use-block-suite-editor.ts similarity index 100% rename from packages/frontend/hooks/src/use-block-suite-editor.ts rename to packages/frontend/core/src/hooks/use-block-suite-editor.ts diff --git a/packages/frontend/hooks/src/use-block-suite-page-meta.ts b/packages/frontend/core/src/hooks/use-block-suite-page-meta.ts similarity index 100% rename from packages/frontend/hooks/src/use-block-suite-page-meta.ts rename to packages/frontend/core/src/hooks/use-block-suite-page-meta.ts diff --git a/packages/frontend/hooks/src/use-block-suite-page-references.ts b/packages/frontend/core/src/hooks/use-block-suite-page-references.ts similarity index 100% rename from packages/frontend/hooks/src/use-block-suite-page-references.ts rename to packages/frontend/core/src/hooks/use-block-suite-page-references.ts diff --git a/packages/frontend/hooks/src/use-block-suite-workspace-helper.ts b/packages/frontend/core/src/hooks/use-block-suite-workspace-helper.ts similarity index 100% rename from packages/frontend/hooks/src/use-block-suite-workspace-helper.ts rename to packages/frontend/core/src/hooks/use-block-suite-workspace-helper.ts diff --git a/packages/frontend/hooks/src/use-block-suite-workspace-page-title.ts b/packages/frontend/core/src/hooks/use-block-suite-workspace-page-title.ts similarity index 100% rename from packages/frontend/hooks/src/use-block-suite-workspace-page-title.ts rename to packages/frontend/core/src/hooks/use-block-suite-workspace-page-title.ts diff --git a/packages/frontend/hooks/src/use-block-suite-workspace-page.ts b/packages/frontend/core/src/hooks/use-block-suite-workspace-page.ts similarity index 100% rename from packages/frontend/hooks/src/use-block-suite-workspace-page.ts rename to packages/frontend/core/src/hooks/use-block-suite-workspace-page.ts diff --git a/packages/frontend/hooks/src/use-data-source-status.ts b/packages/frontend/core/src/hooks/use-data-source-status.ts similarity index 100% rename from packages/frontend/hooks/src/use-data-source-status.ts rename to packages/frontend/core/src/hooks/use-data-source-status.ts diff --git a/packages/frontend/core/src/hooks/use-get-page-info.ts b/packages/frontend/core/src/hooks/use-get-page-info.ts index 885a4336b..024957ad7 100644 --- a/packages/frontend/core/src/hooks/use-get-page-info.ts +++ b/packages/frontend/core/src/hooks/use-get-page-info.ts @@ -1,6 +1,6 @@ +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import type { GetPageInfoById } from '@affine/env/page-info'; import type { Workspace } from '@blocksuite/store'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useAtomValue } from 'jotai'; import { useCallback, useMemo } from 'react'; diff --git a/packages/frontend/hooks/src/use-is-tiny-screen.ts b/packages/frontend/core/src/hooks/use-is-tiny-screen.ts similarity index 97% rename from packages/frontend/hooks/src/use-is-tiny-screen.ts rename to packages/frontend/core/src/hooks/use-is-tiny-screen.ts index e87971da7..4b0880991 100644 --- a/packages/frontend/hooks/src/use-is-tiny-screen.ts +++ b/packages/frontend/core/src/hooks/use-is-tiny-screen.ts @@ -1,6 +1,6 @@ import 'foxact/use-debounced-state'; -import debounce from 'lodash.debounce'; +import { debounce } from 'lodash-es'; import { type RefObject, useEffect, useState } from 'react'; export function useIsTinyScreen({ diff --git a/packages/frontend/core/src/hooks/use-subscription.ts b/packages/frontend/core/src/hooks/use-subscription.ts index e669f2fca..be6a1a0b7 100644 --- a/packages/frontend/core/src/hooks/use-subscription.ts +++ b/packages/frontend/core/src/hooks/use-subscription.ts @@ -1,5 +1,5 @@ +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { type SubscriptionQuery, subscriptionQuery } from '@affine/graphql'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useSelfHosted } from './affine/use-server-config'; import { useQuery } from './use-query'; diff --git a/packages/frontend/hooks/src/use-workspace-blob.ts b/packages/frontend/core/src/hooks/use-workspace-blob.ts similarity index 100% rename from packages/frontend/hooks/src/use-workspace-blob.ts rename to packages/frontend/core/src/hooks/use-workspace-blob.ts diff --git a/packages/frontend/hooks/src/use-workspace-info.ts b/packages/frontend/core/src/hooks/use-workspace-info.ts similarity index 100% rename from packages/frontend/hooks/src/use-workspace-info.ts rename to packages/frontend/core/src/hooks/use-workspace-info.ts diff --git a/packages/frontend/hooks/src/use-workspace-status.ts b/packages/frontend/core/src/hooks/use-workspace-status.ts similarity index 100% rename from packages/frontend/hooks/src/use-workspace-status.ts rename to packages/frontend/core/src/hooks/use-workspace-status.ts diff --git a/packages/frontend/hooks/src/use-workspace.ts b/packages/frontend/core/src/hooks/use-workspace.ts similarity index 100% rename from packages/frontend/hooks/src/use-workspace.ts rename to packages/frontend/core/src/hooks/use-workspace.ts diff --git a/packages/frontend/core/src/layouts/workspace-layout.tsx b/packages/frontend/core/src/layouts/workspace-layout.tsx index 207e1a662..269658d86 100644 --- a/packages/frontend/core/src/layouts/workspace-layout.tsx +++ b/packages/frontend/core/src/layouts/workspace-layout.tsx @@ -7,6 +7,8 @@ import { PageListDragOverlay, } from '@affine/component/page-list'; import { MainContainer, WorkspaceFallback } from '@affine/component/workspace'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; +import { useWorkspaceStatus } from '@affine/core/hooks/use-workspace-status'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import { assertExists } from '@blocksuite/global/utils'; import { @@ -18,8 +20,6 @@ import { useSensor, useSensors, } from '@dnd-kit/core'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; -import { useWorkspaceStatus } from '@toeverything/hooks/use-workspace-status'; import { useAtom, useAtomValue, useSetAtom } from 'jotai'; import type { PropsWithChildren, ReactNode } from 'react'; import { lazy, Suspense, useCallback, useEffect, useState } from 'react'; diff --git a/packages/frontend/core/src/pages/404.tsx b/packages/frontend/core/src/pages/404.tsx index f6f980ad1..280a33da8 100644 --- a/packages/frontend/core/src/pages/404.tsx +++ b/packages/frontend/core/src/pages/404.tsx @@ -1,5 +1,5 @@ import { NotFoundPage } from '@affine/component/not-found-page'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; // eslint-disable-next-line @typescript-eslint/no-restricted-imports import { useSession } from 'next-auth/react'; import type { ReactElement } from 'react'; diff --git a/packages/frontend/core/src/pages/workspace/all-page/all-page.tsx b/packages/frontend/core/src/pages/workspace/all-page/all-page.tsx index 6e1cbda9c..cd71592ae 100644 --- a/packages/frontend/core/src/pages/workspace/all-page/all-page.tsx +++ b/packages/frontend/core/src/pages/workspace/all-page/all-page.tsx @@ -9,6 +9,7 @@ import { useCollectionManager, VirtualizedPageList, } from '@affine/component/page-list'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; @@ -19,7 +20,6 @@ import { ViewLayersIcon, } from '@blocksuite/icons'; import type { PageMeta, Workspace } from '@blocksuite/store'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import clsx from 'clsx'; import { useAtomValue, useSetAtom } from 'jotai'; import { diff --git a/packages/frontend/core/src/pages/workspace/collection.tsx b/packages/frontend/core/src/pages/workspace/collection.tsx index 28d55d333..7464a2f5c 100644 --- a/packages/frontend/core/src/pages/workspace/collection.tsx +++ b/packages/frontend/core/src/pages/workspace/collection.tsx @@ -10,6 +10,7 @@ import { useEditCollection, } from '@affine/component/page-list'; import { WindowsAppControls } from '@affine/core/components/pure/header/windows-app-controls'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import type { Collection } from '@affine/env/filter'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; @@ -20,7 +21,6 @@ import { PageIcon, ViewLayersIcon, } from '@blocksuite/icons'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { getCurrentStore } from '@toeverything/infra/atom'; import { useAtomValue } from 'jotai'; import { useSetAtom } from 'jotai'; diff --git a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx index 2716ffa86..d1b847112 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx @@ -4,13 +4,13 @@ import { useCollectionManager, } from '@affine/component/page-list'; import { ResizePanel } from '@affine/component/resize-panel'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; +import { useWorkspaceStatus } from '@affine/core/hooks/use-workspace-status'; import { WorkspaceSubPath } from '@affine/env/workspace'; import { globalBlockSuiteSchema, SyncEngineStep } from '@affine/workspace'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import type { AffineEditorContainer } from '@blocksuite/presets'; import type { Page, Workspace } from '@blocksuite/store'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; -import { useWorkspaceStatus } from '@toeverything/hooks/use-workspace-status'; import { appSettingAtom } from '@toeverything/infra/atom'; import { useAtom, useAtomValue, useSetAtom } from 'jotai'; import { diff --git a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/copilot.tsx b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/copilot.tsx index 8e5833c93..18a3e9936 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/copilot.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/copilot.tsx @@ -1,7 +1,7 @@ +import { useActiveBlocksuiteEditor } from '@affine/core/hooks/use-block-suite-editor'; import { assertExists } from '@blocksuite/global/utils'; import { AiIcon } from '@blocksuite/icons'; import { CopilotPanel } from '@blocksuite/presets'; -import { useActiveBlocksuiteEditor } from '@toeverything/hooks/use-block-suite-editor'; import { useCallback, useRef } from 'react'; import type { EditorExtension } from '../types'; diff --git a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx index 06e73dacf..c3a258c8f 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx @@ -1,7 +1,7 @@ +import { useActiveBlocksuiteEditor } from '@affine/core/hooks/use-block-suite-editor'; import { assertExists } from '@blocksuite/global/utils'; import { FrameIcon } from '@blocksuite/icons'; import { FramePanel } from '@blocksuite/presets'; -import { useActiveBlocksuiteEditor } from '@toeverything/hooks/use-block-suite-editor'; import { useCallback, useRef } from 'react'; import type { EditorExtension } from '../types'; diff --git a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx index 002adb2dc..6d24a2701 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx @@ -1,7 +1,7 @@ +import { useActiveBlocksuiteEditor } from '@affine/core/hooks/use-block-suite-editor'; import { assertExists } from '@blocksuite/global/utils'; import { TocIcon } from '@blocksuite/icons'; import { TOCPanel } from '@blocksuite/presets'; -import { useActiveBlocksuiteEditor } from '@toeverything/hooks/use-block-suite-editor'; import { useCallback, useRef } from 'react'; import type { EditorExtension } from '../types'; diff --git a/packages/frontend/core/src/pages/workspace/index.tsx b/packages/frontend/core/src/pages/workspace/index.tsx index 249ac3f88..ed9aeabf1 100644 --- a/packages/frontend/core/src/pages/workspace/index.tsx +++ b/packages/frontend/core/src/pages/workspace/index.tsx @@ -1,4 +1,5 @@ import { WorkspaceFallback } from '@affine/component/workspace'; +import { useWorkspace } from '@affine/core/hooks/use-workspace'; import { type Workspace } from '@affine/workspace'; import { currentWorkspaceAtom, @@ -6,7 +7,6 @@ import { workspaceListLoadingStatusAtom, workspaceManagerAtom, } from '@affine/workspace/atom'; -import { useWorkspace } from '@toeverything/hooks/use-workspace'; import { useAtom, useAtomValue } from 'jotai'; import { type ReactElement, Suspense, useEffect, useMemo } from 'react'; import { Outlet, useParams } from 'react-router-dom'; diff --git a/packages/frontend/core/src/pages/workspace/trash-page.tsx b/packages/frontend/core/src/pages/workspace/trash-page.tsx index 4d6648f47..c823f657f 100644 --- a/packages/frontend/core/src/pages/workspace/trash-page.tsx +++ b/packages/frontend/core/src/pages/workspace/trash-page.tsx @@ -4,12 +4,12 @@ import { TrashOperationCell, VirtualizedPageList, } from '@affine/component/page-list'; +import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { waitForCurrentWorkspaceAtom } from '@affine/workspace/atom'; import { assertExists } from '@blocksuite/global/utils'; import { DeleteIcon } from '@blocksuite/icons'; import type { PageMeta } from '@blocksuite/store'; -import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { getCurrentStore } from '@toeverything/infra/atom'; import { useAtomValue } from 'jotai'; import { useCallback } from 'react'; diff --git a/packages/frontend/core/src/providers/modal-provider.tsx b/packages/frontend/core/src/providers/modal-provider.tsx index 8d8fca03b..7dd00fc93 100644 --- a/packages/frontend/core/src/providers/modal-provider.tsx +++ b/packages/frontend/core/src/providers/modal-provider.tsx @@ -1,3 +1,4 @@ +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace'; import { currentWorkspaceAtom, @@ -5,7 +6,6 @@ import { workspaceListAtom, } from '@affine/workspace/atom'; import { assertExists } from '@blocksuite/global/utils'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useAtom, useAtomValue } from 'jotai'; import type { ReactElement } from 'react'; import { lazy, Suspense, useCallback } from 'react'; diff --git a/packages/frontend/core/src/providers/session-provider.tsx b/packages/frontend/core/src/providers/session-provider.tsx index 3980fbe1a..e44f17089 100644 --- a/packages/frontend/core/src/providers/session-provider.tsx +++ b/packages/frontend/core/src/providers/session-provider.tsx @@ -1,9 +1,8 @@ -import '@toeverything/hooks/use-affine-ipc-renderer'; - import { pushNotificationAtom } from '@affine/component/notification-center'; +import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { affine } from '@affine/electron-api'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { CLOUD_WORKSPACE_CHANGED_BROADCAST_CHANNEL_KEY } from '@affine/workspace'; -import { useAsyncCallback } from '@toeverything/hooks/affine-async-hooks'; import { useAtom, useSetAtom } from 'jotai'; // eslint-disable-next-line @typescript-eslint/no-restricted-imports import { SessionProvider, useSession } from 'next-auth/react'; @@ -51,7 +50,7 @@ const SessionDefence = (props: PropsWithChildren) => { }); if (environment.isDesktop) { - window.affine.ipcRenderer.send('affine:login'); + affine?.ipcRenderer.send('affine:login'); } } prevSession.current = session; diff --git a/packages/frontend/core/tsconfig.json b/packages/frontend/core/tsconfig.json index c60824a29..6a65ddf11 100644 --- a/packages/frontend/core/tsconfig.json +++ b/packages/frontend/core/tsconfig.json @@ -14,9 +14,6 @@ { "path": "../../frontend/graphql" }, - { - "path": "../../frontend/hooks" - }, { "path": "../../frontend/i18n" }, @@ -32,6 +29,9 @@ { "path": "../../common/env" }, + { + "path": "../../common/y-indexeddb" + }, { "path": "./tsconfig.node.json" }, diff --git a/packages/frontend/hooks/package.json b/packages/frontend/hooks/package.json deleted file mode 100644 index 144cbb038..000000000 --- a/packages/frontend/hooks/package.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "name": "@toeverything/hooks", - "type": "module", - "exports": { - "./*": "./src/*" - }, - "private": true, - "dependencies": { - "foxact": "^0.2.20", - "jotai": "^2.5.1", - "jotai-effect": "^0.2.3", - "lodash.debounce": "^4.0.8", - "p-queue": "^8.0.0", - "react": "18.2.0", - "rxjs": "^7.8.1", - "swr": "2.2.4", - "uuid": "^9.0.1" - }, - "devDependencies": { - "@affine/debug": "workspace:*", - "@affine/electron-api": "workspace:*", - "@affine/env": "workspace:*", - "@affine/workspace": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312220916-e3abcbb", - "@blocksuite/blocks": "0.11.0-nightly-202312220916-e3abcbb", - "@blocksuite/global": "0.11.0-nightly-202312220916-e3abcbb", - "@blocksuite/lit": "0.11.0-nightly-202312220916-e3abcbb", - "@blocksuite/presets": "0.11.0-nightly-202312220916-e3abcbb", - "@blocksuite/store": "0.11.0-nightly-202312220916-e3abcbb", - "@testing-library/react": "^14.0.0", - "@toeverything/infra": "workspace:*", - "@types/image-blob-reduce": "^4.1.3", - "@types/lodash.debounce": "^4.0.7", - "fake-indexeddb": "^5.0.0", - "vitest": "1.1.1", - "y-provider": "workspace:*" - }, - "peerDependencies": { - "@blocksuite/block-std": "*", - "@blocksuite/blocks": "*", - "@blocksuite/global": "*", - "@blocksuite/presets": "*", - "@blocksuite/store": "*", - "y-provider": "workspace:*" - }, - "peerDependenciesMeta": { - "@affine/env": { - "optional": true - }, - "@blocksuite/block-std": { - "optional": true - }, - "@blocksuite/blocks": { - "optional": true - }, - "@blocksuite/global": { - "optional": true - }, - "@blocksuite/presets": { - "optional": true - }, - "@blocksuite/store": { - "optional": true - }, - "y-provider": { - "optional": true - } - }, - "version": "0.11.0" -} diff --git a/packages/frontend/hooks/project.json b/packages/frontend/hooks/project.json deleted file mode 100644 index a4b0460d7..000000000 --- a/packages/frontend/hooks/project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "hooks", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "projectType": "library", - "sourceRoot": "packages/frontend/hooks/src" -} diff --git a/packages/frontend/hooks/src/use-affine-ipc-renderer.ts b/packages/frontend/hooks/src/use-affine-ipc-renderer.ts deleted file mode 100644 index 0cf2176b3..000000000 --- a/packages/frontend/hooks/src/use-affine-ipc-renderer.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { useCallback, useEffect, useRef } from 'react'; - -declare global { - interface IPCRenderer { - send(channel: string, ...args: any[]): void; - invoke(channel: string, ...args: any[]): Promise; - on( - channel: string, - listener: (event: unknown, ...args: any[]) => void - ): this; - once( - channel: string, - listener: (event: unknown, ...args: any[]) => void - ): this; - removeListener(channel: string, listener: (...args: any[]) => void): this; - } - - interface Window { - affine: { - ipcRenderer: IPCRenderer; - }; - } -} - -/** - * Unsafe - */ -export function useAffineAsyncCallback(channel: string) { - return useCallback( - (...args: any[]): Promise => { - return window.affine.ipcRenderer.invoke(channel, ...args); - }, - [channel] - ); -} - -/** - * Unsafe - */ -export function useAffineListener( - channel: string, - listener: (event: unknown, ...args: any[]) => void, - once?: boolean -): void { - const fnRef = useRef<((event: unknown, ...args: any[]) => void) | null>(null); - if (!fnRef.current) { - fnRef.current = listener; - } - const ipcListener = fnRef.current ?? (fnRef.current = listener); - useEffect(() => { - if (once) { - window.affine.ipcRenderer.once(channel, ipcListener); - } else { - window.affine.ipcRenderer.on(channel, ipcListener); - } - return () => { - window.affine.ipcRenderer.removeListener(channel, ipcListener); - }; - }, [channel, once, ipcListener]); -} diff --git a/packages/frontend/hooks/tsconfig.json b/packages/frontend/hooks/tsconfig.json deleted file mode 100644 index 4f7367530..000000000 --- a/packages/frontend/hooks/tsconfig.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../../../tsconfig.json", - "include": ["./src"], - "compilerOptions": { - "composite": true, - "noEmit": false, - "outDir": "lib" - }, - "references": [ - { "path": "../../common/env" }, - { "path": "../../common/y-indexeddb" }, - { "path": "../../common/debug" }, - { "path": "../../common/infra" }, - { "path": "../electron-api" }, - { "path": "../workspace" } - ] -} diff --git a/tests/storybook/src/stories/quick-search/quick-search-main.stories.tsx b/tests/storybook/src/stories/quick-search/quick-search-main.stories.tsx index f5346c2f5..6ba8604ba 100644 --- a/tests/storybook/src/stories/quick-search/quick-search-main.stories.tsx +++ b/tests/storybook/src/stories/quick-search/quick-search-main.stories.tsx @@ -5,12 +5,12 @@ import { } from '@affine/core/commands'; import { CMDKQuickSearchModal } from '@affine/core/components/pure/cmdk'; import { HighlightLabel } from '@affine/core/components/pure/cmdk/highlight'; +import { useWorkspace } from '@affine/core/hooks/use-workspace'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { currentWorkspaceAtom } from '@affine/workspace/atom'; import type { Page } from '@blocksuite/store'; import type { Meta, StoryFn } from '@storybook/react'; -import { useWorkspace } from '@toeverything/hooks/use-workspace'; import { useStore } from 'jotai'; import { useEffect, useLayoutEffect, useState } from 'react'; import { withRouter } from 'storybook-addon-react-router-v6'; diff --git a/tsconfig.json b/tsconfig.json index 9983d4a0d..a956f6ad9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -66,7 +66,6 @@ "@affine-test/kit/*": ["./tests/kit/*"], "@affine-test/fixtures/*": ["./tests/fixtures/*"], "@toeverything/y-indexeddb": ["./packages/common/y-indexeddb/src"], - "@toeverything/hooks/*": ["./packages/frontend/hooks/src/*"], "@toeverything/infra/*": ["./packages/common/infra/src/*"], "@affine/native": ["./packages/frontend/native/index.d.ts"], "@affine/native/*": ["./packages/frontend/native/*"], @@ -97,9 +96,6 @@ { "path": "./packages/frontend/graphql" }, - { - "path": "./packages/frontend/hooks" - }, { "path": "./packages/frontend/i18n" }, diff --git a/yarn.lock b/yarn.lock index 585c90775..9397ed4d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13238,61 +13238,6 @@ __metadata: languageName: node linkType: hard -"@toeverything/hooks@workspace:packages/frontend/hooks": - version: 0.0.0-use.local - resolution: "@toeverything/hooks@workspace:packages/frontend/hooks" - dependencies: - "@affine/debug": "workspace:*" - "@affine/electron-api": "workspace:*" - "@affine/env": "workspace:*" - "@affine/workspace": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312220916-e3abcbb" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312220916-e3abcbb" - "@blocksuite/global": "npm:0.11.0-nightly-202312220916-e3abcbb" - "@blocksuite/lit": "npm:0.11.0-nightly-202312220916-e3abcbb" - "@blocksuite/presets": "npm:0.11.0-nightly-202312220916-e3abcbb" - "@blocksuite/store": "npm:0.11.0-nightly-202312220916-e3abcbb" - "@testing-library/react": "npm:^14.0.0" - "@toeverything/infra": "workspace:*" - "@types/image-blob-reduce": "npm:^4.1.3" - "@types/lodash.debounce": "npm:^4.0.7" - fake-indexeddb: "npm:^5.0.0" - foxact: "npm:^0.2.20" - jotai: "npm:^2.5.1" - jotai-effect: "npm:^0.2.3" - lodash.debounce: "npm:^4.0.8" - p-queue: "npm:^8.0.0" - react: "npm:18.2.0" - rxjs: "npm:^7.8.1" - swr: "npm:2.2.4" - uuid: "npm:^9.0.1" - vitest: "npm:1.1.1" - y-provider: "workspace:*" - peerDependencies: - "@blocksuite/block-std": "*" - "@blocksuite/blocks": "*" - "@blocksuite/global": "*" - "@blocksuite/presets": "*" - "@blocksuite/store": "*" - y-provider: "workspace:*" - peerDependenciesMeta: - "@affine/env": - optional: true - "@blocksuite/block-std": - optional: true - "@blocksuite/blocks": - optional: true - "@blocksuite/global": - optional: true - "@blocksuite/presets": - optional: true - "@blocksuite/store": - optional: true - y-provider: - optional: true - languageName: unknown - linkType: soft - "@toeverything/infra@workspace:*, @toeverything/infra@workspace:packages/common/infra": version: 0.0.0-use.local resolution: "@toeverything/infra@workspace:packages/common/infra" @@ -14035,15 +13980,6 @@ __metadata: languageName: node linkType: hard -"@types/lodash.debounce@npm:^4.0.7": - version: 4.0.9 - resolution: "@types/lodash.debounce@npm:4.0.9" - dependencies: - "@types/lodash": "npm:*" - checksum: 8183a152e01928e3b97ca773f6ae6038b8695e76493ba8bf6b743ec143948a62294fbc9d49fa4a78b52265b3ba4892ef57534e0c13d04aa0f111671b5a944feb - languageName: node - linkType: hard - "@types/lodash@npm:*, @types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.178, @types/lodash@npm:^4.14.191": version: 4.14.202 resolution: "@types/lodash@npm:4.14.202" @@ -28846,16 +28782,6 @@ __metadata: languageName: node linkType: hard -"p-queue@npm:^8.0.0": - version: 8.0.0 - resolution: "p-queue@npm:8.0.0" - dependencies: - eventemitter3: "npm:^5.0.1" - p-timeout: "npm:^6.1.2" - checksum: 3d11784d48e5713989f712ccf33899157e88860a84c0e694fb8a1477f01ef1594a7633698ec1a4aebd38020f452a87adbe07733137c069f2fa5c392fe8e3fe99 - languageName: node - linkType: hard - "p-retry@npm:^4.5.0": version: 4.6.2 resolution: "p-retry@npm:4.6.2" @@ -28866,13 +28792,6 @@ __metadata: languageName: node linkType: hard -"p-timeout@npm:^6.1.2": - version: 6.1.2 - resolution: "p-timeout@npm:6.1.2" - checksum: ca3ede368d792bd86fcfa4e133220536382225d31e5f62e2cedb8280df267b25f6684aa0056b22e8aa538cc85014b310058d8fdddeb0a1ff363093d56e87ac3a - languageName: node - linkType: hard - "p-try@npm:^1.0.0": version: 1.0.0 resolution: "p-try@npm:1.0.0"