From 54a649a9d517712281b76249bc91e0a2e993c3ff Mon Sep 17 00:00:00 2001 From: unclebill Date: Fri, 11 Mar 2022 18:47:31 +0800 Subject: [PATCH 1/2] chore(eslint): disable import/no-deprecated --- packages/.eslintrc.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/.eslintrc.json b/packages/.eslintrc.json index 5f952dca7275..381d7bb585fb 100644 --- a/packages/.eslintrc.json +++ b/packages/.eslintrc.json @@ -50,7 +50,7 @@ "react/self-closing-comp": ["warn", { "component": true, "html": true }], "react-hooks/exhaustive-deps": "off", "react-hooks/rules-of-hooks": "error", - "import/no-deprecated": "error", + "import/no-deprecated": "off", "import/no-duplicates": "error", "unicorn/better-regex": "error", "unicorn/catch-error-name": ["error", { "ignore": ["^err$"] }], @@ -65,7 +65,6 @@ "unicorn/prefer-number-properties": "error", "unicorn/relative-url-style": ["error", "always"], "unicorn/throw-new-error": "error", - "unused-imports/no-unused-imports-ts": "error", "@dimensiondev/no-jsx-template-literal": "error", "@dimensiondev/no-locale-case": "error", "@dimensiondev/no-number-constructor": "off", From d834e418ce9872368be065e38a5631f60aecaba1 Mon Sep 17 00:00:00 2001 From: unclebill Date: Sat, 12 Mar 2022 11:07:12 +0800 Subject: [PATCH 2/2] fix: remove annotation comments --- .../dashboard/src/components/DashboardFrame/Navigation.tsx | 4 ---- packages/dashboard/src/components/DashboardFrame/index.tsx | 4 ---- packages/dashboard/src/components/PageFrame/index.tsx | 4 ---- .../src/components/InjectedComponents/DialogDismissIcon.tsx | 4 ---- packages/mask/src/components/shared/InjectedDialog.tsx | 4 ---- .../options-page/DashboardComponents/ActionsBarNFT.tsx | 3 --- .../mask/src/extension/options-page/DashboardDialogs/Base.tsx | 4 ---- .../options-page/DashboardDialogs/Wallet/HideTokenConfirm.tsx | 2 -- .../options-page/DashboardDialogs/Wallet/TransferNFT.tsx | 2 -- packages/mask/src/extension/popups/UI.tsx | 2 -- .../plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx | 4 ---- .../mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx | 3 --- .../facebook.com/injection/ToolbarUI.tsx | 4 ---- .../minds.com/injection/ToolboxHint_UI.tsx | 4 ---- .../twitter.com/injection/ToolboxHint_UI.tsx | 4 ---- packages/mask/src/utils/hooks/useMatchXS.ts | 2 -- .../mask/src/utils/type-transform/BackupFormat/JSON/latest.ts | 1 - .../src/utils/type-transform/BackupFormat/JSON/version-0.ts | 4 ---- .../src/utils/type-transform/BackupFormat/JSON/version-1.ts | 1 - .../src/utils/type-transform/BackupFormat/JSON/version-2.ts | 1 - packages/theme/src/index.ts | 2 -- 21 files changed, 63 deletions(-) diff --git a/packages/dashboard/src/components/DashboardFrame/Navigation.tsx b/packages/dashboard/src/components/DashboardFrame/Navigation.tsx index 46b70387d6b3..196763c73993 100644 --- a/packages/dashboard/src/components/DashboardFrame/Navigation.tsx +++ b/packages/dashboard/src/components/DashboardFrame/Navigation.tsx @@ -5,8 +5,6 @@ import { ListItemIcon, Collapse, Theme, - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated useMediaQuery, styled, listItemClasses, @@ -122,8 +120,6 @@ export function Navigation({ onClose }: NavigationProps) { const isWalletTransferPath = useMatch(DashboardRoutes.WalletsTransfer) const isWalletHistoryPath = useMatch(DashboardRoutes.WalletsHistory) - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated const isLargeScreen = useMediaQuery((theme) => theme.breakpoints.up('lg')) const t = useDashboardI18N() const mode = useTheme().palette.mode diff --git a/packages/dashboard/src/components/DashboardFrame/index.tsx b/packages/dashboard/src/components/DashboardFrame/index.tsx index 76b8fc5d3e2d..9808e9622c47 100644 --- a/packages/dashboard/src/components/DashboardFrame/index.tsx +++ b/packages/dashboard/src/components/DashboardFrame/index.tsx @@ -1,6 +1,4 @@ import { memo, Suspense, useMemo, useState } from 'react' -// see https://github.com/import-js/eslint-plugin-import/issues/2288 -// eslint-disable-next-line import/no-deprecated import { Grid, styled, Theme, useMediaQuery } from '@mui/material' import { MaskColorVar } from '@masknet/theme' import { ErrorBoundary } from '@masknet/shared' @@ -27,8 +25,6 @@ const LeftContainer = styled(Grid)(({ theme }) => ({ export interface DashboardFrameProps extends React.PropsWithChildren<{}> {} export const DashboardFrame = memo((props: DashboardFrameProps) => { - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated const isLargeScreen = useMediaQuery((theme) => theme.breakpoints.up('lg')) const [navigationExpanded, setNavigationExpanded] = useState(true) const [drawerOpen, setDrawerOpen] = useState(false) diff --git a/packages/dashboard/src/components/PageFrame/index.tsx b/packages/dashboard/src/components/PageFrame/index.tsx index 181966cdaa2b..363329cd1cf0 100644 --- a/packages/dashboard/src/components/PageFrame/index.tsx +++ b/packages/dashboard/src/components/PageFrame/index.tsx @@ -11,8 +11,6 @@ import { Theme, Toolbar, Typography, - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated useMediaQuery, useTheme, } from '@mui/material' @@ -132,8 +130,6 @@ export const PageFrame = memo((props: PageFrameProps) => { const location = useLocation() const left = typeof props.title === 'string' ? {props.title} : props.title const right = props.primaryAction - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated const isLargeScreen = useMediaQuery((theme) => theme.breakpoints.up('lg')) const { drawerOpen, toggleDrawer } = useContext(DashboardContext) const showFeaturePromotions = featurePromotionsEnabled.some((path: string) => path === location.pathname) diff --git a/packages/mask/src/components/InjectedComponents/DialogDismissIcon.tsx b/packages/mask/src/components/InjectedComponents/DialogDismissIcon.tsx index c647378f7c42..e10aae55a43d 100644 --- a/packages/mask/src/components/InjectedComponents/DialogDismissIcon.tsx +++ b/packages/mask/src/components/InjectedComponents/DialogDismissIcon.tsx @@ -1,5 +1,3 @@ -// see https://github.com/import-js/eslint-plugin-import/issues/2288 -// eslint-disable-next-line import/no-deprecated import { useTheme, useMediaQuery } from '@mui/material' import CloseIcon from '@mui/icons-material/Close' import ArrowBackRoundedIcon from '@mui/icons-material/ArrowBackRounded' @@ -11,8 +9,6 @@ export interface DialogDismissIconUIProps { export function DialogDismissIconUI(props: DialogDismissIconUIProps) { const close = const back = - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated const auto = useMediaQuery(`(min-width: ${useTheme().breakpoints.values.sm}px)`) if (!props.style || props.style === 'auto') return auto ? close : back if (props.style === 'back') return back diff --git a/packages/mask/src/components/shared/InjectedDialog.tsx b/packages/mask/src/components/shared/InjectedDialog.tsx index a3a666636c94..89f207caa45d 100644 --- a/packages/mask/src/components/shared/InjectedDialog.tsx +++ b/packages/mask/src/components/shared/InjectedDialog.tsx @@ -10,8 +10,6 @@ import { Typography, useTheme, Dialog, - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated useMediaQuery, } from '@mui/material' import { makeStyles, useDialogStackActor, useStylesExtends, mergeClasses } from '@masknet/theme' @@ -82,8 +80,6 @@ export function InjectedDialog(props: InjectedDialogProps) { props, overwrite.InjectedDialog?.classes, ) - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated const fullScreen = useMediaQuery(useTheme().breakpoints.down('xs')) const isDashboard = isDashboardPage() const { children, open, disableBackdropClick, titleBarIconStyle, onClose, title, disableTitleBorder, ...rest } = diff --git a/packages/mask/src/extension/options-page/DashboardComponents/ActionsBarNFT.tsx b/packages/mask/src/extension/options-page/DashboardComponents/ActionsBarNFT.tsx index 30a04c9dabdf..c3dae3f12d68 100644 --- a/packages/mask/src/extension/options-page/DashboardComponents/ActionsBarNFT.tsx +++ b/packages/mask/src/extension/options-page/DashboardComponents/ActionsBarNFT.tsx @@ -4,7 +4,6 @@ import { makeStyles, useStylesExtends } from '@masknet/theme' import MoreHorizIcon from '@mui/icons-material/MoreHoriz' import { Wallet, ERC721TokenDetailed, EthereumTokenType, useChainIdValid } from '@masknet/web3-shared-evm' import { useMenu, useI18N } from '../../../utils' -// eslint-disable-next-line import/no-deprecated import { useModal } from '../DashboardDialogs/Base' import { DashboardWalletHideTokenConfirmDialog, DashboardWalletTransferDialogNFT } from '../DashboardDialogs/Wallet' @@ -27,9 +26,7 @@ export function ActionsBarNFT(props: ActionsBarNFT_Props) { const chainIdValid = useChainIdValid() - // eslint-disable-next-line import/no-deprecated const [transferDialog, , openTransferDialogOpen] = useModal(DashboardWalletTransferDialogNFT) - // eslint-disable-next-line import/no-deprecated const [hideTokenConfirmDialog, , openHideTokenConfirmDialog] = useModal(DashboardWalletHideTokenConfirmDialog) const [menu, openMenu] = useMenu([ token.contractDetailed.type === EthereumTokenType.ERC721 ? ( diff --git a/packages/mask/src/extension/options-page/DashboardDialogs/Base.tsx b/packages/mask/src/extension/options-page/DashboardDialogs/Base.tsx index 0851dc7d6fd9..94633995c73a 100644 --- a/packages/mask/src/extension/options-page/DashboardDialogs/Base.tsx +++ b/packages/mask/src/extension/options-page/DashboardDialogs/Base.tsx @@ -12,7 +12,6 @@ import { import { makeStyles } from '@masknet/theme' import { ThemeProvider } from '@mui/material/styles' import CloseIcon from '@mui/icons-material/Close' -// eslint-disable-next-line import/no-deprecated import { extendsTheme, useClassicMaskFullPageTheme, useMatchXS } from '../../../utils' const useStyles = makeStyles()((theme) => ({ @@ -78,7 +77,6 @@ function reducer( /** @deprecated */ export function useModal>( - // eslint-disable-next-line import/no-deprecated Modal: React.FunctionComponent>, ComponentProps?: DialogProps, ): [React.ReactNode, () => void, (props: AdditionalPropsAppendByDispatch) => void] { @@ -96,7 +94,6 @@ export function useModal = { TransitionProps: { onExited }, ...compositeProps, @@ -104,7 +101,6 @@ export function useModal, ) { const { wallet, token } = props.ComponentProps! diff --git a/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx b/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx index 0b7d40bff1a5..0395997f6091 100644 --- a/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx +++ b/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx @@ -14,7 +14,6 @@ import { Image } from '../../../../components/shared/Image' import { WalletMessages } from '../../../../plugins/Wallet/messages' import { MaskIconOutlined } from '../../../../resources/MaskIcon' import { CollectibleContext } from '../../DashboardComponents/CollectibleList' -// eslint-disable-next-line import/no-deprecated import { DashboardDialogCore, DashboardDialogWrapper, WrappedDialogProps } from '../Base' const useTransferDialogStylesNFT = makeStyles()((theme) => ({ @@ -31,7 +30,6 @@ const useTransferDialogStylesNFT = makeStyles()((theme) => ({ }, })) -// eslint-disable-next-line import/no-deprecated export function DashboardWalletTransferDialogNFT(props: WrappedDialogProps<{ token: ERC721TokenDetailed }>) { const { token } = props.ComponentProps! const { onClose } = props diff --git a/packages/mask/src/extension/popups/UI.tsx b/packages/mask/src/extension/popups/UI.tsx index c5911f9c596a..c50ed7a8e8ef 100644 --- a/packages/mask/src/extension/popups/UI.tsx +++ b/packages/mask/src/extension/popups/UI.tsx @@ -2,7 +2,6 @@ import { lazy } from 'react' import { Navigate, Route, Routes, HashRouter } from 'react-router-dom' import { createInjectHooksRenderer, useActivatedPluginsDashboard } from '@masknet/plugin-infra' import { PopupRoutes } from '@masknet/shared-base' -// eslint-disable-next-line import/no-deprecated import { useClassicMaskFullPageTheme } from '../../utils' import '../../social-network-adaptor/browser-action' import { Web3Provider } from '@masknet/web3-shared-evm' @@ -12,7 +11,6 @@ import { Appearance } from '@masknet/theme' import { MaskUIRoot } from '../../UIRoot' function useAlwaysLightTheme() { - // eslint-disable-next-line import/no-deprecated return useClassicMaskFullPageTheme({ forcePalette: Appearance.light }) } const Wallet = lazy(() => import('./pages/Wallet')) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx index 18bbc8660fe6..4c858fdb8cf2 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx @@ -1,8 +1,6 @@ import { useState, useCallback, useEffect, MouseEvent } from 'react' import BigNumber from 'bignumber.js' import classNames from 'classnames' -// see https://github.com/import-js/eslint-plugin-import/issues/2288 -// eslint-disable-next-line import/no-deprecated import { Box, ListItem, Typography, Popper, useMediaQuery, Theme } from '@mui/material' import { makeStyles } from '@masknet/theme' import { Trans } from 'react-i18next' @@ -187,8 +185,6 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) { const { history, onSelect } = props const { t } = useI18N() const { classes } = useStyles() - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated const isSmall = useMediaQuery((theme: Theme) => theme.breakpoints.down('sm')) const { value: availability, diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx index 2375beec1602..71003d0953d9 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx @@ -1,6 +1,4 @@ import { useCallback, useEffect, useState } from 'react' -// see https://github.com/import-js/eslint-plugin-import/issues/2288 -// eslint-disable-next-line import/no-deprecated import { DialogContent, Theme, useMediaQuery } from '@mui/material' import { makeStyles, MaskColorVar, useStylesExtends } from '@masknet/theme' import { FungibleTokenDetailed, useChainId, ChainId, useTokenConstants } from '@masknet/web3-shared-evm' @@ -52,7 +50,6 @@ export function SelectTokenDialog(props: SelectTokenDialogProps) { ) const chainId = useChainId() const { NATIVE_TOKEN_ADDRESS } = useTokenConstants(chainId) - // eslint-disable-next-line import/no-deprecated const isMdScreen = useMediaQuery((theme) => theme.breakpoints.down('md')) const [id, setId] = useState('') diff --git a/packages/mask/src/social-network-adaptor/facebook.com/injection/ToolbarUI.tsx b/packages/mask/src/social-network-adaptor/facebook.com/injection/ToolbarUI.tsx index e5a4a0ce6050..0c37fe697914 100644 --- a/packages/mask/src/social-network-adaptor/facebook.com/injection/ToolbarUI.tsx +++ b/packages/mask/src/social-network-adaptor/facebook.com/injection/ToolbarUI.tsx @@ -1,5 +1,3 @@ -// see https://github.com/import-js/eslint-plugin-import/issues/2288 -// eslint-disable-next-line import/no-deprecated import { styled, ListItemButton, Typography, ListItemIcon, useMediaQuery } from '@mui/material' import { ToolboxHintUnstyled } from '../../../components/InjectedComponents/ToolboxUnstyled' @@ -26,8 +24,6 @@ const Icon = styled(ListItemIcon)` ` export function ToolboxAtFacebook() { - // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated const isSmall = useMediaQuery(`(max-height: ${fbBreakPoint}px)`) return ( theme.breakpoints.down('sm'), { defaultMatches: process.env.architecture === 'app' ? true : undefined, }) diff --git a/packages/mask/src/utils/type-transform/BackupFormat/JSON/latest.ts b/packages/mask/src/utils/type-transform/BackupFormat/JSON/latest.ts index e34e8fd1d99a..b67e401d5e20 100644 --- a/packages/mask/src/utils/type-transform/BackupFormat/JSON/latest.ts +++ b/packages/mask/src/utils/type-transform/BackupFormat/JSON/latest.ts @@ -1,4 +1,3 @@ -/* eslint-disable import/no-deprecated */ import { isBackupJSONFileVersion1, patchNonBreakingUpgradeForBackupJSONFileVersion1, diff --git a/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-0.ts b/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-0.ts index dde78f180e6c..251ab90ea385 100644 --- a/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-0.ts +++ b/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-0.ts @@ -1,5 +1,3 @@ -/* eslint-disable import/no-deprecated */ - import type { EC_Public_JsonWebKey, EC_Private_JsonWebKey, AESJsonWebKey } from '@masknet/shared-base' /** @@ -14,9 +12,7 @@ export interface BackupJSONFileVersion0 { } local: AESJsonWebKey } -// eslint-disable-next-line import/no-deprecated export function isBackupJSONFileVersion0(obj: object): obj is BackupJSONFileVersion0 { - // eslint-disable-next-line import/no-deprecated const data: BackupJSONFileVersion0 = obj as any if (!data.local || !data.key || !data.key.key || !data.key.key.privateKey || !data.key.key.publicKey) return false return true diff --git a/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-1.ts b/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-1.ts index ae84c60717fc..e820767e5182 100644 --- a/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-1.ts +++ b/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-1.ts @@ -1,4 +1,3 @@ -/* eslint-disable import/no-deprecated */ import type { BackupJSONFileVersion0 } from './version-0' import type { ProfileIdentifier, diff --git a/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-2.ts b/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-2.ts index 0d7e048c2424..a2a56c5bdeff 100644 --- a/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-2.ts +++ b/packages/mask/src/utils/type-transform/BackupFormat/JSON/version-2.ts @@ -1,4 +1,3 @@ -/* eslint-disable import/no-deprecated */ import type { LinkedProfileDetails } from '../../../../../background/database/persona/db' import type { BackupJSONFileVersion1 } from './version-1' import { diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts index 4da24ce03a08..ce0d412e598b 100644 --- a/packages/theme/src/index.ts +++ b/packages/theme/src/index.ts @@ -1,6 +1,5 @@ /// // see https://github.com/import-js/eslint-plugin-import/issues/2288 -// eslint-disable-next-line import/no-deprecated import { createTheme, PaletteMode, ThemeOptions, useMediaQuery } from '@mui/material' import * as Changes from './changes' import * as Components from './component-changes' @@ -49,7 +48,6 @@ export type { MaskCSSVariableColor } from './constants' const query = '(prefers-color-scheme: dark)' export function useSystemPreferencePalette(): PaletteMode { // see https://github.com/import-js/eslint-plugin-import/issues/2288 - // eslint-disable-next-line import/no-deprecated return useMediaQuery(query) ? 'dark' : 'light' } export function currentSystemPreferencePalette(): PaletteMode {