From 0014b38278630877ca578dc599d198bd53ac5fb4 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Mon, 11 Apr 2022 15:06:41 +0800 Subject: [PATCH] refactor: split plugin infra entries --- .../components/DashboardFrame/Navigation.tsx | 2 +- .../src/initialization/Dashboard.tsx | 9 +--- .../src/initialization/PluginHost.ts | 2 +- .../pages/Wallets/components/Assets/index.tsx | 3 +- .../Wallets/components/Balance/index.tsx | 2 +- .../components/CollectibleCard/index.tsx | 2 +- .../components/CollectibleList/index.tsx | 2 +- .../CollectiblePlaceHolder/index.tsx | 2 +- .../components/FungibleTokenTable/index.tsx | 2 +- .../ChangeNetworkTip.tsx | 2 +- .../FungibleTokenTableRow/index.tsx | 2 +- .../components/HistoryTableRow/index.tsx | 2 +- .../components/ReceiveDialog/index.tsx | 2 +- .../components/Transfer/TransferERC20.tsx | 2 +- .../components/Transfer/TransferERC721.tsx | 2 +- .../Wallets/components/Transfer/index.tsx | 2 +- .../components/WalletStateBar/index.tsx | 2 +- .../WalletStateBar/useNetworkSelector.tsx | 2 +- .../dashboard/src/pages/Wallets/index.tsx | 2 +- .../pages/Wallets/utils/getTokenUSDValue.tsx | 2 +- .../components/Wallet/CollectibleCard.tsx | 2 +- .../TypedMessageRender/Components/Text.tsx | 2 +- packages/mask/src/UIRoot.tsx | 2 +- .../CompositionDialog/BadgeRenderer.tsx | 2 +- .../CompositionDialog/CompositionUI.tsx | 2 +- .../CompositionDialog/PluginEntryRender.tsx | 4 +- .../src/components/DataSource/usePostInfo.ts | 3 +- .../DecryptedPost/DecryptedPost.tsx | 4 +- .../DecryptedPostMetadataRender.tsx | 2 +- .../DisabledPluginSuggestion.tsx | 4 +- .../InjectedComponents/PageInspector.tsx | 2 +- .../InjectedComponents/PageTabItem.tsx | 2 +- .../InjectedComponents/PostActions.tsx | 2 +- .../InjectedComponents/PostComments.tsx | 2 +- .../InjectedComponents/PostInspector.tsx | 7 +++- .../InjectedComponents/PostReplacer.tsx | 2 +- .../InjectedComponents/ProfileSlider.tsx | 2 +- .../InjectedComponents/ProfileTabContent.tsx | 4 +- .../InjectedComponents/SearchResultBox.tsx | 2 +- .../InjectedComponents/ToolboxUnstyled.tsx | 2 +- .../components/shared/ApplicationBoard.tsx | 3 +- .../src/components/shared/WalletStatusBox.tsx | 2 +- .../Jobs/StartPluginWorker.ts | 2 +- .../WelcomeServices/generateBackupJSON.ts | 2 +- .../WelcomeServices/restoreBackup.ts | 2 +- .../mask/src/extension/dashboard/index.tsx | 2 +- packages/mask/src/extension/popups/UI.tsx | 2 +- .../components/NetworkSelector/index.tsx | 2 +- .../components/WalletStateBar/index.tsx | 2 +- .../src/extension/popups/pages/Swap/index.tsx | 2 +- .../Wallet/ContractInteraction/index.tsx | 2 +- .../pages/Wallet/SelectWallet/WalletItem.tsx | 2 +- .../pages/Wallet/SwitchWallet/WalletItem.tsx | 2 +- .../pages/Wallet/Transfer/AccountItem.tsx | 2 +- .../pages/Wallet/Transfer/Transfer1559.tsx | 2 +- .../ActivityList/ActivityListItem.tsx | 2 +- .../Wallet/components/WalletInfo/index.tsx | 2 +- packages/mask/src/extension/popups/render.tsx | 2 +- .../plugins/ArtBlocks/SNSAdaptor/index.tsx | 2 +- .../plugins/Avatar/SNSAdaptor/NFTAvatar.tsx | 2 +- .../mask/src/plugins/Avatar/Services/bind.ts | 2 +- .../mask/src/plugins/Avatar/Services/index.ts | 2 +- .../plugins/Collectible/SNSAdaptor/index.tsx | 2 +- .../plugins/CryptoartAI/SNSAdaptor/index.tsx | 2 +- .../UI/Web3State/createNonFungibleToken.ts | 2 +- .../plugins/EVM/UI/Web3State/getAssetsFn.ts | 2 +- .../src/plugins/EVM/UI/Web3State/index.ts | 2 +- .../mask/src/plugins/EVM/UI/Web3UI/index.tsx | 2 +- .../UI/components/FortmaticProviderBridge.tsx | 2 +- .../UI/components/InjectedProviderBridge.tsx | 2 +- .../UI/components/NetworkIconClickBait.tsx | 2 +- .../UI/components/ProviderIconClickBait.tsx | 2 +- packages/mask/src/plugins/EVM/constants.ts | 2 +- .../mask/src/plugins/EVM/storage/index.ts | 2 +- packages/mask/src/plugins/EVM/utils/token.ts | 2 +- packages/mask/src/plugins/External/base.ts | 2 +- .../SNSAdaptor/FindTrumanDialog.tsx | 2 +- .../plugins/FindTruman/SNSAdaptor/index.tsx | 2 +- packages/mask/src/plugins/FindTruman/base.ts | 3 +- .../plugins/Furucombo/SNSAdaptor/index.tsx | 2 +- .../src/plugins/Gitcoin/SNSAdaptor/index.tsx | 4 +- packages/mask/src/plugins/Gitcoin/base.ts | 3 +- .../plugins/GoodGhosting/SNSAdaptor/index.tsx | 3 +- .../plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx | 3 +- .../ITO/SNSAdaptor/CompositionDialog.tsx | 2 +- .../mask/src/plugins/ITO/SNSAdaptor/index.tsx | 2 +- packages/mask/src/plugins/ITO/base.ts | 3 +- .../SNSAdaptor/components/DrawDialog.tsx | 2 +- .../src/plugins/MaskBox/SNSAdaptor/index.tsx | 2 +- .../mask/src/plugins/MaskPluginWrapper.tsx | 2 +- packages/mask/src/plugins/NextID/base.ts | 3 +- .../plugins/NextID/components/BindDialog.tsx | 2 +- .../plugins/NextID/components/BindPanelUI.tsx | 2 +- .../plugins/NextID/components/BindingItem.tsx | 2 +- .../NextID/components/Tip/AddDialog.tsx | 2 +- .../components/Tip/NFTSection/NFTList.tsx | 2 +- .../components/Tip/NFTSection/index.tsx | 2 +- .../NextID/components/Tip/TipButton.tsx | 2 +- .../NextID/components/Tip/TipDialog.tsx | 5 +-- .../plugins/NextID/components/Tip/TipForm.tsx | 2 +- .../NextID/components/UnbindConfirm.tsx | 2 +- .../NextID/components/UnbindPanelUI.tsx | 2 +- .../plugins/NextID/contexts/Tip/TipContext.ts | 2 +- .../mask/src/plugins/NextID/storage/index.ts | 2 +- packages/mask/src/plugins/Pets/base.tsx | 3 +- .../plugins/Polls/SNSAdaptor/PollsDialog.tsx | 2 +- .../plugins/Polls/SNSAdaptor/PollsInPost.tsx | 2 +- .../plugins/PoolTogether/SNSAdaptor/index.tsx | 2 +- .../plugins/PoolTogether/UI/NetworkView.tsx | 2 +- .../Profile/SNSAdaptor/WalletsPage.tsx | 2 +- .../RedPacket/SNSAdaptor/RedPacketDialog.tsx | 2 +- .../RedPacket/SNSAdaptor/RedPacketInPost.tsx | 2 +- .../RedPacket/SNSAdaptor/RedPacketPast.tsx | 2 +- .../SNSAdaptor/RedpacketNftConfirmDialog.tsx | 2 +- .../plugins/RedPacket/SNSAdaptor/index.tsx | 2 +- packages/mask/src/plugins/RedPacket/base.ts | 3 +- packages/mask/src/plugins/Savings/base.ts | 3 +- .../src/plugins/Snapshot/SNSAdaptor/index.tsx | 3 +- .../Trader/SNSAdaptor/trader/TradeView.tsx | 2 +- .../Trader/SNSAdaptor/trader/TraderDialog.tsx | 4 +- .../SNSAdaptor/trending/TrendingViewDeck.tsx | 3 +- packages/mask/src/plugins/Trader/base.ts | 3 +- .../src/plugins/Trader/trader/0x/useTrade.ts | 2 +- .../Trader/trader/balancer/useTrade.ts | 2 +- .../plugins/Trader/trader/bancor/useTrade.ts | 2 +- .../plugins/Trader/trader/dodo/useTrade.ts | 2 +- .../Trader/trader/openocean/useTrade.ts | 2 +- .../SNSAdaptor/UnlockProtocolDialog.tsx | 2 +- .../SNSAdaptor/UnlockProtocolInPost.tsx | 2 +- .../mask/src/plugins/UnlockProtocol/base.ts | 3 +- .../src/plugins/VCent/SNSAdaptor/index.tsx | 2 +- .../ConnectionProgress.tsx | 2 +- .../PluginProviderRender.tsx | 2 +- .../SNSAdaptor/SelectProviderDialog/index.tsx | 2 +- .../src/plugins/dHEDGE/SNSAdaptor/index.tsx | 2 +- .../automation/pasteToCommentBoxFacebook.ts | 2 +- .../injection/NFT/NFTAvatarInFacebook.tsx | 2 +- .../facebook.com/injection/PostInspector.tsx | 2 +- .../facebook.com/injection/PostReplacer.tsx | 2 +- .../injection/NFT/NFTAvatarSettingDialog.tsx | 2 +- .../instagram.com/injection/post-inspector.ts | 2 +- .../automation/pasteToCommentBoxMinds.ts | 2 +- .../minds.com/injection/PostInspector.tsx | 2 +- .../minds.com/injection/PostReplacer.tsx | 2 +- .../twitter.com/collecting/post.ts | 2 +- .../twitter.com/injection/MaskIcon.tsx | 2 +- .../injection/PostActions/index.tsx | 2 +- .../twitter.com/injection/PostInspector.tsx | 2 +- .../twitter.com/injection/PostReplacer.tsx | 2 +- packages/mask/src/social-network/PostInfo.ts | 1 - .../defaults/inject/CommentBox.tsx | 3 +- .../defaults/inject/Comments.tsx | 3 +- .../defaults/inject/PostActions.tsx | 3 +- .../defaults/inject/PostInspector.tsx | 3 +- .../defaults/inject/PostReplacer.tsx | 3 +- packages/mask/src/social-network/types.ts | 2 +- packages/mask/src/social-network/ui.ts | 2 +- .../utils/create-post-context.ts | 7 +++- .../src/web3/UI/EthereumChainBoundary.tsx | 3 +- .../mask/src/web3/UI/TokenAmountPanel.tsx | 2 +- packages/plugin-infra/package.json | 41 +++++++++++++++++-- .../src/entry-background-worker.ts | 2 + .../plugin-infra/src/entry-content-script.ts | 20 +++++++++ packages/plugin-infra/src/entry-dashboard.ts | 2 + packages/plugin-infra/src/entry-dom.ts | 11 +++++ packages/plugin-infra/src/entry-web3.ts | 11 +++++ packages/plugin-infra/src/entry.ts | 4 ++ packages/plugin-infra/src/index.ts | 20 --------- .../plugin-infra/src/manager/sns-adaptor.ts | 2 +- packages/plugin-infra/src/types.ts | 13 ------ packages/plugin-infra/src/utils/index.ts | 3 -- packages/plugin-infra/src/web3-types.ts | 14 ++++++- packages/plugin-infra/src/web3/useAccount.ts | 2 +- .../plugin-infra/src/web3/useAllowTestnet.ts | 2 +- .../plugin-infra/src/web3/useAssetType.ts | 2 +- packages/plugin-infra/src/web3/useBalance.ts | 4 +- packages/plugin-infra/src/web3/useBeat.ts | 2 +- .../plugin-infra/src/web3/useBlockNumber.ts | 2 +- .../plugin-infra/src/web3/useChainColor.ts | 2 +- .../plugin-infra/src/web3/useChainDetailed.ts | 2 +- packages/plugin-infra/src/web3/useChainId.ts | 2 +- .../plugin-infra/src/web3/useChainIdValid.ts | 2 +- .../src/web3/useCollectibleType.ts | 2 +- .../plugin-infra/src/web3/useCurrencyType.ts | 2 +- packages/plugin-infra/src/web3/useNameType.ts | 2 +- .../src/web3/useNetworkDescriptor.ts | 2 +- .../src/web3/useNetworkDescriptors.ts | 2 +- .../plugin-infra/src/web3/useNetworkType.ts | 2 +- .../src/web3/useProviderDescriptor.ts | 2 +- .../src/web3/useProviderDescriptors.ts | 2 +- .../plugin-infra/src/web3/useProviderType.ts | 2 +- .../plugin-infra/src/web3/useTokenPrice.ts | 3 +- .../src/web3/useTransactionType.ts | 2 +- packages/plugin-infra/src/web3/useWallet.ts | 2 +- .../plugin-infra/src/web3/useWalletPrimary.ts | 2 +- packages/plugin-infra/src/web3/useWallets.ts | 2 +- .../plugin-infra/src/web3/useWeb3State.ts | 2 +- packages/plugin-infra/src/web3/useWeb3UI.ts | 2 +- .../src/SNSAdaptor/ConnectButton.tsx | 2 +- .../CyberConnect/src/SNSAdaptor/index.tsx | 2 +- packages/plugins/CyberConnect/src/base.tsx | 3 +- .../src/SNSAdaptor/components/TabContent.tsx | 3 +- .../FileService/src/SNSAdaptor/MainDialog.tsx | 2 +- .../plugins/FileService/src/Worker/index.ts | 3 +- packages/plugins/FileService/src/base.ts | 2 +- .../plugins/Flow/src/UI/Web3State/index.ts | 2 +- packages/plugins/Flow/src/UI/Web3UI/index.tsx | 2 +- .../UI/components/ProviderIconClickBait.tsx | 2 +- .../Flow/src/apis/getFungibleAssets.ts | 2 +- packages/plugins/Flow/src/constants.ts | 3 +- packages/plugins/Flow/src/helpers/token.ts | 2 +- .../plugins/Solana/src/UI/Web3State/index.ts | 2 +- .../plugins/Solana/src/UI/Web3UI/index.tsx | 2 +- .../UI/components/ProviderIconClickBait.tsx | 2 +- .../Solana/src/apis/getFungibleAssets.ts | 2 +- .../Solana/src/apis/getNonFungibleAssets.ts | 2 +- packages/plugins/Solana/src/constants.ts | 2 +- packages/plugins/Solana/src/helpers/token.ts | 2 +- packages/plugins/example/src/Worker/index.ts | 2 +- .../src/producers/fungibleTokenAsset.ts | 2 +- .../producers/nonFungibleCollectionAsset.ts | 2 +- .../UI/components/ReversedAddress/index.tsx | 2 +- .../web3-providers/src/coingecko/index.ts | 2 +- packages/web3-providers/src/debank/format.ts | 2 +- .../web3-providers/src/token-price/index.ts | 2 +- packages/web3-providers/src/types.ts | 2 +- packages/web3-providers/src/zerion/format.ts | 3 +- packages/web3-providers/src/zerion/index.ts | 2 +- 228 files changed, 353 insertions(+), 283 deletions(-) delete mode 100644 packages/mask/src/social-network/PostInfo.ts create mode 100644 packages/plugin-infra/src/entry-background-worker.ts create mode 100644 packages/plugin-infra/src/entry-content-script.ts create mode 100644 packages/plugin-infra/src/entry-dashboard.ts create mode 100644 packages/plugin-infra/src/entry-dom.ts create mode 100644 packages/plugin-infra/src/entry-web3.ts create mode 100644 packages/plugin-infra/src/entry.ts delete mode 100644 packages/plugin-infra/src/index.ts delete mode 100644 packages/plugin-infra/src/utils/index.ts diff --git a/packages/dashboard/src/components/DashboardFrame/Navigation.tsx b/packages/dashboard/src/components/DashboardFrame/Navigation.tsx index 469b906b6ac1..390a541cc36a 100644 --- a/packages/dashboard/src/components/DashboardFrame/Navigation.tsx +++ b/packages/dashboard/src/components/DashboardFrame/Navigation.tsx @@ -32,7 +32,7 @@ import { import { useDashboardI18N } from '../../locales' import { MaskColorVar } from '@masknet/theme' import { DashboardRoutes } from '@masknet/shared-base' -import { NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra' +import { NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra/web3' const ListItemLinkUnStyled = ({ to, ...props }: ListItemProps & { to: string }) => { const navigate = useNavigate() diff --git a/packages/dashboard/src/initialization/Dashboard.tsx b/packages/dashboard/src/initialization/Dashboard.tsx index 4d4ce9f6ea29..5715cdc26333 100644 --- a/packages/dashboard/src/initialization/Dashboard.tsx +++ b/packages/dashboard/src/initialization/Dashboard.tsx @@ -9,13 +9,8 @@ import { } from '@masknet/theme' import { I18NextProviderHMR, SharedContextProvider } from '@masknet/shared' import { ErrorBoundary } from '@masknet/shared-base-ui' -import { - createInjectHooksRenderer, - NetworkPluginID, - PluginsWeb3ContextProvider, - useActivatedPluginsDashboard, - useAllPluginsWeb3State, -} from '@masknet/plugin-infra' +import { createInjectHooksRenderer, useActivatedPluginsDashboard } from '@masknet/plugin-infra/dashboard' +import { NetworkPluginID, PluginsWeb3ContextProvider, useAllPluginsWeb3State } from '@masknet/plugin-infra/web3' import { Web3Provider } from '@masknet/web3-shared-evm' import { i18NextInstance } from '@masknet/shared-base' diff --git a/packages/dashboard/src/initialization/PluginHost.ts b/packages/dashboard/src/initialization/PluginHost.ts index 90046b03c47b..4e6e223cf984 100644 --- a/packages/dashboard/src/initialization/PluginHost.ts +++ b/packages/dashboard/src/initialization/PluginHost.ts @@ -1,7 +1,7 @@ import './plugins' import { Emitter } from '@servie/events' -import { startPluginDashboard, Plugin } from '@masknet/plugin-infra' +import { startPluginDashboard, Plugin } from '@masknet/plugin-infra/dashboard' import { Services, Messages } from '../API' import { createI18NBundle, i18NextInstance } from '@masknet/shared-base' import { InMemoryStorages, PersistentStorages } from '../utils/kv-storage' diff --git a/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx b/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx index 6a1dcba73df4..edc898d78b7b 100644 --- a/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx @@ -1,5 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' -import { NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra' +import { type Web3Plugin, NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra/web3' import { makeStyles, useTabs } from '@masknet/theme' import { TabContext, TabList, TabPanel } from '@mui/lab' import { Box, Button, Tab } from '@mui/material' diff --git a/packages/dashboard/src/pages/Wallets/components/Balance/index.tsx b/packages/dashboard/src/pages/Wallets/components/Balance/index.tsx index 643fc72b438e..d782c2df2c3c 100644 --- a/packages/dashboard/src/pages/Wallets/components/Balance/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Balance/index.tsx @@ -1,5 +1,5 @@ import { CardIcon, DownloadIcon, MaskWalletIcon, SendIcon, SwapIcon } from '@masknet/icons' -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { MiniNetworkSelector } from '@masknet/shared' import { DashboardRoutes } from '@masknet/shared-base' import { MaskColorVar } from '@masknet/theme' diff --git a/packages/dashboard/src/pages/Wallets/components/CollectibleCard/index.tsx b/packages/dashboard/src/pages/Wallets/components/CollectibleCard/index.tsx index f6efbf2c828a..702c4756ec8e 100644 --- a/packages/dashboard/src/pages/Wallets/components/CollectibleCard/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/CollectibleCard/index.tsx @@ -12,7 +12,7 @@ import { useCurrentWeb3NetworkPluginID, useWeb3State, Web3Plugin, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' const useStyles = makeStyles()((theme) => ({ container: { diff --git a/packages/dashboard/src/pages/Wallets/components/CollectibleList/index.tsx b/packages/dashboard/src/pages/Wallets/components/CollectibleList/index.tsx index 695e940d787f..d2550fbfce83 100644 --- a/packages/dashboard/src/pages/Wallets/components/CollectibleList/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/CollectibleList/index.tsx @@ -16,7 +16,7 @@ import { useAccount, useCurrentWeb3NetworkPluginID, NetworkPluginID, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { useAsyncRetry } from 'react-use' const useStyles = makeStyles()({ diff --git a/packages/dashboard/src/pages/Wallets/components/CollectiblePlaceHolder/index.tsx b/packages/dashboard/src/pages/Wallets/components/CollectiblePlaceHolder/index.tsx index 99430c67191f..cb0b20053a85 100644 --- a/packages/dashboard/src/pages/Wallets/components/CollectiblePlaceHolder/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/CollectiblePlaceHolder/index.tsx @@ -4,7 +4,7 @@ import { makeStyles, MaskColorVar } from '@masknet/theme' import { useDashboardI18N } from '../../../../locales' import { WalletIcon } from '@masknet/shared' import { Box } from '@mui/material' -import { useNetworkDescriptor } from '@masknet/plugin-infra' +import { useNetworkDescriptor } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()({ container: { diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx index 5ae01fcc022a..dd7a4a744d6a 100644 --- a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx @@ -19,7 +19,7 @@ import { useAccount, NetworkPluginID, useCurrentWeb3NetworkPluginID, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' const useStyles = makeStyles()((theme) => ({ container: { diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/ChangeNetworkTip.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/ChangeNetworkTip.tsx index 6ba5bc09da2e..25741491728f 100644 --- a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/ChangeNetworkTip.tsx +++ b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/ChangeNetworkTip.tsx @@ -2,7 +2,7 @@ import { memo } from 'react' import { Link, Typography } from '@mui/material' import { useDashboardI18N } from '../../../../locales' import { MaskColorVar } from '@masknet/theme' -import { useNetworkDescriptors, useProviderDescriptor, useWeb3UI } from '@masknet/plugin-infra' +import { useNetworkDescriptors, useProviderDescriptor, useWeb3UI } from '@masknet/plugin-infra/web3' interface ChangeNetworkTipProps { chainId?: number diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx index 9f0346e4d371..91dad838d11a 100644 --- a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx @@ -11,7 +11,7 @@ import { useCurrentWeb3NetworkPluginID, useWeb3State, Web3Plugin, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { ChainId } from '@masknet/web3-shared-evm' import { useDashboardI18N } from '../../../../locales' import { ChangeNetworkTip } from './ChangeNetworkTip' diff --git a/packages/dashboard/src/pages/Wallets/components/HistoryTableRow/index.tsx b/packages/dashboard/src/pages/Wallets/components/HistoryTableRow/index.tsx index f5f6be3ac606..2a501ecc8f79 100644 --- a/packages/dashboard/src/pages/Wallets/components/HistoryTableRow/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/HistoryTableRow/index.tsx @@ -12,7 +12,7 @@ import { import { TransactionIcon } from '../TransactionIcon' import { LinkOutIcon } from '@masknet/icons' import classNames from 'classnames' -import { useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()((theme) => ({ type: { diff --git a/packages/dashboard/src/pages/Wallets/components/ReceiveDialog/index.tsx b/packages/dashboard/src/pages/Wallets/components/ReceiveDialog/index.tsx index 744cedd421db..7e33574c0887 100644 --- a/packages/dashboard/src/pages/Wallets/components/ReceiveDialog/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/ReceiveDialog/index.tsx @@ -7,7 +7,7 @@ import { WalletQRCodeContainer } from '../../../../components/WalletQRCodeContai import { useCopyToClipboard } from 'react-use' import { useCurrentSelectedWalletNetwork } from '../../api' import { NetworkType, resolveNetworkAddressPrefix } from '@masknet/web3-shared-evm' -import { useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()((theme) => ({ paper: { diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx index 201755ea9479..b7f07cee84d8 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx @@ -6,7 +6,7 @@ import { useNetworkDescriptor, useWeb3State, Web3Plugin, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { NetworkType } from '@masknet/public-api' import { FormattedAddress, TokenAmountPanel, usePickToken } from '@masknet/shared' import { MaskColorVar, MaskTextField } from '@masknet/theme' diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx index fcde2a2753c1..2465cb63731d 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx @@ -36,7 +36,7 @@ import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useGasConfig } from '../../hooks/useGasConfig' import { unionBy } from 'lodash-unified' import { TransferTab } from './types' -import { NetworkPluginID, useLookupAddress, useNetworkDescriptor, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useLookupAddress, useNetworkDescriptor, useWeb3State } from '@masknet/plugin-infra/web3' import { NetworkType } from '@masknet/public-api' import { useAsync, useUpdateEffect } from 'react-use' import { multipliedBy } from '@masknet/web3-shared-base' diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/index.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/index.tsx index 6a6fbaafdcc0..4bd3a214af25 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/index.tsx @@ -9,7 +9,7 @@ import { useLocation } from 'react-router-dom' import { useDashboardI18N } from '../../../../locales' import { TransferERC721 } from './TransferERC721' import { TransferTab } from './types' -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' const assetTabs = [TransferTab.Token, TransferTab.Collectibles] as const export * from './types' diff --git a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx index b08e2c0878bd..6a67cf0cc5a9 100644 --- a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx @@ -11,7 +11,7 @@ import { useWeb3State, Web3Plugin, useReverseAddress, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { EMPTY_LIST } from '@masknet/shared-base' import { PluginMessages } from '../../../../API' import { useRecentTransactions } from '../../hooks/useRecentTransactions' diff --git a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/useNetworkSelector.tsx b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/useNetworkSelector.tsx index 0316ece1f660..a221eba8c480 100644 --- a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/useNetworkSelector.tsx +++ b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/useNetworkSelector.tsx @@ -2,7 +2,7 @@ import { MenuItem, Stack, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import { SuccessIcon } from '@masknet/icons' import { WalletIcon, useMenu } from '@masknet/shared' -import { useChainId, useNetworkDescriptors, useProviderDescriptor, useWeb3UI } from '@masknet/plugin-infra' +import { useChainId, useNetworkDescriptors, useProviderDescriptor, useWeb3UI } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()((theme) => ({ item: { diff --git a/packages/dashboard/src/pages/Wallets/index.tsx b/packages/dashboard/src/pages/Wallets/index.tsx index 676c9be0e2e4..d211a8c7eace 100644 --- a/packages/dashboard/src/pages/Wallets/index.tsx +++ b/packages/dashboard/src/pages/Wallets/index.tsx @@ -9,7 +9,7 @@ import { useWallets, useWeb3State as useWeb3PluginState, Web3Plugin, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { DashboardRoutes, relativeRouteOf } from '@masknet/shared-base' import { useWeb3State } from '@masknet/web3-shared-evm' diff --git a/packages/dashboard/src/pages/Wallets/utils/getTokenUSDValue.tsx b/packages/dashboard/src/pages/Wallets/utils/getTokenUSDValue.tsx index 96e5b0740f3b..92ae2df56215 100644 --- a/packages/dashboard/src/pages/Wallets/utils/getTokenUSDValue.tsx +++ b/packages/dashboard/src/pages/Wallets/utils/getTokenUSDValue.tsx @@ -1,4 +1,4 @@ -import { CurrencyType } from '@masknet/plugin-infra' +import { CurrencyType } from '@masknet/plugin-infra/web3' export const getTokenUSDValue = (value?: { [key in CurrencyType]?: string }) => value ? Number.parseFloat(value[CurrencyType.USD] ?? '') : 0 diff --git a/packages/dashboard/stories/components/Wallet/CollectibleCard.tsx b/packages/dashboard/stories/components/Wallet/CollectibleCard.tsx index cc9dc776ecd3..580fce31c65c 100644 --- a/packages/dashboard/stories/components/Wallet/CollectibleCard.tsx +++ b/packages/dashboard/stories/components/Wallet/CollectibleCard.tsx @@ -1,6 +1,6 @@ import { story } from '@masknet/storybook-shared' import { CollectibleCard as C } from '../../../src/pages/Wallets/components/CollectibleCard' -import { TokenType } from '@masknet/plugin-infra' +import { TokenType } from '@masknet/plugin-infra/web3' const { meta, of } = story(C) diff --git a/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx b/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx index 261f2613a9af..19437b576d23 100644 --- a/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx +++ b/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx @@ -1,7 +1,7 @@ import { memo, PropsWithChildren, useCallback } from 'react' import { Typography, Link as MaterialLink } from '@mui/material' import type { RenderFragmentsContextType } from '@masknet/typed-message/dom' -import { useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script' export const Container = memo(function Container(props: PropsWithChildren<{}>) { return ( diff --git a/packages/mask/src/UIRoot.tsx b/packages/mask/src/UIRoot.tsx index caa45b96d77f..7e0dabf1b201 100644 --- a/packages/mask/src/UIRoot.tsx +++ b/packages/mask/src/UIRoot.tsx @@ -1,7 +1,7 @@ import { Suspense } from 'react' import { Web3Provider } from '@masknet/web3-shared-evm' import { StyledEngineProvider, Theme } from '@mui/material' -import { NetworkPluginID, PluginsWeb3ContextProvider, useAllPluginsWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, PluginsWeb3ContextProvider, useAllPluginsWeb3State } from '@masknet/plugin-infra/web3' import { I18NextProviderHMR, SharedContextProvider } from '@masknet/shared' import { ErrorBoundary, ErrorBoundaryBuildInfoContext, useValueRef } from '@masknet/shared-base-ui' import { i18NextInstance } from '@masknet/shared-base' diff --git a/packages/mask/src/components/CompositionDialog/BadgeRenderer.tsx b/packages/mask/src/components/CompositionDialog/BadgeRenderer.tsx index d5be53533851..52acc9e00ef5 100644 --- a/packages/mask/src/components/CompositionDialog/BadgeRenderer.tsx +++ b/packages/mask/src/components/CompositionDialog/BadgeRenderer.tsx @@ -1,4 +1,4 @@ -import { useActivatedPluginsSNSAdaptor, Plugin, usePluginI18NField } from '@masknet/plugin-infra' +import { useActivatedPluginsSNSAdaptor, Plugin, usePluginI18NField } from '@masknet/plugin-infra/content-script' import { makeStyles, ShadowRootTooltip } from '@masknet/theme' import type { TypedMessage } from '@masknet/typed-message' import { Box, Chip } from '@mui/material' diff --git a/packages/mask/src/components/CompositionDialog/CompositionUI.tsx b/packages/mask/src/components/CompositionDialog/CompositionUI.tsx index 4b1123ab42d5..2c1cf610fc9d 100644 --- a/packages/mask/src/components/CompositionDialog/CompositionUI.tsx +++ b/packages/mask/src/components/CompositionDialog/CompositionUI.tsx @@ -13,7 +13,7 @@ import { Flags, PersistentStorages } from '../../../shared' import { ClickableChip } from '../shared/SelectRecipients/ClickableChip' import { SelectRecipientsUI } from '../shared/SelectRecipients/SelectRecipients' import type { Profile } from '../../database' -import { CompositionContext } from '@masknet/plugin-infra' +import { CompositionContext } from '@masknet/plugin-infra/content-script' import { DebugMetadataInspector } from '../shared/DebugMetadataInspector' import { Trans } from 'react-i18next' import type { EncryptTargetE2E, EncryptTargetPublic } from '@masknet/encryption' diff --git a/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx b/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx index 0f24a4afb9ed..e415cb94cd24 100644 --- a/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx +++ b/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx @@ -1,11 +1,11 @@ import { - useCurrentWeb3NetworkPluginID, useActivatedPluginSNSAdaptor_Web3Supported, useActivatedPluginsSNSAdaptor, Plugin, PluginI18NFieldRender, usePluginI18NField, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/content-script' +import { useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra/web3' import { ErrorBoundary } from '@masknet/shared-base-ui' import { Result } from 'ts-results' import { RedPacketPluginID } from '../../plugins/RedPacket/constants' diff --git a/packages/mask/src/components/DataSource/usePostInfo.ts b/packages/mask/src/components/DataSource/usePostInfo.ts index 43fdc666e360..532c98851aea 100644 --- a/packages/mask/src/components/DataSource/usePostInfo.ts +++ b/packages/mask/src/components/DataSource/usePostInfo.ts @@ -1,8 +1,7 @@ import { activatedSocialNetworkUI } from '../../social-network' -import { usePostInfoDetails } from '@masknet/plugin-infra' +import { usePostInfoDetails } from '@masknet/plugin-infra/content-script' import type { ProfileIdentifier } from '@masknet/shared-base' -export { usePostInfo, PostInfoProvider, usePostInfoDetails } from '@masknet/plugin-infra' export function usePostLink() { const id = usePostInfoDetails.snsID() const identifier = usePostInfoDetails.identifier() diff --git a/packages/mask/src/components/InjectedComponents/DecryptedPost/DecryptedPost.tsx b/packages/mask/src/components/InjectedComponents/DecryptedPost/DecryptedPost.tsx index c9d5c5060234..b7c881d3988f 100644 --- a/packages/mask/src/components/InjectedComponents/DecryptedPost/DecryptedPost.tsx +++ b/packages/mask/src/components/InjectedComponents/DecryptedPost/DecryptedPost.tsx @@ -14,12 +14,12 @@ import type { DecryptionProgress, FailureDecryption, SuccessDecryption } from '. import { DecryptPostSuccess, DecryptPostSuccessProps } from './DecryptedPostSuccess' import { DecryptPostAwaiting, DecryptPostAwaitingProps } from './DecryptPostAwaiting' import { DecryptPostFailed, DecryptPostFailedProps } from './DecryptPostFailed' -import { usePostClaimedAuthor, usePostInfoDetails, usePostInfo } from '../../DataSource/usePostInfo' +import { usePostClaimedAuthor } from '../../DataSource/usePostInfo' import { delay, encodeArrayBuffer, safeUnreachable } from '@dimensiondev/kit' import { activatedSocialNetworkUI } from '../../../social-network' import type { DecryptionContext, SocialNetworkEncodedPayload } from '../../../../background/services/crypto/decryption' import { DecryptIntermediateProgressKind, DecryptProgressKind } from '@masknet/encryption' -import type { PostContext } from '@masknet/plugin-infra' +import { type PostContext, usePostInfoDetails, usePostInfo } from '@masknet/plugin-infra/content-script' import { Some } from 'ts-results' function progressReducer( diff --git a/packages/mask/src/components/InjectedComponents/DecryptedPostMetadataRender.tsx b/packages/mask/src/components/InjectedComponents/DecryptedPostMetadataRender.tsx index 66a5914878b1..4260a3677ebb 100644 --- a/packages/mask/src/components/InjectedComponents/DecryptedPostMetadataRender.tsx +++ b/packages/mask/src/components/InjectedComponents/DecryptedPostMetadataRender.tsx @@ -1,4 +1,4 @@ -import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script' import type { MetadataRenderProps } from '@masknet/typed-message/dom' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { diff --git a/packages/mask/src/components/InjectedComponents/DisabledPluginSuggestion.tsx b/packages/mask/src/components/InjectedComponents/DisabledPluginSuggestion.tsx index dafa9d1aa00e..11ba18790aca 100644 --- a/packages/mask/src/components/InjectedComponents/DisabledPluginSuggestion.tsx +++ b/packages/mask/src/components/InjectedComponents/DisabledPluginSuggestion.tsx @@ -1,11 +1,11 @@ +import type { Option } from 'ts-results' import { useActivatedPluginsSNSAdaptor, registeredPlugins, usePostInfoDetails, - Option, Plugin, usePluginI18NField, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/content-script' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { Switch } from '@mui/material' import Services from '../../extension/service' diff --git a/packages/mask/src/components/InjectedComponents/PageInspector.tsx b/packages/mask/src/components/InjectedComponents/PageInspector.tsx index df1da63ed3c3..0aaae17f968f 100644 --- a/packages/mask/src/components/InjectedComponents/PageInspector.tsx +++ b/packages/mask/src/components/InjectedComponents/PageInspector.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react' import { useCustomSnackbar } from '@masknet/theme' import { Button, Box, Typography } from '@mui/material' -import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script' import { useMatchXS, MaskMessages, useI18N } from '../../utils' import { useAutoPasteFailedDialog } from './AutoPasteFailedDialog' diff --git a/packages/mask/src/components/InjectedComponents/PageTabItem.tsx b/packages/mask/src/components/InjectedComponents/PageTabItem.tsx index c0b78647b617..6340061fea0c 100644 --- a/packages/mask/src/components/InjectedComponents/PageTabItem.tsx +++ b/packages/mask/src/components/InjectedComponents/PageTabItem.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { makeStyles } from '@masknet/theme' import { Button } from '@mui/material' -import { Plugin, usePluginI18NField } from '@masknet/plugin-infra' +import { type Plugin, usePluginI18NField } from '@masknet/plugin-infra/content-script' const borderShadows = { dark: '0px 0px 16px 0px #FFFFFF33', diff --git a/packages/mask/src/components/InjectedComponents/PostActions.tsx b/packages/mask/src/components/InjectedComponents/PostActions.tsx index ecca18ed8be0..c084f3d59543 100644 --- a/packages/mask/src/components/InjectedComponents/PostActions.tsx +++ b/packages/mask/src/components/InjectedComponents/PostActions.tsx @@ -1,4 +1,4 @@ -import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script' const ActionsRenderer = createInjectHooksRenderer( useActivatedPluginsSNSAdaptor.visibility.useNotMinimalMode, diff --git a/packages/mask/src/components/InjectedComponents/PostComments.tsx b/packages/mask/src/components/InjectedComponents/PostComments.tsx index 01712c86c463..8a10b52102c9 100644 --- a/packages/mask/src/components/InjectedComponents/PostComments.tsx +++ b/packages/mask/src/components/InjectedComponents/PostComments.tsx @@ -8,7 +8,7 @@ import { useEffect } from 'react' import { useAsync } from 'react-use' import Services from '../../extension/service' import { extractTextFromTypedMessage } from '@masknet/typed-message' -import { usePostInfoDetails } from '../DataSource/usePostInfo' +import { usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { decodeArrayBuffer } from '@dimensiondev/kit' const useStyle = makeStyles()({ diff --git a/packages/mask/src/components/InjectedComponents/PostInspector.tsx b/packages/mask/src/components/InjectedComponents/PostInspector.tsx index db2b5ae4b75a..41a0f4e648ba 100644 --- a/packages/mask/src/components/InjectedComponents/PostInspector.tsx +++ b/packages/mask/src/components/InjectedComponents/PostInspector.tsx @@ -6,8 +6,11 @@ import { PostIVIdentifier, ProfileIdentifier } from '@masknet/shared-base' import type { TypedMessageTuple } from '@masknet/typed-message' import type { Profile } from '../../database' import { useCurrentIdentity, useFriendsList } from '../DataSource/useActivatedUI' -import { usePostInfoDetails } from '../DataSource/usePostInfo' -import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { + usePostInfoDetails, + createInjectHooksRenderer, + useActivatedPluginsSNSAdaptor, +} from '@masknet/plugin-infra/content-script' import { PossiblePluginSuggestionPostInspector } from './DisabledPluginSuggestion' import { MaskPostExtraPluginWrapper } from '../../plugins/MaskPluginWrapper' import { useSubscription } from 'use-subscription' diff --git a/packages/mask/src/components/InjectedComponents/PostReplacer.tsx b/packages/mask/src/components/InjectedComponents/PostReplacer.tsx index 0308ca2a2fb6..6f4bcffdea61 100644 --- a/packages/mask/src/components/InjectedComponents/PostReplacer.tsx +++ b/packages/mask/src/components/InjectedComponents/PostReplacer.tsx @@ -10,7 +10,7 @@ import { import { TextResizeContext, TypedMessageRender, useTransformedValue } from '@masknet/typed-message/dom' import { makeStyles } from '@masknet/theme' import { useEffect, useMemo } from 'react' -import { usePostInfoDetails } from '../DataSource/usePostInfo' +import { usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { TypedMessageRenderContext } from '../../../shared-ui/TypedMessageRender/context' import { useCurrentIdentity } from '../DataSource/useActivatedUI' import { activatedSocialNetworkUI } from '../../social-network/ui' diff --git a/packages/mask/src/components/InjectedComponents/ProfileSlider.tsx b/packages/mask/src/components/InjectedComponents/ProfileSlider.tsx index 5d0529635dfd..e04244d4dcbf 100644 --- a/packages/mask/src/components/InjectedComponents/ProfileSlider.tsx +++ b/packages/mask/src/components/InjectedComponents/ProfileSlider.tsx @@ -1,4 +1,4 @@ -import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script' const PluginRenderer = createInjectHooksRenderer(useActivatedPluginsSNSAdaptor.visibility.useAnyMode, (x) => { return () => { diff --git a/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx b/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx index feeaeba8c65f..3bee5277aeb8 100644 --- a/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx +++ b/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx @@ -3,8 +3,8 @@ import { Plugin, PluginId, useActivatedPluginsSNSAdaptor, - useAvailablePlugins, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/content-script' +import { useAvailablePlugins } from '@masknet/plugin-infra/web3' import { EMPTY_LIST, NextIDPlatform } from '@masknet/shared-base' import { makeStyles, useStylesExtends } from '@masknet/theme' import { useAddressNames } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/components/InjectedComponents/SearchResultBox.tsx b/packages/mask/src/components/InjectedComponents/SearchResultBox.tsx index 0ca0f3934593..c917be2bf891 100644 --- a/packages/mask/src/components/InjectedComponents/SearchResultBox.tsx +++ b/packages/mask/src/components/InjectedComponents/SearchResultBox.tsx @@ -1,4 +1,4 @@ -import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script' const PluginRenderer = createInjectHooksRenderer( useActivatedPluginsSNSAdaptor.visibility.useNotMinimalMode, diff --git a/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx b/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx index 40b413cacbca..2f6303e1c2b9 100644 --- a/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx +++ b/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx @@ -21,7 +21,7 @@ import { useChainDetailed, useWeb3State, useReverseAddress, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { useCallback, useEffect, useMemo } from 'react' import { WalletIcon } from '@masknet/shared' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' diff --git a/packages/mask/src/components/shared/ApplicationBoard.tsx b/packages/mask/src/components/shared/ApplicationBoard.tsx index 3762504887d9..9d3608d5aa9c 100644 --- a/packages/mask/src/components/shared/ApplicationBoard.tsx +++ b/packages/mask/src/components/shared/ApplicationBoard.tsx @@ -1,7 +1,8 @@ import { Fragment } from 'react' import { makeStyles } from '@masknet/theme' import { useChainId } from '@masknet/web3-shared-evm' -import { useActivatedPluginsSNSAdaptor, useCurrentWeb3NetworkPluginID, Plugin, useAccount } from '@masknet/plugin-infra' +import { useActivatedPluginsSNSAdaptor, Plugin } from '@masknet/plugin-infra/content-script' +import { useCurrentWeb3NetworkPluginID, useAccount } from '@masknet/plugin-infra/web3' import { getCurrentSNSNetwork } from '../../social-network-adaptor/utils' import { activatedSocialNetworkUI } from '../../social-network' diff --git a/packages/mask/src/components/shared/WalletStatusBox.tsx b/packages/mask/src/components/shared/WalletStatusBox.tsx index 256564f8801e..f75f919884b7 100644 --- a/packages/mask/src/components/shared/WalletStatusBox.tsx +++ b/packages/mask/src/components/shared/WalletStatusBox.tsx @@ -16,7 +16,7 @@ import { useProviderType, useReverseAddress, useWallet, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { FormattedAddress, useSnackbarCallback, WalletIcon } from '@masknet/shared' import { WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' diff --git a/packages/mask/src/extension/background-script/Jobs/StartPluginWorker.ts b/packages/mask/src/extension/background-script/Jobs/StartPluginWorker.ts index a07e9127957c..d11eb4390500 100644 --- a/packages/mask/src/extension/background-script/Jobs/StartPluginWorker.ts +++ b/packages/mask/src/extension/background-script/Jobs/StartPluginWorker.ts @@ -1,4 +1,4 @@ -import { startPluginWorker, Plugin } from '@masknet/plugin-infra' +import { startPluginWorker, Plugin } from '@masknet/plugin-infra/background-worker' import { InMemoryStorages, PersistentStorages } from '../../../../shared' import { createPluginDatabase } from '../../../database/Plugin' import { createPluginHost } from '../../../plugin-infra/host' diff --git a/packages/mask/src/extension/background-script/WelcomeServices/generateBackupJSON.ts b/packages/mask/src/extension/background-script/WelcomeServices/generateBackupJSON.ts index 2becd9acf9af..be2a2f677f23 100644 --- a/packages/mask/src/extension/background-script/WelcomeServices/generateBackupJSON.ts +++ b/packages/mask/src/extension/background-script/WelcomeServices/generateBackupJSON.ts @@ -15,7 +15,7 @@ import { LegacyWalletRecordToJSONFormat, WalletRecordToJSONFormat, } from '../../../utils/type-transform/BackupFormat/JSON/DBRecord-JSON/WalletRecord' -import { activatedPluginsWorker } from '@masknet/plugin-infra' +import { activatedPluginsWorker } from '@masknet/plugin-infra/background-worker' import { RelationRecordToJSONFormat } from '../../../utils/type-transform/BackupFormat/JSON/DBRecord-JSON/RelationRecord' import { timeout } from '@dimensiondev/kit' diff --git a/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts b/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts index 1117c89495d6..a03fd82d1633 100644 --- a/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts +++ b/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts @@ -19,7 +19,7 @@ import { recoverWalletFromMnemonic, recoverWalletFromPrivateKey, } from '../../../plugins/Wallet/services' -import { activatedPluginsWorker, registeredPluginIDs } from '@masknet/plugin-infra' +import { activatedPluginsWorker, registeredPluginIDs } from '@masknet/plugin-infra/background-worker' import { Result } from 'ts-results' import { addWallet } from '../../../plugins/Wallet/services/wallet/database' import { patchCreateNewRelation, patchCreateOrUpdateRelation } from '../IdentityService' diff --git a/packages/mask/src/extension/dashboard/index.tsx b/packages/mask/src/extension/dashboard/index.tsx index ccf5e5bc9fc2..bfbb0098cf32 100644 --- a/packages/mask/src/extension/dashboard/index.tsx +++ b/packages/mask/src/extension/dashboard/index.tsx @@ -6,7 +6,7 @@ import { PluginTransakMessages } from '../../plugins/Transak/messages' import { PluginTraderMessages, PluginTraderRPC } from '../../plugins/Trader/messages' import { PluginPetMessages } from '../../plugins/Pets/messages' import { MaskMessages } from '../../utils/messages' -import { startPluginDashboard } from '@masknet/plugin-infra' +import { startPluginDashboard } from '@masknet/plugin-infra/dashboard' import { createPluginHost } from '../../plugin-infra/host' import type { DashboardPluginMessages, DashboardPluginServices } from '@masknet/shared' import { createNormalReactRoot } from '../../utils/createNormalReactRoot' diff --git a/packages/mask/src/extension/popups/UI.tsx b/packages/mask/src/extension/popups/UI.tsx index 9e5993fe12c9..9c48b28f9e34 100644 --- a/packages/mask/src/extension/popups/UI.tsx +++ b/packages/mask/src/extension/popups/UI.tsx @@ -1,6 +1,6 @@ import { lazy } from 'react' import { Navigate, Route, Routes, HashRouter } from 'react-router-dom' -import { createInjectHooksRenderer, useActivatedPluginsDashboard } from '@masknet/plugin-infra' +import { createInjectHooksRenderer, useActivatedPluginsDashboard } from '@masknet/plugin-infra/dashboard' import { PopupRoutes } from '@masknet/shared-base' import { usePopupFullPageTheme } from '../../utils/theme/useClassicMaskFullPageTheme' import '../../social-network-adaptor/browser-action' diff --git a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx index d246ba6ff24d..61f2aa5dfe41 100644 --- a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx +++ b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx @@ -3,7 +3,7 @@ import { Box, MenuItem, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import { Flags } from '../../../../../shared' import { ChainId, ProviderType, useAccount, useChainId } from '@masknet/web3-shared-evm' -import { getRegisteredWeb3Networks, NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra' +import { getRegisteredWeb3Networks, NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra/web3' import { currentMaskWalletAccountSettings, currentProviderSettings } from '../../../../plugins/Wallet/settings' import { ChainIcon, useMenuConfig, WalletIcon } from '@masknet/shared' import { useValueRef } from '@masknet/shared-base-ui' diff --git a/packages/mask/src/extension/popups/components/WalletStateBar/index.tsx b/packages/mask/src/extension/popups/components/WalletStateBar/index.tsx index 794ff1f8ddfc..a6defa097ebf 100644 --- a/packages/mask/src/extension/popups/components/WalletStateBar/index.tsx +++ b/packages/mask/src/extension/popups/components/WalletStateBar/index.tsx @@ -2,7 +2,7 @@ import { FC, memo } from 'react' import { LoadingIcon } from '@masknet/icons' import { FormattedAddress, WalletIcon } from '@masknet/shared' import { makeStyles } from '@masknet/theme' -import { NetworkPluginID, useProviderDescriptor, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useProviderDescriptor, useWeb3State } from '@masknet/plugin-infra/web3' import { formatEthereumAddress, ProviderType } from '@masknet/web3-shared-evm' import { Box, Stack, StackProps, Typography } from '@mui/material' import { NetworkSelector } from '../../components/NetworkSelector' diff --git a/packages/mask/src/extension/popups/pages/Swap/index.tsx b/packages/mask/src/extension/popups/pages/Swap/index.tsx index a4475eba395b..7386a1ab1b48 100644 --- a/packages/mask/src/extension/popups/pages/Swap/index.tsx +++ b/packages/mask/src/extension/popups/pages/Swap/index.tsx @@ -11,7 +11,7 @@ import { SwapWeb3Context } from '../../../../web3/context' import { PopupRoutes } from '@masknet/shared-base' import { useI18N } from '../../../../utils' import { useSwapPageTheme } from '../../../../utils/theme/useSwapPageTheme' -import { NetworkPluginID, useReverseAddress } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress } from '@masknet/plugin-infra/web3' import { TargetChainIdContext } from '../../../../plugins/Trader/trader/useTargetChainIdContext' import { AllProviderTradeContext } from '../../../../plugins/Trader/trader/useAllProviderTradeContext' diff --git a/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx index 7042c2d50e17..9b99701069e9 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/ContractInteraction/index.tsx @@ -28,7 +28,7 @@ import BigNumber from 'bignumber.js' import { useNativeTokenPrice, useTokenPrice } from '../../../../../plugins/Wallet/hooks/useTokenPrice' import { LoadingPlaceholder } from '../../../components/LoadingPlaceholder' import { toHex } from 'web3-utils' -import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' import { isGreaterThan, leftShift, pow10 } from '@masknet/web3-shared-base' import { CopyIconButton } from '../../../components/CopyIconButton' diff --git a/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/WalletItem.tsx b/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/WalletItem.tsx index c5db190b3c20..aa8ab08a23f9 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/WalletItem.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/WalletItem.tsx @@ -6,7 +6,7 @@ import { MaskWalletIcon, SuccessIcon } from '@masknet/icons' import { ListItem, ListItemText, Typography } from '@mui/material' import { FormattedAddress } from '@masknet/shared' import { CopyIconButton } from '../../../components/CopyIconButton' -import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()({ item: { diff --git a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/WalletItem.tsx b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/WalletItem.tsx index 9b68fb064a48..2dd3e8d009b0 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/WalletItem.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/WalletItem.tsx @@ -2,7 +2,7 @@ import type { Wallet } from '@masknet/web3-shared-evm' import { formatEthereumAddress } from '@masknet/web3-shared-evm' import { makeStyles } from '@masknet/theme' import { memo } from 'react' -import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' import { MaskWalletIcon, SuccessIcon } from '@masknet/icons' import { ListItem, ListItemText, Typography } from '@mui/material' import { FormattedAddress } from '@masknet/shared' diff --git a/packages/mask/src/extension/popups/pages/Wallet/Transfer/AccountItem.tsx b/packages/mask/src/extension/popups/pages/Wallet/Transfer/AccountItem.tsx index 196129237e6c..e10a20883830 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/Transfer/AccountItem.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/Transfer/AccountItem.tsx @@ -3,7 +3,7 @@ import { MenuItem, Typography } from '@mui/material' import { FormattedAddress } from '@masknet/shared' import { formatEthereumAddress } from '@masknet/web3-shared-evm' import { makeStyles } from '@masknet/theme' -import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()({ menuItem: { diff --git a/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx b/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx index 74a1e8e69671..99975cb87b82 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx @@ -47,7 +47,7 @@ import { useNavigate } from 'react-router-dom' import { LoadingButton } from '@mui/lab' import { useNativeTokenPrice } from '../../../../../plugins/Wallet/hooks/useTokenPrice' import { toHex } from 'web3-utils' -import { NetworkPluginID, useLookupAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useLookupAddress, useWeb3State } from '@masknet/plugin-infra/web3' import { AccountItem } from './AccountItem' import Services from '../../../../service' import { TransferAddressError } from '../type' diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/ActivityList/ActivityListItem.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/ActivityList/ActivityListItem.tsx index 9ea9744e2428..e9af9e99ee1d 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/components/ActivityList/ActivityListItem.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/components/ActivityList/ActivityListItem.tsx @@ -7,7 +7,7 @@ import { ArrowRightIcon, CircleCloseIcon, InteractionCircleIcon, LoaderIcon, Upl import { RecentTransactionDescription } from '../../../../../../plugins/Wallet/SNSAdaptor/WalletStatusDialog/TransactionDescription' import formatDateTime from 'date-fns/format' import { useI18N } from '../../../../../../utils' -import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()({ item: { diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/WalletInfo/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/WalletInfo/index.tsx index 8f45a0babcc7..c0dc8c86650d 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/components/WalletInfo/index.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/components/WalletInfo/index.tsx @@ -8,7 +8,7 @@ import { useNavigate, useLocation, useMatch } from 'react-router-dom' import { PopupRoutes } from '@masknet/shared-base' import { formatEthereumAddress, useWallet } from '@masknet/web3-shared-evm' import { CopyIconButton } from '../../../../components/CopyIconButton' -import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()({ container: { diff --git a/packages/mask/src/extension/popups/render.tsx b/packages/mask/src/extension/popups/render.tsx index 496c8f5138ba..eab329694ff8 100644 --- a/packages/mask/src/extension/popups/render.tsx +++ b/packages/mask/src/extension/popups/render.tsx @@ -1,4 +1,4 @@ -import { startPluginDashboard } from '@masknet/plugin-infra' +import { startPluginDashboard } from '@masknet/plugin-infra/dashboard' import { createNormalReactRoot } from '../../utils' import { createPluginHost } from '../../plugin-infra/host' import { Services } from '../service' diff --git a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/index.tsx b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/index.tsx index aa1c69861973..c87a89d7b1c1 100644 --- a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/index.tsx @@ -1,4 +1,4 @@ -import { Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { uniq } from 'lodash-unified' import { checkUrl, getAssetInfoFromURL, getRelevantUrl } from '../utils' diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx index 7ff23aef19e7..c8fa3e40e34a 100644 --- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx +++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx @@ -16,7 +16,7 @@ import { useI18N } from '../../../utils' import { EthereumChainBoundary } from '../../../web3/UI/EthereumChainBoundary' import { AddNFT } from './AddNFT' import { NFTImage } from './NFTImage' -import { useAccount, useWeb3State } from '@masknet/plugin-infra' +import { useAccount, useWeb3State } from '@masknet/plugin-infra/web3' import { ReversedAddress } from '@masknet/shared' const useStyles = makeStyles()((theme) => ({ diff --git a/packages/mask/src/plugins/Avatar/Services/bind.ts b/packages/mask/src/plugins/Avatar/Services/bind.ts index cb8cd6cd73e7..c0df092a1ea0 100644 --- a/packages/mask/src/plugins/Avatar/Services/bind.ts +++ b/packages/mask/src/plugins/Avatar/Services/bind.ts @@ -1,5 +1,5 @@ import { ChainId, isSameAddress } from '@masknet/web3-shared-evm' -import { NetworkPluginID } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' import addSeconds from 'date-fns/addSeconds' import { KeyValue } from '@masknet/web3-providers' import { NFT_AVATAR_DB_NAME, NFT_AVATAR_DB_NAME_STORAGE } from '../constants' diff --git a/packages/mask/src/plugins/Avatar/Services/index.ts b/packages/mask/src/plugins/Avatar/Services/index.ts index 6e4bd9401855..2f25a164f0f5 100644 --- a/packages/mask/src/plugins/Avatar/Services/index.ts +++ b/packages/mask/src/plugins/Avatar/Services/index.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '@masknet/plugin-infra' +import type { NetworkPluginID } from '@masknet/plugin-infra/web3' import type { AvatarMetaDB } from '../types' import { getNFTAvatarFromJSON } from './db' import { getUserAddress, setUserAddress } from './bind' diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/index.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/index.tsx index 0081e9e71e44..3678e5116a9f 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/index.tsx @@ -1,5 +1,5 @@ import { uniq } from 'lodash-unified' -import { Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra/content-script' import { PostInspector } from './PostInspector' import { base } from '../base' import { checkUrl, getAssetInfoFromURL, getRelevantUrl } from '../utils' diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/index.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/index.tsx index 91ee0df8821e..aa613895fdb0 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/index.tsx @@ -1,5 +1,5 @@ import { uniq } from 'lodash-unified' -import { Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra/content-script' import { PostInspector } from './PostInspector' import { base } from '../base' import { checkUrl, getAssetInfoFromURL, getRelevantUrl } from '../utils' diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/createNonFungibleToken.ts b/packages/mask/src/plugins/EVM/UI/Web3State/createNonFungibleToken.ts index 218ba80a7734..042d9a508c93 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/createNonFungibleToken.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/createNonFungibleToken.ts @@ -1,4 +1,4 @@ -import { TokenType, Web3Plugin } from '@masknet/plugin-infra' +import { TokenType, Web3Plugin } from '@masknet/plugin-infra/web3' import type { ERC721TokenDetailed } from '@masknet/web3-shared-evm' export function createNonFungibleToken(token: ERC721TokenDetailed) { diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts index d52b42264d73..9d8c99b1a1a2 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts @@ -5,7 +5,7 @@ import { Pagination, TokenType, Web3Plugin, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import BalanceCheckerABI from '@masknet/web3-contracts/abis/BalanceChecker.json' import ERC721ABI from '@masknet/web3-contracts/abis/ERC721.json' import type { ERC721 } from '@masknet/web3-contracts/types/ERC721' diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/index.ts b/packages/mask/src/plugins/EVM/UI/Web3State/index.ts index 576402fdf9c1..5269ae74fe8d 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/index.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/index.ts @@ -1,5 +1,5 @@ import Ens from 'ethjs-ens' -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { ChainId, formatBalance, diff --git a/packages/mask/src/plugins/EVM/UI/Web3UI/index.tsx b/packages/mask/src/plugins/EVM/UI/Web3UI/index.tsx index b562856c13a7..fd596bf68290 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3UI/index.tsx +++ b/packages/mask/src/plugins/EVM/UI/Web3UI/index.tsx @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { NetworkIconClickBait } from '../components/NetworkIconClickBait' import { ProviderIconClickBait } from '../components/ProviderIconClickBait' diff --git a/packages/mask/src/plugins/EVM/UI/components/FortmaticProviderBridge.tsx b/packages/mask/src/plugins/EVM/UI/components/FortmaticProviderBridge.tsx index b70f17f981fc..e40b72649b54 100644 --- a/packages/mask/src/plugins/EVM/UI/components/FortmaticProviderBridge.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/FortmaticProviderBridge.tsx @@ -8,7 +8,7 @@ import { ProviderType, FortmaticProvider as Fortmatic, } from '@masknet/web3-shared-evm' -import { NetworkPluginID, useChainId, useProviderType } from '@masknet/plugin-infra' +import { NetworkPluginID, useChainId, useProviderType } from '@masknet/plugin-infra/web3' import { isDashboardPage, isPopupPage } from '@masknet/shared-base' import { EVM_Messages } from '../../messages' import { WalletRPC } from '../../../Wallet/messages' diff --git a/packages/mask/src/plugins/EVM/UI/components/InjectedProviderBridge.tsx b/packages/mask/src/plugins/EVM/UI/components/InjectedProviderBridge.tsx index 26018fae8728..2c9ba648e372 100644 --- a/packages/mask/src/plugins/EVM/UI/components/InjectedProviderBridge.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/InjectedProviderBridge.tsx @@ -1,7 +1,7 @@ import { useEffect, useCallback } from 'react' import { useMount } from 'react-use' import { ProviderType, isInjectedProvider, ChainId } from '@masknet/web3-shared-evm' -import { NetworkPluginID, useChainId, useProviderType } from '@masknet/plugin-infra' +import { NetworkPluginID, useChainId, useProviderType } from '@masknet/plugin-infra/web3' import { isDashboardPage, isPopupPage } from '@masknet/shared-base' import { EVM_Messages } from '../../messages' import Services from '../../../../extension/service' diff --git a/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx b/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx index 7b0bb4c8d22d..ee93baf13a0a 100644 --- a/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx @@ -1,6 +1,6 @@ import { useCallback, cloneElement, isValidElement } from 'react' import { unreachable } from '@dimensiondev/kit' -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { getChainIdFromNetworkType, isFortmaticSupported, NetworkType, ProviderType } from '@masknet/web3-shared-evm' import { WalletMessages } from '../../../Wallet/messages' diff --git a/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx b/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx index f0564cb61c90..7256cd206518 100644 --- a/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx @@ -1,6 +1,6 @@ import { useCallback, cloneElement, isValidElement } from 'react' import { unreachable } from '@dimensiondev/kit' -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { openWindow, useRemoteControlledDialog } from '@masknet/shared-base-ui' import { isDashboardPage } from '@masknet/shared-base' import { diff --git a/packages/mask/src/plugins/EVM/constants.ts b/packages/mask/src/plugins/EVM/constants.ts index d15f094f39c6..791f19849232 100644 --- a/packages/mask/src/plugins/EVM/constants.ts +++ b/packages/mask/src/plugins/EVM/constants.ts @@ -1,4 +1,4 @@ -import { NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra/web3' import { ChainId, NetworkType, ProviderType } from '@masknet/web3-shared-evm' export const PLUGIN_ID = NetworkPluginID.PLUGIN_EVM diff --git a/packages/mask/src/plugins/EVM/storage/index.ts b/packages/mask/src/plugins/EVM/storage/index.ts index 2fcd4ff88276..d2c8548ec648 100644 --- a/packages/mask/src/plugins/EVM/storage/index.ts +++ b/packages/mask/src/plugins/EVM/storage/index.ts @@ -1,5 +1,5 @@ import type { ScopedStorage } from '@masknet/shared-base' -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' export const StorageDefaultValue = { domainAddressBook: {} as Web3Plugin.DomainAddressBook, diff --git a/packages/mask/src/plugins/EVM/utils/token.ts b/packages/mask/src/plugins/EVM/utils/token.ts index 9ce35d7ef4f6..4f4a79f990a5 100644 --- a/packages/mask/src/plugins/EVM/utils/token.ts +++ b/packages/mask/src/plugins/EVM/utils/token.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { CurrencyType, formatBalance, getTokenConstants, isSameAddress } from '@masknet/web3-shared-evm' // TODO: remove diff --git a/packages/mask/src/plugins/External/base.ts b/packages/mask/src/plugins/External/base.ts index 0c5813aae091..9a6b03a89e02 100644 --- a/packages/mask/src/plugins/External/base.ts +++ b/packages/mask/src/plugins/External/base.ts @@ -1,4 +1,4 @@ -import { Plugin, PluginId } from '@masknet/plugin-infra' +import { type Plugin, PluginId } from '@masknet/plugin-infra' import { Flags } from '../../../shared' export const base: Plugin.Shared.Definition = { diff --git a/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx b/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx index 6450ab921425..770fa5d55ff7 100644 --- a/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx +++ b/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx @@ -9,7 +9,7 @@ import ParticipatePanel from './ParticipatePanel' import { useContext } from 'react' import type { FindTrumanI18nFunction } from '../types' import { FindTrumanContext } from '../context' -import { useAccount } from '@masknet/plugin-infra' +import { useAccount } from '@masknet/plugin-infra/web3' import { useConst } from './hooks/useConst' import IntroductionPanel from './IntroductionPanel' diff --git a/packages/mask/src/plugins/FindTruman/SNSAdaptor/index.tsx b/packages/mask/src/plugins/FindTruman/SNSAdaptor/index.tsx index 5c9c787ce528..8696c3e8d3de 100644 --- a/packages/mask/src/plugins/FindTruman/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/FindTruman/SNSAdaptor/index.tsx @@ -2,7 +2,7 @@ import { base } from '../base' import { useMemo, Suspense, useState } from 'react' import { Skeleton } from '@mui/material' import { makeStyles } from '@masknet/theme' -import { type Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra/content-script' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' import { PostInspector } from './PostInspector' diff --git a/packages/mask/src/plugins/FindTruman/base.ts b/packages/mask/src/plugins/FindTruman/base.ts index e032674c6055..b5b340c83f6d 100644 --- a/packages/mask/src/plugins/FindTruman/base.ts +++ b/packages/mask/src/plugins/FindTruman/base.ts @@ -1,4 +1,5 @@ -import { Plugin, NetworkPluginID } from '@masknet/plugin-infra' +import type { Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' import { ChainId } from '@masknet/web3-shared-evm' import { FIND_TRUMAN_PLUGIN_ID, FIND_TRUMAN_PLUGIN_NAME } from './constants' diff --git a/packages/mask/src/plugins/Furucombo/SNSAdaptor/index.tsx b/packages/mask/src/plugins/Furucombo/SNSAdaptor/index.tsx index 1c7c198ce206..987836ce1c14 100644 --- a/packages/mask/src/plugins/Furucombo/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/Furucombo/SNSAdaptor/index.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { base } from '../base' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' diff --git a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/index.tsx b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/index.tsx index cf5cf52711a0..26132bb8dbd7 100644 --- a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/index.tsx @@ -1,9 +1,9 @@ import { useMemo } from 'react' import { ChainId } from '@masknet/web3-shared-evm' -import { NetworkPluginID, Plugin, useChainId, usePluginWrapper } from '@masknet/plugin-infra' +import { usePostInfoDetails, Plugin, usePluginWrapper } from '@masknet/plugin-infra/content-script' +import { NetworkPluginID, useChainId } from '@masknet/plugin-infra/web3' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' -import { usePostInfoDetails } from '../../../components/DataSource/usePostInfo' import { PreviewCard } from './PreviewCard' import { base } from '../base' import { PLUGIN_NAME, PLUGIN_META_KEY } from '../constants' diff --git a/packages/mask/src/plugins/Gitcoin/base.ts b/packages/mask/src/plugins/Gitcoin/base.ts index bc69402d0f86..c247ddc24c7b 100644 --- a/packages/mask/src/plugins/Gitcoin/base.ts +++ b/packages/mask/src/plugins/Gitcoin/base.ts @@ -1,4 +1,5 @@ -import { NetworkPluginID, Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' +import type { Plugin } from '@masknet/plugin-infra' import { ChainId } from '@masknet/web3-shared-evm' import { PLUGIN_ID, PLUGIN_NAME, PLUGIN_DESCRIPTION } from './constants' diff --git a/packages/mask/src/plugins/GoodGhosting/SNSAdaptor/index.tsx b/packages/mask/src/plugins/GoodGhosting/SNSAdaptor/index.tsx index 13d7750ee42c..b6000f9ebe9a 100644 --- a/packages/mask/src/plugins/GoodGhosting/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/GoodGhosting/SNSAdaptor/index.tsx @@ -1,8 +1,7 @@ import { useMemo } from 'react' -import { Plugin, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' -import { usePostInfoDetails } from '../../../components/DataSource/usePostInfo' import { PreviewCard } from '../UI/PreviewCard' import { ChainId } from '@masknet/web3-shared-evm' import { base } from '../base' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx index f271fdc2402e..6c575395fef0 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx @@ -1,4 +1,5 @@ -import { useCurrentWeb3NetworkPluginID, PluginId, useActivatedPlugin } from '@masknet/plugin-infra' +import { useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra/web3' +import { PluginId, useActivatedPlugin } from '@masknet/plugin-infra/dom' import { useEffect, useState, useLayoutEffect, useRef } from 'react' import { flatten, uniq } from 'lodash-unified' import formatDateTime from 'date-fns/format' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx index 813936ebf513..e81ac152284e 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx @@ -19,7 +19,7 @@ import { PoolSettings, useFillCallback } from './hooks/useFill' import { ConfirmDialog } from './ConfirmDialog' import { WalletMessages } from '../../Wallet/messages' import { omit, set } from 'lodash-unified' -import { useCompositionContext } from '@masknet/plugin-infra' +import { useCompositionContext } from '@masknet/plugin-infra/content-script' import { activatedSocialNetworkUI } from '../../../social-network' interface StyleProps { diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx index f1f05be2b2a0..0cee3093d406 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx @@ -1,4 +1,4 @@ -import { Plugin, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper } from '@masknet/plugin-infra/content-script' import { useState } from 'react' import { ItoLabelIcon } from '../assets/ItoLabelIcon' import { makeStyles } from '@masknet/theme' diff --git a/packages/mask/src/plugins/ITO/base.ts b/packages/mask/src/plugins/ITO/base.ts index 66d6f38288a9..cb3556541e59 100644 --- a/packages/mask/src/plugins/ITO/base.ts +++ b/packages/mask/src/plugins/ITO/base.ts @@ -1,4 +1,5 @@ -import { NetworkPluginID, Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' +import type { Plugin } from '@masknet/plugin-infra' import { ChainId } from '@masknet/web3-shared-evm' import { ITO_MetaKey_1, ITO_MetaKey_2, ITO_PluginID } from './constants' diff --git a/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/DrawDialog.tsx b/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/DrawDialog.tsx index 3b54781299a1..3f9dc5c8773c 100644 --- a/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/DrawDialog.tsx +++ b/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/DrawDialog.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { useContainer } from 'unstated-next' import { makeStyles } from '@masknet/theme' import { Add, Remove } from '@mui/icons-material' -import { useProviderDescriptor } from '@masknet/plugin-infra' +import { useProviderDescriptor } from '@masknet/plugin-infra/web3' import { FormattedAddress, FormattedBalance, ImageIcon, InjectedDialog } from '@masknet/shared' import { Box, Button, DialogContent, TextField, Typography } from '@mui/material' import { diff --git a/packages/mask/src/plugins/MaskBox/SNSAdaptor/index.tsx b/packages/mask/src/plugins/MaskBox/SNSAdaptor/index.tsx index 52c5b95dbfee..1e2c7a4d70a8 100644 --- a/packages/mask/src/plugins/MaskBox/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/MaskBox/SNSAdaptor/index.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { base } from '../base' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' diff --git a/packages/mask/src/plugins/MaskPluginWrapper.tsx b/packages/mask/src/plugins/MaskPluginWrapper.tsx index b3018c47dd5e..6618f9b41ba0 100644 --- a/packages/mask/src/plugins/MaskPluginWrapper.tsx +++ b/packages/mask/src/plugins/MaskPluginWrapper.tsx @@ -13,7 +13,7 @@ import { PluginWrapperComponent, Plugin, PluginWrapperMethods, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/content-script' interface PluginWrapperProps extends React.PropsWithChildren<{}> { open?: boolean diff --git a/packages/mask/src/plugins/NextID/base.ts b/packages/mask/src/plugins/NextID/base.ts index 832aeb38641c..cafbe251789a 100644 --- a/packages/mask/src/plugins/NextID/base.ts +++ b/packages/mask/src/plugins/NextID/base.ts @@ -1,4 +1,5 @@ -import { CurrentSNSNetwork, NetworkPluginID, Plugin } from '@masknet/plugin-infra' +import { CurrentSNSNetwork, Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' import { ChainId } from '@masknet/web3-shared-evm' import { PLUGIN_DESCRIPTION, PLUGIN_ID, PLUGIN_NAME } from './constants' import { languages } from './locales/languages' diff --git a/packages/mask/src/plugins/NextID/components/BindDialog.tsx b/packages/mask/src/plugins/NextID/components/BindDialog.tsx index 4879f7f3e952..064b100e977d 100644 --- a/packages/mask/src/plugins/NextID/components/BindDialog.tsx +++ b/packages/mask/src/plugins/NextID/components/BindDialog.tsx @@ -6,7 +6,7 @@ import type { Persona } from '../../../database' import type { Binding } from '@masknet/shared-base' import { NextIDAction, NextIDPlatform } from '@masknet/shared-base' import { BindPanelUI } from './BindPanelUI' -import { useAccount } from '@masknet/plugin-infra' +import { useAccount } from '@masknet/plugin-infra/web3' import { useCustomSnackbar } from '@masknet/theme' import { delay } from '@dimensiondev/kit' import { useBindPayload } from '../hooks/useBindPayload' diff --git a/packages/mask/src/plugins/NextID/components/BindPanelUI.tsx b/packages/mask/src/plugins/NextID/components/BindPanelUI.tsx index 886164d5a15e..0f1a32034442 100644 --- a/packages/mask/src/plugins/NextID/components/BindPanelUI.tsx +++ b/packages/mask/src/plugins/NextID/components/BindPanelUI.tsx @@ -8,7 +8,7 @@ import { useI18N } from '../locales' import { getMaskColor, makeStyles, MaskColorVar } from '@masknet/theme' import type { Persona } from '../../../database' import { InjectedDialog, LoadingAnimation } from '@masknet/shared' -import { NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra' +import { NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra/web3' import { formatPersonaFingerprint } from '@masknet/shared-base' const useStyles = makeStyles()((theme) => ({ diff --git a/packages/mask/src/plugins/NextID/components/BindingItem.tsx b/packages/mask/src/plugins/NextID/components/BindingItem.tsx index f6d8377d7983..942963273b58 100644 --- a/packages/mask/src/plugins/NextID/components/BindingItem.tsx +++ b/packages/mask/src/plugins/NextID/components/BindingItem.tsx @@ -6,7 +6,7 @@ import { DeleteIcon } from '@masknet/icons' import { makeStyles } from '@masknet/theme' import { CopyIconButton } from './CopyIconButton' import { ExternalLink } from 'react-feather' -import { NetworkPluginID, useNetworkDescriptor, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useNetworkDescriptor, useWeb3State } from '@masknet/plugin-infra/web3' import { useI18N } from '../locales' import { ImageIcon } from '@masknet/shared' import { TipButton } from './Tip' diff --git a/packages/mask/src/plugins/NextID/components/Tip/AddDialog.tsx b/packages/mask/src/plugins/NextID/components/Tip/AddDialog.tsx index be9080da903f..0a845139048f 100644 --- a/packages/mask/src/plugins/NextID/components/Tip/AddDialog.tsx +++ b/packages/mask/src/plugins/NextID/components/Tip/AddDialog.tsx @@ -1,4 +1,4 @@ -import { useNetworkDescriptors } from '@masknet/plugin-infra' +import { useNetworkDescriptors } from '@masknet/plugin-infra/web3' import { ImageIcon, InjectedDialog, InjectedDialogProps } from '@masknet/shared' import { makeStyles } from '@masknet/theme' import { diff --git a/packages/mask/src/plugins/NextID/components/Tip/NFTSection/NFTList.tsx b/packages/mask/src/plugins/NextID/components/Tip/NFTSection/NFTList.tsx index bafa0ba86ed1..1205fe7ad0e3 100644 --- a/packages/mask/src/plugins/NextID/components/Tip/NFTSection/NFTList.tsx +++ b/packages/mask/src/plugins/NextID/components/Tip/NFTSection/NFTList.tsx @@ -1,4 +1,4 @@ -import { useWeb3State, Web3Plugin } from '@masknet/plugin-infra' +import { useWeb3State, Web3Plugin } from '@masknet/plugin-infra/web3' import { NFTCardStyledAssetPlayer } from '@masknet/shared' import { makeStyles, ShadowRootTooltip } from '@masknet/theme' import { formatNFT_TokenId, isSameAddress, useChainId } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/NextID/components/Tip/NFTSection/index.tsx b/packages/mask/src/plugins/NextID/components/Tip/NFTSection/index.tsx index 890b18d2701f..5fe00ba9286c 100644 --- a/packages/mask/src/plugins/NextID/components/Tip/NFTSection/index.tsx +++ b/packages/mask/src/plugins/NextID/components/Tip/NFTSection/index.tsx @@ -1,4 +1,4 @@ -import { useNetworkDescriptor, useWeb3State as useWeb3PluginState } from '@masknet/plugin-infra' +import { useNetworkDescriptor, useWeb3State as useWeb3PluginState } from '@masknet/plugin-infra/web3' import { EMPTY_LIST } from '@masknet/shared-base' import { makeStyles } from '@masknet/theme' import { isSameAddress, useAccount } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/NextID/components/Tip/TipButton.tsx b/packages/mask/src/plugins/NextID/components/Tip/TipButton.tsx index 76cb68fe9bed..70ddd580cf5f 100644 --- a/packages/mask/src/plugins/NextID/components/Tip/TipButton.tsx +++ b/packages/mask/src/plugins/NextID/components/Tip/TipButton.tsx @@ -1,5 +1,5 @@ import { TipCoin } from '@masknet/icons' -import { usePostInfoDetails } from '@masknet/plugin-infra' +import { usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { EMPTY_LIST, NextIDPlatform, ProfileIdentifier } from '@masknet/shared-base' import { makeStyles, ShadowRootTooltip } from '@masknet/theme' import { NextIDProof } from '@masknet/web3-providers' diff --git a/packages/mask/src/plugins/NextID/components/Tip/TipDialog.tsx b/packages/mask/src/plugins/NextID/components/Tip/TipDialog.tsx index e0e4c8c442e0..43e733d37edc 100644 --- a/packages/mask/src/plugins/NextID/components/Tip/TipDialog.tsx +++ b/packages/mask/src/plugins/NextID/components/Tip/TipDialog.tsx @@ -1,13 +1,12 @@ import { Drop2Icon, LinkOutIcon, SuccessIcon } from '@masknet/icons' +import { PluginId, useActivatedPlugin } from '@masknet/plugin-infra/dom' import { - PluginId, - useActivatedPlugin, useCurrentWeb3NetworkPluginID, useNetworkDescriptor, useProviderDescriptor, useReverseAddress, useWeb3State, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { InjectedDialog, NFTCardStyledAssetPlayer, WalletIcon } from '@masknet/shared' import { EMPTY_LIST } from '@masknet/shared-base' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' diff --git a/packages/mask/src/plugins/NextID/components/Tip/TipForm.tsx b/packages/mask/src/plugins/NextID/components/Tip/TipForm.tsx index d0f947d54542..baa272a78c6a 100644 --- a/packages/mask/src/plugins/NextID/components/Tip/TipForm.tsx +++ b/packages/mask/src/plugins/NextID/components/Tip/TipForm.tsx @@ -1,4 +1,4 @@ -import { useWeb3State } from '@masknet/plugin-infra' +import { useWeb3State } from '@masknet/plugin-infra/web3' import { WalletMessages } from '@masknet/plugin-wallet' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { makeStyles } from '@masknet/theme' diff --git a/packages/mask/src/plugins/NextID/components/UnbindConfirm.tsx b/packages/mask/src/plugins/NextID/components/UnbindConfirm.tsx index f2d55cdb469c..a4ad27542a64 100644 --- a/packages/mask/src/plugins/NextID/components/UnbindConfirm.tsx +++ b/packages/mask/src/plugins/NextID/components/UnbindConfirm.tsx @@ -1,6 +1,6 @@ import { memo, useState } from 'react' import { Box, DialogContent, Button } from '@mui/material' -import { useWeb3State } from '@masknet/plugin-infra' +import { useWeb3State } from '@masknet/plugin-infra/web3' import { useI18N } from '../locales' import { makeStyles, MaskDialog } from '@masknet/theme' diff --git a/packages/mask/src/plugins/NextID/components/UnbindPanelUI.tsx b/packages/mask/src/plugins/NextID/components/UnbindPanelUI.tsx index ab18c807d452..5c0e0f423c40 100644 --- a/packages/mask/src/plugins/NextID/components/UnbindPanelUI.tsx +++ b/packages/mask/src/plugins/NextID/components/UnbindPanelUI.tsx @@ -8,7 +8,7 @@ import { useI18N } from '../locales' import { getMaskColor, makeStyles, MaskColorVar } from '@masknet/theme' import type { Persona } from '../../../database' import { InjectedDialog, LoadingAnimation } from '@masknet/shared' -import { NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra' +import { NetworkPluginID, useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra/web3' import AbstractTab, { AbstractTabProps } from '../../../components/shared/AbstractTab' import { formatPersonaFingerprint } from '@masknet/shared-base' diff --git a/packages/mask/src/plugins/NextID/contexts/Tip/TipContext.ts b/packages/mask/src/plugins/NextID/contexts/Tip/TipContext.ts index 8fa4be5af260..477ac26dce70 100644 --- a/packages/mask/src/plugins/NextID/contexts/Tip/TipContext.ts +++ b/packages/mask/src/plugins/NextID/contexts/Tip/TipContext.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { ERC721ContractDetailed, FungibleTokenDetailed, diff --git a/packages/mask/src/plugins/NextID/storage/index.ts b/packages/mask/src/plugins/NextID/storage/index.ts index 6c9312b13e59..42a43acd8696 100644 --- a/packages/mask/src/plugins/NextID/storage/index.ts +++ b/packages/mask/src/plugins/NextID/storage/index.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import type { ScopedStorage } from '@masknet/shared-base' import { isSameAddress } from '@masknet/web3-shared-evm' import { remove } from 'lodash-unified' diff --git a/packages/mask/src/plugins/Pets/base.tsx b/packages/mask/src/plugins/Pets/base.tsx index 89cdaaa3b46b..9585794adebf 100644 --- a/packages/mask/src/plugins/Pets/base.tsx +++ b/packages/mask/src/plugins/Pets/base.tsx @@ -1,4 +1,5 @@ -import { CurrentSNSNetwork, Plugin, NetworkPluginID } from '@masknet/plugin-infra' +import { CurrentSNSNetwork, Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' import { ChainId } from '@masknet/web3-shared-evm' import { PetsPluginID } from './constants' diff --git a/packages/mask/src/plugins/Polls/SNSAdaptor/PollsDialog.tsx b/packages/mask/src/plugins/Polls/SNSAdaptor/PollsDialog.tsx index ce0ff662c48f..726ad97560d3 100644 --- a/packages/mask/src/plugins/Polls/SNSAdaptor/PollsDialog.tsx +++ b/packages/mask/src/plugins/Polls/SNSAdaptor/PollsDialog.tsx @@ -24,7 +24,7 @@ import { PollCardUI } from './Polls' import type { PollMetaData } from '../types' import { PLUGIN_META_KEY } from '../constants' import { PluginPollRPC } from '../messages' -import { useCompositionContext } from '@masknet/plugin-infra' +import { useCompositionContext } from '@masknet/plugin-infra/content-script' const useNewPollStyles = makeStyles()((theme) => ({ menuPaper: { diff --git a/packages/mask/src/plugins/Polls/SNSAdaptor/PollsInPost.tsx b/packages/mask/src/plugins/Polls/SNSAdaptor/PollsInPost.tsx index 7248eebe3949..4835b9980527 100644 --- a/packages/mask/src/plugins/Polls/SNSAdaptor/PollsInPost.tsx +++ b/packages/mask/src/plugins/Polls/SNSAdaptor/PollsInPost.tsx @@ -5,7 +5,7 @@ import { renderWithPollMetadata, PollMetadataReader } from '../helpers' import type { PollGunDB } from '../Services' import { PollCardUI } from './Polls' import { PollMetaData, PollStatus } from '../types' -import { usePluginWrapper } from '@masknet/plugin-infra' +import { usePluginWrapper } from '@masknet/plugin-infra/dom' interface PollsInPostProps { message: TypedMessage diff --git a/packages/mask/src/plugins/PoolTogether/SNSAdaptor/index.tsx b/packages/mask/src/plugins/PoolTogether/SNSAdaptor/index.tsx index 78666abfe10e..19ce392da69a 100644 --- a/packages/mask/src/plugins/PoolTogether/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/PoolTogether/SNSAdaptor/index.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' import { ChainId } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/PoolTogether/UI/NetworkView.tsx b/packages/mask/src/plugins/PoolTogether/UI/NetworkView.tsx index 1a716bbd84e9..0e06251f70b9 100644 --- a/packages/mask/src/plugins/PoolTogether/UI/NetworkView.tsx +++ b/packages/mask/src/plugins/PoolTogether/UI/NetworkView.tsx @@ -1,4 +1,4 @@ -import { NetworkPluginID, useNetworkDescriptor } from '@masknet/plugin-infra' +import { NetworkPluginID, useNetworkDescriptor } from '@masknet/plugin-infra/web3' import { ChainId, getChainDetailed } from '@masknet/web3-shared-evm' import { Typography } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' diff --git a/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx b/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx index 75595ece1c67..e64bc48591af 100644 --- a/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx +++ b/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx @@ -5,7 +5,7 @@ import { Copy, ExternalLink } from 'react-feather' import { RewardIcon } from '@masknet/icons' import { makeStyles } from '@masknet/theme' import { WalletMessages } from '@masknet/plugin-wallet' -import { NetworkPluginID, useNetworkDescriptor } from '@masknet/plugin-infra' +import { NetworkPluginID, useNetworkDescriptor } from '@masknet/plugin-infra/web3' import { ImageIcon, useSnackbarCallback } from '@masknet/shared' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { formatEthereumAddress, resolveAddressLinkOnExplorer, useChainId, useWallets } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index 953069f0ff3c..690b7e9131ba 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -26,7 +26,7 @@ import { RedPacketSettings, useCreateCallback } from './hooks/useCreateCallback' import { useCurrentIdentity } from '../../../components/DataSource/useActivatedUI' import { WalletMessages } from '../../Wallet/messages' import { RedPacketConfirmDialog } from './RedPacketConfirmDialog' -import { useCompositionContext } from '@masknet/plugin-infra' +import { useCompositionContext } from '@masknet/plugin-infra/content-script' const useStyles = makeStyles()((theme) => ({ content: { diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInPost.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInPost.tsx index 37b3bce08dad..de1fc5bfa66d 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInPost.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInPost.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react' import type { RedPacketJSONPayload, RedPacketRecord } from '../types' -import { usePostInfoDetails } from '../../../components/DataSource/usePostInfo' +import { usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { RedPacket } from './RedPacket' import { RedPacketRPC } from '../messages' import { activatedSocialNetworkUI } from '../../../social-network' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketPast.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketPast.tsx index 24528b921e70..ff8157f32d02 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketPast.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketPast.tsx @@ -8,7 +8,7 @@ import { RedPacketHistoryList } from './RedPacketHistoryList' import { NftRedPacketHistoryList } from './NftRedPacketHistoryList' import type { NftRedPacketHistory, RedPacketJSONPayload } from '../types' import { RedPacketNftMetaKey } from '../constants' -import { useCompositionContext } from '@masknet/plugin-infra' +import { useCompositionContext } from '@masknet/plugin-infra/content-script' import { useCurrentIdentity } from '../../../components/DataSource/useActivatedUI' import type { ERC721ContractDetailed } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx index cd7890b3b85f..164b3b9a87de 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx @@ -23,7 +23,7 @@ import LaunchIcon from '@mui/icons-material/Launch' import { useI18N } from '../../../utils' import { useCreateNftRedpacketCallback } from './hooks/useCreateNftRedpacketCallback' import { useCurrentIdentity } from '../../../components/DataSource/useActivatedUI' -import { useCompositionContext } from '@masknet/plugin-infra' +import { useCompositionContext } from '@masknet/plugin-infra/content-script' import { RedPacketNftMetaKey } from '../constants' import { WalletMessages } from '../../Wallet/messages' import { RedPacketRPC } from '../messages' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx index 950ebfcaeecb..a01f448cd994 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx @@ -1,4 +1,4 @@ -import { Plugin, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper } from '@masknet/plugin-infra/content-script' import { ChainId, EthereumTokenType, diff --git a/packages/mask/src/plugins/RedPacket/base.ts b/packages/mask/src/plugins/RedPacket/base.ts index 6f0db00eacdb..6895af863cc4 100644 --- a/packages/mask/src/plugins/RedPacket/base.ts +++ b/packages/mask/src/plugins/RedPacket/base.ts @@ -1,4 +1,5 @@ -import { NetworkPluginID, Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' +import type { Plugin } from '@masknet/plugin-infra' import { ChainId } from '@masknet/web3-shared-evm' import { RedPacketMetaKey, RedPacketNftMetaKey, RedPacketPluginID } from './constants' diff --git a/packages/mask/src/plugins/Savings/base.ts b/packages/mask/src/plugins/Savings/base.ts index bf5b5e4cc122..5bf0aa30c04d 100644 --- a/packages/mask/src/plugins/Savings/base.ts +++ b/packages/mask/src/plugins/Savings/base.ts @@ -1,4 +1,5 @@ -import { Plugin, NetworkPluginID } from '@masknet/plugin-infra' +import type { Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' import { ChainId } from '@masknet/web3-shared-evm' import { SAVINGS_PLUGIN_ID } from './constants' diff --git a/packages/mask/src/plugins/Snapshot/SNSAdaptor/index.tsx b/packages/mask/src/plugins/Snapshot/SNSAdaptor/index.tsx index d49f3c680bf9..905b72f30dce 100644 --- a/packages/mask/src/plugins/Snapshot/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/Snapshot/SNSAdaptor/index.tsx @@ -1,10 +1,9 @@ -import { Plugin, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePluginWrapper, usePostInfoDetails } from '@masknet/plugin-infra/content-script' import { base } from '../base' import { useMemo, Suspense } from 'react' import { Skeleton } from '@mui/material' import { makeStyles } from '@masknet/theme' import { PostInspector } from './PostInspector' -import { usePostInfoDetails } from '../../../components/DataSource/usePostInfo' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeView.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeView.tsx index 0bb92e3c47f3..00fd1223f3cb 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeView.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeView.tsx @@ -1,7 +1,7 @@ import { makeStyles, useStylesExtends } from '@masknet/theme' import { Trader, TraderProps } from './Trader' import { AllProviderTradeContext } from '../../trader/useAllProviderTradeContext' -import { useChainId } from '@masknet/plugin-infra' +import { useChainId } from '@masknet/plugin-infra/web3' const useStyles = makeStyles()((theme) => { return { diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx index e3ee9f2853f4..e5417e20234d 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx @@ -1,5 +1,7 @@ import { useEffect, useState } from 'react' -import { useCurrentWeb3NetworkPluginID, useActivatedPlugin, PluginId } from '@masknet/plugin-infra' +import { PluginId } from '@masknet/plugin-infra' +import { useActivatedPlugin } from '@masknet/plugin-infra/dom' +import { useCurrentWeb3NetworkPluginID } from '@masknet/plugin-infra/web3' import { ChainId, useChainId, useChainIdValid } from '@masknet/web3-shared-evm' import { DialogContent } from '@mui/material' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx index e510b7861cbc..a53f5c086ccc 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx @@ -21,7 +21,8 @@ import { currentDataProviderSettings, getCurrentPreferredCoinIdSettings } from ' import { CoinMenu, CoinMenuOption } from './CoinMenu' import { useTransakAllowanceCoin } from '../../../Transak/hooks/useTransakAllowanceCoin' import { CoinSafetyAlert } from './CoinSafetyAlert' -import { PluginId, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' +import { PluginId } from '@masknet/plugin-infra' +import { useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra/content-script' const useStyles = makeStyles()((theme) => { return { diff --git a/packages/mask/src/plugins/Trader/base.ts b/packages/mask/src/plugins/Trader/base.ts index 7f5ad783d7d5..0406e75311fd 100644 --- a/packages/mask/src/plugins/Trader/base.ts +++ b/packages/mask/src/plugins/Trader/base.ts @@ -1,4 +1,5 @@ -import { Plugin, NetworkPluginID } from '@masknet/plugin-infra' +import type { Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' import { ChainId } from '@masknet/web3-shared-evm' import { PLUGIN_ID } from './constants' diff --git a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts index b51d22ef5348..d401ce7f1ae1 100644 --- a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts @@ -13,7 +13,7 @@ import { SwapQuoteResponse, TradeStrategy } from '../../types' import { useSlippageTolerance } from '../0x/useSlippageTolerance' import { currentNetworkSettings } from '../../../Wallet/settings' import { TargetChainIdContext } from '../useTargetChainIdContext' -import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra' +import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra/web3' import type { AsyncStateRetry } from 'react-use/lib/useAsyncRetry' const NATIVE_TOKEN_ADDRESS = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' diff --git a/packages/mask/src/plugins/Trader/trader/balancer/useTrade.ts b/packages/mask/src/plugins/Trader/trader/balancer/useTrade.ts index e326678259a9..388429f7c16c 100644 --- a/packages/mask/src/plugins/Trader/trader/balancer/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/balancer/useTrade.ts @@ -1,4 +1,4 @@ -import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra' +import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra/web3' import { FungibleTokenDetailed, isNativeTokenAddress, useTokenConstants } from '@masknet/web3-shared-evm' import { BALANCER_SWAP_TYPE } from '../../constants' import { PluginTraderRPC } from '../../messages' diff --git a/packages/mask/src/plugins/Trader/trader/bancor/useTrade.ts b/packages/mask/src/plugins/Trader/trader/bancor/useTrade.ts index d4eacd9380d4..c8b7b095a1b7 100644 --- a/packages/mask/src/plugins/Trader/trader/bancor/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/bancor/useTrade.ts @@ -11,7 +11,7 @@ import { SwapBancorRequest, TradeStrategy } from '../../types' import { useSlippageTolerance } from './useSlippageTolerance' import { TargetChainIdContext } from '../useTargetChainIdContext' import { leftShift } from '@masknet/web3-shared-base' -import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra' +import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra/web3' import type { AsyncStateRetry } from 'react-use/lib/useAsyncRetry' export function useTrade( diff --git a/packages/mask/src/plugins/Trader/trader/dodo/useTrade.ts b/packages/mask/src/plugins/Trader/trader/dodo/useTrade.ts index 3bea4b1073bb..79020852c220 100644 --- a/packages/mask/src/plugins/Trader/trader/dodo/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/dodo/useTrade.ts @@ -11,7 +11,7 @@ import type { SwapRouteData, TradeStrategy } from '../../types' import { useSlippageTolerance } from './useSlippageTolerance' import { first } from 'lodash-unified' import { TargetChainIdContext } from '../useTargetChainIdContext' -import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra' +import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra/web3' import type { AsyncStateRetry } from 'react-use/lib/useAsyncRetry' export function useTrade( diff --git a/packages/mask/src/plugins/Trader/trader/openocean/useTrade.ts b/packages/mask/src/plugins/Trader/trader/openocean/useTrade.ts index f0a92940ee24..ae5ecd5bf934 100644 --- a/packages/mask/src/plugins/Trader/trader/openocean/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/openocean/useTrade.ts @@ -12,7 +12,7 @@ import type { SwapOOData, TradeStrategy } from '../../types' import { TargetChainIdContext } from '../useTargetChainIdContext' import { useSlippageTolerance } from './useSlippageTolerance' import { OPENOCEAN_SUPPORTED_CHAINS } from './constants' -import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra' +import { useDoubleBlockBeatRetry } from '@masknet/plugin-infra/web3' import type { AsyncStateRetry } from 'react-use/lib/useAsyncRetry' export function useTrade( diff --git a/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolDialog.tsx b/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolDialog.tsx index d395b446a59a..6ea34011834d 100644 --- a/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolDialog.tsx +++ b/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolDialog.tsx @@ -7,7 +7,7 @@ import { pluginMetaKey } from '../constants' import type { UnlockLocks } from '../types' import { PluginUnlockProtocolRPC } from '../messages' import { SelectRecipientsUnlockDialogUI } from './SelectRecipientsUnlockDialog' -import { useCompositionContext } from '@masknet/plugin-infra' +import { useCompositionContext } from '@masknet/plugin-infra/content-script' import { makeStyles } from '@masknet/theme' interface UnlockProtocolDialogProps extends withClasses<'wrapper'> { diff --git a/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolInPost.tsx b/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolInPost.tsx index d7af53613db4..1b16d6f9a5b2 100644 --- a/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolInPost.tsx +++ b/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/UnlockProtocolInPost.tsx @@ -7,7 +7,7 @@ import { renderWithUnlockProtocolMetadata, UnlockProtocolMetadataReader } from ' import { useAccount, useChainId } from '@masknet/web3-shared-evm' import { PluginUnlockProtocolRPC } from '../messages' import { EthereumChainBoundary } from '../../../web3/UI/EthereumChainBoundary' -import { usePluginWrapper } from '@masknet/plugin-infra' +import { usePluginWrapper } from '@masknet/plugin-infra/dom' interface UnlockProtocolInPostProps { message: TypedMessage diff --git a/packages/mask/src/plugins/UnlockProtocol/base.ts b/packages/mask/src/plugins/UnlockProtocol/base.ts index 9ef8ea73ceba..12b8a1a7ecb9 100644 --- a/packages/mask/src/plugins/UnlockProtocol/base.ts +++ b/packages/mask/src/plugins/UnlockProtocol/base.ts @@ -1,4 +1,5 @@ -import { NetworkPluginID, Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' +import type { Plugin } from '@masknet/plugin-infra' import { ChainId } from '@masknet/web3-shared-evm' import { pluginDescription, pluginName, pluginId, pluginMetaKey } from './constants' diff --git a/packages/mask/src/plugins/VCent/SNSAdaptor/index.tsx b/packages/mask/src/plugins/VCent/SNSAdaptor/index.tsx index d765c23c1d38..78f111dbcc25 100644 --- a/packages/mask/src/plugins/VCent/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/VCent/SNSAdaptor/index.tsx @@ -1,5 +1,5 @@ import type { Plugin } from '@masknet/plugin-infra' -import { usePostInfoDetails } from '../../../components/DataSource/usePostInfo' +import { usePostInfoDetails } from '@masknet/plugin-infra/content-script' import VCentDialog from './TweetDialog' import { base } from '../base' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/ConnectionProgress.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/ConnectionProgress.tsx index f513bb2a18d3..3e8f484df2f4 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/ConnectionProgress.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/ConnectionProgress.tsx @@ -2,7 +2,7 @@ import type { AsyncStateRetry } from 'react-use/lib/useAsyncRetry' import { Box, Card, CircularProgress, Typography, Paper, Link } from '@mui/material' import { useStylesExtends, makeStyles, MaskColorVar } from '@masknet/theme' import { ImageIcon } from '@masknet/shared' -import { NetworkPluginID, useProviderDescriptor } from '@masknet/plugin-infra' +import { NetworkPluginID, useProviderDescriptor } from '@masknet/plugin-infra/web3' import { ProviderType, resolveProviderName, diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/PluginProviderRender.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/PluginProviderRender.tsx index 3b2f0a894e43..349f2952aded 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/PluginProviderRender.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/PluginProviderRender.tsx @@ -1,5 +1,5 @@ import { SelectedIcon } from '@masknet/icons' -import type { NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra' +import type { NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra/web3' import { ImageIcon } from '@masknet/shared' import { makeStyles, ShadowRootTooltip } from '@masknet/theme' import { Box, List, ListItem, Typography } from '@mui/material' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx index f3dadd8190a5..a7bc0b6a4bbb 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx @@ -10,7 +10,7 @@ import { useNetworkDescriptor, useNetworkType, useWeb3UI, -} from '@masknet/plugin-infra' +} from '@masknet/plugin-infra/web3' import { isDashboardPage } from '@masknet/shared-base' import { useI18N } from '../../../../utils/i18n-next-ui' import { WalletMessages } from '../../messages' diff --git a/packages/mask/src/plugins/dHEDGE/SNSAdaptor/index.tsx b/packages/mask/src/plugins/dHEDGE/SNSAdaptor/index.tsx index 7bc8e95ed740..039f320dcce7 100644 --- a/packages/mask/src/plugins/dHEDGE/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/dHEDGE/SNSAdaptor/index.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra/content-script' import { extractTextFromTypedMessage } from '@masknet/typed-message' import { parseURL } from '@masknet/shared-base' import { base } from '../base' diff --git a/packages/mask/src/social-network-adaptor/facebook.com/automation/pasteToCommentBoxFacebook.ts b/packages/mask/src/social-network-adaptor/facebook.com/automation/pasteToCommentBoxFacebook.ts index e0cb86aa8cfe..09ada8d9d695 100644 --- a/packages/mask/src/social-network-adaptor/facebook.com/automation/pasteToCommentBoxFacebook.ts +++ b/packages/mask/src/social-network-adaptor/facebook.com/automation/pasteToCommentBoxFacebook.ts @@ -2,7 +2,7 @@ import { selectElementContents } from '../../../utils/utils' import { delay } from '@dimensiondev/kit' import { isMobileFacebook } from '../utils/isMobile' import { MaskMessages } from '../../../utils/messages' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { inputText, pasteText } from '@masknet/injected-script' export async function pasteToCommentBoxFacebook(encryptedComment: string, current: PostInfo, dom: HTMLElement | null) { diff --git a/packages/mask/src/social-network-adaptor/facebook.com/injection/NFT/NFTAvatarInFacebook.tsx b/packages/mask/src/social-network-adaptor/facebook.com/injection/NFT/NFTAvatarInFacebook.tsx index d888e2543837..44670a1f2f67 100644 --- a/packages/mask/src/social-network-adaptor/facebook.com/injection/NFT/NFTAvatarInFacebook.tsx +++ b/packages/mask/src/social-network-adaptor/facebook.com/injection/NFT/NFTAvatarInFacebook.tsx @@ -6,7 +6,7 @@ import type { NFTAvatarEvent } from '@masknet/shared-base' import { max, pickBy } from 'lodash-unified' import { useCurrentVisitingIdentity } from '../../../../components/DataSource/useActivatedUI' import { useAsync, useLocation, useWindowSize } from 'react-use' -import { useWallet } from '@masknet/plugin-infra' +import { useWallet } from '@masknet/plugin-infra/web3' import type { AvatarMetaDB } from '../../../../plugins/Avatar/types' import { PluginNFTAvatarRPC } from '../../../../plugins/Avatar/messages' import { getAvatarId } from '../../utils/user' diff --git a/packages/mask/src/social-network-adaptor/facebook.com/injection/PostInspector.tsx b/packages/mask/src/social-network-adaptor/facebook.com/injection/PostInspector.tsx index 0ea99a16375c..071f669d6d4e 100644 --- a/packages/mask/src/social-network-adaptor/facebook.com/injection/PostInspector.tsx +++ b/packages/mask/src/social-network-adaptor/facebook.com/injection/PostInspector.tsx @@ -1,6 +1,6 @@ import type { DOMProxy } from '@dimensiondev/holoflows-kit' import { isMobileFacebook } from '../utils/isMobile' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { injectPostInspectorDefault } from '../../../social-network/defaults/inject/PostInspector' import { Flags } from '../../../../shared' diff --git a/packages/mask/src/social-network-adaptor/facebook.com/injection/PostReplacer.tsx b/packages/mask/src/social-network-adaptor/facebook.com/injection/PostReplacer.tsx index 45b0772012ee..98a1d409ff80 100644 --- a/packages/mask/src/social-network-adaptor/facebook.com/injection/PostReplacer.tsx +++ b/packages/mask/src/social-network-adaptor/facebook.com/injection/PostReplacer.tsx @@ -1,5 +1,5 @@ import { injectPostReplacer } from '../../../social-network/defaults/inject/PostReplacer' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' function resolveContentNode(node: HTMLElement) { return node.querySelector('[role=article] div[dir="auto"] > [id] > div > div > span') diff --git a/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/NFTAvatarSettingDialog.tsx b/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/NFTAvatarSettingDialog.tsx index 3f350a513860..ae6f99f36625 100644 --- a/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/NFTAvatarSettingDialog.tsx +++ b/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/NFTAvatarSettingDialog.tsx @@ -10,7 +10,7 @@ import { NFTAvatar } from '../../../../plugins/Avatar/SNSAdaptor/NFTAvatar' import { DialogStackingProvider, makeStyles } from '@masknet/theme' import type { ERC721TokenDetailed } from '@masknet/web3-shared-evm' import { Instagram } from '@masknet/web3-providers' -import { useWallet } from '@masknet/plugin-infra' +import { useWallet } from '@masknet/plugin-infra/web3' import { PluginNFTAvatarRPC } from '../../../../plugins/Avatar/messages' import type { AvatarMetaDB } from '../../../../plugins/Avatar/types' import { RSS3_KEY_SNS } from '../../../../plugins/Avatar/constants' diff --git a/packages/mask/src/social-network-adaptor/instagram.com/injection/post-inspector.ts b/packages/mask/src/social-network-adaptor/instagram.com/injection/post-inspector.ts index a44cf7af726c..a1f842ff6353 100644 --- a/packages/mask/src/social-network-adaptor/instagram.com/injection/post-inspector.ts +++ b/packages/mask/src/social-network-adaptor/instagram.com/injection/post-inspector.ts @@ -1,5 +1,5 @@ import { injectPostInspectorDefault } from '../../../social-network/defaults' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { Flags } from '../../../../shared' const map = new WeakMap() diff --git a/packages/mask/src/social-network-adaptor/minds.com/automation/pasteToCommentBoxMinds.ts b/packages/mask/src/social-network-adaptor/minds.com/automation/pasteToCommentBoxMinds.ts index 9d5b6bb277e9..8ba2a4035876 100644 --- a/packages/mask/src/social-network-adaptor/minds.com/automation/pasteToCommentBoxMinds.ts +++ b/packages/mask/src/social-network-adaptor/minds.com/automation/pasteToCommentBoxMinds.ts @@ -1,4 +1,4 @@ -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { MaskMessages } from '../../../utils/messages' import { delay } from '@dimensiondev/kit' import { selectElementContents } from '../../../utils/utils' diff --git a/packages/mask/src/social-network-adaptor/minds.com/injection/PostInspector.tsx b/packages/mask/src/social-network-adaptor/minds.com/injection/PostInspector.tsx index 7d6ad19cddad..a8180da05f1d 100644 --- a/packages/mask/src/social-network-adaptor/minds.com/injection/PostInspector.tsx +++ b/packages/mask/src/social-network-adaptor/minds.com/injection/PostInspector.tsx @@ -1,5 +1,5 @@ import { injectPostInspectorDefault } from '../../../social-network/defaults/inject/PostInspector' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' export function injectPostInspectorAtMinds(signal: AbortSignal, current: PostInfo) { return injectPostInspectorDefault()(current, signal) diff --git a/packages/mask/src/social-network-adaptor/minds.com/injection/PostReplacer.tsx b/packages/mask/src/social-network-adaptor/minds.com/injection/PostReplacer.tsx index 777f99bedd69..46015389323e 100644 --- a/packages/mask/src/social-network-adaptor/minds.com/injection/PostReplacer.tsx +++ b/packages/mask/src/social-network-adaptor/minds.com/injection/PostReplacer.tsx @@ -1,5 +1,5 @@ import { injectPostReplacer } from '../../../social-network/defaults/inject/PostReplacer' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' function resolveContentNode(node: HTMLElement) { return node.closest( diff --git a/packages/mask/src/social-network-adaptor/twitter.com/collecting/post.ts b/packages/mask/src/social-network-adaptor/twitter.com/collecting/post.ts index a5f8a93279b5..2f5af0ab53a2 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/collecting/post.ts +++ b/packages/mask/src/social-network-adaptor/twitter.com/collecting/post.ts @@ -2,7 +2,7 @@ import { postsContentSelector, postsImageSelector, timelinePostContentSelector } import { IntervalWatcher, DOMProxy, DOMProxyEvents } from '@dimensiondev/holoflows-kit' import type { EventListener } from '@servie/events' import { creator, globalUIState, SocialNetworkUI as Next } from '../../../social-network' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { postIdParser, postParser, postImagesParser, postContentMessageParser } from '../utils/fetch' import { memoize, noop } from 'lodash-unified' import Services from '../../../extension/service' diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/MaskIcon.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/MaskIcon.tsx index a4fcaf947e06..93043a03dafd 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/injection/MaskIcon.tsx +++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/MaskIcon.tsx @@ -1,6 +1,6 @@ import { MutationObserverWatcher, DOMProxy, LiveSelector } from '@dimensiondev/holoflows-kit' import { bioPageUserNickNameSelector, floatingBioCardSelector, bioPageUserIDSelector } from '../utils/selector' -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import Services from '../../../extension/service' import { ProfileIdentifier } from '@masknet/shared-base' import { MaskIcon } from '../../../resources/MaskIcon' diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/PostActions/index.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/PostActions/index.tsx index 637903840779..97da8d812000 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/injection/PostActions/index.tsx +++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/PostActions/index.tsx @@ -1,4 +1,4 @@ -import type { PostInfo } from '@masknet/plugin-infra' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { Flags } from '../../../../../shared' import { createPostActionsInjector } from '../../../../social-network/defaults/inject/PostActions' diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/PostInspector.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/PostInspector.tsx index ec793e6d3ae9..6ff7a1017d8a 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/injection/PostInspector.tsx +++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/PostInspector.tsx @@ -1,5 +1,5 @@ /* eslint @dimensiondev/unicode-specific-set: ["error", { "only": "code" }] */ -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { injectPostInspectorDefault } from '../../../social-network/defaults/inject/PostInspector' import { twitterEncoding } from '../encoding' diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/PostReplacer.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/PostReplacer.tsx index 540cfb34f540..6f61f0dce256 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/injection/PostReplacer.tsx +++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/PostReplacer.tsx @@ -1,4 +1,4 @@ -import type { PostInfo } from '../../../social-network/PostInfo' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import { injectPostReplacer } from '../../../social-network/defaults/inject/PostReplacer' function resolveLangNode(node: HTMLElement) { diff --git a/packages/mask/src/social-network/PostInfo.ts b/packages/mask/src/social-network/PostInfo.ts deleted file mode 100644 index 876f098853b1..000000000000 --- a/packages/mask/src/social-network/PostInfo.ts +++ /dev/null @@ -1 +0,0 @@ -export type { PostInfo } from '@masknet/plugin-infra' diff --git a/packages/mask/src/social-network/defaults/inject/CommentBox.tsx b/packages/mask/src/social-network/defaults/inject/CommentBox.tsx index fc120931887f..8752180fdac2 100644 --- a/packages/mask/src/social-network/defaults/inject/CommentBox.tsx +++ b/packages/mask/src/social-network/defaults/inject/CommentBox.tsx @@ -1,11 +1,10 @@ import { memo, useCallback } from 'react' -import type { PostInfo } from '../../PostInfo' +import { type PostInfo, usePostInfoDetails, usePostInfo, PostInfoProvider } from '@masknet/plugin-infra/content-script' import { DOMProxy, MutationObserverWatcher } from '@dimensiondev/holoflows-kit' import { CommentBox, CommentBoxProps } from '../../../components/InjectedComponents/CommentBox' import Services from '../../../extension/service' import { createReactRootShadowed } from '../../../utils/shadow-root/renderInShadowRoot' import { makeStyles } from '@masknet/theme' -import { usePostInfoDetails, usePostInfo, PostInfoProvider } from '../../../components/DataSource/usePostInfo' import { noop } from 'lodash-unified' import { MaskMessages } from '../../../utils/messages' import { startWatch } from '../../../utils/watcher' diff --git a/packages/mask/src/social-network/defaults/inject/Comments.tsx b/packages/mask/src/social-network/defaults/inject/Comments.tsx index 2ecc1f8b65e6..060b112eeb21 100644 --- a/packages/mask/src/social-network/defaults/inject/Comments.tsx +++ b/packages/mask/src/social-network/defaults/inject/Comments.tsx @@ -1,10 +1,9 @@ import { memo } from 'react' -import type { PostInfo } from '../../PostInfo' +import { type PostInfo, PostInfoProvider } from '@masknet/plugin-infra/content-script' import { MutationObserverWatcher, ValueRef } from '@dimensiondev/holoflows-kit' import { createReactRootShadowed } from '../../../utils/shadow-root/renderInShadowRoot' import { PostComment, PostCommentProps } from '../../../components/InjectedComponents/PostComments' import { makeStyles } from '@masknet/theme' -import { PostInfoProvider } from '../../../components/DataSource/usePostInfo' import { noop } from 'lodash-unified' import { collectNodeText } from '../../../utils' import { startWatch } from '../../../utils/watcher' diff --git a/packages/mask/src/social-network/defaults/inject/PostActions.tsx b/packages/mask/src/social-network/defaults/inject/PostActions.tsx index 0de5f11dcd7f..d1b26788287e 100644 --- a/packages/mask/src/social-network/defaults/inject/PostActions.tsx +++ b/packages/mask/src/social-network/defaults/inject/PostActions.tsx @@ -1,8 +1,7 @@ import { noop } from 'lodash-unified' -import { PostInfoProvider } from '../../../components/DataSource/usePostInfo' +import { PostInfoProvider, type PostInfo } from '@masknet/plugin-infra/content-script' import { PostActions } from '../../../components/InjectedComponents/PostActions' import { createReactRootShadowed } from '../../../utils/shadow-root/renderInShadowRoot' -import type { PostInfo } from '../../PostInfo' export function createPostActionsInjector() { return function injectPostActions(current: PostInfo, signal: AbortSignal) { diff --git a/packages/mask/src/social-network/defaults/inject/PostInspector.tsx b/packages/mask/src/social-network/defaults/inject/PostInspector.tsx index f9942e41ba9d..92ac1e29f486 100644 --- a/packages/mask/src/social-network/defaults/inject/PostInspector.tsx +++ b/packages/mask/src/social-network/defaults/inject/PostInspector.tsx @@ -1,10 +1,9 @@ import { memo } from 'react' import type { DOMProxy } from '@dimensiondev/holoflows-kit' -import type { PostInfo } from '../../PostInfo' +import { type PostInfo, PostInfoProvider } from '@masknet/plugin-infra/content-script' import { createReactRootShadowed } from '../../../utils/shadow-root/renderInShadowRoot' import { PostInspector, PostInspectorProps } from '../../../components/InjectedComponents/PostInspector' import { makeStyles } from '@masknet/theme' -import { PostInfoProvider } from '../../../components/DataSource/usePostInfo' import { noop } from 'lodash-unified' export function injectPostInspectorDefault( diff --git a/packages/mask/src/social-network/defaults/inject/PostReplacer.tsx b/packages/mask/src/social-network/defaults/inject/PostReplacer.tsx index 8c74b6a4a3a8..3d17d7f7ab58 100644 --- a/packages/mask/src/social-network/defaults/inject/PostReplacer.tsx +++ b/packages/mask/src/social-network/defaults/inject/PostReplacer.tsx @@ -1,8 +1,7 @@ import { memo } from 'react' import { createReactRootShadowed } from '../../../utils/shadow-root/renderInShadowRoot' -import { PostInfoProvider } from '../../../components/DataSource/usePostInfo' +import { PostInfoProvider, PostInfo } from '@masknet/plugin-infra/content-script' import { PostReplacer, PostReplacerProps } from '../../../components/InjectedComponents/PostReplacer' -import type { PostInfo } from '../../PostInfo' import type { DOMProxy } from '@dimensiondev/holoflows-kit' import { noop } from 'lodash-unified' diff --git a/packages/mask/src/social-network/types.ts b/packages/mask/src/social-network/types.ts index 5601bec36c8b..6e9dc95b4eee 100644 --- a/packages/mask/src/social-network/types.ts +++ b/packages/mask/src/social-network/types.ts @@ -1,6 +1,6 @@ import type { ValueRef } from '@dimensiondev/holoflows-kit' import type { GrayscaleAlgorithm, SocialNetworkEnum } from '@masknet/encryption' -import type { PostInfo } from '@masknet/plugin-infra' +import type { PostInfo } from '@masknet/plugin-infra/content-script' import type { Identifier, ObservableWeakMap, diff --git a/packages/mask/src/social-network/ui.ts b/packages/mask/src/social-network/ui.ts index 5c8235d5e9f4..8f54d8a0c768 100644 --- a/packages/mask/src/social-network/ui.ts +++ b/packages/mask/src/social-network/ui.ts @@ -15,7 +15,7 @@ import { i18NextInstance, } from '@masknet/shared-base' import { Environment, assertNotEnvironment } from '@dimensiondev/holoflows-kit' -import { startPluginSNSAdaptor } from '@masknet/plugin-infra' +import { startPluginSNSAdaptor } from '@masknet/plugin-infra/content-script' import { getCurrentSNSNetwork } from '../social-network-adaptor/utils' import { createPluginHost } from '../plugin-infra/host' import { definedSocialNetworkUIs } from './define' diff --git a/packages/mask/src/social-network/utils/create-post-context.ts b/packages/mask/src/social-network/utils/create-post-context.ts index bc1c175702ff..5f0f5f72e62d 100644 --- a/packages/mask/src/social-network/utils/create-post-context.ts +++ b/packages/mask/src/social-network/utils/create-post-context.ts @@ -1,5 +1,10 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' -import type { PostContext, PostContextAuthor, PostContextCreation, PostContextSNSActions } from '@masknet/plugin-infra' +import type { + PostContext, + PostContextAuthor, + PostContextCreation, + PostContextSNSActions, +} from '@masknet/plugin-infra/content-script' import { extractTextFromTypedMessage, isTypedMessageEqual, diff --git a/packages/mask/src/web3/UI/EthereumChainBoundary.tsx b/packages/mask/src/web3/UI/EthereumChainBoundary.tsx index ae7288a76a70..5c8fb75422e6 100644 --- a/packages/mask/src/web3/UI/EthereumChainBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumChainBoundary.tsx @@ -2,7 +2,8 @@ import React, { useCallback } from 'react' import { Box, Typography, Theme } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import type { SxProps } from '@mui/system' -import { NetworkPluginID, useActivatedPlugin, useCurrentWeb3NetworkPluginID, useAccount } from '@masknet/plugin-infra' +import { useActivatedPlugin } from '@masknet/plugin-infra/dom' +import { NetworkPluginID, useCurrentWeb3NetworkPluginID, useAccount } from '@masknet/plugin-infra/web3' import { ChainId, getChainDetailedCAIP, diff --git a/packages/mask/src/web3/UI/TokenAmountPanel.tsx b/packages/mask/src/web3/UI/TokenAmountPanel.tsx index 8c01e8a81b8f..ebd591db85aa 100644 --- a/packages/mask/src/web3/UI/TokenAmountPanel.tsx +++ b/packages/mask/src/web3/UI/TokenAmountPanel.tsx @@ -5,7 +5,7 @@ import { makeStyles, useStylesExtends } from '@masknet/theme' import { Box, Chip, ChipProps, InputProps, TextField, TextFieldProps, Typography } from '@mui/material' import { FormattedBalance } from '@masknet/shared' import type { FungibleTokenDetailed } from '@masknet/web3-shared-evm' -import { useWeb3State } from '@masknet/plugin-infra' +import { useWeb3State } from '@masknet/plugin-infra/web3' import { SelectTokenChip, SelectTokenChipProps } from './SelectTokenChip' import { useI18N } from '../../utils' diff --git a/packages/plugin-infra/package.json b/packages/plugin-infra/package.json index 299e65b2aadf..b8f421154a0f 100644 --- a/packages/plugin-infra/package.json +++ b/packages/plugin-infra/package.json @@ -4,11 +4,46 @@ "license": "AGPL-3.0-or-later", "exports": { ".": { - "webpack": "./src/index.ts", - "default": "./dist/index.js" + "types": "./dist/entry.d.ts", + "webpack": "./src/entry.ts", + "default": "./dist/entry.js" + }, + "./web3": { + "types": "./dist/entry-web3.d.ts", + "webpack": "./src/entry-web3.ts", + "default": "./dist/entry-web3.js" + }, + "./dom": { + "types": "./dist/entry-dom.d.ts", + "webpack": "./src/entry-dom.ts", + "default": "./dist/entry-dom.js" + }, + "./background-worker": { + "types": "./dist/entry-background-worker.d.ts", + "webpack": "./src/entry-background-worker.ts", + "default": "./dist/entry-background-worker.js" + }, + "./dashboard": { + "types": "./dist/entry-dashboard.d.ts", + "webpack": "./src/entry-dashboard.ts", + "default": "./dist/entry-dashboard.js" + }, + "./content-script": { + "types": "./dist/entry-content-script.d.ts", + "webpack": "./src/entry-content-script.ts", + "default": "./dist/entry-content-script.js" } }, - "types": "./dist/index.d.ts", + "typesVersions": { + "*": { + "web3": ["./dist/entry-web3.d.ts"], + "dom": ["./dist/entry-dom.d.ts"], + "background-worker": ["./dist/entry-background-worker.d.ts"], + "dashboard": ["./dist/entry-dashboard.d.ts"], + "content-script": ["./dist/entry-content-script.d.ts"] + } + }, + "types": "./dist/entry.d.ts", "scripts": {}, "dependencies": { "@dimensiondev/holoflows-kit": "^0.9.0-20210902104757-7c3d0d0", diff --git a/packages/plugin-infra/src/entry-background-worker.ts b/packages/plugin-infra/src/entry-background-worker.ts new file mode 100644 index 000000000000..a0a0c162a088 --- /dev/null +++ b/packages/plugin-infra/src/entry-background-worker.ts @@ -0,0 +1,2 @@ +export * from './entry' +export { activatedPluginsWorker, startPluginWorker } from './manager/worker' diff --git a/packages/plugin-infra/src/entry-content-script.ts b/packages/plugin-infra/src/entry-content-script.ts new file mode 100644 index 000000000000..a46106a26b09 --- /dev/null +++ b/packages/plugin-infra/src/entry-content-script.ts @@ -0,0 +1,20 @@ +export * from './entry-dom' +export { + startPluginSNSAdaptor, + useActivatedPluginSNSAdaptor, + useActivatedPluginSNSAdaptor_Web3Supported, + useActivatedPluginsSNSAdaptor, + useIsMinimalMode, +} from './manager/sns-adaptor' +export { + type PostContext, + type PostContextAuthor, + type PostContextComment, + type PostContextCreation, + type PostContextSNSActions, + type PostInfo, + PostInfoProvider, + usePostInfo, + usePostInfoDetails, +} from './PostContext' +export { CompositionContext, useCompositionContext } from './CompositionContext' diff --git a/packages/plugin-infra/src/entry-dashboard.ts b/packages/plugin-infra/src/entry-dashboard.ts new file mode 100644 index 000000000000..9ba0ebd883bf --- /dev/null +++ b/packages/plugin-infra/src/entry-dashboard.ts @@ -0,0 +1,2 @@ +export * from './entry-dom' +export { startPluginDashboard, useActivatedPluginDashboard, useActivatedPluginsDashboard } from './manager/dashboard' diff --git a/packages/plugin-infra/src/entry-dom.ts b/packages/plugin-infra/src/entry-dom.ts new file mode 100644 index 000000000000..30cc15ee646a --- /dev/null +++ b/packages/plugin-infra/src/entry-dom.ts @@ -0,0 +1,11 @@ +export * from './entry' +export { createInjectHooksRenderer } from './utils/createInjectHooksRenderer' +export { + PluginI18NFieldRender, + type PluginI18NFieldRenderProps, + type PluginWrapperComponent, + type PluginWrapperMethods, + useActivatedPlugin, + usePluginI18NField, + usePluginWrapper, +} from './hooks' diff --git a/packages/plugin-infra/src/entry-web3.ts b/packages/plugin-infra/src/entry-web3.ts new file mode 100644 index 000000000000..f10b434742c9 --- /dev/null +++ b/packages/plugin-infra/src/entry-web3.ts @@ -0,0 +1,11 @@ +export * from './web3' +export * from './web3-types' +export { + useActivatedPluginWeb3State, + useActivatedPluginWeb3UI, + useAllPluginsWeb3State, + useLookupAddress, + useReverseAddress, + useAvailablePlugins, +} from './hooks' +export { getRegisteredWeb3Networks, getRegisteredWeb3Providers } from './manager/store' diff --git a/packages/plugin-infra/src/entry.ts b/packages/plugin-infra/src/entry.ts new file mode 100644 index 000000000000..68a654a0e1a0 --- /dev/null +++ b/packages/plugin-infra/src/entry.ts @@ -0,0 +1,4 @@ +export * from './types' +export { createPluginMessage, type DefaultPluginMessage, type PluginMessageEmitter } from './utils/message' +export { createPluginRPC, createPluginRPCGenerator } from './utils/rpc' +export { getPluginDefine, registerPlugin, registeredPlugins, registeredPluginIDs } from './manager/store' diff --git a/packages/plugin-infra/src/index.ts b/packages/plugin-infra/src/index.ts deleted file mode 100644 index 4d6cd4c5cddb..000000000000 --- a/packages/plugin-infra/src/index.ts +++ /dev/null @@ -1,20 +0,0 @@ -export * from './web3' -export * from './types' -export * from './web3-types' -export * from './hooks' -export * from './manager/dashboard' -export * from './manager/sns-adaptor' -export * from './manager/worker' -export * from './utils' -export * from './PostContext' -export * from './CompositionContext' -export * from 'ts-results' -export { - getPluginDefine, - registerPlugin, - registeredPlugins, - registeredPluginIDs, - getRegisteredWeb3Networks, - getRegisteredWeb3Providers, -} from './manager/store' -export { activatedPluginsWorker } from './manager/worker' diff --git a/packages/plugin-infra/src/manager/sns-adaptor.ts b/packages/plugin-infra/src/manager/sns-adaptor.ts index 2e2e33bfc2d6..202666e5acc7 100644 --- a/packages/plugin-infra/src/manager/sns-adaptor.ts +++ b/packages/plugin-infra/src/manager/sns-adaptor.ts @@ -2,7 +2,7 @@ import { useSubscription, Subscription } from 'use-subscription' import { createManager } from './manage' import { getPluginDefine } from './store' import type { CurrentSNSNetwork, Plugin } from '../types' -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { unreachable } from '@dimensiondev/kit' const { events, activated, startDaemon, minimalMode } = createManager((def) => def.SNSAdaptor) diff --git a/packages/plugin-infra/src/types.ts b/packages/plugin-infra/src/types.ts index 572cb250b4cc..fe9e2dc24653 100644 --- a/packages/plugin-infra/src/types.ts +++ b/packages/plugin-infra/src/types.ts @@ -687,19 +687,6 @@ export enum PluginId { CrossChainBridge = 'io.mask.cross-chain-bridge', // @masknet/scripts: insert-here } - -export interface Pagination { - /** The item size of each page. */ - size?: number - /** The page index. */ - page?: number -} - -export interface Pageable { - currentPage: number - hasNextPage: boolean - data: T[] -} /** * This namespace is not related to the plugin authors */ diff --git a/packages/plugin-infra/src/utils/index.ts b/packages/plugin-infra/src/utils/index.ts deleted file mode 100644 index 091067f16c38..000000000000 --- a/packages/plugin-infra/src/utils/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export { createInjectHooksRenderer } from './createInjectHooksRenderer' -export * from './message' -export * from './rpc' diff --git a/packages/plugin-infra/src/web3-types.ts b/packages/plugin-infra/src/web3-types.ts index 5c1442031d6b..2e305170174e 100644 --- a/packages/plugin-infra/src/web3-types.ts +++ b/packages/plugin-infra/src/web3-types.ts @@ -1,7 +1,19 @@ import type { BigNumber } from 'bignumber.js' import type { Subscription } from 'use-subscription' -import type { Pagination, Plugin, Pageable } from './types' +import type { Plugin } from './types' +export interface Pagination { + /** The item size of each page. */ + size?: number + /** The page index. */ + page?: number +} + +export interface Pageable { + currentPage: number + hasNextPage: boolean + data: T[] +} /** * A network plugin defines the way to connect to a single chain. */ diff --git a/packages/plugin-infra/src/web3/useAccount.ts b/packages/plugin-infra/src/web3/useAccount.ts index 18b10a6c18bd..bbb938a2964a 100644 --- a/packages/plugin-infra/src/web3/useAccount.ts +++ b/packages/plugin-infra/src/web3/useAccount.ts @@ -1,5 +1,5 @@ import { first } from 'lodash-unified' -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' /** diff --git a/packages/plugin-infra/src/web3/useAllowTestnet.ts b/packages/plugin-infra/src/web3/useAllowTestnet.ts index 1b5c2ec9fb4d..ef3f8dcb5109 100644 --- a/packages/plugin-infra/src/web3/useAllowTestnet.ts +++ b/packages/plugin-infra/src/web3/useAllowTestnet.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useAllowTestnet(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useAssetType.ts b/packages/plugin-infra/src/web3/useAssetType.ts index cf6258df0c43..77abbf95a1a2 100644 --- a/packages/plugin-infra/src/web3/useAssetType.ts +++ b/packages/plugin-infra/src/web3/useAssetType.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useAssetType(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useBalance.ts b/packages/plugin-infra/src/web3/useBalance.ts index 513b55a4806b..bc04e875028a 100644 --- a/packages/plugin-infra/src/web3/useBalance.ts +++ b/packages/plugin-infra/src/web3/useBalance.ts @@ -1,6 +1,6 @@ import { useAsyncRetry } from 'react-use' -import { useAccount, useChainId } from '.' -import { NetworkPluginID, useWeb3State } from '..' +import { useAccount, useChainId, useWeb3State } from '.' +import type { NetworkPluginID } from '../web3-types' export function useBalance(expectedChainId?: number, expectedAccount?: string, pluginID?: NetworkPluginID) { const { Utils } = useWeb3State() diff --git a/packages/plugin-infra/src/web3/useBeat.ts b/packages/plugin-infra/src/web3/useBeat.ts index edaccc761f23..29166bf02a47 100644 --- a/packages/plugin-infra/src/web3/useBeat.ts +++ b/packages/plugin-infra/src/web3/useBeat.ts @@ -1,7 +1,7 @@ import type { DependencyList } from 'react' import type { AsyncStateRetry } from 'react-use/lib/useAsyncRetry' import { useBeatRetry } from '@masknet/web3-shared-base' -import { useWeb3State } from '..' +import { useWeb3State } from '.' import { useChainId } from './useChainId' const DEFAULT_SINGLE_BLOCK_DELAY = 15 * 1000 diff --git a/packages/plugin-infra/src/web3/useBlockNumber.ts b/packages/plugin-infra/src/web3/useBlockNumber.ts index b3970cecd4f4..e642024c9910 100644 --- a/packages/plugin-infra/src/web3/useBlockNumber.ts +++ b/packages/plugin-infra/src/web3/useBlockNumber.ts @@ -1,6 +1,6 @@ import { useAsyncRetry } from 'react-use' import { useChainId, useWeb3State } from '.' -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' export function useBlockNumber(expectedChainId?: number, pluginID?: NetworkPluginID) { const { Utils } = useWeb3State() diff --git a/packages/plugin-infra/src/web3/useChainColor.ts b/packages/plugin-infra/src/web3/useChainColor.ts index fd2f99ce5fa4..1e1d61e3fd52 100644 --- a/packages/plugin-infra/src/web3/useChainColor.ts +++ b/packages/plugin-infra/src/web3/useChainColor.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { useChainId } from './useChainId' import { useWeb3State } from './useWeb3State' diff --git a/packages/plugin-infra/src/web3/useChainDetailed.ts b/packages/plugin-infra/src/web3/useChainDetailed.ts index 8b19639c09e3..a5face6dccd9 100644 --- a/packages/plugin-infra/src/web3/useChainDetailed.ts +++ b/packages/plugin-infra/src/web3/useChainDetailed.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { useChainId } from './useChainId' import { useWeb3State } from './useWeb3State' diff --git a/packages/plugin-infra/src/web3/useChainId.ts b/packages/plugin-infra/src/web3/useChainId.ts index 13e3f3dd685f..0ba9a6512535 100644 --- a/packages/plugin-infra/src/web3/useChainId.ts +++ b/packages/plugin-infra/src/web3/useChainId.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useChainId(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useChainIdValid.ts b/packages/plugin-infra/src/web3/useChainIdValid.ts index 4eb8a90e7a7a..1fca2450a41b 100644 --- a/packages/plugin-infra/src/web3/useChainIdValid.ts +++ b/packages/plugin-infra/src/web3/useChainIdValid.ts @@ -1,7 +1,7 @@ import { useChainId } from './useChainId' import { useWeb3State } from './useWeb3State' import { useAccount } from './useAccount' -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' export function useChainIdValid(pluginID?: NetworkPluginID) { const account = useAccount(pluginID) diff --git a/packages/plugin-infra/src/web3/useCollectibleType.ts b/packages/plugin-infra/src/web3/useCollectibleType.ts index a5c472dcfe33..dacae5c60e83 100644 --- a/packages/plugin-infra/src/web3/useCollectibleType.ts +++ b/packages/plugin-infra/src/web3/useCollectibleType.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useCollectibleType(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useCurrencyType.ts b/packages/plugin-infra/src/web3/useCurrencyType.ts index 1d506d79aaaa..bf9b4223e543 100644 --- a/packages/plugin-infra/src/web3/useCurrencyType.ts +++ b/packages/plugin-infra/src/web3/useCurrencyType.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useCurrencyType(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useNameType.ts b/packages/plugin-infra/src/web3/useNameType.ts index e953b611f245..1aad4f7b56c6 100644 --- a/packages/plugin-infra/src/web3/useNameType.ts +++ b/packages/plugin-infra/src/web3/useNameType.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useNameType(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useNetworkDescriptor.ts b/packages/plugin-infra/src/web3/useNetworkDescriptor.ts index f7bb10353f38..4b04831429b2 100644 --- a/packages/plugin-infra/src/web3/useNetworkDescriptor.ts +++ b/packages/plugin-infra/src/web3/useNetworkDescriptor.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { useNetworkType } from './useNetworkType' import { useCurrentWeb3NetworkPluginID } from './Context' import { getPluginDefine } from '../manager/store' diff --git a/packages/plugin-infra/src/web3/useNetworkDescriptors.ts b/packages/plugin-infra/src/web3/useNetworkDescriptors.ts index 162d5fe303e7..9227a0c835d6 100644 --- a/packages/plugin-infra/src/web3/useNetworkDescriptors.ts +++ b/packages/plugin-infra/src/web3/useNetworkDescriptors.ts @@ -1,5 +1,5 @@ import { useCurrentWeb3NetworkPluginID } from '.' -import { getPluginDefine } from '..' +import { getPluginDefine } from '../entry' export function useNetworkDescriptors(expectedPluginID?: string) { const pluginID = useCurrentWeb3NetworkPluginID() diff --git a/packages/plugin-infra/src/web3/useNetworkType.ts b/packages/plugin-infra/src/web3/useNetworkType.ts index 232ba5287a4d..df46ff5aaf30 100644 --- a/packages/plugin-infra/src/web3/useNetworkType.ts +++ b/packages/plugin-infra/src/web3/useNetworkType.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useNetworkType(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useProviderDescriptor.ts b/packages/plugin-infra/src/web3/useProviderDescriptor.ts index 3b48bd3b49d7..41056dc9709e 100644 --- a/packages/plugin-infra/src/web3/useProviderDescriptor.ts +++ b/packages/plugin-infra/src/web3/useProviderDescriptor.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { useProviderType } from './useProviderType' import { useCurrentWeb3NetworkPluginID } from './Context' import { getPluginDefine } from '../manager/store' diff --git a/packages/plugin-infra/src/web3/useProviderDescriptors.ts b/packages/plugin-infra/src/web3/useProviderDescriptors.ts index 0db2b0167c14..6df454cebe58 100644 --- a/packages/plugin-infra/src/web3/useProviderDescriptors.ts +++ b/packages/plugin-infra/src/web3/useProviderDescriptors.ts @@ -1,5 +1,5 @@ import { useCurrentWeb3NetworkPluginID } from '.' -import { getPluginDefine } from '..' +import { getPluginDefine } from '../entry' export function useProviderDescriptors(expectedPluginID?: string) { const pluginID = useCurrentWeb3NetworkPluginID() diff --git a/packages/plugin-infra/src/web3/useProviderType.ts b/packages/plugin-infra/src/web3/useProviderType.ts index 49442c19dc33..26750585a473 100644 --- a/packages/plugin-infra/src/web3/useProviderType.ts +++ b/packages/plugin-infra/src/web3/useProviderType.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useProviderType(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useTokenPrice.ts b/packages/plugin-infra/src/web3/useTokenPrice.ts index 0afc182c4632..2c8d42b9c4fc 100644 --- a/packages/plugin-infra/src/web3/useTokenPrice.ts +++ b/packages/plugin-infra/src/web3/useTokenPrice.ts @@ -1,5 +1,4 @@ -import type { NetworkPluginID } from '..' -import type { CurrencyType } from '../web3-types' +import type { NetworkPluginID, CurrencyType } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useTokenPrice(id: string, currencyType: string, pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useTransactionType.ts b/packages/plugin-infra/src/web3/useTransactionType.ts index eb1f6cf5be6c..3fea9939d47e 100644 --- a/packages/plugin-infra/src/web3/useTransactionType.ts +++ b/packages/plugin-infra/src/web3/useTransactionType.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useTransactionType(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useWallet.ts b/packages/plugin-infra/src/web3/useWallet.ts index 268c68b8c7a0..3280d2f85635 100644 --- a/packages/plugin-infra/src/web3/useWallet.ts +++ b/packages/plugin-infra/src/web3/useWallet.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { useAccount } from './useAccount' import { usePluginWeb3StateContext } from './Context' diff --git a/packages/plugin-infra/src/web3/useWalletPrimary.ts b/packages/plugin-infra/src/web3/useWalletPrimary.ts index 5707b9cffbf8..23687b2db398 100644 --- a/packages/plugin-infra/src/web3/useWalletPrimary.ts +++ b/packages/plugin-infra/src/web3/useWalletPrimary.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useWalletPrimary(pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useWallets.ts b/packages/plugin-infra/src/web3/useWallets.ts index 89d5df19c795..277640dcb1ee 100644 --- a/packages/plugin-infra/src/web3/useWallets.ts +++ b/packages/plugin-infra/src/web3/useWallets.ts @@ -1,4 +1,4 @@ -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' import { usePluginWeb3StateContext } from './Context' export function useWallets(type?: string, pluginID?: NetworkPluginID) { diff --git a/packages/plugin-infra/src/web3/useWeb3State.ts b/packages/plugin-infra/src/web3/useWeb3State.ts index 381cb694a293..1435ed6b826c 100644 --- a/packages/plugin-infra/src/web3/useWeb3State.ts +++ b/packages/plugin-infra/src/web3/useWeb3State.ts @@ -1,6 +1,6 @@ import { useCurrentWeb3NetworkPluginID } from './Context' import { useActivatedPluginWeb3State } from '../hooks/useActivatedPluginWeb3State' -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' export function useWeb3State(expectedPluginID?: NetworkPluginID) { const pluginID = useCurrentWeb3NetworkPluginID() diff --git a/packages/plugin-infra/src/web3/useWeb3UI.ts b/packages/plugin-infra/src/web3/useWeb3UI.ts index 4a23eb31c66d..58088e1bc5a1 100644 --- a/packages/plugin-infra/src/web3/useWeb3UI.ts +++ b/packages/plugin-infra/src/web3/useWeb3UI.ts @@ -1,6 +1,6 @@ import { useCurrentWeb3NetworkPluginID } from './Context' import { useActivatedPluginWeb3UI } from '../hooks/useActivatedPluginWeb3UI' -import type { NetworkPluginID } from '..' +import type { NetworkPluginID } from '../web3-types' export function useWeb3UI(expectedPluginID?: NetworkPluginID) { const pluginID = useCurrentWeb3NetworkPluginID() diff --git a/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx b/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx index 8ec249548854..dd8b0fb823e2 100644 --- a/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx +++ b/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx @@ -1,7 +1,7 @@ import { useEffect, useState, useCallback } from 'react' import { makeStyles, MaskColorVar } from '@masknet/theme' import { useWeb3, isSameAddress } from '@masknet/web3-shared-evm' -import { useAccount, useCurrentWeb3NetworkPluginID, NetworkPluginID } from '@masknet/plugin-infra' +import { useAccount, useCurrentWeb3NetworkPluginID, NetworkPluginID } from '@masknet/plugin-infra/web3' import CyberConnect, { Env } from '@cyberlab/cyberconnect' import { PluginCyberConnectRPC } from '../messages' import { CircularProgress, useTheme, Typography } from '@mui/material' diff --git a/packages/plugins/CyberConnect/src/SNSAdaptor/index.tsx b/packages/plugins/CyberConnect/src/SNSAdaptor/index.tsx index 005ea38c9ae7..d5fddf3842a3 100644 --- a/packages/plugins/CyberConnect/src/SNSAdaptor/index.tsx +++ b/packages/plugins/CyberConnect/src/SNSAdaptor/index.tsx @@ -1,4 +1,4 @@ -import { Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra' +import { type Plugin, usePostInfoDetails, usePluginWrapper } from '@masknet/plugin-infra/content-script' import { base } from '../base' import { useMemo } from 'react' import { parseURL } from '@masknet/shared-base' diff --git a/packages/plugins/CyberConnect/src/base.tsx b/packages/plugins/CyberConnect/src/base.tsx index 610d5c97c685..1d133b171379 100644 --- a/packages/plugins/CyberConnect/src/base.tsx +++ b/packages/plugins/CyberConnect/src/base.tsx @@ -1,4 +1,5 @@ -import { Plugin, NetworkPluginID } from '@masknet/plugin-infra' +import type { Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID } from '@masknet/plugin-infra/web3' import { ChainId } from '@masknet/web3-shared-evm' import { CYBERCONNECT_PLUGIN_ID } from './constants' diff --git a/packages/plugins/Debugger/src/SNSAdaptor/components/TabContent.tsx b/packages/plugins/Debugger/src/SNSAdaptor/components/TabContent.tsx index 0676ea28456c..993edb1cc927 100644 --- a/packages/plugins/Debugger/src/SNSAdaptor/components/TabContent.tsx +++ b/packages/plugins/Debugger/src/SNSAdaptor/components/TabContent.tsx @@ -1,4 +1,5 @@ -import { Plugin, useBalance, useBlockNumber } from '@masknet/plugin-infra' +import type { Plugin } from '@masknet/plugin-infra' +import { useBalance, useBlockNumber } from '@masknet/plugin-infra/web3' import { makeStyles } from '@masknet/theme' import { Box, List, ListItem, ListItemText, Typography } from '@mui/material' diff --git a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx index b7bd512fbb7a..ade8addbd839 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx @@ -9,7 +9,7 @@ import { Entry } from './components' import { META_KEY_2 } from '../constants' import { Exchange } from './hooks/Exchange' import type { FileInfo, DialogCloseCallback } from '../types' -import { useCompositionContext } from '@masknet/plugin-infra' +import { useCompositionContext } from '@masknet/plugin-infra/content-script' interface Props { onClose: () => void diff --git a/packages/plugins/FileService/src/Worker/index.ts b/packages/plugins/FileService/src/Worker/index.ts index 4bc895f3fe50..d8e78a94e6d3 100644 --- a/packages/plugins/FileService/src/Worker/index.ts +++ b/packages/plugins/FileService/src/Worker/index.ts @@ -1,4 +1,5 @@ -import { None, Plugin, Result, Some } from '@masknet/plugin-infra' +import type { Plugin } from '@masknet/plugin-infra' +import { None, Result, Some } from 'ts-results' import { base } from '../base' import type { FileInfo } from '../types' import { getAllFiles, setFileInfo, setupDatabase } from './database' diff --git a/packages/plugins/FileService/src/base.ts b/packages/plugins/FileService/src/base.ts index e12c54f479cc..799e01b93b3a 100644 --- a/packages/plugins/FileService/src/base.ts +++ b/packages/plugins/FileService/src/base.ts @@ -1,4 +1,4 @@ -import { Plugin, PluginId } from '@masknet/plugin-infra' +import { type Plugin, PluginId } from '@masknet/plugin-infra' import { languages } from './locales/languages' export const base: Plugin.Shared.Definition = { diff --git a/packages/plugins/Flow/src/UI/Web3State/index.ts b/packages/plugins/Flow/src/UI/Web3State/index.ts index 99e7b6f4fe42..11c6b37237df 100644 --- a/packages/plugins/Flow/src/UI/Web3State/index.ts +++ b/packages/plugins/Flow/src/UI/Web3State/index.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { NetworkType, ProviderType, diff --git a/packages/plugins/Flow/src/UI/Web3UI/index.tsx b/packages/plugins/Flow/src/UI/Web3UI/index.tsx index b2570d85f695..64efdd84e1c3 100644 --- a/packages/plugins/Flow/src/UI/Web3UI/index.tsx +++ b/packages/plugins/Flow/src/UI/Web3UI/index.tsx @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { ProviderIconClickBait } from '../components/ProviderIconClickBait' export const Web3UI: Web3Plugin.UI.UI = { diff --git a/packages/plugins/Flow/src/UI/components/ProviderIconClickBait.tsx b/packages/plugins/Flow/src/UI/components/ProviderIconClickBait.tsx index ee51685cd481..81870f244672 100644 --- a/packages/plugins/Flow/src/UI/components/ProviderIconClickBait.tsx +++ b/packages/plugins/Flow/src/UI/components/ProviderIconClickBait.tsx @@ -1,5 +1,5 @@ import { useCallback, cloneElement, isValidElement } from 'react' -import { NetworkPluginID, useChainId, Web3Plugin } from '@masknet/plugin-infra' +import { NetworkPluginID, useChainId, Web3Plugin } from '@masknet/plugin-infra/web3' import { useFCL } from '@masknet/web3-shared-flow' import { getStorage } from '../../storage' diff --git a/packages/plugins/Flow/src/apis/getFungibleAssets.ts b/packages/plugins/Flow/src/apis/getFungibleAssets.ts index bc895c1e7770..a1335e23a821 100644 --- a/packages/plugins/Flow/src/apis/getFungibleAssets.ts +++ b/packages/plugins/Flow/src/apis/getFungibleAssets.ts @@ -1,4 +1,4 @@ -import { Pagination, Web3Plugin, CurrencyType } from '@masknet/plugin-infra' +import { Pagination, Web3Plugin, CurrencyType } from '@masknet/plugin-infra/web3' import { ChainId, createClient, getTokenConstants } from '@masknet/web3-shared-flow' import { CoinGecko } from '@masknet/web3-providers' import { createFungibleAsset, createFungibleToken } from '../helpers' diff --git a/packages/plugins/Flow/src/constants.ts b/packages/plugins/Flow/src/constants.ts index ad7360a26ee2..6661cd9388ca 100644 --- a/packages/plugins/Flow/src/constants.ts +++ b/packages/plugins/Flow/src/constants.ts @@ -1,4 +1,5 @@ -import { PluginId, Web3Plugin } from '@masknet/plugin-infra' +import { PluginId } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { ChainId, NetworkType, ProviderType } from '@masknet/web3-shared-flow/types' export const PLUGIN_ID = PluginId.Flow diff --git a/packages/plugins/Flow/src/helpers/token.ts b/packages/plugins/Flow/src/helpers/token.ts index a3c843d0ac83..fe40789fa8a8 100644 --- a/packages/plugins/Flow/src/helpers/token.ts +++ b/packages/plugins/Flow/src/helpers/token.ts @@ -1,4 +1,4 @@ -import { CurrencyType, TokenType, Web3Plugin } from '@masknet/plugin-infra' +import { CurrencyType, TokenType, Web3Plugin } from '@masknet/plugin-infra/web3' import { leftShift, multipliedBy } from '@masknet/web3-shared-base' import type { ChainId } from '@masknet/web3-shared-flow' diff --git a/packages/plugins/Solana/src/UI/Web3State/index.ts b/packages/plugins/Solana/src/UI/Web3State/index.ts index b28e17072f9e..f6a4fdfb8b51 100644 --- a/packages/plugins/Solana/src/UI/Web3State/index.ts +++ b/packages/plugins/Solana/src/UI/Web3State/index.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { createConstantSubscription, mapSubscription } from '@masknet/shared-base' import { toFixed } from '@masknet/web3-shared-base' import { diff --git a/packages/plugins/Solana/src/UI/Web3UI/index.tsx b/packages/plugins/Solana/src/UI/Web3UI/index.tsx index 017a04ffe144..b41ed84159bb 100644 --- a/packages/plugins/Solana/src/UI/Web3UI/index.tsx +++ b/packages/plugins/Solana/src/UI/Web3UI/index.tsx @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { ProviderIconClickBait } from '../components/ProviderIconClickBait' export const Web3UI: Web3Plugin.UI.UI = { diff --git a/packages/plugins/Solana/src/UI/components/ProviderIconClickBait.tsx b/packages/plugins/Solana/src/UI/components/ProviderIconClickBait.tsx index 279c2f9d14fb..6bb00b918c49 100644 --- a/packages/plugins/Solana/src/UI/components/ProviderIconClickBait.tsx +++ b/packages/plugins/Solana/src/UI/components/ProviderIconClickBait.tsx @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { isDashboardPage } from '@masknet/shared-base' import { ProviderType } from '@masknet/web3-shared-solana' import { cloneElement, isValidElement, useCallback } from 'react' diff --git a/packages/plugins/Solana/src/apis/getFungibleAssets.ts b/packages/plugins/Solana/src/apis/getFungibleAssets.ts index be04dd6f7ff3..7859f6a017ca 100644 --- a/packages/plugins/Solana/src/apis/getFungibleAssets.ts +++ b/packages/plugins/Solana/src/apis/getFungibleAssets.ts @@ -1,4 +1,4 @@ -import { Pagination, Web3Plugin, CurrencyType } from '@masknet/plugin-infra' +import { Pagination, Web3Plugin, CurrencyType } from '@masknet/plugin-infra/web3' import { ChainId, getTokenConstants } from '@masknet/web3-shared-solana' import { CoinGecko } from '@masknet/web3-providers' import { createFungibleAsset, createFungibleToken } from '../helpers' diff --git a/packages/plugins/Solana/src/apis/getNonFungibleAssets.ts b/packages/plugins/Solana/src/apis/getNonFungibleAssets.ts index d0b71ed36221..194c54c5c960 100644 --- a/packages/plugins/Solana/src/apis/getNonFungibleAssets.ts +++ b/packages/plugins/Solana/src/apis/getNonFungibleAssets.ts @@ -1,7 +1,7 @@ import { Connection } from '@metaplex/js' import { ChainId } from '@masknet/web3-shared-solana' import { Metadata } from '@metaplex-foundation/mpl-token-metadata' -import { Pageable, Pagination, TokenType, Web3Plugin } from '@masknet/plugin-infra' +import { Pageable, Pagination, TokenType, Web3Plugin } from '@masknet/plugin-infra/web3' import { fetchJSON, GetProgramAccountsResponse, requestRPC, SPL_TOKEN_PROGRAM_ID } from './shared' import { ENDPOINT_KEY } from '../constants' diff --git a/packages/plugins/Solana/src/constants.ts b/packages/plugins/Solana/src/constants.ts index 14e276600aa5..b7011c723cc3 100644 --- a/packages/plugins/Solana/src/constants.ts +++ b/packages/plugins/Solana/src/constants.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { ChainId, NetworkType, ProviderType } from '@masknet/web3-shared-solana' import { PublicKey } from '@solana/web3.js' diff --git a/packages/plugins/Solana/src/helpers/token.ts b/packages/plugins/Solana/src/helpers/token.ts index b760927bfd52..97023a39e81c 100644 --- a/packages/plugins/Solana/src/helpers/token.ts +++ b/packages/plugins/Solana/src/helpers/token.ts @@ -1,4 +1,4 @@ -import { CurrencyType, TokenType, Web3Plugin } from '@masknet/plugin-infra' +import { CurrencyType, TokenType, Web3Plugin } from '@masknet/plugin-infra/web3' import { leftShift, multipliedBy } from '@masknet/web3-shared-base' import type { ChainId } from '@masknet/web3-shared-solana' diff --git a/packages/plugins/example/src/Worker/index.ts b/packages/plugins/example/src/Worker/index.ts index 875d881ada9b..c9a0027ae6d5 100644 --- a/packages/plugins/example/src/Worker/index.ts +++ b/packages/plugins/example/src/Worker/index.ts @@ -1,5 +1,5 @@ import type { Plugin } from '@masknet/plugin-infra' -// import { Ok, Some } from '@masknet/plugin-infra' +// import { Ok, Some } from 'ts-results' import { base } from '../base' interface File { diff --git a/packages/provider-proxy/src/producers/fungibleTokenAsset.ts b/packages/provider-proxy/src/producers/fungibleTokenAsset.ts index 22b447b93604..ca78d22190f4 100644 --- a/packages/provider-proxy/src/producers/fungibleTokenAsset.ts +++ b/packages/provider-proxy/src/producers/fungibleTokenAsset.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { getAssetListFromDebank } from '@masknet/web3-providers' import type { ProducerArgBase, ProducerKeyFunction, ProducerPushFunction, RPCMethodRegistrationValue } from '../types' diff --git a/packages/provider-proxy/src/producers/nonFungibleCollectionAsset.ts b/packages/provider-proxy/src/producers/nonFungibleCollectionAsset.ts index f04ee2632978..4a622cd6fd07 100644 --- a/packages/provider-proxy/src/producers/nonFungibleCollectionAsset.ts +++ b/packages/provider-proxy/src/producers/nonFungibleCollectionAsset.ts @@ -1,4 +1,4 @@ -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' import { getNFTScanNFTList, getOpenSeaCollectionList } from '@masknet/web3-providers' import { collectAllPageDate } from '../helper/request' import type { ProducerArgBase, ProducerKeyFunction, ProducerPushFunction, RPCMethodRegistrationValue } from '../types' diff --git a/packages/shared/src/UI/components/ReversedAddress/index.tsx b/packages/shared/src/UI/components/ReversedAddress/index.tsx index 32028f42e208..efe5cf79ff2c 100644 --- a/packages/shared/src/UI/components/ReversedAddress/index.tsx +++ b/packages/shared/src/UI/components/ReversedAddress/index.tsx @@ -1,5 +1,5 @@ import { memo } from 'react' -import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra' +import { NetworkPluginID, useReverseAddress, useWeb3State } from '@masknet/plugin-infra/web3' interface ReverseAddressProps { address: string diff --git a/packages/web3-providers/src/coingecko/index.ts b/packages/web3-providers/src/coingecko/index.ts index 40f40657bfde..129adb1c75c1 100644 --- a/packages/web3-providers/src/coingecko/index.ts +++ b/packages/web3-providers/src/coingecko/index.ts @@ -1,4 +1,4 @@ -import type { CurrencyType } from '@masknet/plugin-infra' +import type { CurrencyType } from '@masknet/plugin-infra/web3' import { COINGECKO_URL_BASE } from './constants' import type { PriceAPI } from '..' diff --git a/packages/web3-providers/src/debank/format.ts b/packages/web3-providers/src/debank/format.ts index 763f302c8345..1beb4479a6e9 100644 --- a/packages/web3-providers/src/debank/format.ts +++ b/packages/web3-providers/src/debank/format.ts @@ -1,6 +1,6 @@ import type { WalletTokenRecord } from './type' import { createNativeToken, getChainIdFromName } from '@masknet/web3-shared-evm' -import { CurrencyType, TokenType, Web3Plugin } from '@masknet/plugin-infra' +import { CurrencyType, TokenType, Web3Plugin } from '@masknet/plugin-infra/web3' import { multipliedBy, rightShift, toFixed } from '@masknet/web3-shared-base' import DeBank from '@masknet/web3-constants/evm/debank.json' diff --git a/packages/web3-providers/src/token-price/index.ts b/packages/web3-providers/src/token-price/index.ts index 43c6fb357756..f8bb408a46a5 100644 --- a/packages/web3-providers/src/token-price/index.ts +++ b/packages/web3-providers/src/token-price/index.ts @@ -1,4 +1,4 @@ -import type { CurrencyType } from '@masknet/plugin-infra' +import type { CurrencyType } from '@masknet/plugin-infra/web3' import type { TokenPriceBaseAPI } from '../types' const URL_BASE = 'https://api.coingecko.com/api/v3' diff --git a/packages/web3-providers/src/types.ts b/packages/web3-providers/src/types.ts index 163d1ef5423b..c9ccbf35bcc1 100644 --- a/packages/web3-providers/src/types.ts +++ b/packages/web3-providers/src/types.ts @@ -7,7 +7,7 @@ import type { ERC721TokenDetailed, NativeTokenDetailed, } from '@masknet/web3-shared-evm' -import type { CurrencyType } from '@masknet/plugin-infra' +import type { CurrencyType } from '@masknet/plugin-infra/web3' import type { Result } from 'ts-results' import type { NextIDAction, NextIDStoragePayload, NextIDPayload, NextIDPlatform } from '@masknet/shared-base' diff --git a/packages/web3-providers/src/zerion/format.ts b/packages/web3-providers/src/zerion/format.ts index 90fc1bfa51d9..e0d2412e7761 100644 --- a/packages/web3-providers/src/zerion/format.ts +++ b/packages/web3-providers/src/zerion/format.ts @@ -15,8 +15,7 @@ import type { ZerionAsset, ZerionCovalentAsset, } from './type' -import type { Web3Plugin } from '@masknet/plugin-infra' -import { TokenType } from '@masknet/plugin-infra' +import { type Web3Plugin, TokenType } from '@masknet/plugin-infra/web3' type Asset = Web3Plugin.Asset diff --git a/packages/web3-providers/src/zerion/index.ts b/packages/web3-providers/src/zerion/index.ts index 10c58a2d0ebb..d4e46687f6a0 100644 --- a/packages/web3-providers/src/zerion/index.ts +++ b/packages/web3-providers/src/zerion/index.ts @@ -12,7 +12,7 @@ import type { import { values } from 'lodash-unified' import { getChainIdFromNetworkType, getZerionConstants, NetworkType } from '@masknet/web3-shared-evm' import { formatAssets } from './format' -import type { Web3Plugin } from '@masknet/plugin-infra' +import type { Web3Plugin } from '@masknet/plugin-infra/web3' const ZERION_API = 'wss://api-v4.zerion.io' // cspell:disable-next-line