From 212e2708b77ec003773cf080e242f5a41f85726b Mon Sep 17 00:00:00 2001 From: Jack Works Date: Sat, 9 Apr 2022 13:39:59 +0800 Subject: [PATCH 1/3] chore: upgrade to @types/react-18 --- package.json | 6 +- pnpm-lock.yaml | 346 ++++++++++++++++++++++++------------------------- 2 files changed, 172 insertions(+), 180 deletions(-) diff --git a/package.json b/package.json index 672f410428ad..63d11f870d67 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "@mui/material": "5.6.0", "@mui/system": "5.6.0", "@types/masknet__global-types": "workspace:*", - "@types/react": "17.0.43", - "@types/react-dom": "^18", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", "@types/web": "^0.0.61", "lodash": "^4.17.21", "lodash-es": "^4.17.21", @@ -83,7 +83,7 @@ "pnpm": { "overrides": { "@types/node": "^17.0.23", - "@types/react@18": "17.0.43" + "@types/react": "18.0.0" }, "onlyBuiltDependencies": [] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3692857c76ef..bf9aca4373dc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ onlyBuiltDependencies: [] overrides: '@types/node': ^17.0.23 - '@types/react@18': 17.0.43 + '@types/react': 18.0.0 importers: @@ -32,8 +32,8 @@ importers: '@swc/core': ^1.2.148 '@types/lodash-es': ^4.17.6 '@types/masknet__global-types': workspace:* - '@types/react': 17.0.43 - '@types/react-dom': ^18 + '@types/react': 18.0.0 + '@types/react-dom': ^18.0.0 '@types/web': ^0.0.61 '@typescript-eslint/experimental-utils': ^5.18.0 cspell: ^5.19.6 @@ -63,16 +63,16 @@ importers: dependencies: '@dimensiondev/kit': 0.0.0-20220228054820-f2378be '@emotion/cache': 11.7.1 - '@emotion/react': 11.9.0_00a11a054056e3746b551a83b9229751 + '@emotion/react': 11.9.0_@types+react@18.0.0+react@18.0.0 '@emotion/serialize': 1.0.3 - '@emotion/styled': 11.8.1_24d67be66bb875d00e77a145b4bdc2ae + '@emotion/styled': 11.8.1_e2545690ae9f35939f01f34fa19b116d '@emotion/utils': 1.1.0 - '@mui/icons-material': 5.6.0_c00cc9082dc0b2fab042e40bf027d4c0 - '@mui/lab': 5.0.0-alpha.76_ee5f284ff44c03611175cc4ed4b571e1 - '@mui/material': 5.6.0_70fa32ac459e5c1cdea1741a31157dc6 - '@mui/system': 5.6.0_21629f01debc92bd51a65c25f7bee622 + '@mui/icons-material': 5.6.0_2553ee89b70ee3f11770355e548c8981 + '@mui/lab': 5.0.0-alpha.76_80117c0dbb09ea5d010ebb0c5061e006 + '@mui/material': 5.6.0_a40551c8620010c48b5371ddd0c74eca + '@mui/system': 5.6.0_f5344666332bfd9c91b01daf5bc202c4 '@types/masknet__global-types': link:packages/polyfills/types - '@types/react': 17.0.43 + '@types/react': 18.0.0 '@types/react-dom': 18.0.0 '@types/web': 0.0.61 lodash: 4.17.21 @@ -227,12 +227,12 @@ importers: zod: 3.14.4 devDependencies: '@babel/core': 7.17.9 - '@storybook/addon-actions': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/addon-essentials': 6.4.21_938c653df97d8a0f1d6e7b97938360b8 + '@storybook/addon-actions': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/addon-essentials': 6.4.21_7a43e45f716102e2c57d61b9bdce0487 '@storybook/addon-links': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/builder-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 - '@storybook/manager-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 - '@storybook/react': 6.4.21_3fa753c9d93deabb095fb4ed76733f7f + '@storybook/builder-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 + '@storybook/manager-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 + '@storybook/react': 6.4.21_32f94d51867974d8f619bc885c138fab babel-loader: 8.2.4_@babel+core@7.17.9 buffer: 6.0.3 path-browserify: 1.0.1 @@ -1061,7 +1061,7 @@ importers: '@mui/material': link:..\empty '@mui/system': link:..\empty '@servie/events': ^3.0.0 - '@types/react': link:..\empty + '@types/react': 18.0.0 anchorme: ^2.1.2 async-call-rpc: ^6.0.2 bignumber.js: ^9.0.2 @@ -1086,7 +1086,7 @@ importers: '@mui/material': link:../empty '@mui/system': link:../empty '@servie/events': 3.0.0 - '@types/react': link:../empty + '@types/react': 18.0.0 anchorme: 2.1.2 async-call-rpc: 6.0.2 bignumber.js: 9.0.2 @@ -1126,7 +1126,7 @@ importers: '@storybook/react': ^6.4.21 devDependencies: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/react': 6.4.21_3443f62b06efa38269518a3a5320234f + '@storybook/react': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 packages/test-serializer: specifiers: {} @@ -1170,12 +1170,12 @@ importers: use-subscription: 1.6.0_react@18.0.0 devDependencies: '@babel/core': 7.17.9 - '@storybook/addon-actions': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/addon-essentials': 6.4.21_938c653df97d8a0f1d6e7b97938360b8 + '@storybook/addon-actions': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/addon-essentials': 6.4.21_7a43e45f716102e2c57d61b9bdce0487 '@storybook/addon-links': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/builder-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 - '@storybook/manager-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 - '@storybook/react': 6.4.21_3fa753c9d93deabb095fb4ed76733f7f + '@storybook/builder-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 + '@storybook/manager-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 + '@storybook/react': 6.4.21_32f94d51867974d8f619bc885c138fab babel-loader: 8.2.4_@babel+core@7.17.9 packages/typed-message: @@ -4138,7 +4138,7 @@ packages: resolution: {integrity: sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==} dev: false - /@emotion/react/11.9.0_00a11a054056e3746b551a83b9229751: + /@emotion/react/11.9.0_@types+react@18.0.0+react@18.0.0: resolution: {integrity: sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==} peerDependencies: '@babel/core': ^7.0.0 @@ -4156,7 +4156,7 @@ packages: '@emotion/serialize': 1.0.3 '@emotion/utils': 1.1.0 '@emotion/weak-memoize': 0.2.5 - '@types/react': 17.0.43 + '@types/react': 18.0.0 hoist-non-react-statics: 3.3.2 react: 18.0.0 dev: false @@ -4239,7 +4239,7 @@ packages: react: 18.0.0 dev: true - /@emotion/styled/11.8.1_24d67be66bb875d00e77a145b4bdc2ae: + /@emotion/styled/11.8.1_e2545690ae9f35939f01f34fa19b116d: resolution: {integrity: sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==} peerDependencies: '@babel/core': ^7.0.0 @@ -4255,10 +4255,10 @@ packages: '@babel/runtime': 7.17.2 '@emotion/babel-plugin': 11.7.2 '@emotion/is-prop-valid': 1.1.2 - '@emotion/react': 11.9.0_00a11a054056e3746b551a83b9229751 + '@emotion/react': 11.9.0_@types+react@18.0.0+react@18.0.0 '@emotion/serialize': 1.0.3 '@emotion/utils': 1.1.0 - '@types/react': 17.0.43 + '@types/react': 18.0.0 react: 18.0.0 dev: false @@ -5531,7 +5531,7 @@ packages: engines: {node: '>= 10'} dev: false - /@mui/base/5.0.0-alpha.75_c13207e15fed56fc7b9b70ab319ad0ff: + /@mui/base/5.0.0-alpha.75_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-eQ8SP2ML5nJyOdSqmk26ezg/eEP1k42Z+k6uMfNbgHZc8iZwgw9iVe+6g5j/qZPKS88AtxVG8YsLLZkXT82/Bw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5544,10 +5544,10 @@ packages: dependencies: '@babel/runtime': 7.17.9 '@emotion/is-prop-valid': 1.1.2 - '@mui/types': 7.1.3_@types+react@17.0.43 + '@mui/types': 7.1.3_@types+react@18.0.0 '@mui/utils': 5.6.0_react@18.0.0 '@popperjs/core': 2.11.5 - '@types/react': 17.0.43 + '@types/react': 18.0.0 clsx: 1.1.1 prop-types: 15.8.1 react: 18.0.0 @@ -5555,7 +5555,7 @@ packages: react-is: 17.0.2 dev: false - /@mui/icons-material/5.6.0_c00cc9082dc0b2fab042e40bf027d4c0: + /@mui/icons-material/5.6.0_2553ee89b70ee3f11770355e548c8981: resolution: {integrity: sha512-2GDGt+/BbwM3oVkF84b9FFKQdQ9TxBJIRnTwT99vO2mimdfJaojxMRB2lkysm9tUY4HOf0yoU6O//X6GTC0Zhw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5567,12 +5567,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@mui/material': 5.6.0_70fa32ac459e5c1cdea1741a31157dc6 - '@types/react': 17.0.43 + '@mui/material': 5.6.0_a40551c8620010c48b5371ddd0c74eca + '@types/react': 18.0.0 react: 18.0.0 dev: false - /@mui/lab/5.0.0-alpha.76_ee5f284ff44c03611175cc4ed4b571e1: + /@mui/lab/5.0.0-alpha.76_80117c0dbb09ea5d010ebb0c5061e006: resolution: {integrity: sha512-MCx6t28L6xo5S3/GXFZqIfXBdFXfCO8UblEb+sf48UREDx1awUDLS7/n0BLC9N6pj6P95OpMx+at25gTSd2CQQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5597,12 +5597,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@mui/base': 5.0.0-alpha.75_c13207e15fed56fc7b9b70ab319ad0ff - '@mui/material': 5.6.0_70fa32ac459e5c1cdea1741a31157dc6 - '@mui/system': 5.6.0_21629f01debc92bd51a65c25f7bee622 + '@mui/base': 5.0.0-alpha.75_761282c47ea27a9f40e1344337910648 + '@mui/material': 5.6.0_a40551c8620010c48b5371ddd0c74eca + '@mui/system': 5.6.0_f5344666332bfd9c91b01daf5bc202c4 '@mui/utils': 5.6.0_react@18.0.0 '@mui/x-date-pickers': 5.0.0-alpha.0_ef8af87094730c2ff7511bcf56b6fe3a - '@types/react': 17.0.43 + '@types/react': 18.0.0 clsx: 1.1.1 prop-types: 15.8.1 react: 18.0.0 @@ -5615,7 +5615,7 @@ packages: - '@emotion/styled' dev: false - /@mui/material/5.6.0_70fa32ac459e5c1cdea1741a31157dc6: + /@mui/material/5.6.0_a40551c8620010c48b5371ddd0c74eca: resolution: {integrity: sha512-yh4FoRRPTgJWjv1oIu3YuvfYGD/WOEnyGizQ9fKs+hlMjIc0rzFpyUCo++P/3BUd0/hRKcI8D8mrpJK9OiOy1g==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5633,13 +5633,13 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@emotion/react': 11.9.0_00a11a054056e3746b551a83b9229751 - '@emotion/styled': 11.8.1_24d67be66bb875d00e77a145b4bdc2ae - '@mui/base': 5.0.0-alpha.75_c13207e15fed56fc7b9b70ab319ad0ff - '@mui/system': 5.6.0_21629f01debc92bd51a65c25f7bee622 - '@mui/types': 7.1.3_@types+react@17.0.43 + '@emotion/react': 11.9.0_@types+react@18.0.0+react@18.0.0 + '@emotion/styled': 11.8.1_e2545690ae9f35939f01f34fa19b116d + '@mui/base': 5.0.0-alpha.75_761282c47ea27a9f40e1344337910648 + '@mui/system': 5.6.0_f5344666332bfd9c91b01daf5bc202c4 + '@mui/types': 7.1.3_@types+react@18.0.0 '@mui/utils': 5.6.0_react@18.0.0 - '@types/react': 17.0.43 + '@types/react': 18.0.0 '@types/react-transition-group': 4.4.4 clsx: 1.1.1 csstype: 3.0.11 @@ -5651,7 +5651,7 @@ packages: react-transition-group: 4.4.2_react-dom@18.0.0+react@18.0.0 dev: false - /@mui/private-theming/5.6.0_00a11a054056e3746b551a83b9229751: + /@mui/private-theming/5.6.0_@types+react@18.0.0+react@18.0.0: resolution: {integrity: sha512-62jUFaMGfW3nvq/worcOAEiY++rWd44tpWShq4o97DybWmmWvEFYlBIuHEcXrtBIK/cloaQw8jqelQIFZeiVdw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5663,7 +5663,7 @@ packages: dependencies: '@babel/runtime': 7.17.9 '@mui/utils': 5.6.0_react@18.0.0 - '@types/react': 17.0.43 + '@types/react': 18.0.0 prop-types: 15.8.1 react: 18.0.0 dev: false @@ -5683,13 +5683,13 @@ packages: dependencies: '@babel/runtime': 7.17.9 '@emotion/cache': 11.7.1 - '@emotion/react': 11.9.0_00a11a054056e3746b551a83b9229751 - '@emotion/styled': 11.8.1_24d67be66bb875d00e77a145b4bdc2ae + '@emotion/react': 11.9.0_@types+react@18.0.0+react@18.0.0 + '@emotion/styled': 11.8.1_e2545690ae9f35939f01f34fa19b116d prop-types: 15.8.1 react: 18.0.0 dev: false - /@mui/system/5.6.0_21629f01debc92bd51a65c25f7bee622: + /@mui/system/5.6.0_f5344666332bfd9c91b01daf5bc202c4: resolution: {integrity: sha512-FoytH73hY78Dll6F0fg7AI/hnpplygbFeW0HsqBfwFWrt2PMc2YSq2ICqHzd2CZPIhzEgRHDTSI8bMTLtG9W7A==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5706,20 +5706,20 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@emotion/react': 11.9.0_00a11a054056e3746b551a83b9229751 - '@emotion/styled': 11.8.1_24d67be66bb875d00e77a145b4bdc2ae - '@mui/private-theming': 5.6.0_00a11a054056e3746b551a83b9229751 + '@emotion/react': 11.9.0_@types+react@18.0.0+react@18.0.0 + '@emotion/styled': 11.8.1_e2545690ae9f35939f01f34fa19b116d + '@mui/private-theming': 5.6.0_@types+react@18.0.0+react@18.0.0 '@mui/styled-engine': 5.6.0_840a430ee8e73823706c6e9dc692d93a - '@mui/types': 7.1.3_@types+react@17.0.43 + '@mui/types': 7.1.3_@types+react@18.0.0 '@mui/utils': 5.6.0_react@18.0.0 - '@types/react': 17.0.43 + '@types/react': 18.0.0 clsx: 1.1.1 csstype: 3.0.11 prop-types: 15.8.1 react: 18.0.0 dev: false - /@mui/types/7.1.3_@types+react@17.0.43: + /@mui/types/7.1.3_@types+react@18.0.0: resolution: {integrity: sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==} peerDependencies: '@types/react': '*' @@ -5727,7 +5727,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 17.0.43 + '@types/react': 18.0.0 dev: false /@mui/utils/5.6.0_react@18.0.0: @@ -5769,8 +5769,8 @@ packages: '@date-io/dayjs': 2.13.1 '@date-io/luxon': 2.13.1 '@date-io/moment': 2.13.1 - '@mui/material': 5.6.0_70fa32ac459e5c1cdea1741a31157dc6 - '@mui/system': 5.6.0_21629f01debc92bd51a65c25f7bee622 + '@mui/material': 5.6.0_a40551c8620010c48b5371ddd0c74eca + '@mui/system': 5.6.0_f5344666332bfd9c91b01daf5bc202c4 '@mui/utils': 5.6.0_react@18.0.0 clsx: 1.1.1 prop-types: 15.8.1 @@ -6517,7 +6517,7 @@ packages: '@stablelib/xchacha20': 1.0.1 dev: false - /@storybook/addon-actions/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/addon-actions/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-rqEsAHwywZZv9Zzv6A/QXNLiosKY6S+JAEoT9VSeDW07d/MvH7FKoF7fQCnm3ZR53et9AazBJttoiyODZsbjxA==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6530,7 +6530,7 @@ packages: dependencies: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -6552,7 +6552,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-backgrounds/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/addon-backgrounds/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-W7FTIBdztuj3zwQX6c+YdnQQqqk5JrWGJ+OwMIRusG7uPOLeADLVHNwC19avytWuK5xsioawzsj7ZB/Od+z9aA==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6566,7 +6566,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -6582,7 +6582,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-controls/6.4.21_3443f62b06efa38269518a3a5320234f: + /@storybook/addon-controls/6.4.21_6676df11394319ba139cc7cf3fc4a2f6: resolution: {integrity: sha512-lrBmFB/Zog41rIKOohYXmA6yjeust5AtO+ZK02iqQZVCSMfYF9FXN7XRsnd0wv4WbFgPtQbLyWRWerb+IPOvBw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6596,7 +6596,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/node-logger': 6.4.21 @@ -6617,7 +6617,7 @@ packages: - webpack-command dev: true - /@storybook/addon-docs/6.4.21_f99eb68687e23a5bd31e4c4a7e5a6884: + /@storybook/addon-docs/6.4.21_00a1bb987fd47ac13bfff3fd3d0af211: resolution: {integrity: sha512-yaj6f5wHUwju1mq3sAs1CuP01EJ3jwJ5awes/1oH6T3FSumphhECzyMeSWbNheQU/9wGVwMdPRPSjuNumTMOrQ==} peerDependencies: '@storybook/angular': 6.4.21 @@ -6675,17 +6675,17 @@ packages: '@mdx-js/react': 1.6.22_react@18.0.0 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/builder-webpack4': 6.4.21_3443f62b06efa38269518a3a5320234f + '@storybook/builder-webpack4': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/core': 6.4.21_54e11f467b1ffbe6f6a87d19e8dd2990 + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/core': 6.4.21_b09091cd6567950dc77fc0116d25c179 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/csf-tools': 6.4.21 '@storybook/node-logger': 6.4.21 '@storybook/postinstall': 6.4.21 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/react': 6.4.21_3fa753c9d93deabb095fb4ed76733f7f + '@storybook/react': 6.4.21_32f94d51867974d8f619bc885c138fab '@storybook/source-loader': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -6728,7 +6728,7 @@ packages: - webpack-command dev: true - /@storybook/addon-essentials/6.4.21_938c653df97d8a0f1d6e7b97938360b8: + /@storybook/addon-essentials/6.4.21_7a43e45f716102e2c57d61b9bdce0487: resolution: {integrity: sha512-2vhbzSMAfQ2Trwrg7E+doWLHy++mhXtV+ksgezo7PATMCKnBK6ItUwGvL7fQzLtaz+JbLqx/tgI8spMCUod+BA==} peerDependencies: '@babel/core': ^7.9.6 @@ -6754,14 +6754,14 @@ packages: optional: true dependencies: '@babel/core': 7.17.9 - '@storybook/addon-actions': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/addon-backgrounds': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/addon-controls': 6.4.21_3443f62b06efa38269518a3a5320234f - '@storybook/addon-docs': 6.4.21_f99eb68687e23a5bd31e4c4a7e5a6884 - '@storybook/addon-measure': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/addon-outline': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/addon-toolbars': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff - '@storybook/addon-viewport': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/addon-actions': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/addon-backgrounds': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/addon-controls': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 + '@storybook/addon-docs': 6.4.21_00a1bb987fd47ac13bfff3fd3d0af211 + '@storybook/addon-measure': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/addon-outline': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/addon-toolbars': 6.4.21_761282c47ea27a9f40e1344337910648 + '@storybook/addon-viewport': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/node-logger': 6.4.21 @@ -6821,7 +6821,7 @@ packages: ts-dedent: 2.2.0 dev: true - /@storybook/addon-measure/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/addon-measure/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-Gg+/os8erwwMkxqMnMeRtS7zrRBqPlWxYoXCdDEDqWe+sbJ8lbIXpJpBDC7PfVpotVYWuNETSxR3qAfJjWrBRg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6835,7 +6835,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 core-js: 3.21.1 @@ -6846,7 +6846,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-outline/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/addon-outline/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-ADVnl3dOKkzdv32qkS63Fm37keellV98RrNbGDmE4xMiu55/srn/LfklTHRdbUwpKvVxf/44EQ0HXSNJBuWeDg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6860,7 +6860,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 core-js: 3.21.1 @@ -6873,7 +6873,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-toolbars/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/addon-toolbars/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-eu1OkMy4slGsK1jYxfEydQXDW+/VnhBf9zf6JexUh9SVzIWswDzmtsoZ4L1ws/vw7EQcbBBXU4UIG/xy5qH8dA==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6886,7 +6886,7 @@ packages: dependencies: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 core-js: 3.21.1 react: 18.0.0 @@ -6896,7 +6896,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-viewport/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/addon-viewport/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-O+SarJuO+S3ZrGskgMDmDnDjZg+7spCE6zdOuv2OX2wB+OTnoka0P0OhwHsg14Lc5DOWn22rv4q91v6RqAx6Yg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6910,7 +6910,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-events': 6.4.21 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 core-js: 3.21.1 @@ -6972,7 +6972,7 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/builder-webpack4/6.4.21_3443f62b06efa38269518a3a5320234f: + /@storybook/builder-webpack4/6.4.21_6676df11394319ba139cc7cf3fc4a2f6: resolution: {integrity: sha512-tetK8iZJ/S7U1Hrvm9i5ejH/SKJ/UHJcZ+j1VrzQK15wuwalevYJGJI3Gk2NzqKE8rda4CXPK1ES3iGcS67eZw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7009,7 +7009,7 @@ packages: '@storybook/channels': 6.4.21 '@storybook/client-api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/node-logger': 6.4.21 @@ -7018,7 +7018,7 @@ packages: '@storybook/semver': 7.3.2 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/ui': 6.4.21_761282c47ea27a9f40e1344337910648 '@types/node': 17.0.23 '@types/webpack': 4.41.32 autoprefixer: 9.8.8 @@ -7063,7 +7063,7 @@ packages: - webpack-command dev: true - /@storybook/builder-webpack5/6.4.21_164b1797f867d9c858af06e84125ac22: + /@storybook/builder-webpack5/6.4.21_923a04cc5515e169cb9f7791c68fa444: resolution: {integrity: sha512-pUD8+wL2LN1iFHAcpDo0E7lXkL5E6pCqmKmUbkgs1bPgvY0n9gyvDK46H70P/HWu+PGXKMXI/gofsF5ub1NaRQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7099,7 +7099,7 @@ packages: '@storybook/channels': 6.4.21 '@storybook/client-api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/node-logger': 6.4.21 @@ -7213,7 +7213,7 @@ packages: global: 4.4.0 dev: true - /@storybook/components/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/components/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-OnuAS/bMdLKdmkWtDNUxM9qSFCU3pcGWqXzasU3sjvibIcz3472xTFiwjW9UiHR7ipu/YQKALnIbyyjznGY4Kg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7241,7 +7241,7 @@ packages: react-dom: 18.0.0_react@18.0.0 react-popper-tooltip: 3.1.1_react-dom@18.0.0+react@18.0.0 react-syntax-highlighter: 13.5.3_react@18.0.0 - react-textarea-autosize: 8.3.3_00a11a054056e3746b551a83b9229751 + react-textarea-autosize: 8.3.3_@types+react@18.0.0+react@18.0.0 regenerator-runtime: 0.13.9 ts-dedent: 2.2.0 util-deprecate: 1.0.2 @@ -7249,7 +7249,7 @@ packages: - '@types/react' dev: true - /@storybook/core-client/6.4.21_7face686035a81bee5b1109093988804: + /@storybook/core-client/6.4.21_06088e2d7a06d5e99d2d63c90b958423: resolution: {integrity: sha512-1zdfhL7ryP5xgcBNuaQplkiPIgPZ2OnIFA1gqun1xl9OBA7K2J115uZ2grQwS7hrhRBqsRIvMv1k9UmAYzXqiw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7269,7 +7269,7 @@ packages: '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/ui': 6.4.21_761282c47ea27a9f40e1344337910648 airbnb-js-shims: 2.2.1 ansi-to-html: 0.6.15 core-js: 3.21.1 @@ -7283,12 +7283,11 @@ packages: typescript: 4.7.0-beta unfetch: 4.2.0 util-deprecate: 1.0.2 - webpack: 5.72.0_@swc+core@1.2.148 transitivePeerDependencies: - '@types/react' dev: true - /@storybook/core-client/6.4.21_95aa421267e6ee73b80ff04a19400a6e: + /@storybook/core-client/6.4.21_52964a89527dab1a5853ff97b8c8dbf6: resolution: {integrity: sha512-1zdfhL7ryP5xgcBNuaQplkiPIgPZ2OnIFA1gqun1xl9OBA7K2J115uZ2grQwS7hrhRBqsRIvMv1k9UmAYzXqiw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7308,7 +7307,7 @@ packages: '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/ui': 6.4.21_761282c47ea27a9f40e1344337910648 airbnb-js-shims: 2.2.1 ansi-to-html: 0.6.15 core-js: 3.21.1 @@ -7322,11 +7321,12 @@ packages: typescript: 4.7.0-beta unfetch: 4.2.0 util-deprecate: 1.0.2 + webpack: 4.46.0 transitivePeerDependencies: - '@types/react' dev: true - /@storybook/core-client/6.4.21_e939176610c01a31d76293db73c8c341: + /@storybook/core-client/6.4.21_dad35682b5ba1569a0bd69cee463c25f: resolution: {integrity: sha512-1zdfhL7ryP5xgcBNuaQplkiPIgPZ2OnIFA1gqun1xl9OBA7K2J115uZ2grQwS7hrhRBqsRIvMv1k9UmAYzXqiw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7346,7 +7346,7 @@ packages: '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/ui': 6.4.21_761282c47ea27a9f40e1344337910648 airbnb-js-shims: 2.2.1 ansi-to-html: 0.6.15 core-js: 3.21.1 @@ -7360,7 +7360,7 @@ packages: typescript: 4.7.0-beta unfetch: 4.2.0 util-deprecate: 1.0.2 - webpack: 4.46.0 + webpack: 5.72.0_@swc+core@1.2.148 transitivePeerDependencies: - '@types/react' dev: true @@ -7441,7 +7441,7 @@ packages: core-js: 3.21.1 dev: true - /@storybook/core-server/6.4.21_3443f62b06efa38269518a3a5320234f: + /@storybook/core-server/6.4.21_6676df11394319ba139cc7cf3fc4a2f6: resolution: {integrity: sha512-uOBrLKzERAJvGAtd9ieozoTjEu0Hnr7DnufppG4t14Yu61lcbsT3IzPeZDuFaM3tGjWlNgXIezZ2aBoxTMVokQ==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7458,13 +7458,13 @@ packages: optional: true dependencies: '@discoveryjs/json-ext': 0.5.7 - '@storybook/builder-webpack4': 6.4.21_3443f62b06efa38269518a3a5320234f - '@storybook/core-client': 6.4.21_e939176610c01a31d76293db73c8c341 + '@storybook/builder-webpack4': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 + '@storybook/core-client': 6.4.21_52964a89527dab1a5853ff97b8c8dbf6 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/csf-tools': 6.4.21 - '@storybook/manager-webpack4': 6.4.21_3443f62b06efa38269518a3a5320234f + '@storybook/manager-webpack4': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 '@storybook/node-logger': 6.4.21 '@storybook/semver': 7.3.2 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -7514,7 +7514,7 @@ packages: - webpack-command dev: true - /@storybook/core-server/6.4.21_54e11f467b1ffbe6f6a87d19e8dd2990: + /@storybook/core-server/6.4.21_b09091cd6567950dc77fc0116d25c179: resolution: {integrity: sha512-uOBrLKzERAJvGAtd9ieozoTjEu0Hnr7DnufppG4t14Yu61lcbsT3IzPeZDuFaM3tGjWlNgXIezZ2aBoxTMVokQ==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7531,15 +7531,15 @@ packages: optional: true dependencies: '@discoveryjs/json-ext': 0.5.7 - '@storybook/builder-webpack4': 6.4.21_3443f62b06efa38269518a3a5320234f - '@storybook/builder-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 - '@storybook/core-client': 6.4.21_e939176610c01a31d76293db73c8c341 + '@storybook/builder-webpack4': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 + '@storybook/builder-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 + '@storybook/core-client': 6.4.21_52964a89527dab1a5853ff97b8c8dbf6 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/csf-tools': 6.4.21 - '@storybook/manager-webpack4': 6.4.21_3443f62b06efa38269518a3a5320234f - '@storybook/manager-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 + '@storybook/manager-webpack4': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 + '@storybook/manager-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 '@storybook/node-logger': 6.4.21 '@storybook/semver': 7.3.2 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -7589,7 +7589,7 @@ packages: - webpack-command dev: true - /@storybook/core/6.4.21_16004b5a440d702f5f9825005161ccda: + /@storybook/core/6.4.21_6de641eb108072507d9ecf1874b1375b: resolution: {integrity: sha512-HNy3L/5stURU5CPyo4Gh/NHhgs6qgvNq82pOr9mhnr2chNOUTh/kaWjrR4k/Mnh8qzItYLs1tpIFKvhclHXAdw==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7603,9 +7603,9 @@ packages: typescript: optional: true dependencies: - '@storybook/builder-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 - '@storybook/core-client': 6.4.21_e939176610c01a31d76293db73c8c341 - '@storybook/core-server': 6.4.21_54e11f467b1ffbe6f6a87d19e8dd2990 + '@storybook/builder-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 + '@storybook/core-client': 6.4.21_52964a89527dab1a5853ff97b8c8dbf6 + '@storybook/core-server': 6.4.21_b09091cd6567950dc77fc0116d25c179 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 typescript: 4.7.0-beta @@ -7623,7 +7623,7 @@ packages: - webpack-command dev: true - /@storybook/core/6.4.21_54e11f467b1ffbe6f6a87d19e8dd2990: + /@storybook/core/6.4.21_b09091cd6567950dc77fc0116d25c179: resolution: {integrity: sha512-HNy3L/5stURU5CPyo4Gh/NHhgs6qgvNq82pOr9mhnr2chNOUTh/kaWjrR4k/Mnh8qzItYLs1tpIFKvhclHXAdw==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7637,9 +7637,9 @@ packages: typescript: optional: true dependencies: - '@storybook/builder-webpack5': 6.4.21_164b1797f867d9c858af06e84125ac22 - '@storybook/core-client': 6.4.21_95aa421267e6ee73b80ff04a19400a6e - '@storybook/core-server': 6.4.21_54e11f467b1ffbe6f6a87d19e8dd2990 + '@storybook/builder-webpack5': 6.4.21_923a04cc5515e169cb9f7791c68fa444 + '@storybook/core-client': 6.4.21_06088e2d7a06d5e99d2d63c90b958423 + '@storybook/core-server': 6.4.21_b09091cd6567950dc77fc0116d25c179 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 typescript: 4.7.0-beta @@ -7656,7 +7656,7 @@ packages: - webpack-command dev: true - /@storybook/core/6.4.21_7822d91b2715397e4708e387b24481fe: + /@storybook/core/6.4.21_f311106ca85cecd28536e695bd84733b: resolution: {integrity: sha512-HNy3L/5stURU5CPyo4Gh/NHhgs6qgvNq82pOr9mhnr2chNOUTh/kaWjrR4k/Mnh8qzItYLs1tpIFKvhclHXAdw==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7670,8 +7670,8 @@ packages: typescript: optional: true dependencies: - '@storybook/core-client': 6.4.21_e939176610c01a31d76293db73c8c341 - '@storybook/core-server': 6.4.21_3443f62b06efa38269518a3a5320234f + '@storybook/core-client': 6.4.21_52964a89527dab1a5853ff97b8c8dbf6 + '@storybook/core-server': 6.4.21_6676df11394319ba139cc7cf3fc4a2f6 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 typescript: 4.7.0-beta @@ -7719,7 +7719,7 @@ packages: lodash: 4.17.21 dev: true - /@storybook/manager-webpack4/6.4.21_3443f62b06efa38269518a3a5320234f: + /@storybook/manager-webpack4/6.4.21_6676df11394319ba139cc7cf3fc4a2f6: resolution: {integrity: sha512-JhcGU6KtmNQUfSNNgAWIKVKOaupx7+RYw3y6P0JN5km5nzqpipkeJzh+jdMqefJbIRV/psqKm/jpt/pPfaIHyQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7733,11 +7733,11 @@ packages: '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.17.9 '@babel/preset-react': 7.16.7_@babel+core@7.17.9 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core-client': 6.4.21_e939176610c01a31d76293db73c8c341 + '@storybook/core-client': 6.4.21_52964a89527dab1a5853ff97b8c8dbf6 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/node-logger': 6.4.21 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/ui': 6.4.21_761282c47ea27a9f40e1344337910648 '@types/node': 17.0.23 '@types/webpack': 4.41.32 babel-loader: 8.2.4_598a497cebab8e15ee8f9e5632178e63 @@ -7778,7 +7778,7 @@ packages: - webpack-command dev: true - /@storybook/manager-webpack5/6.4.21_164b1797f867d9c858af06e84125ac22: + /@storybook/manager-webpack5/6.4.21_923a04cc5515e169cb9f7791c68fa444: resolution: {integrity: sha512-oAec1kNFVcGSPOht51BN6uE+OvEcZPa04qgqoMu58vBF20XVcNXofs0sJxXTdwNgwPW+xL2rzsGk1GK1EsLmmQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7792,11 +7792,11 @@ packages: '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.17.9 '@babel/preset-react': 7.16.7_@babel+core@7.17.9 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core-client': 6.4.21_7face686035a81bee5b1109093988804 + '@storybook/core-client': 6.4.21_dad35682b5ba1569a0bd69cee463c25f '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/node-logger': 6.4.21 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/ui': 6.4.21_761282c47ea27a9f40e1344337910648 '@types/node': 17.0.23 babel-loader: 8.2.4_acba72ea4bf9d339cdfcd8f55cdb7006 case-sensitive-paths-webpack-plugin: 2.4.0 @@ -7899,7 +7899,7 @@ packages: - supports-color dev: true - /@storybook/react/6.4.21_3443f62b06efa38269518a3a5320234f: + /@storybook/react/6.4.21_32f94d51867974d8f619bc885c138fab: resolution: {integrity: sha512-7SJJnEbZ5THQBjor37shxnhXiFTB7g46U68I/PY56A5ZLb4TkorKStrniKgTcxG9xNqQjyxm0S6CICUp9gn8PQ==} engines: {node: '>=10.13.0'} hasBin: true @@ -7914,11 +7914,12 @@ packages: typescript: optional: true dependencies: - '@babel/preset-flow': 7.16.7 - '@babel/preset-react': 7.16.7 + '@babel/core': 7.17.9 + '@babel/preset-flow': 7.16.7_@babel+core@7.17.9 + '@babel/preset-react': 7.16.7_@babel+core@7.17.9 '@pmmmwh/react-refresh-webpack-plugin': 0.5.5_06cd85ae30adde416cafc06517ba554d '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core': 6.4.21_7822d91b2715397e4708e387b24481fe + '@storybook/core': 6.4.21_6de641eb108072507d9ecf1874b1375b '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/node-logger': 6.4.21 @@ -7927,7 +7928,7 @@ packages: '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@types/webpack-env': 1.16.3 babel-plugin-add-react-displayname: 0.0.5 - babel-plugin-named-asset-import: 0.3.8 + babel-plugin-named-asset-import: 0.3.8_@babel+core@7.17.9 babel-plugin-react-docgen: 4.2.1 core-js: 3.21.1 global: 4.4.0 @@ -7961,7 +7962,7 @@ packages: - webpack-plugin-serve dev: true - /@storybook/react/6.4.21_3fa753c9d93deabb095fb4ed76733f7f: + /@storybook/react/6.4.21_6676df11394319ba139cc7cf3fc4a2f6: resolution: {integrity: sha512-7SJJnEbZ5THQBjor37shxnhXiFTB7g46U68I/PY56A5ZLb4TkorKStrniKgTcxG9xNqQjyxm0S6CICUp9gn8PQ==} engines: {node: '>=10.13.0'} hasBin: true @@ -7976,12 +7977,11 @@ packages: typescript: optional: true dependencies: - '@babel/core': 7.17.9 - '@babel/preset-flow': 7.16.7_@babel+core@7.17.9 - '@babel/preset-react': 7.16.7_@babel+core@7.17.9 + '@babel/preset-flow': 7.16.7 + '@babel/preset-react': 7.16.7 '@pmmmwh/react-refresh-webpack-plugin': 0.5.5_06cd85ae30adde416cafc06517ba554d '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core': 6.4.21_16004b5a440d702f5f9825005161ccda + '@storybook/core': 6.4.21_f311106ca85cecd28536e695bd84733b '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/node-logger': 6.4.21 @@ -7990,7 +7990,7 @@ packages: '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@types/webpack-env': 1.16.3 babel-plugin-add-react-displayname: 0.0.5 - babel-plugin-named-asset-import: 0.3.8_@babel+core@7.17.9 + babel-plugin-named-asset-import: 0.3.8 babel-plugin-react-docgen: 4.2.1 core-js: 3.21.1 global: 4.4.0 @@ -8121,7 +8121,7 @@ packages: ts-dedent: 2.2.0 dev: true - /@storybook/ui/6.4.21_c13207e15fed56fc7b9b70ab319ad0ff: + /@storybook/ui/6.4.21_761282c47ea27a9f40e1344337910648: resolution: {integrity: sha512-jjEEFDm8PAzscn5dN+3YJap9033ce98YYC9FCQVF5sB41CIwI0PD5LUafxWbaxQdL+t/ZlRYXNz3FLNFHMwzcQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -8132,7 +8132,7 @@ packages: '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/channels': 6.4.21 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_c13207e15fed56fc7b9b70ab319ad0ff + '@storybook/components': 6.4.21_761282c47ea27a9f40e1344337910648 '@storybook/core-events': 6.4.21 '@storybook/router': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/semver': 7.3.2 @@ -8917,32 +8917,32 @@ packages: /@types/react-avatar-editor/10.3.6: resolution: {integrity: sha512-2r9+WYriqXIyjOTxy/DSiCUhr2TBiYD4Gzbyych1WUEwdPboNj0JRz9B5868TwiGgKD61jdWYyKy/OutHs7L6A==} dependencies: - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: false /@types/react-dom/18.0.0: resolution: {integrity: sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg==} dependencies: - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: false /@types/react-highlight-words/0.16.4: resolution: {integrity: sha512-KITBX3xzheQLu2s3bUgLmRE7ekmhc52zRjRTwkKayQARh30L4fjEGzGm7ULK9TuX2LgxWWavZqyQGDGjAHbL3w==} dependencies: - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: false /@types/react-is/17.0.3: resolution: {integrity: sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==} dependencies: - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: false /@types/react-router-dom/5.3.3: resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==} dependencies: '@types/history': 4.7.11 - '@types/react': 17.0.44 + '@types/react': 18.0.0 '@types/react-router': 5.1.18 dev: false @@ -8950,43 +8950,35 @@ packages: resolution: {integrity: sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==} dependencies: '@types/history': 4.7.11 - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: false /@types/react-syntax-highlighter/11.0.5: resolution: {integrity: sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==} dependencies: - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: true /@types/react-transition-group/4.4.4: resolution: {integrity: sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==} dependencies: - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: false /@types/react-virtualized-auto-sizer/1.0.1: resolution: {integrity: sha512-GH8sAnBEM5GV9LTeiz56r4ZhMOUSrP43tAQNSRVxNexDjcNKLCEtnxusAItg1owFUFE6k0NslV26gqVClVvong==} dependencies: - '@types/react': 17.0.44 + '@types/react': 18.0.0 dev: false /@types/react-window/1.8.5: resolution: {integrity: sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw==} dependencies: - '@types/react': 17.0.44 - dev: false - - /@types/react/17.0.43: - resolution: {integrity: sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A==} - dependencies: - '@types/prop-types': 15.7.5 - '@types/scheduler': 0.16.2 - csstype: 3.0.11 + '@types/react': 18.0.0 dev: false - /@types/react/17.0.44: - resolution: {integrity: sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g==} + /@types/react/18.0.0: + resolution: {integrity: sha512-7+K7zEQYu7NzOwQGLR91KwWXXDzmTFODRVizJyIALf6RfLv2GDpqpknX64pvRVILXCpXi7O/pua8NGk44dLvJw==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 @@ -20545,9 +20537,9 @@ packages: '@emotion/styled': optional: true dependencies: - '@emotion/react': 11.9.0_00a11a054056e3746b551a83b9229751 - '@emotion/styled': 11.8.1_24d67be66bb875d00e77a145b4bdc2ae - '@mui/material': 5.6.0_70fa32ac459e5c1cdea1741a31157dc6 + '@emotion/react': 11.9.0_@types+react@18.0.0+react@18.0.0 + '@emotion/styled': 11.8.1_e2545690ae9f35939f01f34fa19b116d + '@mui/material': 5.6.0_a40551c8620010c48b5371ddd0c74eca clsx: 1.1.1 hoist-non-react-statics: 3.3.2 react: 18.0.0 @@ -22213,7 +22205,7 @@ packages: refractor: 3.6.0 dev: true - /react-textarea-autosize/8.3.3_00a11a054056e3746b551a83b9229751: + /react-textarea-autosize/8.3.3_@types+react@18.0.0+react@18.0.0: resolution: {integrity: sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==} engines: {node: '>=10'} peerDependencies: @@ -22222,7 +22214,7 @@ packages: '@babel/runtime': 7.17.9 react: 18.0.0 use-composed-ref: 1.2.1_react@18.0.0 - use-latest: 1.2.0_00a11a054056e3746b551a83b9229751 + use-latest: 1.2.0_@types+react@18.0.0+react@18.0.0 transitivePeerDependencies: - '@types/react' dev: true @@ -24991,7 +24983,7 @@ packages: react: ^16.8.0 || ^17.0.2 dependencies: '@emotion/cache': 11.7.1 - '@emotion/react': 11.9.0_00a11a054056e3746b551a83b9229751 + '@emotion/react': 11.9.0_@types+react@18.0.0+react@18.0.0 '@emotion/serialize': 1.0.2 '@emotion/utils': 1.1.0 react: 18.0.0 @@ -25548,7 +25540,7 @@ packages: react: 18.0.0 dev: true - /use-isomorphic-layout-effect/1.1.2_00a11a054056e3746b551a83b9229751: + /use-isomorphic-layout-effect/1.1.2_@types+react@18.0.0+react@18.0.0: resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' @@ -25557,11 +25549,11 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 17.0.43 + '@types/react': 18.0.0 react: 18.0.0 dev: true - /use-latest/1.2.0_00a11a054056e3746b551a83b9229751: + /use-latest/1.2.0_@types+react@18.0.0+react@18.0.0: resolution: {integrity: sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==} peerDependencies: '@types/react': '*' @@ -25570,9 +25562,9 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 17.0.43 + '@types/react': 18.0.0 react: 18.0.0 - use-isomorphic-layout-effect: 1.1.2_00a11a054056e3746b551a83b9229751 + use-isomorphic-layout-effect: 1.1.2_@types+react@18.0.0+react@18.0.0 dev: true /use-subscription/1.6.0_react@18.0.0: @@ -27364,7 +27356,7 @@ packages: dev: false github.com/ProjectOpenSea/wyvern-schemas/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26: - resolution: {tarball: https://codeload.github.com/ProjectOpenSea/wyvern-schemas/tar.gz/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26} + resolution: {commit: e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26, repo: git+ssh://git@github.com/ProjectOpenSea/wyvern-schemas.git, type: git} name: wyvern-schemas version: 0.10.7 dependencies: @@ -27379,7 +27371,7 @@ packages: dev: false github.com/ProjectWyvern/ethereumjs-abi/3d2d89641a6ad5984929b6ca4b646452ec74f73d: - resolution: {tarball: https://codeload.github.com/ProjectWyvern/ethereumjs-abi/tar.gz/3d2d89641a6ad5984929b6ca4b646452ec74f73d} + resolution: {commit: 3d2d89641a6ad5984929b6ca4b646452ec74f73d, repo: git+ssh://git@github.com/ProjectWyvern/ethereumjs-abi.git, type: git} name: ethereumjs-abi version: 0.6.6 dependencies: @@ -27396,7 +27388,7 @@ packages: dev: false github.com/ethereumjs/ethereumjs-abi/ee3994657fa7a427238e6ba92a84d0b529bbcde0: - resolution: {tarball: https://codeload.github.com/ethereumjs/ethereumjs-abi/tar.gz/ee3994657fa7a427238e6ba92a84d0b529bbcde0} + resolution: {commit: ee3994657fa7a427238e6ba92a84d0b529bbcde0, repo: git+ssh://git@github.com/ethereumjs/ethereumjs-abi.git, type: git} name: ethereumjs-abi version: 0.6.8 dependencies: From 950ef6ebb0f900ebeb46186df5f4432141693a6f Mon Sep 17 00:00:00 2001 From: Jack Works Date: Sat, 9 Apr 2022 16:40:12 +0800 Subject: [PATCH 2/3] fix: type error --- .../src/components/CreateWalletForm/index.tsx | 15 +++++-- .../RegisterFrame/ColumnContentLayout.tsx | 2 +- .../components/Transfer/TransferERC721.tsx | 2 +- .../components/WalletStateBar/index.tsx | 4 +- .../TypedMessageRender/Components/Text.tsx | 4 +- .../CompositionDialog/TypedMessageEditor.tsx | 2 +- .../components/InjectedComponents/PageTab.tsx | 3 +- .../InjectedComponents/PageTabItem.tsx | 6 ++- .../InjectedComponents/SelectPeopleDialog.tsx | 4 +- .../src/components/shared/DraggableDiv.tsx | 8 ++-- .../SelectProfileUI/SelectProfileUI.tsx | 5 ++- .../shared/SelectRecipients/ProfileInList.tsx | 6 +-- .../DashboardDialogs/Wallet/TransferNFT.tsx | 2 +- .../pages/Wallet/AddDeriveWallet/index.tsx | 2 +- .../pages/Wallet/SwitchWallet/index.tsx | 12 +---- .../ArtBlocks/SNSAdaptor/PurchaseDialog.tsx | 2 +- .../plugins/Avatar/SNSAdaptor/NFTAvatar.tsx | 2 +- .../Collectible/SNSAdaptor/OrderRow.tsx | 44 ++++++++++--------- .../CryptoartAI/SNSAdaptor/CheckoutDialog.tsx | 2 +- .../SNSAdaptor/MakeOfferDialog.tsx | 2 +- .../FindTruman/SNSAdaptor/LoadingFailCard.tsx | 4 +- .../plugins/ITO/SNSAdaptor/RegionSelect.tsx | 2 +- .../mask/src/plugins/ITO/SNSAdaptor/index.tsx | 14 +++--- .../NextID/components/Tip/TipTaskManager.tsx | 2 +- .../plugins/NextID/contexts/RootContext.tsx | 4 +- .../NextID/contexts/Tip/TipTaskProvider.tsx | 2 +- .../mask/src/plugins/Pets/SNSAdaptor/Drag.tsx | 3 +- .../plugins/PoolTogether/UI/DepositDialog.tsx | 4 +- .../plugins/RedPacket/SNSAdaptor/index.tsx | 14 +++--- .../Snapshot/SNSAdaptor/LoadingFailCard.tsx | 6 ++- .../SNSAdaptor/trending/TrendingPopper.tsx | 5 +-- .../UnlockProtocol/SNSAdaptor/LockInList.tsx | 6 +-- .../UnlockProtocol/SNSAdaptor/index.tsx | 14 +++--- .../src/plugins/dHEDGE/UI/InvestDialog.tsx | 4 +- .../defaults/inject/CommentBox.tsx | 2 +- .../UI/EthereumERC20TokenApprovedBoundary.tsx | 14 ++++-- .../src/SNSAdaptor/components/Copyable.tsx | 2 +- .../src/SNSAdaptor/hooks/Exchange.tsx | 2 +- .../FileService/src/SNSAdaptor/index.tsx | 14 +++--- .../src/components/ErrorBoundary/CrashUI.tsx | 2 +- .../src/UI/components/I18NextProviderHMR.tsx | 1 + .../src/contexts/SharedContextProvider.tsx | 4 +- .../contexts/base/BaseSharedUIProvider.tsx | 4 +- .../src/contexts/evm/TokenPicker/index.tsx | 4 +- packages/shared/src/contexts/evm/index.tsx | 4 +- .../shared/src/hooks/useSnackbarCallback.tsx | 2 +- .../shared/src/wallet/FormattedBalance.tsx | 4 +- .../MaskSearchableItemInList.tsx | 5 +-- .../SearchableList/SearchableList.tsx | 6 ++- .../theme/src/Components/Snackbar/index.tsx | 2 +- .../web3-shared/base/src/hooks/useBeat.ts | 2 +- 51 files changed, 148 insertions(+), 139 deletions(-) diff --git a/packages/dashboard/src/components/CreateWalletForm/index.tsx b/packages/dashboard/src/components/CreateWalletForm/index.tsx index cf42f4d17f8c..ddb77638de16 100644 --- a/packages/dashboard/src/components/CreateWalletForm/index.tsx +++ b/packages/dashboard/src/components/CreateWalletForm/index.tsx @@ -1,4 +1,13 @@ -import { FormControl, ListItemIcon, MenuItem, Select, styled, Typography, FilledInput } from '@mui/material' +import { + FormControl, + ListItemIcon, + MenuItem, + Select, + styled, + Typography, + FilledInput, + SelectChangeEvent, +} from '@mui/material' import { makeStyles } from '@masknet/theme' import { useCallback, useState } from 'react' import { useDashboardI18N } from '../../locales' @@ -32,7 +41,7 @@ export interface CreateWalletFormProps { export function CreateWalletForm(props: CreateWalletFormProps) { const { options } = props const { classes } = useStyles() - const [selected, setSelected] = useState() + const [selected, setSelected] = useState() const t = useDashboardI18N() @@ -43,7 +52,7 @@ export function CreateWalletForm(props: CreateWalletFormProps) { classes={{ filled: classes.filled }} variant="filled" value={selected} - onChange={useCallback((event) => setSelected(event.target.value), [])}> + onChange={useCallback((event: SelectChangeEvent) => setSelected(event.target.value), [])}> {options.map(({ label, icon, value }) => ( {icon} diff --git a/packages/dashboard/src/components/RegisterFrame/ColumnContentLayout.tsx b/packages/dashboard/src/components/RegisterFrame/ColumnContentLayout.tsx index 8a5a732a9824..ec79b6c20424 100644 --- a/packages/dashboard/src/components/RegisterFrame/ColumnContentLayout.tsx +++ b/packages/dashboard/src/components/RegisterFrame/ColumnContentLayout.tsx @@ -49,7 +49,7 @@ export const RestoreBlueLogo = styled(RestoreBlueIcon)(({ theme }) => ({ interface PersonaLogoBoxProps {} -export const PersonaLogoBox = memo(({ children }) => { +export const PersonaLogoBox = memo>(({ children }) => { const t = useDashboardI18N() return ( diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx index 7e72ca73c272..fcde2a2753c1 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx @@ -211,7 +211,7 @@ export const TransferERC721 = memo(() => { }, [transferState]) const onTransfer = useCallback( - async (data) => { + async (data: FormInputs) => { if (EthereumAddress.isValid(data.recipient)) { await transferCallback(data.tokenId, data.recipient, gasConfig) return diff --git a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx index 574dd8689708..b08e2c0878bd 100644 --- a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx @@ -1,4 +1,4 @@ -import { FC, memo } from 'react' +import React, { FC, memo } from 'react' import { Box, Button, Stack, Typography } from '@mui/material' import { ProviderType, TransactionStatusType } from '@masknet/web3-shared-evm' import { makeStyles, MaskColorVar } from '@masknet/theme' @@ -109,7 +109,7 @@ interface WalletStateBarUIProps { openMenu: ReturnType[1] } -export const WalletStateBarUI: FC = ({ +export const WalletStateBarUI: FC> = ({ isPending, network, provider, diff --git a/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx b/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx index 96a2909ed745..261f2613a9af 100644 --- a/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx +++ b/packages/mask/shared-ui/TypedMessageRender/Components/Text.tsx @@ -1,9 +1,9 @@ -import { memo, useCallback } from 'react' +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' -export const Container = memo(function Container(props) { +export const Container = memo(function Container(props: PropsWithChildren<{}>) { return ( {props.children} diff --git a/packages/mask/src/components/CompositionDialog/TypedMessageEditor.tsx b/packages/mask/src/components/CompositionDialog/TypedMessageEditor.tsx index 0e1f0d9da9f5..85ef689df99d 100644 --- a/packages/mask/src/components/CompositionDialog/TypedMessageEditor.tsx +++ b/packages/mask/src/components/CompositionDialog/TypedMessageEditor.tsx @@ -76,7 +76,7 @@ export const TypedMessageEditor = memo( [setMessage], ) const deleteMetaID = useCallback( - (meta) => { + (meta: string) => { setMessage(editTypedMessageMeta(currentValue.current, (map) => map.delete(meta))) }, [setMessage], diff --git a/packages/mask/src/components/InjectedComponents/PageTab.tsx b/packages/mask/src/components/InjectedComponents/PageTab.tsx index 99314220ce0c..58405377ce20 100644 --- a/packages/mask/src/components/InjectedComponents/PageTab.tsx +++ b/packages/mask/src/components/InjectedComponents/PageTab.tsx @@ -13,7 +13,7 @@ const useStyles = makeStyles()((theme) => ({ })) export interface PageTabProps { - tabs: Plugin.SNSAdaptor.ProfileTab[] + tabs: ({ pluginID: string } & Plugin.SNSAdaptor.ProfileTab)[] selectedTab?: Plugin.SNSAdaptor.ProfileTab onChange?: (tag: Plugin.SNSAdaptor.ProfileTab) => void } @@ -34,6 +34,7 @@ export function PageTab(props: PageTabProps) {
{tabs.map((x) => ( ({ })) export interface PageTabItemProps { + pluginID: string tab: Plugin.SNSAdaptor.ProfileTab selected?: boolean onClick?: (tab: Plugin.SNSAdaptor.ProfileTab) => void @@ -43,6 +44,7 @@ export interface PageTabItemProps { export function PageTabItem(props: PageTabItemProps) { const { tab, selected, onClick } = props const { classes } = useStyles() + const translate = usePluginI18NField() return ( ) } diff --git a/packages/mask/src/components/InjectedComponents/SelectPeopleDialog.tsx b/packages/mask/src/components/InjectedComponents/SelectPeopleDialog.tsx index dd32661e1280..7c5d25422b30 100644 --- a/packages/mask/src/components/InjectedComponents/SelectPeopleDialog.tsx +++ b/packages/mask/src/components/InjectedComponents/SelectPeopleDialog.tsx @@ -49,7 +49,9 @@ export function SelectProfileDialog(props: SelectProfileDialogProps) { {rejection && ( - Error: {rejection.message} {console.error(rejection)} + <> + Error: {rejection.message} {console.error(rejection)} + )} diff --git a/packages/mask/src/components/shared/DraggableDiv.tsx b/packages/mask/src/components/shared/DraggableDiv.tsx index 29f6332e1e3f..ca2cf87eec02 100644 --- a/packages/mask/src/components/shared/DraggableDiv.tsx +++ b/packages/mask/src/components/shared/DraggableDiv.tsx @@ -34,14 +34,14 @@ export function DraggableDiv({ return (
-
- + {...DraggableProps} + // @ts-expect-error @types/react 18 + children={
} + />
) } diff --git a/packages/mask/src/components/shared/SelectProfileUI/SelectProfileUI.tsx b/packages/mask/src/components/shared/SelectProfileUI/SelectProfileUI.tsx index e80e7c6e1530..956e802f4a74 100644 --- a/packages/mask/src/components/shared/SelectProfileUI/SelectProfileUI.tsx +++ b/packages/mask/src/components/shared/SelectProfileUI/SelectProfileUI.tsx @@ -98,7 +98,10 @@ export function SelectProfileUI(props: SelectProfileUIProps) { setSearch(e.target.value), [])} + onChange={useCallback( + (e: React.ChangeEvent) => setSearch(e.target.value), + [], + )} onKeyDown={(e) => { if (search === '' && e.key === 'Backspace') { onSetSelected(selected.slice(0, selected.length - 1) as Profile[]) diff --git a/packages/mask/src/components/shared/SelectRecipients/ProfileInList.tsx b/packages/mask/src/components/shared/SelectRecipients/ProfileInList.tsx index da4a6626e388..cb62b3efa096 100644 --- a/packages/mask/src/components/shared/SelectRecipients/ProfileInList.tsx +++ b/packages/mask/src/components/shared/SelectRecipients/ProfileInList.tsx @@ -1,4 +1,4 @@ -import { ChangeEvent, useCallback } from 'react' +import { useCallback } from 'react' import classNames from 'classnames' import { ListItemText, Checkbox, ListItemAvatar } from '@mui/material' import ListItemButton from '@mui/material/ListItemButton' @@ -32,7 +32,7 @@ export interface ProfileInListProps extends withClasses { search?: string checked?: boolean disabled?: boolean - onChange: (ev: ChangeEvent, checked: boolean) => void + onChange: (ev: React.MouseEvent, checked: boolean) => void CheckboxProps?: Partial ListItemProps?: Partial>> } @@ -41,7 +41,7 @@ export function ProfileInList(props: ProfileInListProps) { const profile = props.item const name = profile.nickname || profile.identifier.userId const secondary = profile.linkedPersona?.fingerprint ? profile.linkedPersona?.fingerprint.toLowerCase() : '' - const onClick = useCallback((ev) => props.onChange(ev, !props.checked), [props]) + const onClick = useCallback((ev: React.MouseEvent) => props.onChange(ev, !props.checked), [props]) return ( { + (ev: { open: boolean }) => { if (ev.open) return resetTransferCallback() if (transferState.type !== TransactionStateType.HASH) return diff --git a/packages/mask/src/extension/popups/pages/Wallet/AddDeriveWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/AddDeriveWallet/index.tsx index 9e131e2b33b2..f6ea7ac36cc0 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/AddDeriveWallet/index.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/AddDeriveWallet/index.tsx @@ -104,7 +104,7 @@ const AddDeriveWallet = memo(() => { }, [mnemonic, wallets.length, page]) const onCheck = useCallback( - async (checked, index) => { + async (checked: boolean, index: number) => { if (checked) { indexes.current.add(page * 10 + index) } else { diff --git a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx index 2da42076d2ef..6f79f43564b8 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx @@ -6,7 +6,6 @@ import { useNavigate } from 'react-router-dom' import { PopupRoutes } from '@masknet/shared-base' import { useI18N } from '../../../../../utils' import { WalletRPC } from '../../../../../plugins/Wallet/messages' -import { useCopyToClipboard } from 'react-use' import { NetworkSelector } from '../../../components/NetworkSelector' import { currentProviderSettings } from '../../../../../plugins/Wallet/settings' import { WalletItem } from './WalletItem' @@ -89,8 +88,6 @@ const SwitchWallet = memo(() => { const wallet = useWallet() const wallets = useWallets(ProviderType.MaskWallet) - const [, copyToClipboard] = useCopyToClipboard() - const handleClickCreate = useCallback(() => { if (!walletPrimary) { browser.tabs.create({ @@ -103,7 +100,7 @@ const SwitchWallet = memo(() => { }, [walletPrimary, history]) const handleSelect = useCallback( - async (address) => { + async (address: string | undefined) => { await WalletRPC.updateMaskAccount({ account: address, }) @@ -116,13 +113,6 @@ const SwitchWallet = memo(() => { [history], ) - const onCopy = useCallback( - (address: string) => { - copyToClipboard(address) - }, - [copyToClipboard], - ) - return ( <>
diff --git a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx index eeec4036bee1..b2f6097b84fe 100644 --- a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx +++ b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx @@ -98,7 +98,7 @@ export function PurchaseDialog(props: ActionBarProps) { const { setDialog: setTransactionDialog } = useRemoteControlledDialog( WalletMessages.events.transactionDialogUpdated, useCallback( - (ev) => { + (ev: { open: boolean }) => { if (!ev.open) { const allowedTypes = [TransactionStateType.HASH, TransactionStateType.CONFIRMED] if (!allowedTypes.includes(purchaseState.type)) return diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx index ab5233b8f5c1..7ff23aef19e7 100644 --- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx +++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx @@ -110,7 +110,7 @@ export function NFTAvatar(props: NFTAvatarProps) { setSelectedToken(undefined) }, [onChange, selectedToken]) - const onAddClick = useCallback((token) => { + const onAddClick = useCallback((token: ERC721TokenDetailed) => { setSelectedToken(token) setCollectibles_((tokens) => uniqBy([token, ...tokens], (x) => x.contractDetailed.address && x.tokenId)) }, []) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx index 5bd6a4855a44..f0b8f0a75305 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx @@ -88,27 +88,29 @@ export function OrderRow({ order, isDifferenceToken }: IRowProps) { <> - {provider === NonFungibleAssetProvider.OPENSEA ? ( - - {order.payment_token_contract?.image_url && ( - {order.payment_token_contract?.symbol} - )} - - ) : null} - {getOrderUnitPrice( - order.current_price, - order.payment_token_contract?.decimals, - order.quantity, - )}{' '} - {order.payment_token_contract?.symbol} + <> + {provider === NonFungibleAssetProvider.OPENSEA ? ( + + {order.payment_token_contract?.image_url && ( + {order.payment_token_contract?.symbol} + )} + + ) : null} + {getOrderUnitPrice( + order.current_price, + order.payment_token_contract?.decimals, + order.quantity, + )}{' '} + {order.payment_token_contract?.symbol} + diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx index e629a535a458..7a8d14bb20d2 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx @@ -117,7 +117,7 @@ export function CheckoutDialog(props: CheckoutDialogProps) { const { setDialog: setTransactionDialog } = useRemoteControlledDialog( WalletMessages.events.transactionDialogUpdated, useCallback( - (ev) => { + (ev: { open: boolean }) => { if (!ev.open) { if (purchaseState.type === TransactionStateType.HASH) onClose() } diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx index eb1a07ac67be..061bf046af62 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx @@ -131,7 +131,7 @@ export function MakeOfferDialog(props: MakeOfferDialogProps) { const { setDialog: setTransactionDialog } = useRemoteControlledDialog( WalletMessages.events.transactionDialogUpdated, useCallback( - (ev) => { + (ev: { open: boolean }) => { if (!ev.open) { if (placeBidState.type === TransactionStateType.HASH) onClose() if (placeBidState.type === TransactionStateType.CONFIRMED) { diff --git a/packages/mask/src/plugins/FindTruman/SNSAdaptor/LoadingFailCard.tsx b/packages/mask/src/plugins/FindTruman/SNSAdaptor/LoadingFailCard.tsx index 6e3289e6a725..3d64d3699033 100644 --- a/packages/mask/src/plugins/FindTruman/SNSAdaptor/LoadingFailCard.tsx +++ b/packages/mask/src/plugins/FindTruman/SNSAdaptor/LoadingFailCard.tsx @@ -2,7 +2,9 @@ import { Component } from 'react' import { FindTrumanCard } from './FindTrumanCard' import { Typography, Button } from '@mui/material' -export class LoadingFailCard extends Component<{ title: string; retry: () => void; isFullPluginDown?: boolean }> { +export class LoadingFailCard extends Component< + React.PropsWithChildren<{ title: string; retry: () => void; isFullPluginDown?: boolean }> +> { static getDerivedStateFromError(error: unknown) { return { error } } diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/RegionSelect.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/RegionSelect.tsx index c3096c60e708..0abfe7e7b1df 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/RegionSelect.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/RegionSelect.tsx @@ -74,7 +74,7 @@ export const RegionSelect = forwardRef(({ value = [], onRegionChange, ...props } const displayRef = useRef() const [anchorEl, setAnchorEl] = useState(null) const [open, setOpen] = useState(false) - const handleDisplayRef = useCallback((node) => { + const handleDisplayRef = useCallback((node: HTMLElement | null) => { displayRef.current = node if (node) setAnchorEl(node) }, []) diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx index d88bf44cac20..f1f05be2b2a0 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/index.tsx @@ -52,14 +52,12 @@ const sns: Plugin.SNSAdaptor.Definition = { dialog({ open, onClose }) { return }, - label: { - fallback: ( - <> - - ITO - - ), - }, + label: ( + <> + + ITO + + ), }, ApplicationEntries: [ { diff --git a/packages/mask/src/plugins/NextID/components/Tip/TipTaskManager.tsx b/packages/mask/src/plugins/NextID/components/Tip/TipTaskManager.tsx index 0f1cff3df855..fe2d7bc659e8 100644 --- a/packages/mask/src/plugins/NextID/components/Tip/TipTaskManager.tsx +++ b/packages/mask/src/plugins/NextID/components/Tip/TipTaskManager.tsx @@ -10,7 +10,7 @@ let id = 0 interface Task extends TipTask { id: number } -export const TipTaskManager: FC = ({ children }) => { +export const TipTaskManager: FC> = ({ children }) => { const [tasks, setTasks] = useState(EMPTY_LIST) const removeTask = useCallback((task: Task) => { diff --git a/packages/mask/src/plugins/NextID/contexts/RootContext.tsx b/packages/mask/src/plugins/NextID/contexts/RootContext.tsx index fbb81ad990d7..6a35beb5686e 100644 --- a/packages/mask/src/plugins/NextID/contexts/RootContext.tsx +++ b/packages/mask/src/plugins/NextID/contexts/RootContext.tsx @@ -1,6 +1,6 @@ -import type { FC } from 'react' +import type { FC, PropsWithChildren } from 'react' import { TargetChainIdContext } from './TargetChainIdContext' -export const RootContext: FC = ({ children }) => { +export const RootContext: FC> = ({ children }) => { return {children} } diff --git a/packages/mask/src/plugins/NextID/contexts/Tip/TipTaskProvider.tsx b/packages/mask/src/plugins/NextID/contexts/Tip/TipTaskProvider.tsx index 7b8722fa717e..1c71b88292ca 100644 --- a/packages/mask/src/plugins/NextID/contexts/Tip/TipTaskProvider.tsx +++ b/packages/mask/src/plugins/NextID/contexts/Tip/TipTaskProvider.tsx @@ -17,7 +17,7 @@ interface Props { task: TipTask } -export const TipTaskProvider: FC = ({ children, task }) => { +export const TipTaskProvider: FC> = ({ children, task }) => { const [recipient, setRecipient] = useState('') const [tipType, setTipType] = useState(TipType.Token) const [amount, setAmount] = useState('') diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/Drag.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/Drag.tsx index 70ff082eceb5..5ab3a54fd214 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/Drag.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/Drag.tsx @@ -22,7 +22,8 @@ interface DraggableProps { moveHandle?: (x: number, y: number) => void } -class Draggable extends React.PureComponent { +// TODO: move to function components +class Draggable extends React.PureComponent> { ref = React.createRef() mouseMoveFuc = this.onMouseMove.bind(this) mouseUpFuc = this.onMouseUp.bind(this) diff --git a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx index d6005b4826e2..1ebc32698a11 100644 --- a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx +++ b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx @@ -148,7 +148,7 @@ export function DepositDialog() { const { setDialog: openSwapDialog } = useRemoteControlledDialog( PluginTraderMessages.swapDialogUpdated, useCallback( - (ev) => { + (ev: { open: boolean }) => { if (!ev.open) { retryLoadTokenBalance() } @@ -194,7 +194,7 @@ export function DepositDialog() { const { setDialog: setTransactionDialogOpen } = useRemoteControlledDialog( WalletMessages.events.transactionDialogUpdated, useCallback( - (ev) => { + (ev: { open: boolean }) => { if (!ev.open) { retryLoadTokenBalance() if (depositState.type === TransactionStateType.HASH) onClose() diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx index e8e633e2390e..950ebfcaeecb 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/index.tsx @@ -83,14 +83,12 @@ const sns: Plugin.SNSAdaptor.Definition = { ]), CompositionDialogEntry: { dialog: RedPacketDialog, - label: { - fallback: ( - <> - - Luck drop - - ), - }, + label: ( + <> + + Luck drop + + ), }, ApplicationEntries: [ { diff --git a/packages/mask/src/plugins/Snapshot/SNSAdaptor/LoadingFailCard.tsx b/packages/mask/src/plugins/Snapshot/SNSAdaptor/LoadingFailCard.tsx index 0e054adfce28..fdb45c198733 100644 --- a/packages/mask/src/plugins/Snapshot/SNSAdaptor/LoadingFailCard.tsx +++ b/packages/mask/src/plugins/Snapshot/SNSAdaptor/LoadingFailCard.tsx @@ -1,8 +1,10 @@ -import { Component } from 'react' +import { Component, PropsWithChildren } from 'react' import { SnapshotCard } from './SnapshotCard' import { Typography, Button } from '@mui/material' -export class LoadingFailCard extends Component<{ title: string; retry: () => void; isFullPluginDown?: boolean }> { +export class LoadingFailCard extends Component< + PropsWithChildren<{ title: string; retry: () => void; isFullPluginDown?: boolean }> +> { static getDerivedStateFromError(error: unknown) { return { error } } diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx index 27642f95a731..577ee9359008 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx @@ -13,8 +13,6 @@ export interface TrendingPopperProps { PopperProps?: Partial } -const TIMEOUT = 1500 - export function TrendingPopper(props: TrendingPopperProps) { const popperRef = useRef<{ update(): void } | null>(null) const [freezed, setFreezed] = useState(false) // disable any click @@ -24,10 +22,9 @@ export function TrendingPopper(props: TrendingPopperProps) { const [anchorEl, setAnchorEl] = useState(null) const [availableDataProviders, setAvailableDataProviders] = useState([]) const popper = useRef(null) - const [mouseIn, setMouseIn] = useState(false) // #region select token and provider dialog could be open by trending view - const onFreezed = useCallback((ev) => setFreezed(ev.open), []) + const onFreezed = useCallback((ev: { open: boolean }) => setFreezed(ev.open), []) useRemoteControlledDialog(WalletMessages.events.transactionDialogUpdated, onFreezed) useRemoteControlledDialog(WalletMessages.events.walletStatusDialogUpdated, onFreezed) useRemoteControlledDialog(WalletMessages.events.selectProviderDialogUpdated, onFreezed) diff --git a/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/LockInList.tsx b/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/LockInList.tsx index c879ecf7aa88..d084feef0381 100644 --- a/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/LockInList.tsx +++ b/packages/mask/src/plugins/UnlockProtocol/SNSAdaptor/LockInList.tsx @@ -1,7 +1,7 @@ import { ListItem, ListItemText, Checkbox } from '@mui/material' import { makeStyles } from '@masknet/theme' import classNames from 'classnames' -import { ChangeEvent, useCallback } from 'react' +import { MouseEvent, useCallback } from 'react' import type { DefaultComponentProps } from '@mui/material/OverridableComponent' import type { CheckboxProps } from '@mui/material/Checkbox' import type { ListItemTypeMap } from '@mui/material/ListItem' @@ -28,7 +28,7 @@ export interface LockInListProps { search?: string checked?: boolean disabled?: boolean - onChange: (ev: ChangeEvent, checked: boolean) => void + onChange: (ev: MouseEvent, checked: boolean) => void CheckboxProps?: Partial ListItemProps?: Partial>> } @@ -38,7 +38,7 @@ export function LockInList(props: LockInListProps) { const lock = props.item const name = lock.lock.name const secondary = lock.lock.address - const onClick = useCallback((ev) => props.onChange(ev, !props.checked), [props]) + const onClick = useCallback((ev: MouseEvent) => props.onChange(ev, !props.checked), [props]) return ( 'An Unlock Protocol post has been added'], ]), CompositionDialogEntry: { - label: { - fallback: ( - <> - - {pluginName} - - ), - }, + label: ( + <> + + {pluginName} + + ), dialog: UnlockProtocolDialog, }, } diff --git a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx index 88cf755db47f..5917f8bb5148 100644 --- a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx +++ b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx @@ -105,7 +105,7 @@ export function InvestDialog() { const { setDialog: openSwapDialog } = useRemoteControlledDialog( PluginTraderMessages.swapDialogUpdated, useCallback( - (ev) => { + (ev: { open: boolean }) => { if (!ev.open) { retryLoadTokenBalance() } @@ -149,7 +149,7 @@ export function InvestDialog() { const { setDialog: setTransactionDialogOpen } = useRemoteControlledDialog( WalletMessages.events.transactionDialogUpdated, useCallback( - (ev) => { + (ev: { open: boolean }) => { if (!ev.open) { retryLoadTokenBalance() if (investState.type === TransactionStateType.HASH) onClose() diff --git a/packages/mask/src/social-network/defaults/inject/CommentBox.tsx b/packages/mask/src/social-network/defaults/inject/CommentBox.tsx index 5e046a648995..fc120931887f 100644 --- a/packages/mask/src/social-network/defaults/inject/CommentBox.tsx +++ b/packages/mask/src/social-network/defaults/inject/CommentBox.tsx @@ -35,7 +35,7 @@ export const injectCommentBoxDefaultFactory = function ( const iv = usePostInfoDetails.iv() const props = additionPropsToCommentBox(classes) const onCallback = useCallback( - async (content) => { + async (content: string) => { const decryptedText = extractTextFromTypedMessage(postContent).unwrap() const encryptedComment = await Services.Crypto.encryptComment( new Uint8Array(decodeArrayBuffer(iv!)), diff --git a/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx b/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx index 2697d0f2795d..f9f211595c2c 100644 --- a/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumERC20TokenApprovedBoundary.tsx @@ -79,7 +79,7 @@ export function EthereumERC20TokenApprovedBoundary(props: EthereumERC20TokenAppr ) // not a valid erc20 token, please given token as undefined - if (!token) return {render ? render(false) : children} + if (!token) return {render ? (render(false) as any) : children} if (approveStateType === ApproveStateType.UNKNOWN) return ( @@ -93,7 +93,9 @@ export function EthereumERC20TokenApprovedBoundary(props: EthereumERC20TokenAppr {...props.ActionButtonProps}> {fallback ?? 'Enter an amount'} - {withChildren ? {render ? render(true) : children} : null} + {withChildren ? ( + {render ? (render(true) as any) : children} + ) : null} ) if (approveStateType === ApproveStateType.FAILED) @@ -108,7 +110,9 @@ export function EthereumERC20TokenApprovedBoundary(props: EthereumERC20TokenAppr {...props.ActionButtonProps}> {t('wallet_load_retry', { symbol: token.symbol ?? token.name ?? 'Token' })} - {withChildren ? {render ? render(true) : children} : null} + {withChildren ? ( + {render ? (render(true) as any) : children} + ) : null} ) if (approveStateType === ApproveStateType.NOT_APPROVED) @@ -143,7 +147,9 @@ export function EthereumERC20TokenApprovedBoundary(props: EthereumERC20TokenAppr - {withChildren ? {render ? render(true) : children} : null} + {withChildren ? ( + {render ? (render(true) as any) : children} + ) : null} ) if (approveStateType === ApproveStateType.PENDING || approveStateType === ApproveStateType.UPDATING) diff --git a/packages/plugins/FileService/src/SNSAdaptor/components/Copyable.tsx b/packages/plugins/FileService/src/SNSAdaptor/components/Copyable.tsx index 4e43e92e224d..395b740f385f 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/components/Copyable.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/components/Copyable.tsx @@ -2,7 +2,7 @@ interface Props { className?: string } -export const CopyableCode: React.FC = ({ children, className }) => { +export const CopyableCode: React.FC> = ({ children, className }) => { const onSelect = (event: React.MouseEvent) => { const selection = globalThis.getSelection() if (selection === null) { diff --git a/packages/plugins/FileService/src/SNSAdaptor/hooks/Exchange.tsx b/packages/plugins/FileService/src/SNSAdaptor/hooks/Exchange.tsx index b05801493a65..196fb1b835be 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/hooks/Exchange.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/hooks/Exchange.tsx @@ -2,7 +2,7 @@ import { noop, omit } from 'lodash-unified' import { createContext, useContext } from 'react' import type { FileInfo, DialogCloseCallback } from '../../types' -export interface Props { +export interface Props extends React.PropsWithChildren<{}> { onInsert(info: FileInfo | null): void onUploading(enabled: boolean): void onDialogClose(cb: DialogCloseCallback): void diff --git a/packages/plugins/FileService/src/SNSAdaptor/index.tsx b/packages/plugins/FileService/src/SNSAdaptor/index.tsx index b38c6466452a..0b6c3f0175b9 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/index.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/index.tsx @@ -24,14 +24,12 @@ const definition: Plugin.SNSAdaptor.Definition = { [META_KEY_2, onAttachedFile], ]), CompositionDialogEntry: { - label: { - fallback: ( - <> - - File Service - - ), - }, + label: ( + <> + + File Service + + ), dialog: FileServiceDialog, }, ApplicationEntries: [ diff --git a/packages/shared-base-ui/src/components/ErrorBoundary/CrashUI.tsx b/packages/shared-base-ui/src/components/ErrorBoundary/CrashUI.tsx index 597585ac980f..ed31bb3aaf76 100644 --- a/packages/shared-base-ui/src/components/ErrorBoundary/CrashUI.tsx +++ b/packages/shared-base-ui/src/components/ErrorBoundary/CrashUI.tsx @@ -6,7 +6,7 @@ import ExpandMore from '@mui/icons-material/ExpandMore' import { ErrorBoundaryBuildInfoContext, ErrorBoundaryError } from './context' import { useSharedBaseI18N } from '../../locales' -export type CrashUIProps = ErrorBoundaryError & { +export interface CrashUIProps extends React.PropsWithChildren { /** Type of the Error */ type: string /** The Error message */ diff --git a/packages/shared/src/UI/components/I18NextProviderHMR.tsx b/packages/shared/src/UI/components/I18NextProviderHMR.tsx index ed52432832b5..63c3d1dce579 100644 --- a/packages/shared/src/UI/components/I18NextProviderHMR.tsx +++ b/packages/shared/src/UI/components/I18NextProviderHMR.tsx @@ -23,6 +23,7 @@ export const I18NextProviderHMR = return I18nextProvider({ i18n, defaultNS, + // @ts-expect-error react-18 children, }) } diff --git a/packages/shared/src/contexts/SharedContextProvider.tsx b/packages/shared/src/contexts/SharedContextProvider.tsx index 4191366944a1..67838690496c 100644 --- a/packages/shared/src/contexts/SharedContextProvider.tsx +++ b/packages/shared/src/contexts/SharedContextProvider.tsx @@ -1,8 +1,8 @@ -import type { FC } from 'react' +import type { FC, PropsWithChildren } from 'react' import { BaseSharedUIProvider } from './base' import { EvmSharedUIProvider } from './evm' -export const SharedContextProvider: FC = ({ children }) => { +export const SharedContextProvider: FC> = ({ children }) => { return ( {children} diff --git a/packages/shared/src/contexts/base/BaseSharedUIProvider.tsx b/packages/shared/src/contexts/base/BaseSharedUIProvider.tsx index bcaee9b4979b..4ce536fee9af 100644 --- a/packages/shared/src/contexts/base/BaseSharedUIProvider.tsx +++ b/packages/shared/src/contexts/base/BaseSharedUIProvider.tsx @@ -1,5 +1,5 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' -import { createContext, FC, useContext, useMemo } from 'react' +import { createContext, FC, PropsWithChildren, useContext, useMemo } from 'react' import { useValueRef } from '@masknet/shared-base-ui' import type { SharedComponentOverwrite } from './types' @@ -16,7 +16,7 @@ const BaseUIContext = createContext({ componentOverwrite: sharedUIComponentOverwrite.value, }) -export const BaseSharedUIProvider: FC = ({ children }) => { +export const BaseSharedUIProvider: FC> = ({ children }) => { const snsId = useValueRef(sharedUINetworkIdentifier) const overwrite = useValueRef(sharedUIComponentOverwrite) diff --git a/packages/shared/src/contexts/evm/TokenPicker/index.tsx b/packages/shared/src/contexts/evm/TokenPicker/index.tsx index 7751c4be66ee..b5abae98c24f 100644 --- a/packages/shared/src/contexts/evm/TokenPicker/index.tsx +++ b/packages/shared/src/contexts/evm/TokenPicker/index.tsx @@ -1,7 +1,7 @@ import { defer, DeferTuple } from '@dimensiondev/kit' import { EMPTY_LIST } from '@masknet/shared-base' import type { FungibleTokenDetailed } from '@masknet/web3-shared-evm' -import { createContext, FC, useCallback, useContext, useMemo, useState } from 'react' +import { createContext, FC, PropsWithChildren, useCallback, useContext, useMemo, useState } from 'react' import { PickTokenOptions, SelectTokenDialog } from './SelectTokenDialog' interface ContextOptions { @@ -20,7 +20,7 @@ interface Task { } let id = 0 -export const TokenPickerProvider: FC = ({ children }) => { +export const TokenPickerProvider: FC> = ({ children }) => { const [tasks, setTasks] = useState(EMPTY_LIST) const removeTask = useCallback((task: Task) => { diff --git a/packages/shared/src/contexts/evm/index.tsx b/packages/shared/src/contexts/evm/index.tsx index 6f1f934b17e0..c021f0bf571c 100644 --- a/packages/shared/src/contexts/evm/index.tsx +++ b/packages/shared/src/contexts/evm/index.tsx @@ -1,8 +1,8 @@ -import type { FC } from 'react' +import type { FC, PropsWithChildren } from 'react' import { TokenPickerProvider } from './TokenPicker' export * from './TokenPicker' -export const EvmSharedUIProvider: FC = ({ children }) => { +export const EvmSharedUIProvider: FC> = ({ children }) => { return {children} } diff --git a/packages/shared/src/hooks/useSnackbarCallback.tsx b/packages/shared/src/hooks/useSnackbarCallback.tsx index ddcd076a262b..800f5a493304 100644 --- a/packages/shared/src/hooks/useSnackbarCallback.tsx +++ b/packages/shared/src/hooks/useSnackbarCallback.tsx @@ -33,7 +33,7 @@ export function useSnackbarCallback

Promise, T> ] } return useCallback( - (...args) => + (...args: any[]) => executor(...args).then( (res) => { showSnackbar(successText ?? t.snackbar_done(), { diff --git a/packages/shared/src/wallet/FormattedBalance.tsx b/packages/shared/src/wallet/FormattedBalance.tsx index 0918204964db..4559d3e5e7b5 100644 --- a/packages/shared/src/wallet/FormattedBalance.tsx +++ b/packages/shared/src/wallet/FormattedBalance.tsx @@ -29,9 +29,9 @@ export const FormattedBalance: FC = (props) => { if (symbol) return ( - {formatted} + {String(formatted)} {symbol} ) - return {formatted} + return {String(formatted)} } diff --git a/packages/theme/src/Components/SearchableList/MaskSearchableItemInList.tsx b/packages/theme/src/Components/SearchableList/MaskSearchableItemInList.tsx index ce9d72ff4c8e..9439d792d923 100644 --- a/packages/theme/src/Components/SearchableList/MaskSearchableItemInList.tsx +++ b/packages/theme/src/Components/SearchableList/MaskSearchableItemInList.tsx @@ -17,9 +17,6 @@ export interface MaskSearchableListItemProps extends React.PropsWithChildren< export const MaskSearchableItemInList = ({ children, data, index, style }: FixSizeListItemProps) => (

- {React.createElement>( - children as React.FunctionComponent>, - { data: data.dataSet[index], index: index, onSelect: data.onSelect }, - )} + {React.createElement(children as any, { data: data.dataSet[index], index: index, onSelect: data.onSelect })}
) diff --git a/packages/theme/src/Components/SearchableList/SearchableList.tsx b/packages/theme/src/Components/SearchableList/SearchableList.tsx index b82946e60904..4bc8abaa134b 100644 --- a/packages/theme/src/Components/SearchableList/SearchableList.tsx +++ b/packages/theme/src/Components/SearchableList/SearchableList.tsx @@ -18,7 +18,7 @@ export interface MaskSearchableListProps { /** The key of list item for search */ searchKey?: string[] /** Renderer for each list item */ - itemRender: ReactNode + itemRender: React.ComponentType<{ data: T; index: number; onSelect(): void }> /** The props to react-window */ FixedSizeListProps?: Partial /** The callback when clicked someone list item */ @@ -126,7 +126,9 @@ export function SearchableList({ }} itemCount={readyToRenderData.length} {...rest}> - {(props) => {...props}>{itemRender}} + {(props) => ( + {...props}>{itemRender as any} + )}
)} diff --git a/packages/theme/src/Components/Snackbar/index.tsx b/packages/theme/src/Components/Snackbar/index.tsx index c2820d301b4d..3c584ca25992 100644 --- a/packages/theme/src/Components/Snackbar/index.tsx +++ b/packages/theme/src/Components/Snackbar/index.tsx @@ -188,7 +188,7 @@ export const CustomSnackbarContent = forwardRef const variantIcon = props.processing ? loadingIcon : props.variant ? IconMap[props.variant] : null - let renderedAction = ( + let renderedAction: React.ReactNode = ( snackbar.closeSnackbar(props.id)}> diff --git a/packages/web3-shared/base/src/hooks/useBeat.ts b/packages/web3-shared/base/src/hooks/useBeat.ts index b675feffcb06..afe76eab4307 100644 --- a/packages/web3-shared/base/src/hooks/useBeat.ts +++ b/packages/web3-shared/base/src/hooks/useBeat.ts @@ -13,5 +13,5 @@ export function useBeat(delay = 1000) { export function useBeatRetry(fn: () => Promise, delay = 1000, deps: DependencyList = []): AsyncStateRetry { const beat = useBeat(delay) - return useAsyncRetry(fn, [beat].concat(deps)) + return useAsyncRetry(fn, deps.concat(beat)) } From 9ecba826edaa0e301361201cbd9fc6b5b884ba6f Mon Sep 17 00:00:00 2001 From: Jack Works Date: Sat, 9 Apr 2022 16:50:08 +0800 Subject: [PATCH 3/3] fix: lockfile --- pnpm-lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf9aca4373dc..fd105f6a037d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27356,7 +27356,7 @@ packages: dev: false github.com/ProjectOpenSea/wyvern-schemas/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26: - resolution: {commit: e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26, repo: git+ssh://git@github.com/ProjectOpenSea/wyvern-schemas.git, type: git} + resolution: {tarball: https://codeload.github.com/ProjectOpenSea/wyvern-schemas/tar.gz/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26} name: wyvern-schemas version: 0.10.7 dependencies: @@ -27371,7 +27371,7 @@ packages: dev: false github.com/ProjectWyvern/ethereumjs-abi/3d2d89641a6ad5984929b6ca4b646452ec74f73d: - resolution: {commit: 3d2d89641a6ad5984929b6ca4b646452ec74f73d, repo: git+ssh://git@github.com/ProjectWyvern/ethereumjs-abi.git, type: git} + resolution: {tarball: https://codeload.github.com/ProjectWyvern/ethereumjs-abi/tar.gz/3d2d89641a6ad5984929b6ca4b646452ec74f73d} name: ethereumjs-abi version: 0.6.6 dependencies: @@ -27388,7 +27388,7 @@ packages: dev: false github.com/ethereumjs/ethereumjs-abi/ee3994657fa7a427238e6ba92a84d0b529bbcde0: - resolution: {commit: ee3994657fa7a427238e6ba92a84d0b529bbcde0, repo: git+ssh://git@github.com/ethereumjs/ethereumjs-abi.git, type: git} + resolution: {tarball: https://codeload.github.com/ethereumjs/ethereumjs-abi/tar.gz/ee3994657fa7a427238e6ba92a84d0b529bbcde0} name: ethereumjs-abi version: 0.6.8 dependencies: