From 137ab51d59a11600f4f3beecc5eaf6972ac495d4 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 16:59:19 +0000 Subject: [PATCH 01/78] Update tailwind to 3.2.7 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0eadb8f32..49eb71214 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "react-dom": "^18.2.0", "source-map-explorer": "^2.5.3", "tailwind-merge": "^1.13.2", - "tailwindcss": "3.1.8", + "tailwindcss": "3.2.7", "typechain": "^8.1.0", "typescript": "^5.3.3", "ua-parser-js": "^1.0.35", @@ -124,4 +124,4 @@ "devDependencies": { "@types/d3": "^7.4.3" } -} +} \ No newline at end of file From dc66a4e3aa055382926323c0a8fc543c25f273a9 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 16:59:36 +0000 Subject: [PATCH 02/78] Fix date picker className precedence --- src/components/common/calendar/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/common/calendar/index.tsx b/src/components/common/calendar/index.tsx index bebb49eec..eeea211c9 100644 --- a/src/components/common/calendar/index.tsx +++ b/src/components/common/calendar/index.tsx @@ -32,17 +32,17 @@ export const Calendar = ({ day: cn( 'text-white/60 h-32 w-36 p-0 rounded-8 border-box', 'focus-visible:border focus-visible:border-white/50 focus-visible:outline-none', - 'hover:bg-background-900 hover:text-white' + 'hover:!bg-background-900 hover:text-white' ), day_selected: - 'focus-visible:bg-primary/80 font-weight-500 text-white bg-primary/20 rounded-0 [&:not(.outside)]:opacity-100', + 'focus-visible:bg-primary/80 font-weight-500 !text-white bg-primary/20 !rounded-0 [&:not(.outside)]:opacity-100', day_range_start: - 'rounded-l-8 [&:not(.outside)]:bg-primary [&:not(.outside)]:text-black', + '!rounded-l-8 [&:not(.outside)]:!bg-primary [&:not(.outside)]:!text-black', day_range_end: - 'rounded-r-8 [&:not(.outside)]:bg-primary [&:not(.outside)]:text-black', + '!rounded-r-8 [&:not(.outside)]:!bg-primary [&:not(.outside)]:!text-black', day_today: 'border border-white/80', day_outside: 'outside opacity-20', - day_disabled: 'text-white/20 opacity-50', + day_disabled: '!text-white/20 !opacity-50', day_range_middle: 'aria-selected:bg-primary/20', day_hidden: 'invisible', ...classNames, From b8f68fba52d3df7c461f34d5c3a5d1cfa62579a1 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 16:59:54 +0000 Subject: [PATCH 03/78] Fix tab menu class priority using button variant --- src/components/common/tabs/TabsMenuButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/tabs/TabsMenuButton.tsx b/src/components/common/tabs/TabsMenuButton.tsx index 3cf2472c7..f9fccc962 100644 --- a/src/components/common/tabs/TabsMenuButton.tsx +++ b/src/components/common/tabs/TabsMenuButton.tsx @@ -13,7 +13,7 @@ export const TabsMenuButton: FC = ({ children, isActive, ...props }) => { type="button" variant={variant} size="sm" - className="rounded-8 text-14" + className="!rounded-8 !text-14" fullWidth {...props} > From 0b26fe74012f17dc402edd98220239af59054ee1 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 17:00:43 +0000 Subject: [PATCH 04/78] Use class name merger wherever className is passed as prop --- .../common/TokenInputField/TokenInputField.tsx | 18 +++++++++++------- .../common/WarningMessageWithIcon.tsx | 6 +++++- .../WarningWithTooltip/WarningWithTooltip.tsx | 3 ++- src/components/common/forwardArrow.tsx | 3 ++- src/components/common/tooltip/Tooltip.tsx | 10 ++++++---- .../mainMenu/MainMenuRightBurger/MenuItem.tsx | 10 +++++++--- src/libs/modals/Overlay.tsx | 6 +++++- 7 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/components/common/TokenInputField/TokenInputField.tsx b/src/components/common/TokenInputField/TokenInputField.tsx index 52d16c0c9..87e916fe0 100644 --- a/src/components/common/TokenInputField/TokenInputField.tsx +++ b/src/components/common/TokenInputField/TokenInputField.tsx @@ -5,7 +5,12 @@ import { useWeb3 } from 'libs/web3'; import { useFiatCurrency } from 'hooks/useFiatCurrency'; import { LogoImager } from 'components/common/imager/Imager'; import { Slippage } from './Slippage'; -import { prettifyNumber, formatNumber, sanitizeNumber } from 'utils/helpers'; +import { + prettifyNumber, + formatNumber, + sanitizeNumber, + cn, +} from 'utils/helpers'; import { decimalNumberValidationRegex } from 'utils/inputsValidations'; type Props = { @@ -73,12 +78,11 @@ export const TokenInputField: FC = ({ return (
inputRef.current?.focus()} >
diff --git a/src/components/common/WarningMessageWithIcon.tsx b/src/components/common/WarningMessageWithIcon.tsx index e60a8179f..1a5605408 100644 --- a/src/components/common/WarningMessageWithIcon.tsx +++ b/src/components/common/WarningMessageWithIcon.tsx @@ -1,5 +1,6 @@ import { ReactComponent as IconWarning } from 'assets/icons/warning.svg'; import { FC, ReactNode } from 'react'; +import { cn } from 'utils/helpers'; type WarningMessageWithIconProps = { htmlFor?: string; @@ -19,7 +20,10 @@ export const WarningMessageWithIcon: FC = ({ htmlFor={htmlFor} role="alert" aria-live="polite" - className={`flex items-center gap-10 font-mono text-12 text-warning ${className}`} + className={cn( + 'flex items-center gap-10 font-mono !text-12 text-warning', + className + )} > {children ?? message} diff --git a/src/components/common/WarningWithTooltip/WarningWithTooltip.tsx b/src/components/common/WarningWithTooltip/WarningWithTooltip.tsx index bfe15677b..cc0c02bfa 100644 --- a/src/components/common/WarningWithTooltip/WarningWithTooltip.tsx +++ b/src/components/common/WarningWithTooltip/WarningWithTooltip.tsx @@ -1,5 +1,6 @@ import { ReactComponent as IconWarning } from 'assets/icons/warning.svg'; import { Tooltip } from 'components/common/tooltip/Tooltip'; +import { cn } from 'utils/helpers'; type WarningWithTooltipProps = { tooltipContent: string; @@ -13,7 +14,7 @@ export const WarningWithTooltip = ({ return ( - + ); diff --git a/src/components/common/forwardArrow.tsx b/src/components/common/forwardArrow.tsx index 050c8ae5d..2ff49daf8 100644 --- a/src/components/common/forwardArrow.tsx +++ b/src/components/common/forwardArrow.tsx @@ -1,6 +1,7 @@ import { FC } from 'react'; import { ReactComponent as IconArrowCut } from 'assets/icons/arrow-cut.svg'; import { ReactComponent as IconArrowFull } from 'assets/icons/arrow.svg'; +import { cn } from 'utils/helpers'; export type ForwardArrowProps = { arrowType?: 'full' | 'cut'; @@ -11,7 +12,7 @@ export const ForwardArrow: FC = ({ arrowType = 'cut', className = '', }) => { - const newClassName = `h-12 w-7 ${className}`; + const newClassName = cn('h-12 w-7', className); return arrowType === 'cut' ? ( diff --git a/src/components/common/tooltip/Tooltip.tsx b/src/components/common/tooltip/Tooltip.tsx index e4a4c8a3d..d3182fc73 100644 --- a/src/components/common/tooltip/Tooltip.tsx +++ b/src/components/common/tooltip/Tooltip.tsx @@ -5,6 +5,7 @@ import { Instance } from 'tippy.js'; import { ReactComponent as IconTooltip } from 'assets/icons/tooltip.svg'; import ReactDOMServer from 'react-dom/server'; import { carbonEvents } from 'services/events'; +import { cn } from 'utils/helpers'; interface Props extends TippyProps { element: ReactNode; @@ -29,9 +30,7 @@ export const Tooltip: FC = ({ stiffness = 300, children = ( - + ), ...props @@ -78,7 +77,10 @@ export const Tooltip: FC = ({ delay={500} render={(attrs) => ( = ({ item }) => { return (
item.onClick && item.onClick()} - className={`text-18 md:text-16 ${ - disableHoverEffect ? 'p-4' : 'p-10 md:hover:bg-black' - } block cursor-pointer rounded-6 md:hover:text-white ${className}`} + className={cn( + 'text-18 md:text-16', + disableHoverEffect ? 'p-4' : 'p-10 md:hover:bg-black', + 'block cursor-pointer rounded-6 md:hover:text-white', + className + )} >
= ({ children, onClick, className }) => { initial="hidden" animate="visible" exit="exit" - className={`fixed inset-0 z-40 flex overflow-hidden bg-black/70 outline-none backdrop-blur focus:outline-none ${className}`} + className={cn( + 'fixed inset-0 z-40 flex overflow-hidden bg-black/70 outline-none backdrop-blur focus:outline-none', + className + )} > {children} From 4e364af539b27ae05072f2c98bbdcd2a43e947b2 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 17:01:21 +0000 Subject: [PATCH 05/78] Fix fork alert with wrongly set padding --- src/components/core/menu/mainMenu/MainMenuRight.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/core/menu/mainMenu/MainMenuRight.tsx b/src/components/core/menu/mainMenu/MainMenuRight.tsx index e15598c62..8d822ce41 100644 --- a/src/components/core/menu/mainMenu/MainMenuRight.tsx +++ b/src/components/core/menu/mainMenu/MainMenuRight.tsx @@ -9,7 +9,7 @@ import { useBurgerMenuItems } from './MainMenuRightBurger/useBurgerMenuItems'; const TenderlyForkAlert = () => { return IS_TENDERLY_FORK ? ( - ) : null; From e3a9320d80d5cfbd1f4b0d93fb9079ffd07a5e69 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 17:01:37 +0000 Subject: [PATCH 06/78] Fix main menu trade pairs wrongly setting background --- src/components/core/menu/mainMenu/MainMenuTradePairs.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/core/menu/mainMenu/MainMenuTradePairs.tsx b/src/components/core/menu/mainMenu/MainMenuTradePairs.tsx index 65ba0573d..a8e8c4b08 100644 --- a/src/components/core/menu/mainMenu/MainMenuTradePairs.tsx +++ b/src/components/core/menu/mainMenu/MainMenuTradePairs.tsx @@ -25,7 +25,7 @@ export const MainMenuTradePairs: FC = ({ baseToken, quoteToken }) => { }); }} data-testid="select-trade-pair" - className="flex items-center gap-10 rounded-full bg-background-900 py-5 pl-15 pr-15" + className="flex items-center gap-10 rounded-full py-5 pl-15 pr-15" > {`${baseToken.symbol} - ${quoteToken.symbol}`} From 8f1526228579571e54345316fe2881052e178252 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 17:01:51 +0000 Subject: [PATCH 07/78] Adjust trade settings row className priority --- src/components/trade/settings/TradeSettingsRow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/trade/settings/TradeSettingsRow.tsx b/src/components/trade/settings/TradeSettingsRow.tsx index b46a73983..5d70cc76f 100644 --- a/src/components/trade/settings/TradeSettingsRow.tsx +++ b/src/components/trade/settings/TradeSettingsRow.tsx @@ -11,7 +11,7 @@ import { Button } from 'components/common/button'; import { ReactComponent as IconWarning } from 'assets/icons/warning.svg'; const buttonClasses = - 'rounded-8 !text-white/60 hover:text-primary hover:border-primary px-5'; + '!rounded-8 !text-white/60 hover:text-primary hover:border-primary px-5'; const buttonActiveClasses = '!border-primary'; const buttonErrorClasses = '!border-error !text-error focus:text-error'; const inputClasses = From d4f23caa73a021da8c5ee86f9b7995efc4dbc2ea Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 17:06:56 +0000 Subject: [PATCH 08/78] Update yarn.lock --- yarn.lock | 63 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index 959c5212e..f016b1249 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5961,7 +5961,18 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== -fast-glob@^3.2.11, fast-glob@^3.2.9: +fast-glob@^3.2.12: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-glob@^3.2.9: version "3.3.1" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== @@ -7164,7 +7175,7 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -micromatch@4.0.5, micromatch@^4.0.4: +micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -7759,14 +7770,14 @@ postcss-load-config@^3.1.4: lilconfig "^2.0.5" yaml "^1.10.2" -postcss-nested@5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" - integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA== +postcss-nested@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735" + integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w== dependencies: - postcss-selector-parser "^6.0.6" + postcss-selector-parser "^6.0.10" -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6: +postcss-selector-parser@^6.0.10: version "6.0.13" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== @@ -7774,12 +7785,29 @@ postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@^6.0.11: + version "6.0.16" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04" + integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.14, postcss@^8.4.27, postcss@^8.4.31, postcss@^8.4.32: +postcss@^8.0.9: + version "8.4.35" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7" + integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.0.2" + +postcss@^8.4.27, postcss@^8.4.31, postcss@^8.4.32: version "8.4.33" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== @@ -8665,10 +8693,10 @@ tailwind-merge@^1.13.2: resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b" integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ== -tailwindcss@3.1.8: - version "3.1.8" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741" - integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g== +tailwindcss@3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.7.tgz#5936dd08c250b05180f0944500c01dce19188c07" + integrity sha512-B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ== dependencies: arg "^5.0.2" chokidar "^3.5.3" @@ -8676,19 +8704,20 @@ tailwindcss@3.1.8: detective "^5.2.1" didyoumean "^1.2.2" dlv "^1.1.3" - fast-glob "^3.2.11" + fast-glob "^3.2.12" glob-parent "^6.0.2" is-glob "^4.0.3" lilconfig "^2.0.6" + micromatch "^4.0.5" normalize-path "^3.0.0" object-hash "^3.0.0" picocolors "^1.0.0" - postcss "^8.4.14" + postcss "^8.0.9" postcss-import "^14.1.0" postcss-js "^4.0.0" postcss-load-config "^3.1.4" - postcss-nested "5.0.6" - postcss-selector-parser "^6.0.10" + postcss-nested "6.0.0" + postcss-selector-parser "^6.0.11" postcss-value-parser "^4.2.0" quick-lru "^5.1.1" resolve "^1.22.1" From 35046754daa8bf6023501437acecc8b40679170d Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 18:37:23 +0000 Subject: [PATCH 09/78] Update tailwind to 3.3.7 --- package.json | 2 +- yarn.lock | 307 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 202 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index 49eb71214..876bf60bc 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "react-dom": "^18.2.0", "source-map-explorer": "^2.5.3", "tailwind-merge": "^1.13.2", - "tailwindcss": "3.2.7", + "tailwindcss": "3.3.7", "typechain": "^8.1.0", "typescript": "^5.3.3", "ua-parser-js": "^1.0.35", diff --git a/yarn.lock b/yarn.lock index f016b1249..b89a6c787 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17,6 +17,11 @@ resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.0.tgz#223572538f6bea336750039bb43a4016dcc8182d" integrity sha512-iowxq3U30sghZotgl4s/oJRci6WPBfNO5YYgk2cIOMCHr3LeGPcsZjCEr+33Q4N+oV3OABDAtA+pyvWjbvBifQ== +"@alloc/quick-lru@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== + "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" @@ -2002,6 +2007,18 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + "@jest/expect-utils@^29.6.2": version "29.6.2" resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.6.2.tgz#1b97f290d0185d264dd9fdec7567a14a38a90534" @@ -2241,6 +2258,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + "@playwright/test@^1.37.1": version "1.37.1" resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.37.1.tgz#e7f44ae0faf1be52d6360c6bbf689fd0057d9b6f" @@ -3854,30 +3876,11 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-node@^1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" - integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== - dependencies: - acorn "^7.0.0" - acorn-walk "^7.0.0" - xtend "^4.0.2" - -acorn-walk@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - acorn-walk@^8.0.2, acorn-walk@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^7.0.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - acorn@^8.1.0, acorn@^8.10.0, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: version "8.10.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" @@ -3955,6 +3958,11 @@ ansi-styles@^6.0.0, ansi-styles@^6.1.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== + anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -4590,7 +4598,7 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== -color-name@^1.1.4, color-name@~1.1.4: +color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -4647,6 +4655,11 @@ commander@^2.20.3: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -4745,7 +4758,7 @@ cross-fetch@^3.1.4, cross-fetch@^3.1.5: dependencies: node-fetch "^2.6.12" -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -5151,11 +5164,6 @@ define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -defined@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf" - integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q== - delaunator@5: version "5.0.0" resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b" @@ -5196,15 +5204,6 @@ detect-browser@5.3.0: resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca" integrity sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w== -detective@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" - integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== - dependencies: - acorn-node "^1.8.2" - defined "^1.0.0" - minimist "^1.2.6" - didyoumean@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" @@ -5961,10 +5960,10 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== -fast-glob@^3.2.12: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== +fast-glob@^3.2.9: + version "3.3.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" + integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -5972,10 +5971,10 @@ fast-glob@^3.2.12: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.2.9: - version "3.3.1" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" - integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== +fast-glob@^3.3.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -6089,6 +6088,14 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -6247,6 +6254,17 @@ glob@9.3.2: minipass "^4.2.4" path-scurry "^1.6.1" +glob@^10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + glob@^7.1.3, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -6743,6 +6761,15 @@ isomorphic-ws@^4.0.1: resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: version "10.8.7" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" @@ -6823,6 +6850,11 @@ jest-util@^29.6.2: graceful-fs "^4.2.9" picomatch "^2.2.3" +jiti@^1.19.1: + version "1.21.0" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" + integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== + js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" @@ -6988,11 +7020,16 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lilconfig@2.1.0, lilconfig@^2.0.5, lilconfig@^2.0.6: +lilconfig@2.1.0, lilconfig@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== +lilconfig@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.1.tgz#9d8a246fa753106cfc205fd2d77042faca56e5e3" + integrity sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ== + lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -7249,6 +7286,13 @@ minimatch@^7.4.1: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.1: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.0, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" @@ -7323,6 +7367,15 @@ multiformats@^9.4.2: resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-9.9.0.tgz#c68354e7d21037a8f1f8833c8ccd68618e8f1d37" integrity sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg== +mz@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + nanoid@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" @@ -7394,7 +7447,7 @@ nwsapi@^2.2.4: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== -object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -7623,7 +7676,7 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-scurry@^1.6.1: +path-scurry@^1.10.1, path-scurry@^1.6.1: version "1.10.1" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== @@ -7717,6 +7770,11 @@ pino@7.11.0: sonic-boom "^2.2.1" thread-stream "^0.15.1" +pirates@^4.0.1: + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + pkg-types@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.3.tgz#988b42ab19254c01614d13f4f65a2cfc7880f868" @@ -7746,44 +7804,36 @@ popmotion@11.0.5: style-value-types "5.1.2" tslib "2.4.0" -postcss-import@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" - integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== +postcss-import@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70" + integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew== dependencies: postcss-value-parser "^4.0.0" read-cache "^1.0.0" resolve "^1.1.7" -postcss-js@^4.0.0: +postcss-js@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2" integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw== dependencies: camelcase-css "^2.0.1" -postcss-load-config@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== - dependencies: - lilconfig "^2.0.5" - yaml "^1.10.2" - -postcss-nested@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735" - integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w== +postcss-load-config@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3" + integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ== dependencies: - postcss-selector-parser "^6.0.10" + lilconfig "^3.0.0" + yaml "^2.3.4" -postcss-selector-parser@^6.0.10: - version "6.0.13" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" - integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== +postcss-nested@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c" + integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ== dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" + postcss-selector-parser "^6.0.11" postcss-selector-parser@^6.0.11: version "6.0.16" @@ -7798,7 +7848,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.0.9: +postcss@^8.4.23: version "8.4.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7" integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA== @@ -7964,11 +8014,6 @@ quick-format-unescaped@^4.0.3: resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7" integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg== -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -8147,7 +8192,7 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve@^1.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22.3, resolve@^1.22.4: +resolve@^1.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.3, resolve@^1.22.4: version "1.22.4" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== @@ -8156,6 +8201,15 @@ resolve@^1.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22 path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.22.2: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^2.0.0-next.4: version "2.0.0-next.4" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" @@ -8390,6 +8444,11 @@ signal-exit@^3.0.2, signal-exit@^3.0.7: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -8510,7 +8569,7 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -string-width@^4.1.0, string-width@^4.2.0: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -8519,7 +8578,7 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^5.0.0, string-width@^5.0.1: +string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== @@ -8576,7 +8635,7 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8627,6 +8686,19 @@ style-value-types@5.1.2: hey-listen "^1.0.8" tslib "2.4.0" +sucrase@^3.32.0: + version "3.35.0" + resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263" + integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA== + dependencies: + "@jridgewell/gen-mapping" "^0.3.2" + commander "^4.0.0" + glob "^10.3.10" + lines-and-columns "^1.1.6" + mz "^2.7.0" + pirates "^4.0.1" + ts-interface-checker "^0.1.9" + superjson@^1.10.0: version "1.13.1" resolved "https://registry.yarnpkg.com/superjson/-/superjson-1.13.1.tgz#a0b6ab5d22876f6207fcb9d08b0cb2acad8ee5cd" @@ -8693,34 +8765,33 @@ tailwind-merge@^1.13.2: resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b" integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ== -tailwindcss@3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.7.tgz#5936dd08c250b05180f0944500c01dce19188c07" - integrity sha512-B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ== +tailwindcss@3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.7.tgz#9e3c0cb7c6867b4cda4557a447bd2bb6fe20c6fa" + integrity sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ== dependencies: + "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" chokidar "^3.5.3" - color-name "^1.1.4" - detective "^5.2.1" didyoumean "^1.2.2" dlv "^1.1.3" - fast-glob "^3.2.12" + fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - lilconfig "^2.0.6" + jiti "^1.19.1" + lilconfig "^2.1.0" micromatch "^4.0.5" normalize-path "^3.0.0" object-hash "^3.0.0" picocolors "^1.0.0" - postcss "^8.0.9" - postcss-import "^14.1.0" - postcss-js "^4.0.0" - postcss-load-config "^3.1.4" - postcss-nested "6.0.0" + postcss "^8.4.23" + postcss-import "^15.1.0" + postcss-js "^4.0.1" + postcss-load-config "^4.0.1" + postcss-nested "^6.0.1" postcss-selector-parser "^6.0.11" - postcss-value-parser "^4.2.0" - quick-lru "^5.1.1" - resolve "^1.22.1" + resolve "^1.22.2" + sucrase "^3.32.0" temp@^0.9.4: version "0.9.4" @@ -8740,6 +8811,20 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + thread-stream@^0.15.1: version "0.15.2" resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-0.15.2.tgz#fb95ad87d2f1e28f07116eb23d85aba3bc0425f4" @@ -8833,6 +8918,11 @@ ts-essentials@^7.0.1: resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38" integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ== +ts-interface-checker@^0.1.9: + version "0.1.13" + resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" + integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== + tsconfck@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.1.2.tgz#f667035874fa41d908c1fe4d765345fcb1df6e35" @@ -9335,19 +9425,19 @@ wordwrapjs@^4.0.0: reduce-flatten "^2.0.0" typical "^5.2.0" -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== dependencies: ansi-styles "^4.0.0" string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== dependencies: ansi-styles "^4.0.0" string-width "^4.1.0" @@ -9397,7 +9487,7 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xtend@^4.0.1, xtend@^4.0.2: +xtend@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -9427,11 +9517,16 @@ yaml@2.3.1: resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== -yaml@^1.10.0, yaml@^1.10.2: +yaml@^1.10.0: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yaml@^2.3.4: + version "2.4.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed" + integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg== + yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" From 1992c68273ed59a02760beea4c4e84f6a1d7ecd9 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Fri, 15 Mar 2024 18:37:42 +0000 Subject: [PATCH 10/78] Replace js tailwind config with typescript one --- README.md | 6 ++--- tailwind.config.js => tailwind.config.ts | 31 ++++++++++-------------- 2 files changed, 16 insertions(+), 21 deletions(-) rename tailwind.config.js => tailwind.config.ts (96%) diff --git a/README.md b/README.md index 748f799bd..55c7c8725 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ VITE_CHAIN_RPC_URL=https://eth-mainnet.alchemyapi.io/v2/ ## Change Colors -The theme is defined in the [`tailwind.config.js`](./tailwind.config.js#L36) file. +The theme is defined in the [`tailwind.config.ts`](./tailwind.config.ts#L36) file. You can update these colors: - **background**: used for surfaces @@ -164,7 +164,7 @@ To get the oklch value of an hex color you can use this webapp: https://oklch.co ### Background -Background shades are calculated based on hue and chroma. In [`tailwind.config.js`](./tailwind.config.js#L38) you can specify `hue` and `chroma` of the background. +Background shades are calculated based on hue and chroma. In [`tailwind.config.ts`](./tailwind.config.ts#L37) you can specify `hue` and `chroma` of the background. - `hue`: from 0 (pink) to 360 (pink). - `chroma`: It's recommended to use 0.01 or 0.02 depending on the hue. @@ -181,7 +181,7 @@ All other colors are defined with l,c,h values (see https://oklch.com), and the } ``` -You can change the % of the `lighten` & `darken` function with the [`lightDark`](./tailwind.config.js#L18) function. +You can change the % of the `lighten` & `darken` function with the [`lightDark`](./tailwind.config.ts#L20) function. # License diff --git a/tailwind.config.js b/tailwind.config.ts similarity index 96% rename from tailwind.config.js rename to tailwind.config.ts index a5440a1fd..98576fe81 100644 --- a/tailwind.config.js +++ b/tailwind.config.ts @@ -1,4 +1,5 @@ -const { formatRgb } = require('culori'); +import type { Config } from 'tailwindcss'; +import { formatRgb } from 'culori'; function createTwConfigValues(start, end, step) { const remBase = 16; @@ -22,10 +23,8 @@ const lightDark = (l, c, h) => ({ dark: oklch(darken(l, 0.5), c, h), }); -/** @type {import('tailwindcss').Config} */ -module.exports = { +export default { content: ['./src/**/*.{js,jsx,ts,tsx}'], - darkMode: 'class', theme: { screens: { sm: '640px', @@ -118,18 +117,14 @@ module.exports = { backgroundColor: ({ theme }) => theme('colors'), backgroundImage: { none: 'none', - 'gradient-to-t': 'linear-gradient(to top, var(--tw-gradient-stops))', - 'gradient-to-tr': - 'linear-gradient(to top right, var(--tw-gradient-stops))', - 'gradient-to-r': 'linear-gradient(to right, var(--tw-gradient-stops))', - 'gradient-to-br': - 'linear-gradient(to bottom right, var(--tw-gradient-stops))', - 'gradient-to-b': 'linear-gradient(to bottom, var(--tw-gradient-stops))', - 'gradient-to-bl': - 'linear-gradient(to bottom left, var(--tw-gradient-stops))', - 'gradient-to-l': 'linear-gradient(to left, var(--tw-gradient-stops))', - 'gradient-to-tl': - 'linear-gradient(to top left, var(--tw-gradient-stops))', + 'gradient-to-t': 'linear-gradient(to top, --tw-gradient-stops)', + 'gradient-to-tr': 'linear-gradient(to top right, --tw-gradient-stops)', + 'gradient-to-r': 'linear-gradient(to right, --tw-gradient-stops)', + 'gradient-to-br': 'linear-gradient(to bottom right, --tw-gradient-stops)', + 'gradient-to-b': 'linear-gradient(to bottom, --tw-gradient-stops)', + 'gradient-to-bl': 'linear-gradient(to bottom left, --tw-gradient-stops)', + 'gradient-to-l': 'linear-gradient(to left, --tw-gradient-stops)', + 'gradient-to-tl': 'linear-gradient(to top left, --tw-gradient-stops)', }, backgroundOpacity: ({ theme }) => theme('opacity'), backgroundPosition: { @@ -574,7 +569,7 @@ module.exports = { }, fade: { from: { - opacity: 0, + opacity: '0', }, }, translateY: { @@ -938,4 +933,4 @@ module.exports = { }, }, plugins: [], -}; +} satisfies Config; From 5f43bcea8ecad12283a3cab9c23891a00669f72f Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Mon, 18 Mar 2024 16:53:56 +0000 Subject: [PATCH 11/78] Upgrade tailwind to 3.4.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 876bf60bc..5b7dccf62 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "react-dom": "^18.2.0", "source-map-explorer": "^2.5.3", "tailwind-merge": "^1.13.2", - "tailwindcss": "3.3.7", + "tailwindcss": "3.4.1", "typechain": "^8.1.0", "typescript": "^5.3.3", "ua-parser-js": "^1.0.35", diff --git a/yarn.lock b/yarn.lock index b89a6c787..095714320 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8765,10 +8765,10 @@ tailwind-merge@^1.13.2: resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b" integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ== -tailwindcss@3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.7.tgz#9e3c0cb7c6867b4cda4557a447bd2bb6fe20c6fa" - integrity sha512-pjgQxDZPvyS/nG3ZYkyCvsbONJl7GdOejfm24iMt2ElYQQw8Jc4p0m8RdMp7mznPD0kUhfzwV3zAwa80qI0zmQ== +tailwindcss@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.1.tgz#f512ca5d1dd4c9503c7d3d28a968f1ad8f5c839d" + integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" From 3a46b685ecebd1e254b3cc2d84a472e3474e626e Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Mon, 18 Mar 2024 17:07:11 +0000 Subject: [PATCH 12/78] Replace h-* w-* with size-* --- src/components/common/Checkbox/Checkbox.tsx | 4 +- src/components/common/PairLogoName.tsx | 4 +- .../common/TokenInputField/Slippage.tsx | 4 +- .../TokenInputField/TokenInputField.tsx | 8 ++-- .../common/WarningMessageWithIcon.tsx | 4 +- .../common/approval/ApproveToken.tsx | 16 +++----- .../BuySellPriceRangeIndicator.tsx | 14 +++---- src/components/common/calendar/index.tsx | 6 +-- .../common/datePicker/DateRangePicker.tsx | 10 ++--- src/components/common/dropdownMenu/index.tsx | 2 +- .../common/iconTitleText/IconTitleText.tsx | 4 +- src/components/common/inputField/Input.tsx | 4 +- src/components/common/noOrder.tsx | 6 +-- src/components/common/selectToken/index.tsx | 8 ++-- src/components/common/selectTokens/index.tsx | 14 +++---- src/components/common/tokensOverlap/index.tsx | 2 +- src/components/common/tooltip/Tooltip.tsx | 4 +- src/components/common/walletConnect/items.tsx | 12 +++--- .../mainMenu/MainMenuRightBurger/index.tsx | 6 +-- .../useBurgerMenuItems.tsx | 6 +-- .../mainMenu/MainMenuRightNotifications.tsx | 6 +-- .../core/menu/mainMenu/MainMenuTradePairs.tsx | 4 +- .../menu/mainMenu/MainMenuTradeSettings.tsx | 2 +- src/components/explorer/ExplorerEmpty.tsx | 19 ++++----- src/components/explorer/ExplorerSearch.tsx | 8 ++-- .../explorer/ExplorerSearchDropdownButton.tsx | 8 ++-- src/components/explorer/ExplorerTabs.tsx | 4 +- .../input/BuySellBlockNew/BudgetSection.tsx | 10 ++--- .../simulator/input/BuySellBlockNew/index.tsx | 6 +-- .../simulator/input/SimInputChart.tsx | 8 ++-- .../simulator/input/SimInputStrategyType.tsx | 10 ++--- .../input/SimInputTokenSelection.tsx | 14 +++---- .../simulator/mobile-placeholder.tsx | 6 +-- .../result/SimResultChartAnimation.tsx | 6 +-- .../result/SimResultChartControls.tsx | 6 +-- .../result/SimResultChartDownload.tsx | 4 +- .../result/SimResultChartSummary.tsx | 6 +-- .../simulator/result/SimResultChartTabs.tsx | 8 ++-- .../simulator/result/SimResultSummary.tsx | 4 +- .../result/SimResultSummaryGains.tsx | 6 +-- .../simulator/result/SimResultSummaryRoi.tsx | 8 ++-- .../result/SimResultSummaryTable.tsx | 4 +- .../result/SimResultSummaryTokens.tsx | 8 ++-- src/components/strategies/FullOutcome.tsx | 8 ++-- .../strategies/StrategyPageTabs.tsx | 4 +- .../strategies/common/BudgetInput.tsx | 4 +- .../create/BuySellBlock/BudgetSection.tsx | 10 ++--- .../create/BuySellBlock/InputLimit.tsx | 10 ++--- .../strategies/create/BuySellBlock/index.tsx | 6 +-- .../strategies/create/CreateStrategyCTA.tsx | 6 +-- .../create/CreateStrategyHeader.tsx | 10 ++--- .../create/CreateStrategyOrders.tsx | 10 ++--- .../create/CreateStrategyTokenSelection.tsx | 6 +-- .../create/CreateStrategyTypeMenu.tsx | 22 +++++----- .../overlapping/CreateOverlappingStrategy.tsx | 40 +++++++++---------- .../CreateOverlappingStrategyBudget.tsx | 8 ++-- .../edit/EditStrategyBudgetBuySellBlock.tsx | 8 ++-- .../strategies/edit/EditStrategyHeader.tsx | 10 ++--- .../edit/EditStrategyOverlapTokens.tsx | 6 +-- .../edit/overlapping/BudgetWarning.tsx | 10 ++--- .../DepositOverlappingStrategy.tsx | 16 ++++---- .../EditOverlappingStrategyBudget.tsx | 16 ++++---- .../EditPriceOverlappingStrategy.tsx | 16 ++++---- .../edit/overlapping/MarketWarning.tsx | 4 +- .../WithdrawOverlappingStrategy.tsx | 20 +++++----- .../edit/tooltip/TooltipTokenAmount.tsx | 2 +- .../edit/tooltip/TooltipTokenRange.tsx | 2 +- .../MarketPriceIndication.tsx | 6 +-- .../overlapping/OverlappingStrategyGraph.tsx | 4 +- .../overlapping/OverlappingStrategySpread.tsx | 16 ++++---- .../overview/StrategyFilterSort.tsx | 10 ++--- .../strategyBlock/StrategyBlockBudget.tsx | 6 +-- .../strategyBlock/StrategyBlockBuySell.tsx | 16 ++++---- .../strategyBlock/StrategyBlockCreate.tsx | 6 +-- .../strategyBlock/StrategyBlockHeader.tsx | 10 ++--- .../strategyBlock/StrategyBlockManage.tsx | 8 ++-- .../strategyBlock/StrategyBlockRoi.tsx | 8 ++-- .../overview/strategyBlock/StrategyGraph.tsx | 16 ++++---- .../overview/strategyBlock/TokenPrice.tsx | 4 +- .../portfolio/PortfolioPieChart.tsx | 2 +- .../allTokens/PortfolioAllTokensDesktop.tsx | 2 +- .../portfolio/token/PortfolioTokenHeader.tsx | 6 +-- .../token/PortfolioTokenPieChartCenter.tsx | 2 +- .../trade/orderWidget/OrderBookWidgetRate.tsx | 6 +-- .../trade/tradeWidget/NotEnoughLiquidity.tsx | 12 +++--- .../ModalConfirmDelete.tsx | 4 +- .../ModalConfirmPause.tsx | 2 +- .../ModalConfirmWithdraw.tsx | 2 +- .../modals/ModalConfirmStrategy/utils.tsx | 8 ++-- .../ModalDuplicateStrategy.tsx | 4 +- .../modals/ModalSimulatorDisclaimer.tsx | 2 +- .../ModalTokenList/ModalTokenListContent.tsx | 6 +-- .../ModalTradeRouting/ModalTradeRouting.tsx | 12 +++--- .../ModalTradeRoutingRow.tsx | 12 +++--- src/libs/notifications/NotificationLine.tsx | 14 +++---- src/pages/simulator/result/index.tsx | 6 +-- src/pages/strategies/index.tsx | 4 +- 97 files changed, 382 insertions(+), 391 deletions(-) diff --git a/src/components/common/Checkbox/Checkbox.tsx b/src/components/common/Checkbox/Checkbox.tsx index 5f0ca7d57..553b8cb31 100644 --- a/src/components/common/Checkbox/Checkbox.tsx +++ b/src/components/common/Checkbox/Checkbox.tsx @@ -9,7 +9,7 @@ type Props = JSX.IntrinsicElements['button'] & { export const Checkbox: FC = ({ isChecked, setIsChecked, ...attr }) => { const classNames = - 'h-18 w-18 rounded-4 border-2 flex items-center justify-center cursor-pointer'; + 'size-18 rounded-4 border-2 flex items-center justify-center cursor-pointer'; const borderColor = isChecked ? 'border-primary bg-primary' : 'border-white/60'; @@ -21,7 +21,7 @@ export const Checkbox: FC = ({ isChecked, setIsChecked, ...attr }) => { className={cn(`${classNames} ${borderColor}`, attr.className)} onClick={() => setIsChecked(!isChecked)} > - {isChecked && } + {isChecked && } ); }; diff --git a/src/components/common/PairLogoName.tsx b/src/components/common/PairLogoName.tsx index a9bfa06e6..1a26a7d78 100644 --- a/src/components/common/PairLogoName.tsx +++ b/src/components/common/PairLogoName.tsx @@ -15,8 +15,8 @@ export const PairLogoName: FC = ({ }) => { return ( <> - -

+ +

{baseToken.symbol} {baseToken.isSuspicious && ( diff --git a/src/components/common/TokenInputField/Slippage.tsx b/src/components/common/TokenInputField/Slippage.tsx index 9eb3ccb0d..621818f64 100644 --- a/src/components/common/TokenInputField/Slippage.tsx +++ b/src/components/common/TokenInputField/Slippage.tsx @@ -26,11 +26,11 @@ export const Slippage: FC = ({ slippage }) => { element={`The slippage is calculated based on the ${selectedFiatCurrency} value difference between the selected source and target tokens.`} > - {slippage?.eq(0) && } + {slippage?.eq(0) && } {slippage?.gt(0) && <>(+{slippageValue}%)} {slippage?.lt(0) && <>(-{slippageValue}%)} {slippage?.eq(0) && <>Notice: price & slippage are unknown} - {slippage.lt(-3) && } + {slippage.lt(-3) && } ); diff --git a/src/components/common/TokenInputField/TokenInputField.tsx b/src/components/common/TokenInputField/TokenInputField.tsx index 87e916fe0..bead299b7 100644 --- a/src/components/common/TokenInputField/TokenInputField.tsx +++ b/src/components/common/TokenInputField/TokenInputField.tsx @@ -99,7 +99,7 @@ export const TokenInputField: FC = ({ onFocus={(e) => e.target.select()} onBlur={handleBlur} className={` - grow text-ellipsis bg-transparent text-18 font-weight-500 focus:outline-none + text-18 font-weight-500 grow text-ellipsis bg-transparent focus:outline-none ${isError ? 'text-error' : ''} ${disabled ? 'text-white/40' : ''} ${disabled ? 'cursor-not-allowed' : ''} @@ -107,12 +107,12 @@ export const TokenInputField: FC = ({ disabled={disabled} data-testid={testid} /> -

- +
+ {token.symbol}
-
+

{!slippage?.isZero() && showFiatValue && getFiatAsString(value)} {slippage && value && } diff --git a/src/components/common/WarningMessageWithIcon.tsx b/src/components/common/WarningMessageWithIcon.tsx index 1a5605408..c96b69d76 100644 --- a/src/components/common/WarningMessageWithIcon.tsx +++ b/src/components/common/WarningMessageWithIcon.tsx @@ -21,11 +21,11 @@ export const WarningMessageWithIcon: FC = ({ role="alert" aria-live="polite" className={cn( - 'flex items-center gap-10 font-mono !text-12 text-warning', + '!text-12 text-warning flex items-center gap-10 font-mono', className )} > - + {children ?? message} ); diff --git a/src/components/common/approval/ApproveToken.tsx b/src/components/common/approval/ApproveToken.tsx index f288d1eef..4d4265ac1 100644 --- a/src/components/common/approval/ApproveToken.tsx +++ b/src/components/common/approval/ApproveToken.tsx @@ -165,14 +165,10 @@ export const ApproveToken: FC = ({ return ( <> -

+
- +
{token.symbol}
@@ -181,11 +177,11 @@ export const ApproveToken: FC = ({ txBusy ? (
Waiting for Confirmation
) : ( -
+
@@ -204,7 +200,7 @@ export const ApproveToken: FC = ({ variant="white" onClick={onApprove} size="sm" - className="px-10 text-14" + className="text-14 px-10" data-testid={`approve-${token.symbol}`} > {data.nullApprovalRequired ? 'Revoke and Approve' : 'Approve'} @@ -220,7 +216,7 @@ export const ApproveToken: FC = ({ {error ? 
{JSON.stringify(error, null, 2)}
: null}
{data.nullApprovalRequired && ( -
+
diff --git a/src/components/common/buySellPriceRangeIndicator/BuySellPriceRangeIndicator.tsx b/src/components/common/buySellPriceRangeIndicator/BuySellPriceRangeIndicator.tsx index 8acf53ddc..3d1e0be9a 100644 --- a/src/components/common/buySellPriceRangeIndicator/BuySellPriceRangeIndicator.tsx +++ b/src/components/common/buySellPriceRangeIndicator/BuySellPriceRangeIndicator.tsx @@ -7,22 +7,22 @@ export const BuySellPriceRangeIndicator = ({ buy, limit }: Props) => { const background = buy ? 'bg-buy' : 'bg-sell'; return (
-
-
-
+
+
+
{!limit && ( <>
-
-
+
+
diff --git a/src/components/common/calendar/index.tsx b/src/components/common/calendar/index.tsx index eeea211c9..6ccc6c1f8 100644 --- a/src/components/common/calendar/index.tsx +++ b/src/components/common/calendar/index.tsx @@ -23,7 +23,7 @@ export const Calendar = ({ caption_start: '[&>:first-child]:flex-row-reverse', caption_label: 'flex-1 text-center text-14', nav: 'gap-10 flex items-center', - nav_button: 'h-16 w-16 bg-transparent opacity-50 hover:opacity-100', + nav_button: 'size-16 bg-transparent opacity-50 hover:opacity-100', table: 'border-collapse', head_row: 'flex m-b-1', head_cell: 'text-white/20 rounded-8 w-36 text-12 font-weight-400', @@ -50,13 +50,13 @@ export const Calendar = ({ components={{ IconLeft: () => ( ), IconRight: () => ( ), diff --git a/src/components/common/datePicker/DateRangePicker.tsx b/src/components/common/datePicker/DateRangePicker.tsx index 92720d987..5850af725 100644 --- a/src/components/common/datePicker/DateRangePicker.tsx +++ b/src/components/common/datePicker/DateRangePicker.tsx @@ -96,7 +96,7 @@ const Content = (props: Props) => { return (
{ type="button" role="radio" key={days} - className="box-border rounded-8 border-2 border-transparent bg-clip-padding py-8 px-30 text-start text-14 font-weight-500 hover:border-background-700 [&[aria-checked=true]]:bg-black" + className="rounded-8 px-30 text-14 font-weight-500 hover:border-background-700 box-border border-2 border-transparent bg-clip-padding py-8 text-start [&[aria-checked=true]]:bg-black" onClick={() => handlePreset(days)} aria-checked={selectedPreset?.days === days} data-testid="date-picker-button" @@ -159,12 +159,12 @@ export const DatePickerButton = memo( return ( <> - - + + {hasDates ? ( diff --git a/src/components/common/dropdownMenu/index.tsx b/src/components/common/dropdownMenu/index.tsx index 45ae8c5bc..437195f6d 100644 --- a/src/components/common/dropdownMenu/index.tsx +++ b/src/components/common/dropdownMenu/index.tsx @@ -100,7 +100,7 @@ export const DropdownMenu: FC = ({ ref={refs.setFloating} className={cn( // z-index is above header/footer - 'z-50 min-w-[200px] rounded bg-background-800 shadow-lg backdrop-blur-2xl', + 'bg-background-800 z-50 min-w-[200px] rounded shadow-lg backdrop-blur-2xl', className )} style={{ ...floatingStyles, ...transition }} diff --git a/src/components/common/iconTitleText/IconTitleText.tsx b/src/components/common/iconTitleText/IconTitleText.tsx index 47f9f2e3d..eecbd96c0 100644 --- a/src/components/common/iconTitleText/IconTitleText.tsx +++ b/src/components/common/iconTitleText/IconTitleText.tsx @@ -31,13 +31,13 @@ export const IconTitleText: FC = ({ return (
{icon}

{title}

{text && ( -

{text}

+

{text}

)}
); diff --git a/src/components/common/inputField/Input.tsx b/src/components/common/inputField/Input.tsx index d1116e9b8..d6272712a 100644 --- a/src/components/common/inputField/Input.tsx +++ b/src/components/common/inputField/Input.tsx @@ -22,7 +22,7 @@ export const Input: FC = ({ }) => { return (
-
+
= ({
-
+
= ({ text = 'No Orders' }) => { return (
-
- +
+
-
{text}
+
{text}
); }; diff --git a/src/components/common/selectToken/index.tsx b/src/components/common/selectToken/index.tsx index 213e245fa..cf520b515 100644 --- a/src/components/common/selectToken/index.tsx +++ b/src/components/common/selectToken/index.tsx @@ -30,7 +30,7 @@ export const SelectTokenButton: FC = ({ type="button" data-testid={testId} className={cn( - 'flex items-center gap-8 rounded-12 p-10', + 'rounded-12 flex items-center gap-8 p-10', symbol ? 'bg-black text-white' : 'bg-primary text-black', className )} @@ -39,15 +39,15 @@ export const SelectTokenButton: FC = ({ {symbol ? ( ) : ( -
- +
+
)}
{description &&

{description}

}

{symbol ?? text}

- + ); }; diff --git a/src/components/common/selectTokens/index.tsx b/src/components/common/selectTokens/index.tsx index 0ed95214d..b8926216c 100644 --- a/src/components/common/selectTokens/index.tsx +++ b/src/components/common/selectTokens/index.tsx @@ -30,11 +30,11 @@ export const SelectTokens: FC = ({ diff --git a/src/components/core/menu/mainMenu/MainMenuTradeSettings.tsx b/src/components/core/menu/mainMenu/MainMenuTradeSettings.tsx index 8ff83f3a3..05429a89d 100644 --- a/src/components/core/menu/mainMenu/MainMenuTradeSettings.tsx +++ b/src/components/core/menu/mainMenu/MainMenuTradeSettings.tsx @@ -26,7 +26,7 @@ export const MainMenuTradeSettings: FC = ({ baseToken, quoteToken }) => { }); }} > - + ); }; diff --git a/src/components/explorer/ExplorerEmpty.tsx b/src/components/explorer/ExplorerEmpty.tsx index 91ac5aa27..4bf05b120 100644 --- a/src/components/explorer/ExplorerEmpty.tsx +++ b/src/components/explorer/ExplorerEmpty.tsx @@ -13,29 +13,26 @@ export const ExplorerEmpty = ({ return (
-

+

{title}

-

+

{text}

diff --git a/src/components/explorer/ExplorerSearch.tsx b/src/components/explorer/ExplorerSearch.tsx index bf982a701..2c543e29f 100644 --- a/src/components/explorer/ExplorerSearch.tsx +++ b/src/components/explorer/ExplorerSearch.tsx @@ -128,7 +128,7 @@ export const _ExplorerSearch: FC = () => {
} > @@ -149,17 +149,17 @@ export const _ExplorerSearch: FC = () => { size={'md'} className={'w-40 shrink-0 !px-0 md:w-[180px]'} > - + Search {isInvalidAddress && (
- + Invalid Wallet Address
)} diff --git a/src/components/explorer/ExplorerSearchDropdownButton.tsx b/src/components/explorer/ExplorerSearchDropdownButton.tsx index 36dd953fc..d18ef416b 100644 --- a/src/components/explorer/ExplorerSearchDropdownButton.tsx +++ b/src/components/explorer/ExplorerSearchDropdownButton.tsx @@ -14,22 +14,22 @@ export const ExplorerSearchDropdownButton = forwardRef< ); }); diff --git a/src/components/explorer/ExplorerTabs.tsx b/src/components/explorer/ExplorerTabs.tsx index 8b5c791ba..4780847e8 100644 --- a/src/components/explorer/ExplorerTabs.tsx +++ b/src/components/explorer/ExplorerTabs.tsx @@ -30,14 +30,14 @@ export const ExplorerTabs = () => { label: 'Overview', href: '/explore/$type/$slug', params: { type, slug }, - icon: , + icon: , badge: strategies?.length || 0, }, { label: 'Portfolio', href: '/explore/$type/$slug/portfolio', params: { type, slug }, - icon: , + icon: , }, ]; diff --git a/src/components/simulator/input/BuySellBlockNew/BudgetSection.tsx b/src/components/simulator/input/BuySellBlockNew/BudgetSection.tsx index f33ddd6dc..b564a2f90 100644 --- a/src/components/simulator/input/BuySellBlockNew/BudgetSection.tsx +++ b/src/components/simulator/input/BuySellBlockNew/BudgetSection.tsx @@ -52,8 +52,8 @@ export const BudgetSection: FC = ({ return (
- - + + 2 = ({ Set {capitalize(type)} Budget {isBudgetOptional && ( - Optional + Optional )} = ({ htmlFor={inputId} role="alert" aria-live="polite" - className="flex items-center gap-10 font-mono text-12 text-error" + className="text-12 text-error flex items-center gap-10 font-mono" > - + Insufficient balance )} diff --git a/src/components/simulator/input/BuySellBlockNew/index.tsx b/src/components/simulator/input/BuySellBlockNew/index.tsx index 721b76f4b..9460e52f4 100644 --- a/src/components/simulator/input/BuySellBlockNew/index.tsx +++ b/src/components/simulator/input/BuySellBlockNew/index.tsx @@ -50,7 +50,7 @@ export const BuySellBlock: FC = ({ const inputTitle = ( <> - + 1 = ({ return (
= ({ {buy ? 'Buy Low' : 'Sell High'} - + {base.symbol} diff --git a/src/components/simulator/input/SimInputChart.tsx b/src/components/simulator/input/SimInputChart.tsx index 278e88ab2..870d11fc9 100644 --- a/src/components/simulator/input/SimInputChart.tsx +++ b/src/components/simulator/input/SimInputChart.tsx @@ -156,9 +156,9 @@ export const SimInputChart = ({ ); return ( -
+
-

Price Chart

+

Price Chart

{(dms) => ( @@ -222,7 +222,7 @@ const ErrorMsg = ({ base, quote }: { base?: string; quote?: string }) => { text="Unfortunately, price history for this pair is not available and cannot be simulated." variant="success" /> -

+

However, you can{' '} Create a Strategy

diff --git a/src/components/simulator/input/SimInputStrategyType.tsx b/src/components/simulator/input/SimInputStrategyType.tsx index d0717eb2b..d233b88ba 100644 --- a/src/components/simulator/input/SimInputStrategyType.tsx +++ b/src/components/simulator/input/SimInputStrategyType.tsx @@ -20,13 +20,13 @@ export const SimInputStrategyType: FC = ({ strategyType }) => { const items: ItemProps[] = [ { label: 'recurring', - svg: , + svg: , tooltipText: 'Create buy and sell orders (limit or range) that are linked together. Newly acquired funds automatically rotate between them, creating an endless trading cycle without need for manual intervention.', }, { label: 'overlapping', - svg: , + svg: , tooltipText: 'A concentrated position where you buy and sell in a custom price range, used to create a bid-ask spread that moves as the market does.', }, @@ -38,7 +38,7 @@ export const SimInputStrategyType: FC = ({ strategyType }) => { key="simulatorTypeSelection" >
-

Strategy Type

+

Strategy Type

{items.map(({ label, svg, tooltipText }) => ( @@ -50,7 +50,7 @@ export const SimInputStrategyType: FC = ({ strategyType }) => { key={label} to="/simulate/$simulationType" className={cn( - 'flex h-full w-full flex-row items-center justify-center gap-8 rounded-10 bg-black px-8 py-16 text-14 font-weight-500 outline-white/60', + 'rounded-10 text-14 font-weight-500 flex h-full w-full flex-row items-center justify-center gap-8 bg-black px-8 py-16 outline-white/60', 'md:px-12', 'focus-visible:outline focus-visible:outline-1', strategyType === label ? 'outline outline-1 outline-white' : '' @@ -71,7 +71,7 @@ export const SimInputStrategyType: FC = ({ strategyType }) => { {tooltipText}
} - iconClassName="!h-12 !w-12 text-white/60" + iconClassName="!size-12 text-white/60" /> ))} diff --git a/src/components/simulator/input/SimInputTokenSelection.tsx b/src/components/simulator/input/SimInputTokenSelection.tsx index 317bc25f2..52408fbbf 100644 --- a/src/components/simulator/input/SimInputTokenSelection.tsx +++ b/src/components/simulator/input/SimInputTokenSelection.tsx @@ -44,13 +44,13 @@ export const SimInputTokenSelection: FC = ({ return (
-

Token Pair

+

Token Pair

Selecting the tokens you would like to create a simulation for. @@ -64,7 +64,7 @@ export const SimInputTokenSelection: FC = ({ } />
-
+
= ({ } className={cn( 'h-[50px] flex-1 pl-10 pr-20', - noPriceHistory && 'border-2 border-warning' + noPriceHistory && 'border-warning border-2' )} onClick={() => { openModal('tokenLists', { @@ -103,7 +103,7 @@ export const SimInputTokenSelection: FC = ({ /> ); diff --git a/src/components/simulator/result/SimResultChartSummary.tsx b/src/components/simulator/result/SimResultChartSummary.tsx index f19c26d27..6fe9bb5f9 100644 --- a/src/components/simulator/result/SimResultChartSummary.tsx +++ b/src/components/simulator/result/SimResultChartSummary.tsx @@ -28,11 +28,11 @@ export const SimResultChartSummary = ({ }: Props) => { return (

Price ({quoteToken.symbol} per {baseToken.symbol}) @@ -46,7 +46,7 @@ export const SimResultChartSummary = ({ )}

Portfolio Value ({quoteToken.symbol}) diff --git a/src/components/simulator/result/SimResultChartTabs.tsx b/src/components/simulator/result/SimResultChartTabs.tsx index 6995aebd2..1af740760 100644 --- a/src/components/simulator/result/SimResultChartTabs.tsx +++ b/src/components/simulator/result/SimResultChartTabs.tsx @@ -12,13 +12,13 @@ export const SimResultChartTabs = ({ showSummary, setShowSummary }: Props) => { const tabs = [ { label: 'animation', - icon: , + icon: , isActive: () => !showSummary, click: () => setShowSummary(false), }, { label: 'summary', - icon: , + icon: , isActive: () => showSummary, click: () => setShowSummary(true), }, @@ -27,7 +27,7 @@ export const SimResultChartTabs = ({ showSummary, setShowSummary }: Props) => { return (