From 6a9f58952e397abaea44669a0aa9df596c130f62 Mon Sep 17 00:00:00 2001 From: Jaco Date: Wed, 1 Sep 2021 19:39:04 +0300 Subject: [PATCH] Jest config cleanup (#807) * Jest config cleanup * jsx linting --- jest.config.cjs | 11 +- package.json | 16 +- packages/extension-base/package.json | 8 +- packages/extension-chains/package.json | 2 +- packages/extension-dapp/package.json | 4 +- packages/extension-ui/package.json | 14 +- .../src/Popup/Accounts/AddAccount.tsx | 2 +- .../src/Popup/Accounts/AddAccountImage.tsx | 6 +- .../src/Popup/Derive/Derive.test.tsx | 2 +- .../src/Popup/Derive/SelectParent.tsx | 2 +- .../extension-ui/src/Popup/ImportLedger.tsx | 2 +- .../src/Popup/ImportSeed/SeedAndPath.tsx | 2 +- packages/extension-ui/src/Popup/index.tsx | 4 +- .../extension-ui/src/components/Address.tsx | 6 +- .../src/components/ErrorBoundary.tsx | 2 +- .../src/components/InputFileWithLabel.tsx | 4 +- .../src/components/VerticalSpace.tsx | 2 +- packages/extension-ui/src/partials/Header.tsx | 4 +- .../src/partials/MenuSettings.tsx | 2 +- packages/extension/package.json | 2 +- yarn.lock | 1196 ++++++++--------- 21 files changed, 617 insertions(+), 676 deletions(-) diff --git a/jest.config.cjs b/jest.config.cjs index 88d9fae4..0a37ef55 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -12,14 +12,5 @@ module.exports = { '\\.(css|less)$': 'empty/object', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/__mocks__/fileMock.js' }, - modulePathIgnorePatterns: [ - '/packages/extension/build', - '/packages/extension-base/build', - '/packages/extension-chains/build', - '/packages/extension-dapp/build', - '/packages/extension-inject/build', - '/packages/extension-ui/build' - ], - testEnvironment: 'jsdom', - transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/)'] + testEnvironment: 'jsdom' }; diff --git a/package.json b/package.json index 7480fa0e..8744c503 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,13 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^5.6.2-6", - "@polkadot/keyring": "^7.2.2-5", - "@polkadot/networks": "^7.2.2-5", - "@polkadot/types": "^5.6.2-6", - "@polkadot/util": "^7.2.2-5", - "@polkadot/util-crypto": "^7.2.2-5", - "@polkadot/x-fetch": "^7.2.2-5", + "@polkadot/api": "^5.7.2-2", + "@polkadot/keyring": "^7.3.1", + "@polkadot/networks": "^7.3.1", + "@polkadot/types": "^5.7.2-2", + "@polkadot/util": "^7.3.1", + "@polkadot/util-crypto": "^7.3.1", + "@polkadot/x-fetch": "^7.3.1", "babel-core": "^7.0.0-bridge.0", "safe-buffer": "^5.2.1", "typescript": "^4.3.5", @@ -41,7 +41,7 @@ }, "devDependencies": { "@babel/core": "^7.15.0", - "@polkadot/dev": "^0.62.62", + "@polkadot/dev": "^0.62.64", "@types/jest": "^27.0.1", "i18next-scanner": "^3.0.0", "sinon-chrome": "^3.0.1", diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json index 826f8804..a771deab 100644 --- a/packages/extension-base/package.json +++ b/packages/extension-base/package.json @@ -9,11 +9,11 @@ "sideEffects": false, "dependencies": { "@babel/runtime": "^7.15.3", - "@polkadot/api": "^5.6.2-6", + "@polkadot/api": "^5.7.2-2", "@polkadot/extension-dapp": "^0.39.4-5", "@polkadot/extension-inject": "^0.39.4-5", - "@polkadot/keyring": "^7.2.2-5", - "@polkadot/phishing": "^0.6.270", - "@polkadot/ui-keyring": "^0.85.2-0" + "@polkadot/keyring": "^7.3.1", + "@polkadot/phishing": "^0.6.276", + "@polkadot/ui-keyring": "^0.85.3" } } diff --git a/packages/extension-chains/package.json b/packages/extension-chains/package.json index 198fa520..e31eaec0 100644 --- a/packages/extension-chains/package.json +++ b/packages/extension-chains/package.json @@ -9,7 +9,7 @@ "sideEffects": false, "dependencies": { "@babel/runtime": "^7.15.3", - "@polkadot/networks": "^7.2.2-5" + "@polkadot/networks": "^7.3.1" }, "peerDependencies": { "@polkadot/api": "*" diff --git a/packages/extension-dapp/package.json b/packages/extension-dapp/package.json index 77533690..3f88fbbd 100644 --- a/packages/extension-dapp/package.json +++ b/packages/extension-dapp/package.json @@ -11,8 +11,8 @@ "@babel/runtime": "^7.15.3", "@metamask/detect-provider": "^1.2.0", "@polkadot/extension-inject": "^0.39.4-5", - "@polkadot/util": "^7.2.2-5", - "@polkadot/util-crypto": "^7.2.2-5", + "@polkadot/util": "^7.3.1", + "@polkadot/util-crypto": "^7.3.1", "web3": "^1.5.2" }, "peerDependencies": { diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json index 3c6c007c..06258e93 100644 --- a/packages/extension-ui/package.json +++ b/packages/extension-ui/package.json @@ -15,13 +15,13 @@ "@polkadot/extension-base": "^0.39.4-5", "@polkadot/extension-dapp": "^0.39.4-5", "@polkadot/extension-inject": "^0.39.4-5", - "@polkadot/hw-ledger": "^7.2.2-5", - "@polkadot/keyring": "^7.2.2-5", - "@polkadot/networks": "^7.2.2-5", - "@polkadot/react-identicon": "^0.85.2-0", - "@polkadot/react-qr": "^0.85.2-0", - "@polkadot/util": "^7.2.2-5", - "@polkadot/util-crypto": "^7.2.2-5", + "@polkadot/hw-ledger": "^7.3.1", + "@polkadot/keyring": "^7.3.1", + "@polkadot/networks": "^7.3.1", + "@polkadot/react-identicon": "^0.85.3", + "@polkadot/react-qr": "^0.85.3", + "@polkadot/util": "^7.3.1", + "@polkadot/util-crypto": "^7.3.1", "file-saver": "^2.0.5", "i18next": "^20.4.0", "react": "^17.0.2", diff --git a/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx b/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx index ed467c13..6549fbd8 100644 --- a/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx +++ b/packages/extension-ui/src/Popup/Accounts/AddAccount.tsx @@ -32,7 +32,7 @@ function AddAccount ({ className }: Props): React.ReactElement { />
- +

{t("You currently don't have any accounts. Create your first account to get started.")}

diff --git a/packages/extension-ui/src/Popup/Accounts/AddAccountImage.tsx b/packages/extension-ui/src/Popup/Accounts/AddAccountImage.tsx index 42662f5f..28a23a7a 100644 --- a/packages/extension-ui/src/Popup/Accounts/AddAccountImage.tsx +++ b/packages/extension-ui/src/Popup/Accounts/AddAccountImage.tsx @@ -68,9 +68,9 @@ function AddAccountImage ({ className, onClick }: Props): React.ReactElement - - - + + + diff --git a/packages/extension-ui/src/Popup/Derive/Derive.test.tsx b/packages/extension-ui/src/Popup/Derive/Derive.test.tsx index 943d0d72..e8f41ca6 100644 --- a/packages/extension-ui/src/Popup/Derive/Derive.test.tsx +++ b/packages/extension-ui/src/Popup/Derive/Derive.test.tsx @@ -55,7 +55,7 @@ describe('Derive', () => { > - + diff --git a/packages/extension-ui/src/Popup/Derive/SelectParent.tsx b/packages/extension-ui/src/Popup/Derive/SelectParent.tsx index 5af6a011..2c67b07c 100644 --- a/packages/extension-ui/src/Popup/Derive/SelectParent.tsx +++ b/packages/extension-ui/src/Popup/Derive/SelectParent.tsx @@ -179,7 +179,7 @@ export default function SelectParent ({ className, isLocked, onDerivationConfirm )}
- + )}
- + {ledgerLocked ? ( diff --git a/packages/extension-ui/src/Popup/ImportSeed/SeedAndPath.tsx b/packages/extension-ui/src/Popup/ImportSeed/SeedAndPath.tsx index c5ad6504..264cc9fa 100644 --- a/packages/extension-ui/src/Popup/ImportSeed/SeedAndPath.tsx +++ b/packages/extension-ui/src/Popup/ImportSeed/SeedAndPath.tsx @@ -95,7 +95,7 @@ function SeedAndPath ({ className, onAccountChange, onNextStep }: Props): React. className='advancedToggle' onClick={_onToggleAdvanced} > - + {t('advanced')} { advanced && ( diff --git a/packages/extension-ui/src/Popup/index.tsx b/packages/extension-ui/src/Popup/index.tsx index 11e87a02..9aa9be9b 100644 --- a/packages/extension-ui/src/Popup/index.tsx +++ b/packages/extension-ui/src/Popup/index.tsx @@ -122,8 +122,8 @@ export default function Popup (): React.ReactElement { : metaRequests && metaRequests.length ? wrapWithErrorBoundary(, 'metadata') : signRequests && signRequests.length - ? wrapWithErrorBoundary(, 'signing') - : wrapWithErrorBoundary(, 'accounts') + ? wrapWithErrorBoundary(, 'signing') + : wrapWithErrorBoundary(, 'accounts') : wrapWithErrorBoundary(, 'welcome'); return ( diff --git a/packages/extension-ui/src/components/Address.tsx b/packages/extension-ui/src/components/Address.tsx index ee2ab13d..3d341797 100644 --- a/packages/extension-ui/src/components/Address.tsx +++ b/packages/extension-ui/src/components/Address.tsx @@ -216,7 +216,7 @@ function Address ({ actions, address, children, className, genesisHash, isExtern
- +
) @@ -225,7 +225,7 @@ function Address ({ actions, address, children, className, genesisHash, isExtern className='name' data-field='name' > - + ) } @@ -249,7 +249,7 @@ function Address ({ actions, address, children, className, genesisHash, isExtern > {formatted || address || t('')} - + { replace: { message: error.message } })} - +