From d664f20d5c45702a3198808779561746bb8e2397 Mon Sep 17 00:00:00 2001 From: Septs Date: Tue, 4 Jan 2022 11:18:51 +0800 Subject: [PATCH 1/6] chore: upgrade package --- package.json | 2 +- pnpm-lock.yaml | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 02eabb6f1dfb..9e1895266d75 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "devDependencies": { "@commitlint/cli": "^16.0.0", "@commitlint/config-conventional": "^16.0.0", - "@dimensiondev/eslint-plugin": "^0.0.1-20211222115249-7984aa5", + "@dimensiondev/eslint-plugin": "^0.0.1-20220104011158-0905fa1", "@dimensiondev/patch-package": "^6.5.0", "@jest/globals": "^27.4.4", "@magic-works/i18n-codegen": "^0.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bad111c8fe8a..2608eb3873c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: specifiers: '@commitlint/cli': ^16.0.0 '@commitlint/config-conventional': ^16.0.0 - '@dimensiondev/eslint-plugin': ^0.0.1-20211222115249-7984aa5 + '@dimensiondev/eslint-plugin': ^0.0.1-20220104011158-0905fa1 '@dimensiondev/kit': 0.0.0-20211215044858-27d964f '@dimensiondev/patch-package': ^6.5.0 '@emotion/cache': ^11.7.1 @@ -89,7 +89,7 @@ importers: devDependencies: '@commitlint/cli': 16.0.0 '@commitlint/config-conventional': 16.0.0 - '@dimensiondev/eslint-plugin': 0.0.1-20211222115249-7984aa5_eslint@8.5.0 + '@dimensiondev/eslint-plugin': 0.0.1-20220104011158-0905fa1_eslint@8.5.0 '@dimensiondev/patch-package': 6.5.0 '@jest/globals': 27.4.4 '@magic-works/i18n-codegen': 0.0.6_typescript@4.6.0-dev.20211202 @@ -3431,17 +3431,13 @@ packages: '@msgpack/msgpack': 1.12.2 dev: false - /@dimensiondev/eslint-plugin/0.0.1-20211222115249-7984aa5_eslint@8.5.0: - resolution: {integrity: sha512-CcPs3cioDRhYs0Gpz+F4TKfL+rsgdulFd3zaBNU06Rq522opZX9VmpcrCDuW4f1EHNYKYIj1wEVGvBvSlbCMAg==, tarball: download/@dimensiondev/eslint-plugin/0.0.1-20211222115249-7984aa5/2641dcbec68ae0b51f1dc91e9c92abe14be0258740198e2c12d24888a5f1f338} - engines: {node: '>= 14'} + /@dimensiondev/eslint-plugin/0.0.1-20220104011158-0905fa1_eslint@8.5.0: + resolution: {integrity: sha512-DyAzOQp2Dp9Nzll6dTbujqyBAXOLhlWXvDdmnfX3+cHixhvaupbMeoh4MmujkOY681N5ohVm2eKWJd/ApC4lrQ==, tarball: download/@dimensiondev/eslint-plugin/0.0.1-20220104011158-0905fa1/931c157d880a7f8a78e87326a2840ad7d4583b5c714f155e045f73a11969fc82} peerDependencies: eslint: '>= 8' dependencies: eslint: 8.5.0 - lodash.set: 4.3.2 dev: true - bundledDependencies: - - lodash.set /@dimensiondev/holoflows-kit/0.9.0-20210902104757-7c3d0d0: resolution: {integrity: sha512-Vk22WLOTW20OECTHdLGulGmDsTFguURQYB9Oq8S+eDVrmWHCxKD/N+4OU5uCFrWCkqjl/n7vec3fVWUSunpBeA==, tarball: download/@dimensiondev/holoflows-kit/0.9.0-20210902104757-7c3d0d0/bce56871014284e7863fc97177b316aec94f6dfddf627312e690958400e958e8} @@ -17757,6 +17753,7 @@ packages: /lodash.set/4.3.2: resolution: {integrity: sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=} + dev: false /lodash.unescape/4.0.1: resolution: {integrity: sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=} From b17b1bfdfed82be05a8eca7c0140b912c9c3699b Mon Sep 17 00:00:00 2001 From: Septs Date: Tue, 4 Jan 2022 11:19:54 +0800 Subject: [PATCH 2/6] fix: react-key --- packages/mask/src/components/shared/ApplicationBoard.tsx | 2 +- packages/mask/src/plugins/GoodGhosting/UI/TimelineView.tsx | 2 +- .../plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx | 2 +- .../RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx | 2 +- .../plugins/RedPacket/SNSAdaptor/SelectNftTokenDialog.tsx | 6 +++--- .../src/plugins/Snapshot/SNSAdaptor/InformationCard.tsx | 2 +- .../mask/src/plugins/Snapshot/SNSAdaptor/ResultCard.tsx | 2 +- .../plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/mask/src/components/shared/ApplicationBoard.tsx b/packages/mask/src/components/shared/ApplicationBoard.tsx index 8dedbed99845..97cc5d144006 100644 --- a/packages/mask/src/components/shared/ApplicationBoard.tsx +++ b/packages/mask/src/components/shared/ApplicationBoard.tsx @@ -345,7 +345,7 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp walletRequired && !selectedWallet ? classes.disabled : '', )} onClick={onClick} - key={i.toString()}> + key={i}> {title} diff --git a/packages/mask/src/plugins/GoodGhosting/UI/TimelineView.tsx b/packages/mask/src/plugins/GoodGhosting/UI/TimelineView.tsx index ebcc4597d47a..ce0576e4e64f 100644 --- a/packages/mask/src/plugins/GoodGhosting/UI/TimelineView.tsx +++ b/packages/mask/src/plugins/GoodGhosting/UI/TimelineView.tsx @@ -89,7 +89,7 @@ export function TimelineView(props: TimelineViewProps) { {timeline.map((timelineEvent, index) => ( - +
{timelineEvent.eventOnDate} diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx index 0ad9dc392d13..4814e73ab520 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx @@ -311,7 +311,7 @@ export function RedPacketERC721Form(props: RedPacketERC721FormProps) {
{existTokenDetailedList.map((value, i) => ( - + {tokenList.map((value, i) => ( - + {nonExistedTokenIdList.map((id, i) => ( - - {' #' + id} + + #{id} {i < nonExistedTokenIdList.length - 1 ? ', ' : ' '} ))} @@ -640,7 +640,7 @@ export function SelectNftTokenDialog(props: SelectNftTokenDialogProps) { ? classes.hide : '', )} - key={i.toString()}> + key={i}> Boolean(strategy.params.address)) .map((strategy, i) => ( {results.map((result, i) => ( - + {(keyword === '' ? contractList : searchedTokenList).map((contract, i) => ( -
- +
+
))} From 2a312b73dff6981198ac70c253cd93e93575a858 Mon Sep 17 00:00:00 2001 From: Septs Date: Tue, 4 Jan 2022 11:20:17 +0800 Subject: [PATCH 3/6] fix: no-jsx-template-literal --- packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx index d27b962dd658..d8cc3deb1787 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx @@ -233,7 +233,7 @@ export function NftAirdropCard(props: NftAirdropCardProps) {
{t('plugin_ito_total_claimable_count')} - {`${claimableCount} ${claimableCount > 1 ? 'items' : 'item'}`}, + {claimableCount} {claimableCount > 1 ? 'items' : 'item'}` {t('plugin_airdrop_nft_check_address')} From 47649a8164060f9f006935ec30fec64e78abaf8f Mon Sep 17 00:00:00 2001 From: Septs Date: Tue, 4 Jan 2022 11:20:25 +0800 Subject: [PATCH 4/6] fix: no-simple-template-literal --- .../twitter.com/injection/ToolboxHint_UI.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx index c30728bd9e5c..2ab4f0f9ed5e 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx +++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/ToolboxHint_UI.tsx @@ -14,7 +14,7 @@ const ListItem = styled(ListItemButton)` display: inline-flex; &:hover { background: rgba(15, 20, 25, 0.1); - ${({ theme }) => (theme.palette.mode === 'dark' ? `background: rgba(217, 217, 217, 0.1);` : '')} + ${({ theme }) => (theme.palette.mode === 'dark' ? 'background: rgba(217, 217, 217, 0.1);' : '')} } /* twitter break point */ @media screen and (max-width: ${twitterBreakPoint}px) { From 9634ace95da4b914ded190def8979e5b5a22992a Mon Sep 17 00:00:00 2001 From: Septs Date: Tue, 4 Jan 2022 11:20:39 +0800 Subject: [PATCH 5/6] fix: react-key --- packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx index d8cc3deb1787..1347b72f02f0 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/NftAirdropCard.tsx @@ -225,7 +225,7 @@ export function NftAirdropCard(props: NftAirdropCardProps) {
{campaignInfos.map((v, i) => { return v.claimableInfo.claimable ? ( -
+
) : null From f96414ab370346e7a23f34916c4c2b24f8db0db7 Mon Sep 17 00:00:00 2001 From: Septs Date: Tue, 4 Jan 2022 18:28:18 +0800 Subject: [PATCH 6/6] chore: add no-duplicate-imports for disabled --- packages/.eslintrc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/.eslintrc.json b/packages/.eslintrc.json index 73167848d18a..878b6f030b1d 100644 --- a/packages/.eslintrc.json +++ b/packages/.eslintrc.json @@ -29,6 +29,7 @@ "import/no-deprecated": "warn", "no-cond-assign": "error", "no-constant-condition": "error", + "no-duplicate-imports": "off", "no-script-url": "error", "no-throw-literal": "error", "no-unmodified-loop-condition": "error",