From 52821c29819834b92ec50a2fec98ec2bf8ff85b4 Mon Sep 17 00:00:00 2001 From: Marcin Ciarka Date: Tue, 26 Mar 2024 10:39:30 +0100 Subject: [PATCH] Lint/typecheck/prettier local speed up chore (#3726) * Update lint script to use eslint cache * Update prettier + prettier cache + format all dem files * Update lint and typecheck scripts in package.json * Update typescript, eslint and minimum node version (needed by new typescript), removed socket.io * Add lint, prettier, and typescript cache creation to dev and prod workflows * Update Node.js version to 18.19.1 --- .codesandbox/Dockerfile | 2 +- .github/workflows/aws-staging.yaml | 2 +- .github/workflows/build.yml | 10 +- .github/workflows/dev-cache.yaml | 17 +- .github/workflows/nextjs-bundle-analysis.yml | 2 +- .github/workflows/prod-cache.yaml | 17 +- .github/workflows/release.yaml | 2 +- .nvmrc | 2 +- Dockerfile.production | 2 +- .../better-calls/send-generic-transaction.ts | 4 +- blockchain/calls/observe.ts | 5 +- blockchain/vault.maths.ts | 4 +- .../AssetsTableDataCellRiskProtection.tsx | 4 +- .../NavigationMenuDropdownContent.tsx | 4 +- components/vault/VaultActionInput.tsx | 8 +- components/vault/VaultDetails.tsx | 12 +- components/vault/VaultWarnings.tsx | 8 +- .../ManageMultiplyVaultButton.tsx | 20 +- .../ManageMultiplyVaultConfirmation.tsx | 4 +- .../ManageVaultHeaderAllowance.tsx | 12 +- .../commonMultiply/OpenMultiplyVaultTitle.tsx | 16 +- .../detailsCards/VaultDetailsCardNetValue.tsx | 12 +- .../ContentCardTargetColRatioAfterBuy.tsx | 4 +- features/aave/aave-context-provider.test.tsx | 6 +- .../aave/components/SidebarAdjustRiskView.tsx | 16 +- .../manage/containers/AaveManageTabBar.tsx | 66 +- .../sidebars/SidebarManageAaveVault.tsx | 8 +- ...tOpenAaveV3PositionStateMachineServices.ts | 8 +- .../controls/PoolCreatorActionController.tsx | 8 +- .../automationMultipleRangeSliderAnalytics.ts | 29 +- .../helpers/getAutomationThatClosedVault.ts | 4 +- .../common/state/automationFeatureStatus.ts | 12 +- .../metadata/maker/stopLossMetadata.ts | 8 +- .../sidebars/SidebarAutoBuyEditingStage.tsx | 4 +- .../automation/protection/stopLoss/helpers.ts | 8 +- .../openFlow/notRequiredProperties.ts | 2 +- .../borrow/open/pipes/openVaultConditions.ts | 4 +- features/dsr/utils/helpers.ts | 4 +- .../earn/guni/open/pipes/openGuniVault.ts | 4 +- features/follow/view/FollowButton.tsx | 16 +- features/form/commonValidators.ts | 4 +- .../pipes/manageMultiplyVault.constants.ts | 4 +- .../pipes/manageMultiplyVaultCalculations.ts | 54 +- .../manage/pipes/manageMultiplyVaultForm.ts | 4 +- .../manage/pipes/manageMultiplyVaultInput.ts | 4 +- .../pipes/openMultiplyVaultCalculations.ts | 4 +- .../open/pipes/openMultiplyVaultConditions.ts | 4 +- .../helpers/getNavTokensNestedListItem.tsx | 8 +- .../navigation/panels/getNavProductsPanel.tsx | 20 +- .../automation/actions/setupAutoBS.ts | 8 +- .../OmniAutoBSSidebarController.tsx | 4 +- .../helpers/resolveStopLossishAction.ts | 4 +- .../sidebars/borrow/OmniBorrowFormOrder.tsx | 16 +- .../multiply/OmniMultiplyFormOrder.tsx | 60 +- .../omni-kit/contexts/OmniProductContext.tsx | 12 +- .../helpers/getOmniBorrowishChangeVariant.ts | 8 +- .../omni-kit/hooks/useOmniProtocolData.ts | 116 ++-- features/omni-kit/hooks/useOmniTransition.ts | 4 +- .../observables/getDpmPositionData.ts | 4 +- .../observables/sendOmniTransaction.ts | 4 +- .../ajna/helpers/getAjnaEarnDefaultAction.ts | 4 +- .../helpers/getAjnaEarnDefaultUiDropdown.ts | 4 +- .../ajna/helpers/getEarnDefaultPrice.ts | 4 +- .../protocols/ajna/hooks/useAjnaData.ts | 4 +- .../metadata/AjnaEarnFormOrderInformation.tsx | 16 +- .../components/sidebar/Erc4626FormOrder.tsx | 64 +- .../common/getAutomationFormDefaults.ts | 12 +- features/productHub/helpers/sortByDefault.ts | 4 +- .../ethersTransactionStateMachine.ts | 2 +- .../termsOfService/termsAcceptance.test.ts | 3 +- features/userSettings/userSettings.ts | 2 +- .../vaultHistory/groupHistoryEventsByHash.ts | 15 +- features/vaultHistory/vaultHistory.ts | 49 +- .../vaultTransitions/openVaultTransitions.ts | 10 +- .../ajna/helpers/getAjnaPositionDetails.ts | 8 +- .../update-handlers/maker/makerHandler.ts | 17 +- helpers/api/tokenTickers.ts | 3 +- helpers/form.tsx | 8 +- helpers/formatters/Formatters.tsx | 8 +- helpers/formatters/format.ts | 8 +- helpers/mocks/manageMultiplyVault.mock.ts | 4 +- helpers/mocks/web3Context.mock.ts | 10 +- helpers/productToVaultType.ts | 8 +- helpers/totalSteps.ts | 16 +- helpers/types.ts | 4 +- package.json | 24 +- server/rewrites.ts | 11 +- yarn.lock | 613 +++++++----------- 88 files changed, 791 insertions(+), 870 deletions(-) diff --git a/.codesandbox/Dockerfile b/.codesandbox/Dockerfile index 26950f92f0..79d40cd0d2 100644 --- a/.codesandbox/Dockerfile +++ b/.codesandbox/Dockerfile @@ -1 +1 @@ -FROM node:18.12 +FROM node:18.19.1 diff --git a/.github/workflows/aws-staging.yaml b/.github/workflows/aws-staging.yaml index 63eb5a9596..cc929f2544 100644 --- a/.github/workflows/aws-staging.yaml +++ b/.github/workflows/aws-staging.yaml @@ -23,7 +23,7 @@ jobs: - name: Setup node uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - name: Check required secrets env: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c30c11afcf..63377fd0ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - uses: actions/cache@v3 id: yarn-cache with: @@ -36,7 +36,7 @@ jobs: if (( 10#${numbers[1]} != 10#${numbers[0]}+1 )); then echo "The last two migration files do not have consecutive numbers: ${numbers[0]} and ${numbers[1]}" exit 1 - fi + fi - name: Install packages if: steps.yarn-cache.outputs.cache-hit != 'true' run: yarn --no-progress --non-interactive --frozen-lockfile @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - uses: actions/cache@v3 id: yarn-cache with: @@ -77,7 +77,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - uses: actions/cache@v3 id: yarn-cache with: @@ -103,7 +103,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - uses: actions/cache@v3 id: yarn-cache with: diff --git a/.github/workflows/dev-cache.yaml b/.github/workflows/dev-cache.yaml index 18272e9943..ca10677041 100644 --- a/.github/workflows/dev-cache.yaml +++ b/.github/workflows/dev-cache.yaml @@ -16,10 +16,10 @@ jobs: - name: Check Out Repo uses: actions/checkout@v3 - - name: Use Node.js 18.12 + - name: Use Node.js 18.19.1 uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - name: Generate Cache Key id: key @@ -40,10 +40,10 @@ jobs: if: ${{ !needs.search.outputs.cache-hit }} steps: - uses: actions/checkout@v3 - - name: Use Node.js 18.12 + - name: Use Node.js 18.19.1 uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - name: Check cache uses: actions/cache@v3 id: yarn-cache @@ -53,6 +53,15 @@ jobs: - name: Install packages if: steps.yarn-cache.outputs.cache-hit != 'true' run: yarn --no-progress --non-interactive --frozen-lockfile + - name: Create lint cache + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn lint --quiet + - name: Create prettier cache + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn format + - name: Create typescript cache + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn typecheck cleanup: name: Cleanup old caches needs: [search] diff --git a/.github/workflows/nextjs-bundle-analysis.yml b/.github/workflows/nextjs-bundle-analysis.yml index b9e0e35d0f..ef706757aa 100644 --- a/.github/workflows/nextjs-bundle-analysis.yml +++ b/.github/workflows/nextjs-bundle-analysis.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - name: Use modules cache uses: actions/cache@v3 id: yarn-cache diff --git a/.github/workflows/prod-cache.yaml b/.github/workflows/prod-cache.yaml index cda7e16ea8..12498aad1f 100644 --- a/.github/workflows/prod-cache.yaml +++ b/.github/workflows/prod-cache.yaml @@ -16,10 +16,10 @@ jobs: - name: Check Out Repo uses: actions/checkout@v3 - - name: Use Node.js 18.12 + - name: Use Node.js 18.19.1 uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - name: Generate Cache Key id: key @@ -40,10 +40,10 @@ jobs: if: ${{ !needs.search.outputs.cache-hit }} steps: - uses: actions/checkout@v3 - - name: Use Node.js 18.12 + - name: Use Node.js 18.19.1 uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - name: Check cache uses: actions/cache@v3 id: yarn-cache @@ -53,6 +53,15 @@ jobs: - name: Install packages if: steps.yarn-cache.outputs.cache-hit != 'true' run: yarn --no-progress --non-interactive --frozen-lockfile + - name: Create lint cache + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn lint --quiet + - name: Create prettier cache + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn format + - name: Create typescript cache + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn typecheck cleanup: name: Cleanup old caches needs: [search] diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7a00b01bd8..2afb74dee6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-node@v3 with: - node-version: 18.12 + node-version: 18.19.1 - name: 'Determine Release Type' run: | if ${{ contains(github.event.inputs.release_type, 'major') }}; then diff --git a/.nvmrc b/.nvmrc index 29ef05d4d5..3c5535cf60 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.12 +18.19.1 diff --git a/Dockerfile.production b/Dockerfile.production index 98e36c3bc3..bc321a33a9 100644 --- a/Dockerfile.production +++ b/Dockerfile.production @@ -1,4 +1,4 @@ -FROM node:18.12 +FROM node:18.19.1 EXPOSE 3000 diff --git a/blockchain/better-calls/send-generic-transaction.ts b/blockchain/better-calls/send-generic-transaction.ts index 8ea8193941..c5b6035ef9 100644 --- a/blockchain/better-calls/send-generic-transaction.ts +++ b/blockchain/better-calls/send-generic-transaction.ts @@ -38,8 +38,8 @@ export const sendGenericTransaction$ = ({ receipt.status === 1 ? TxStatus.Success : receipt.status === 0 - ? TxStatus.Error - : TxStatus.WaitingForConfirmation + ? TxStatus.Error + : TxStatus.WaitingForConfirmation return { status, diff --git a/blockchain/calls/observe.ts b/blockchain/calls/observe.ts index ddc2dd5909..3c6c533d5a 100644 --- a/blockchain/calls/observe.ts +++ b/blockchain/calls/observe.ts @@ -24,6 +24,5 @@ export function observe( ) } -export type CallObservable> = C extends CallDef - ? (a: A) => Observable - : never +export type CallObservable> = + C extends CallDef ? (a: A) => Observable : never diff --git a/blockchain/vault.maths.ts b/blockchain/vault.maths.ts index db234f2289..9633e5ed8b 100644 --- a/blockchain/vault.maths.ts +++ b/blockchain/vault.maths.ts @@ -86,8 +86,8 @@ export function buildPosition({ const daiYieldFromLockedCollateralWithoutOriginationFee = availableDebt.lt(ilkDebtAvailable) ? availableDebt : ilkDebtAvailable.gt(zero) - ? ilkDebtAvailable - : zero + ? ilkDebtAvailable + : zero const daiYieldFromLockedCollateral = daiYieldFromLockedCollateralWithoutOriginationFee.div( originationFee.plus(1), diff --git a/components/assetsTable/cellComponents/AssetsTableDataCellRiskProtection.tsx b/components/assetsTable/cellComponents/AssetsTableDataCellRiskProtection.tsx index feba7c2a8f..b3ce80be5a 100644 --- a/components/assetsTable/cellComponents/AssetsTableDataCellRiskProtection.tsx +++ b/components/assetsTable/cellComponents/AssetsTableDataCellRiskProtection.tsx @@ -24,8 +24,8 @@ export function AssetsTableDataCellProtection({ {level > 0 ? t('discover.table.protection-value', { protection: level }) : isOwner - ? t('discover.table.activate') - : t('discover.table.inactive')} + ? t('discover.table.activate') + : t('discover.table.inactive')} diff --git a/components/navigation/NavigationMenuDropdownContent.tsx b/components/navigation/NavigationMenuDropdownContent.tsx index 14d674f884..d1f7919aa7 100644 --- a/components/navigation/NavigationMenuDropdownContent.tsx +++ b/components/navigation/NavigationMenuDropdownContent.tsx @@ -118,8 +118,8 @@ export function NavigationMenuDropdownContent({ (selected[0] === i && selected[1] < j) || selected[0] < i ? 50 : (selected[0] === i && selected[1] > j) || selected[0] > i - ? -50 - : 0 + ? -50 + : 0 }px)`, }} {...(selected[0] === i && selected[1] === j && { ref })} diff --git a/components/vault/VaultActionInput.tsx b/components/vault/VaultActionInput.tsx index e9b3538aa7..e9124ab46e 100644 --- a/components/vault/VaultActionInput.tsx +++ b/components/vault/VaultActionInput.tsx @@ -198,8 +198,8 @@ export function VaultActionInput({ {auxiliaryFlag && BigNumber.isBigNumber(minAuxiliaryAmount) ? formatCryptoBalance(minAuxiliaryAmount) : !auxiliaryFlag && BigNumber.isBigNumber(minAmount) - ? formatCryptoBalance(minAmount) - : null} + ? formatCryptoBalance(minAmount) + : null} )} @@ -217,8 +217,8 @@ export function VaultActionInput({ {auxiliaryFlag && BigNumber.isBigNumber(maxAuxiliaryAmount) ? formatCryptoBalance(maxAuxiliaryAmount) : !auxiliaryFlag && BigNumber.isBigNumber(maxAmount) - ? formatCryptoBalance(maxAmount) - : null} + ? formatCryptoBalance(maxAmount) + : null} )}{' '} diff --git a/components/vault/VaultDetails.tsx b/components/vault/VaultDetails.tsx index 70f57ed332..df4e38d1e4 100644 --- a/components/vault/VaultDetails.tsx +++ b/components/vault/VaultDetails.tsx @@ -39,10 +39,10 @@ export function getCollRatioColor( return collateralizationRatio.isZero() ? 'primary100' : vaultWillBeAtRiskLevelDanger || vaultWillBeUnderCollateralized - ? 'critical100' - : vaultWillBeAtRiskLevelWarning - ? 'warning100' - : 'success100' + ? 'critical100' + : vaultWillBeAtRiskLevelWarning + ? 'warning100' + : 'success100' } export function getPriceChangeColor({ @@ -51,8 +51,8 @@ export function getPriceChangeColor({ return collateralPricePercentageChange.isZero() ? 'neutral80' : collateralPricePercentageChange.gt(zero) - ? 'success100' - : 'critical100' + ? 'success100' + : 'critical100' } export function getAfterPillColors(collRatioColor: CollRatioColor) { diff --git a/components/vault/VaultWarnings.tsx b/components/vault/VaultWarnings.tsx index 5772dc4ded..2e74fe6049 100644 --- a/components/vault/VaultWarnings.tsx +++ b/components/vault/VaultWarnings.tsx @@ -138,10 +138,10 @@ export function VaultWarnings({ isAutoSellEnabled && isAutoBuyEnabled ? `Auto-Sell ${t('and')} Auto-Buy` : isAutoSellEnabled - ? 'Auto-Sell' - : isAutoBuyEnabled - ? 'Auto-Buy' - : t('active-triggers'), + ? 'Auto-Sell' + : isAutoBuyEnabled + ? 'Auto-Buy' + : t('active-triggers'), }} components={[ConstantMultipleKBLink]} /> diff --git a/components/vault/commonMultiply/ManageMultiplyVaultButton.tsx b/components/vault/commonMultiply/ManageMultiplyVaultButton.tsx index ea4114b41c..def57e71d8 100644 --- a/components/vault/commonMultiply/ManageMultiplyVaultButton.tsx +++ b/components/vault/commonMultiply/ManageMultiplyVaultButton.tsx @@ -16,21 +16,21 @@ export function manageMultiplyVaultButtonText(state: ManageMultiplyVaultState): ? t('adjust-your-position') : t('enter-an-amount') : !state.proxyAddress - ? t('setup-proxy') - : state.insufficientCollateralAllowance - ? t('set-token-allowance', { token: state.vault.token }) - : state.insufficientDaiAllowance - ? t('set-token-allowance', { token: 'DAI' }) - : state.originalEditingStage === 'otherActions' && state.otherAction === 'closeVault' - ? t('close-vault') - : t('confirm') + ? t('setup-proxy') + : state.insufficientCollateralAllowance + ? t('set-token-allowance', { token: state.vault.token }) + : state.insufficientDaiAllowance + ? t('set-token-allowance', { token: 'DAI' }) + : state.originalEditingStage === 'otherActions' && state.otherAction === 'closeVault' + ? t('close-vault') + : t('confirm') case 'proxySuccess': return state.insufficientCollateralAllowance ? t('set-token-allowance', { token: state.vault.token }) : state.insufficientDaiAllowance - ? t('set-token-allowance', { token: 'DAI' }) - : t('continue') + ? t('set-token-allowance', { token: 'DAI' }) + : t('continue') case 'collateralAllowanceSuccess': return state.insufficientDaiAllowance diff --git a/components/vault/commonMultiply/ManageMultiplyVaultConfirmation.tsx b/components/vault/commonMultiply/ManageMultiplyVaultConfirmation.tsx index cd0bf619de..3158db8408 100644 --- a/components/vault/commonMultiply/ManageMultiplyVaultConfirmation.tsx +++ b/components/vault/commonMultiply/ManageMultiplyVaultConfirmation.tsx @@ -40,8 +40,8 @@ export function ManageMultiplyVaultConfirmationStatus({ originalEditingStage === 'adjustPosition' ? 'adjusting-vault-multiply' : otherAction === 'closeVault' - ? 'closing-vault-multiply' - : 'changing-vault-multiply' + ? 'closing-vault-multiply' + : 'changing-vault-multiply' return ( diff --git a/components/vault/commonMultiply/ManageVaultHeaderAllowance.tsx b/components/vault/commonMultiply/ManageVaultHeaderAllowance.tsx index e7e30ee1b9..dfaed97d80 100644 --- a/components/vault/commonMultiply/ManageVaultHeaderAllowance.tsx +++ b/components/vault/commonMultiply/ManageVaultHeaderAllowance.tsx @@ -25,12 +25,12 @@ export function ManageVaultHeaderAllowance({ ? t('vault-form.header.proxy-success') : t('vault-form.header.proxy') : isCollateralAllowanceStage - ? t('vault-form.header.allowance', { token: token.toUpperCase() }) - : isDaiAllowanceStage - ? t('vault-form.header.daiAllowance') - : stage === 'manageInProgress' - ? t('vault-form.header.modified') - : t('vault-form.header.review-manage')} + ? t('vault-form.header.allowance', { token: token.toUpperCase() }) + : isDaiAllowanceStage + ? t('vault-form.header.daiAllowance') + : stage === 'manageInProgress' + ? t('vault-form.header.modified') + : t('vault-form.header.review-manage')} diff --git a/components/vault/commonMultiply/OpenMultiplyVaultTitle.tsx b/components/vault/commonMultiply/OpenMultiplyVaultTitle.tsx index a1d6232e07..181ec8f3d5 100644 --- a/components/vault/commonMultiply/OpenMultiplyVaultTitle.tsx +++ b/components/vault/commonMultiply/OpenMultiplyVaultTitle.tsx @@ -25,14 +25,14 @@ export function OpenMultiplyVaultTitle({ {isEditingStage ? title : isProxyStage - ? stage === 'proxySuccess' - ? t('vault-form.header.proxy-success') - : t('vault-form.header.proxy') - : isAllowanceStage - ? t('vault-form.header.allowance', { token: token.toUpperCase() }) - : stage === 'txInProgress' - ? t('vault-form.header.confirm-in-progress') - : t('vault-form.header.confirm')} + ? stage === 'proxySuccess' + ? t('vault-form.header.proxy-success') + : t('vault-form.header.proxy') + : isAllowanceStage + ? t('vault-form.header.allowance', { token: token.toUpperCase() }) + : stage === 'txInProgress' + ? t('vault-form.header.confirm-in-progress') + : t('vault-form.header.confirm')} diff --git a/components/vault/detailsCards/VaultDetailsCardNetValue.tsx b/components/vault/detailsCards/VaultDetailsCardNetValue.tsx index 2997b2895a..e9e13c7c0f 100644 --- a/components/vault/detailsCards/VaultDetailsCardNetValue.tsx +++ b/components/vault/detailsCards/VaultDetailsCardNetValue.tsx @@ -40,23 +40,23 @@ export function VaultDetailsNetValueModal({ const lockedCollateralUSD = isCollateralLpToken ? vault?.lockedCollateralUSD || zero : vault && marketPrice - ? vault.lockedCollateral.times(marketPrice) - : zero + ? vault.lockedCollateral.times(marketPrice) + : zero const daiDebtUndercollateralizedToken = vault ? isCollateralLpToken ? vault.debt.dividedBy(oraclePrice) : marketPrice - ? vault.debt.dividedBy(marketPrice) - : zero + ? vault.debt.dividedBy(marketPrice) + : zero : zero const netValueUndercollateralizedToken = vault ? isCollateralLpToken ? netValueUSD.dividedBy(oraclePrice) : marketPrice - ? netValueUSD.dividedBy(marketPrice) - : zero + ? netValueUSD.dividedBy(marketPrice) + : zero : zero return ( diff --git a/components/vault/detailsSection/ContentCardTargetColRatioAfterBuy.tsx b/components/vault/detailsSection/ContentCardTargetColRatioAfterBuy.tsx index 1b3a56da96..85cfd00709 100644 --- a/components/vault/detailsSection/ContentCardTargetColRatioAfterBuy.tsx +++ b/components/vault/detailsSection/ContentCardTargetColRatioAfterBuy.tsx @@ -39,8 +39,8 @@ export function ContentCardTargetColRatioAfterBuy({ threshold: !threshold ? undefined : threshold.isEqualTo(maxUint256) - ? t('unlimited') - : `$${formatAmount(threshold, 'USD')}`, + ? t('unlimited') + : `$${formatAmount(threshold, 'USD')}`, } const contentCardSettings: ContentCardProps = { diff --git a/features/aave/aave-context-provider.test.tsx b/features/aave/aave-context-provider.test.tsx index 2aa2fde508..095afad186 100644 --- a/features/aave/aave-context-provider.test.tsx +++ b/features/aave/aave-context-provider.test.tsx @@ -15,19 +15,19 @@ import * as setupAaveV2ContextModule from './setup-aave-v2-context' jest.mock('./setup-aave-v2-context', () => { return { - setupAaveV2Context: jest.fn(() => ({} as AaveContext)), + setupAaveV2Context: jest.fn(() => ({}) as AaveContext), } }) jest.mock('./setup-aave-v3-context', () => { return { - setupAaveV3Context: jest.fn(() => ({} as AaveContext)), + setupAaveV3Context: jest.fn(() => ({}) as AaveContext), } }) jest.mock('./setup-spark-v3-context', () => { return { - setupSparkV3Context: jest.fn(() => ({} as AaveContext)), + setupSparkV3Context: jest.fn(() => ({}) as AaveContext), } }) diff --git a/features/aave/components/SidebarAdjustRiskView.tsx b/features/aave/components/SidebarAdjustRiskView.tsx index 5be6292d96..09e1245291 100644 --- a/features/aave/components/SidebarAdjustRiskView.tsx +++ b/features/aave/components/SidebarAdjustRiskView.tsx @@ -104,12 +104,12 @@ export function adjustRiskView(viewConfig: AdjustRiskViewConfig) { liquidationRatio: targetPosition.category.liquidationThreshold, }) : onChainPosition - ? calculateLiquidationPrice({ - collateral: onChainPosition.collateral, - debt: onChainPosition.debt, - liquidationRatio: onChainPosition.category.liquidationThreshold, - }) - : { liquidationPriceInDebt: zero, liquidationPriceInCollateral: zero } + ? calculateLiquidationPrice({ + collateral: onChainPosition.collateral, + debt: onChainPosition.debt, + liquidationRatio: onChainPosition.category.liquidationThreshold, + }) + : { liquidationPriceInDebt: zero, liquidationPriceInCollateral: zero } const { strategyConfig } = state.context @@ -186,8 +186,8 @@ export function adjustRiskView(viewConfig: AdjustRiskViewConfig) { return onChainPosition ? viewConfig.rightBoundary.formatter(value) : hasUserInteracted(state) - ? viewConfig.rightBoundary.formatter(value) - : '-' + ? viewConfig.rightBoundary.formatter(value) + : '-' }} rightLabel={t(viewConfig.rightBoundary.translationKey)} onChange={(ltv) => { diff --git a/features/aave/manage/containers/AaveManageTabBar.tsx b/features/aave/manage/containers/AaveManageTabBar.tsx index 5d3c41be8d..89a195052b 100644 --- a/features/aave/manage/containers/AaveManageTabBar.tsx +++ b/features/aave/manage/containers/AaveManageTabBar.tsx @@ -231,39 +231,39 @@ export function AaveManageTabBar({ ...(historyIsSupported === undefined ? [] : historyIsSupported - ? [ - { - value: 'history', - label: t('system.history'), - content: ( - - ), - }, - ] - : [ - { - value: 'history', - label: t('system.history'), - content: ( - - ), - }, - ]), + ? [ + { + value: 'history', + label: t('system.history'), + content: ( + + ), + }, + ] + : [ + { + value: 'history', + label: t('system.history'), + content: ( + + ), + }, + ]), ]} /> ) diff --git a/features/aave/manage/sidebars/SidebarManageAaveVault.tsx b/features/aave/manage/sidebars/SidebarManageAaveVault.tsx index 587b4a22ee..4c63a39fc6 100644 --- a/features/aave/manage/sidebars/SidebarManageAaveVault.tsx +++ b/features/aave/manage/sidebars/SidebarManageAaveVault.tsx @@ -218,8 +218,8 @@ export function calculateMaxDebtAmount(context: ManageAaveContext): BigNumber { (isBorrow ? context.manageTokenInput?.manageInput2Value : isDeposit - ? context.manageTokenInput?.manageInput1Value - : zero) ?? zero + ? context.manageTokenInput?.manageInput1Value + : zero) ?? zero const collateral = amountFromWei(position.collateral.amount, position.collateral.symbol).plus( inputCollateralAmount, ) @@ -250,8 +250,8 @@ export function calculateMaxCollateralAmount(context: ManageAaveContext): BigNum (isPayback ? context.manageTokenInput?.manageInput1Value : isWithdraw - ? context.manageTokenInput?.manageInput2Value - : zero) ?? zero + ? context.manageTokenInput?.manageInput2Value + : zero) ?? zero const debt = amountFromWei(position.debt.amount, position.debt.symbol).minus(inputDebtAmount) const collateral = amountFromWei(position.collateral.amount, position.collateral.symbol) const minimumCollateral = debt diff --git a/features/aave/open/services/aave-v3/getOpenAaveV3PositionStateMachineServices.ts b/features/aave/open/services/aave-v3/getOpenAaveV3PositionStateMachineServices.ts index 7c6e091ed3..dd12d67dc9 100644 --- a/features/aave/open/services/aave-v3/getOpenAaveV3PositionStateMachineServices.ts +++ b/features/aave/open/services/aave-v3/getOpenAaveV3PositionStateMachineServices.ts @@ -219,10 +219,10 @@ export function getOpenAaveV3PositionStateMachineServices( context.strategyConfig.type === 'Borrow' ? VaultType.Borrow : context.strategyConfig.type === 'Multiply' - ? VaultType.Multiply - : context.strategyConfig.type === 'Earn' - ? VaultType.Earn - : undefined + ? VaultType.Multiply + : context.strategyConfig.type === 'Earn' + ? VaultType.Earn + : undefined const proxy = context.userDpmAccount?.proxy diff --git a/features/ajna/pool-creator/controls/PoolCreatorActionController.tsx b/features/ajna/pool-creator/controls/PoolCreatorActionController.tsx index 6a8f811e02..33e1fdb2b5 100644 --- a/features/ajna/pool-creator/controls/PoolCreatorActionController.tsx +++ b/features/ajna/pool-creator/controls/PoolCreatorActionController.tsx @@ -47,10 +47,10 @@ export const PoolCreatorActionController: FC = const primaryButtonLabel = !isConnected ? t('connect-wallet') : !isOnSupportedNetwork - ? t('switch-network') - : isTxError - ? t('retry') - : t('pool-creator.form.submit') + ? t('switch-network') + : isTxError + ? t('retry') + : t('pool-creator.form.submit') const networkName = networksById[networkId].name diff --git a/features/automation/common/helpers/automationMultipleRangeSliderAnalytics.ts b/features/automation/common/helpers/automationMultipleRangeSliderAnalytics.ts index 7d2d1327d1..65ab0f095b 100644 --- a/features/automation/common/helpers/automationMultipleRangeSliderAnalytics.ts +++ b/features/automation/common/helpers/automationMultipleRangeSliderAnalytics.ts @@ -44,17 +44,20 @@ export function automationMultipleRangeSliderAnalytics({ [AutomationFeatures.CONSTANT_MULTIPLE]: 'triggerBuyValue', } - useDebouncedCallback((value) => { - const parsedValues = JSON.parse(value) - trackingEvents.automation.inputChange( - MixpanelAutomationEventIds.MoveSlider, - analyticsPageMap[type], - MixpanelCommonAnalyticsSections.Form, - { - ...analyticsAdditionalParams, - [leftValueKeyMap[type]]: parsedValues.leftValue, - [rightValueKeyMap[type]]: parsedValues.rightValue, - }, - ) - }, JSON.stringify({ leftValue: leftValue.toString(), rightValue: rightValue.toString() })) + useDebouncedCallback( + (value) => { + const parsedValues = JSON.parse(value) + trackingEvents.automation.inputChange( + MixpanelAutomationEventIds.MoveSlider, + analyticsPageMap[type], + MixpanelCommonAnalyticsSections.Form, + { + ...analyticsAdditionalParams, + [leftValueKeyMap[type]]: parsedValues.leftValue, + [rightValueKeyMap[type]]: parsedValues.rightValue, + }, + ) + }, + JSON.stringify({ leftValue: leftValue.toString(), rightValue: rightValue.toString() }), + ) } diff --git a/features/automation/common/helpers/getAutomationThatClosedVault.ts b/features/automation/common/helpers/getAutomationThatClosedVault.ts index f47369ab97..00efdf7742 100644 --- a/features/automation/common/helpers/getAutomationThatClosedVault.ts +++ b/features/automation/common/helpers/getAutomationThatClosedVault.ts @@ -10,6 +10,6 @@ export function getAutomationThatClosedVault({ return stopLossTriggered ? AutomationKinds.STOP_LOSS : autoTakeProfitTriggered - ? AutomationKinds.AUTO_TAKE_PROFIT - : undefined + ? AutomationKinds.AUTO_TAKE_PROFIT + : undefined } diff --git a/features/automation/common/state/automationFeatureStatus.ts b/features/automation/common/state/automationFeatureStatus.ts index 2e85b30ef2..99a7494970 100644 --- a/features/automation/common/state/automationFeatureStatus.ts +++ b/features/automation/common/state/automationFeatureStatus.ts @@ -37,12 +37,12 @@ export function getAutomationFeatureStatus({ const stage = isSuccessStage ? 'txSuccess' : isProgressStage - ? 'txInProgress' - : isFailureStage - ? 'txFailure' - : feature !== AutomationFeatures.STOP_LOSS - ? 'editing' - : 'stopLossEditing' + ? 'txInProgress' + : isFailureStage + ? 'txFailure' + : feature !== AutomationFeatures.STOP_LOSS + ? 'editing' + : 'stopLossEditing' const isFirstSetup = triggersId.every((id) => id.isZero()) return { diff --git a/features/automation/metadata/maker/stopLossMetadata.ts b/features/automation/metadata/maker/stopLossMetadata.ts index a2749c03ca..f41ce1ffeb 100644 --- a/features/automation/metadata/maker/stopLossMetadata.ts +++ b/features/automation/metadata/maker/stopLossMetadata.ts @@ -66,10 +66,10 @@ export function getMakerStopLossMetadata(context: ContextWithoutMetadata): StopL (autoSellTriggerData.isTriggerEnabled ? autoSellTriggerData.execCollRatio.minus(MIX_MAX_COL_RATIO_TRIGGER_OFFSET).div(100) : constantMultipleTriggerData.isTriggerEnabled - ? constantMultipleTriggerData.sellExecutionCollRatio - .minus(MIX_MAX_COL_RATIO_TRIGGER_OFFSET) - .div(100) - : nextPositionRatio.minus(NEXT_COLL_RATIO_OFFSET.div(100)) + ? constantMultipleTriggerData.sellExecutionCollRatio + .minus(MIX_MAX_COL_RATIO_TRIGGER_OFFSET) + .div(100) + : nextPositionRatio.minus(NEXT_COLL_RATIO_OFFSET.div(100)) ) .multipliedBy(100) .toFixed(0, BigNumber.ROUND_DOWN), diff --git a/features/automation/optimization/autoBuy/sidebars/SidebarAutoBuyEditingStage.tsx b/features/automation/optimization/autoBuy/sidebars/SidebarAutoBuyEditingStage.tsx index a5a6417c0c..d0e3a3b45b 100644 --- a/features/automation/optimization/autoBuy/sidebars/SidebarAutoBuyEditingStage.tsx +++ b/features/automation/optimization/autoBuy/sidebars/SidebarAutoBuyEditingStage.tsx @@ -275,8 +275,8 @@ export function SidebarAutoBuyEditingStage({ maxBuyOrMinSellPrice: !toggleStatus ? undefined : autoBuyTriggerData.maxBuyOrMinSellPrice.isEqualTo(maxUint256) - ? zero - : autoBuyTriggerData.maxBuyOrMinSellPrice, + ? zero + : autoBuyTriggerData.maxBuyOrMinSellPrice, }) uiChanges.publish(AUTO_BUY_FORM_CHANGE, { type: 'is-editing', diff --git a/features/automation/protection/stopLoss/helpers.ts b/features/automation/protection/stopLoss/helpers.ts index 1a801fb323..2412e84638 100644 --- a/features/automation/protection/stopLoss/helpers.ts +++ b/features/automation/protection/stopLoss/helpers.ts @@ -162,8 +162,8 @@ export const getSavingCompareToLiquidation = ({ collateralDuringLiquidation.times(!isCollateralActive ? afterDynamicStopLossPrice : one), ) : dynamicStopLossPrice && maxToken - ? maxToken.minus( - collateralDuringLiquidation.times(!isCollateralActive ? dynamicStopLossPrice : one), - ) - : undefined + ? maxToken.minus( + collateralDuringLiquidation.times(!isCollateralActive ? dynamicStopLossPrice : one), + ) + : undefined } diff --git a/features/automation/protection/stopLoss/openFlow/notRequiredProperties.ts b/features/automation/protection/stopLoss/openFlow/notRequiredProperties.ts index 5d00a614d0..3095c0221e 100644 --- a/features/automation/protection/stopLoss/openFlow/notRequiredProperties.ts +++ b/features/automation/protection/stopLoss/openFlow/notRequiredProperties.ts @@ -24,7 +24,7 @@ export const notRequiredMethods: Pick< 'getExecutionPrice' | 'prepareAddStopLossTriggerData' > = { getExecutionPrice: () => zero, - prepareAddStopLossTriggerData: () => ({} as AutomationAddTriggerData), + prepareAddStopLossTriggerData: () => ({}) as AutomationAddTriggerData, } export const notRequiredAaveTranslations: Pick< diff --git a/features/borrow/open/pipes/openVaultConditions.ts b/features/borrow/open/pipes/openVaultConditions.ts index 892445a81b..dafd77ccdb 100644 --- a/features/borrow/open/pipes/openVaultConditions.ts +++ b/features/borrow/open/pipes/openVaultConditions.ts @@ -89,8 +89,8 @@ export function applyOpenVaultStageCategorisation(state: OpenVaultState) { currentStep: openingEmptyVault ? totalSteps - 1 : withStopLossStep - ? totalSteps - (token === 'ETH' ? 2 : 3) - : totalSteps - (token === 'ETH' ? 1 : 2), + ? totalSteps - (token === 'ETH' ? 2 : 3) + : totalSteps - (token === 'ETH' ? 1 : 2), proxyAddress, withProxyStep: true, } diff --git a/features/dsr/utils/helpers.ts b/features/dsr/utils/helpers.ts index 0f30d85508..2f82328559 100644 --- a/features/dsr/utils/helpers.ts +++ b/features/dsr/utils/helpers.ts @@ -67,8 +67,8 @@ export function selectPrimaryAction( return activeTab === 'deposit' ? dsrDepositState.deposit : activeTab === 'withdraw' - ? dsrDepositState.withdraw - : dsrDepositState.convert + ? dsrDepositState.withdraw + : dsrDepositState.convert } } diff --git a/features/earn/guni/open/pipes/openGuniVault.ts b/features/earn/guni/open/pipes/openGuniVault.ts index 13acac120e..2baa338c7b 100644 --- a/features/earn/guni/open/pipes/openGuniVault.ts +++ b/features/earn/guni/open/pipes/openGuniVault.ts @@ -254,8 +254,8 @@ export function createOpenGuniVault$( change.kind === 'injectStateOverride' ? change.stateToOverride.depositAmount : change.kind === 'depositAmount' - ? change.depositAmount - : state.depositAmount + ? change.depositAmount + : state.depositAmount const { leveragedAmount, flAmount } = applyCalculations({ ilkData, diff --git a/features/follow/view/FollowButton.tsx b/features/follow/view/FollowButton.tsx index 1f739a2ba6..74c3492f58 100644 --- a/features/follow/view/FollowButton.tsx +++ b/features/follow/view/FollowButton.tsx @@ -134,19 +134,19 @@ export function FollowButton({ (isProcessing ? t('loading') : isHovering && isFollowing - ? t('unfollow') - : isFollowing - ? t('following') - : t('follow'))} + ? t('unfollow') + : isFollowing + ? t('following') + : t('follow'))} {t( isLimitReached && !isFollowing ? 'followed-vaults-limit' : isLimitReached && isFollowing && !isHovering - ? 'following' - : isLimitReached && isFollowing && isHovering - ? 'unfollow' - : '', + ? 'following' + : isLimitReached && isFollowing && isHovering + ? 'unfollow' + : '', )} )} diff --git a/features/form/commonValidators.ts b/features/form/commonValidators.ts index 31349ac110..9a0f30799a 100644 --- a/features/form/commonValidators.ts +++ b/features/form/commonValidators.ts @@ -367,8 +367,8 @@ export function insufficientDaiAllowanceValidator({ const amountToValidate = paybackAmount?.gt(zero) ? paybackAmount : depositDaiAmount?.gt(zero) - ? depositDaiAmount - : zero + ? depositDaiAmount + : zero return !!( amountToValidate && diff --git a/features/multiply/manage/pipes/manageMultiplyVault.constants.ts b/features/multiply/manage/pipes/manageMultiplyVault.constants.ts index f6b59361f7..60379d482c 100644 --- a/features/multiply/manage/pipes/manageMultiplyVault.constants.ts +++ b/features/multiply/manage/pipes/manageMultiplyVault.constants.ts @@ -21,8 +21,8 @@ export function defaultMutableManageMultiplyVaultState( vaultType === VaultType.Borrow ? 'otherActions' : hasZeroCollateral - ? 'otherActions' - : 'adjustPosition', + ? 'otherActions' + : 'adjustPosition', originalEditingStage: hasZeroCollateral ? 'otherActions' : 'adjustPosition', collateralAllowanceAmount: maxUint256, daiAllowanceAmount: maxUint256, diff --git a/features/multiply/manage/pipes/manageMultiplyVaultCalculations.ts b/features/multiply/manage/pipes/manageMultiplyVaultCalculations.ts index 00050e1c88..924333cc91 100644 --- a/features/multiply/manage/pipes/manageMultiplyVaultCalculations.ts +++ b/features/multiply/manage/pipes/manageMultiplyVaultCalculations.ts @@ -54,8 +54,8 @@ function calculateAfterLockedCollateral({ const amount = paybackAmount ? lockedCollateral.plus(paybackAmount) : generateAmount - ? lockedCollateral.minus(generateAmount) - : lockedCollateral + ? lockedCollateral.minus(generateAmount) + : lockedCollateral return amount.gte(zero) ? amount : zero } @@ -79,8 +79,8 @@ function calculateAfterDebt({ const amount = generateAmount ? debt.plus(generateAmount) : paybackAmount - ? debt.minus(paybackAmount) - : debt + ? debt.minus(paybackAmount) + : debt return amount.gte(zero) ? amount : zero } @@ -335,8 +335,8 @@ export function applyManageVaultCalculations }} diff --git a/features/navigation/panels/getNavProductsPanel.tsx b/features/navigation/panels/getNavProductsPanel.tsx index 4640c52790..95798a181b 100644 --- a/features/navigation/panels/getNavProductsPanel.tsx +++ b/features/navigation/panels/getNavProductsPanel.tsx @@ -73,8 +73,8 @@ export const getNavProductsPanel = ({ item.primaryToken === item.secondaryToken ? [item.primaryToken] : item.reverseTokens - ? [item.secondaryToken, item.primaryToken] - : [item.primaryToken, item.secondaryToken], + ? [item.secondaryToken, item.primaryToken] + : [item.primaryToken, item.secondaryToken], position: 'global', }), description: @@ -84,14 +84,14 @@ export const getNavProductsPanel = ({ token: item.primaryToken, }) : item.earnStrategy === EarnStrategies.yield_loop - ? t('nav.earn-on-yield-loop-strategy', { - token: item.primaryToken, - protocol: item.protocol.toUpperCase(), - }) - : t('nav.earn-on-liquidity-provision-strategy', { - token: item.primaryToken, - protocol: item.protocol.toUpperCase(), - }), + ? t('nav.earn-on-yield-loop-strategy', { + token: item.primaryToken, + protocol: item.protocol.toUpperCase(), + }) + : t('nav.earn-on-liquidity-provision-strategy', { + token: item.primaryToken, + protocol: item.protocol.toUpperCase(), + }), tags: [ [ item.earnStrategy === EarnStrategies.erc_4626 diff --git a/features/omni-kit/automation/actions/setupAutoBS.ts b/features/omni-kit/automation/actions/setupAutoBS.ts index 8af200427e..820732b7a8 100644 --- a/features/omni-kit/automation/actions/setupAutoBS.ts +++ b/features/omni-kit/automation/actions/setupAutoBS.ts @@ -38,8 +38,8 @@ export const setupAutoBS = ({ existingAutoBSTrigger && 'minSellPrice' in existingAutoBSTrigger ? existingAutoBSTrigger?.minSellPrice : existingAutoBSTrigger && 'maxBuyPrice' in existingAutoBSTrigger - ? existingAutoBSTrigger?.maxBuyPrice - : undefined + ? existingAutoBSTrigger?.maxBuyPrice + : undefined const isTriggerEnabledWithNoThreshold = (existingAutoBSTrigger && @@ -52,8 +52,8 @@ export const setupAutoBS = ({ const usePrice = isBoolean(automationState.useThreshold) ? automationState.useThreshold : existingAutoBSTrigger - ? !isTriggerEnabledWithNoThreshold - : autoBuySellConstants.defaultToggle + ? !isTriggerEnabledWithNoThreshold + : autoBuySellConstants.defaultToggle const price = usePrice ? (statePrice || currentPrice)?.times(lambdaPriceDenomination) : undefined diff --git a/features/omni-kit/automation/components/auto-buy-sell/OmniAutoBSSidebarController.tsx b/features/omni-kit/automation/components/auto-buy-sell/OmniAutoBSSidebarController.tsx index 23b00468cb..8298b01d31 100644 --- a/features/omni-kit/automation/components/auto-buy-sell/OmniAutoBSSidebarController.tsx +++ b/features/omni-kit/automation/components/auto-buy-sell/OmniAutoBSSidebarController.tsx @@ -161,8 +161,8 @@ export const OmniAutoBSSidebarController: FC<{ type: OmniAutoBSAutomationTypes } const defaultToggle = isBoolean(automationFormState.useThreshold) ? automationFormState.useThreshold : resolvedTrigger && !resolvedThresholdPrice - ? false - : autoBuySellConstants.defaultToggle + ? false + : autoBuySellConstants.defaultToggle const resolveSliderDefaultUpdate = ({ value0, value1 }: { value0: number; value1: number }) => { if (type === AutomationFeatures.AUTO_BUY) { diff --git a/features/omni-kit/automation/helpers/resolveStopLossishAction.ts b/features/omni-kit/automation/helpers/resolveStopLossishAction.ts index fe27833d85..748f2947bb 100644 --- a/features/omni-kit/automation/helpers/resolveStopLossishAction.ts +++ b/features/omni-kit/automation/helpers/resolveStopLossishAction.ts @@ -12,5 +12,5 @@ export const resolveStopLossishAction = ({ action === TriggerAction.Remove ? TriggerAction.Remove : existingSLTrigger || existingTSLTrigger - ? TriggerAction.Update - : TriggerAction.Add + ? TriggerAction.Update + : TriggerAction.Add diff --git a/features/omni-kit/components/sidebars/borrow/OmniBorrowFormOrder.tsx b/features/omni-kit/components/sidebars/borrow/OmniBorrowFormOrder.tsx index d11f4540e0..363eef4a6b 100644 --- a/features/omni-kit/components/sidebars/borrow/OmniBorrowFormOrder.tsx +++ b/features/omni-kit/components/sidebars/borrow/OmniBorrowFormOrder.tsx @@ -137,14 +137,14 @@ export function OmniBorrowFormOrder() { }, ] : isFlowStateReady - ? [ - { - label: t('system.max-transaction-cost'), - value: , - isLoading, - }, - ] - : []), + ? [ + { + label: t('system.max-transaction-cost'), + value: , + isLoading, + }, + ] + : []), ]} /> ) diff --git a/features/omni-kit/components/sidebars/multiply/OmniMultiplyFormOrder.tsx b/features/omni-kit/components/sidebars/multiply/OmniMultiplyFormOrder.tsx index ed8ee804d2..71856017e0 100644 --- a/features/omni-kit/components/sidebars/multiply/OmniMultiplyFormOrder.tsx +++ b/features/omni-kit/components/sidebars/multiply/OmniMultiplyFormOrder.tsx @@ -285,36 +285,36 @@ export function OmniMultiplyFormOrder() { }, ] : isFlowStateReady - ? [ - { - label: t('transaction-fee'), - value: ( - <> - {!oasisFee.isZero() && ( - <> - {formatted.oasisFee} - + - - )} - - - ), - dropdownValues: !oasisFee.isZero() - ? [ - { - label: t('vault-changes.oasis-fee'), - value: formatted.oasisFee, - }, - { - label: t('max-gas-fee'), - value: , - }, - ] - : undefined, - isLoading, - }, - ] - : []), + ? [ + { + label: t('transaction-fee'), + value: ( + <> + {!oasisFee.isZero() && ( + <> + {formatted.oasisFee} + + + + )} + + + ), + dropdownValues: !oasisFee.isZero() + ? [ + { + label: t('vault-changes.oasis-fee'), + value: formatted.oasisFee, + }, + { + label: t('max-gas-fee'), + value: , + }, + ] + : undefined, + isLoading, + }, + ] + : []), ]} /> ) diff --git a/features/omni-kit/contexts/OmniProductContext.tsx b/features/omni-kit/contexts/OmniProductContext.tsx index 27d6fab1c5..e9dbb30c13 100644 --- a/features/omni-kit/contexts/OmniProductContext.tsx +++ b/features/omni-kit/contexts/OmniProductContext.tsx @@ -25,10 +25,10 @@ const multiplyContext = React.createContext = T extends OmniProductType.Borrow ? ProductContextWithBorrow : T extends OmniProductType.Earn - ? ProductContextWithEarn - : T extends OmniProductType.Multiply - ? ProductContextWithMultiply - : never + ? ProductContextWithEarn + : T extends OmniProductType.Multiply + ? ProductContextWithMultiply + : never export function useOmniProductContext( productType: T, @@ -39,8 +39,8 @@ export function useOmniProductContext( productType === OmniProductType.Borrow ? useContext(borrowContext) : productType === OmniProductType.Earn - ? useContext(earnContext) - : useContext(multiplyContext) + ? useContext(earnContext) + : useContext(multiplyContext) if (productType !== environment.productType) throw new Error( diff --git a/features/omni-kit/helpers/getOmniBorrowishChangeVariant.ts b/features/omni-kit/helpers/getOmniBorrowishChangeVariant.ts index 26329b27b1..31a80c2b34 100644 --- a/features/omni-kit/helpers/getOmniBorrowishChangeVariant.ts +++ b/features/omni-kit/helpers/getOmniBorrowishChangeVariant.ts @@ -12,8 +12,8 @@ export const getOmniBorrowishChangeVariant = ({ ? isOracless ? 'positive' : simulation.maxRiskRatio.loanToValue - .minus(simulation.riskRatio.loanToValue) - .gt(LTVWarningThreshold) - ? 'positive' - : 'negative' + .minus(simulation.riskRatio.loanToValue) + .gt(LTVWarningThreshold) + ? 'positive' + : 'negative' : 'positive' diff --git a/features/omni-kit/hooks/useOmniProtocolData.ts b/features/omni-kit/hooks/useOmniProtocolData.ts index 28b368dd57..09b0078155 100644 --- a/features/omni-kit/hooks/useOmniProtocolData.ts +++ b/features/omni-kit/hooks/useOmniProtocolData.ts @@ -72,24 +72,24 @@ export function useOmniProtocolData({ protocolRaw, ) : !isOracless && productType && collateralToken && quoteToken - ? getStaticDpmPositionData$({ - collateralToken, - collateralTokenAddress: tokensAddresses[collateralToken].address, - product: productType, - protocol, - quoteToken, - quoteTokenAddress: tokensAddresses[quoteToken].address, - }) - : isOracless && identifiedTokensData && productType && collateralToken && quoteToken - ? getStaticDpmPositionData$({ - collateralToken: identifiedTokensData[collateralToken].symbol, - collateralTokenAddress: collateralToken, - product: productType, - protocol, - quoteToken: identifiedTokensData[quoteToken].symbol, - quoteTokenAddress: quoteToken, - }) - : EMPTY, + ? getStaticDpmPositionData$({ + collateralToken, + collateralTokenAddress: tokensAddresses[collateralToken].address, + product: productType, + protocol, + quoteToken, + quoteTokenAddress: tokensAddresses[quoteToken].address, + }) + : isOracless && identifiedTokensData && productType && collateralToken && quoteToken + ? getStaticDpmPositionData$({ + collateralToken: identifiedTokensData[collateralToken].symbol, + collateralTokenAddress: collateralToken, + product: productType, + protocol, + quoteToken: identifiedTokensData[quoteToken].symbol, + quoteTokenAddress: quoteToken, + }) + : EMPTY, [ isOracless, positionId, @@ -123,21 +123,21 @@ export function useOmniProtocolData({ networkId, ) : isOracless && dpmPositionData && identifiedTokensData && collateralToken && quoteToken - ? balancesFromAddressInfoArray$( - [ - { - address: collateralToken, - precision: identifiedTokensData[collateralToken].precision, - }, - { - address: quoteToken, - precision: identifiedTokensData[quoteToken].precision, - }, - ], - walletAddress || dpmPositionData.user, - networkId, - ) - : EMPTY, + ? balancesFromAddressInfoArray$( + [ + { + address: collateralToken, + precision: identifiedTokensData[collateralToken].precision, + }, + { + address: quoteToken, + precision: identifiedTokensData[quoteToken].precision, + }, + ], + walletAddress || dpmPositionData.user, + networkId, + ) + : EMPTY, [ isOracless, dpmPositionData, @@ -173,13 +173,13 @@ export function useOmniProtocolData({ quotePrecision: getToken(dpmPositionData.quoteToken).precision, } : isOracless && identifiedTokensData && collateralToken && quoteToken - ? { - collateralDigits: DEFAULT_TOKEN_DIGITS, - collateralPrecision: identifiedTokensData[collateralToken].precision, - quoteDigits: DEFAULT_TOKEN_DIGITS, - quotePrecision: identifiedTokensData[quoteToken].precision, - } - : undefined + ? { + collateralDigits: DEFAULT_TOKEN_DIGITS, + collateralPrecision: identifiedTokensData[collateralToken].precision, + quoteDigits: DEFAULT_TOKEN_DIGITS, + quotePrecision: identifiedTokensData[quoteToken].precision, + } + : undefined }, [isOracless, dpmPositionData, identifiedTokensData, collateralToken, quoteToken]) const tokensIconsData = useMemo(() => { @@ -189,24 +189,24 @@ export function useOmniProtocolData({ quoteToken, } : dpmPositionData && isOracless && identifiedTokensData - ? { - collateralToken: - identifiedTokensData[dpmPositionData.collateralTokenAddress.toLowerCase()].source === - 'blockchain' - ? dpmPositionData.collateralTokenAddress - : dpmPositionData.collateralToken, - quoteToken: - identifiedTokensData[dpmPositionData.quoteTokenAddress.toLowerCase()].source === - 'blockchain' - ? dpmPositionData.quoteTokenAddress - : dpmPositionData.quoteToken, - } - : dpmPositionData - ? { - collateralToken: dpmPositionData.collateralToken, - quoteToken: dpmPositionData.quoteToken, - } - : undefined + ? { + collateralToken: + identifiedTokensData[dpmPositionData.collateralTokenAddress.toLowerCase()].source === + 'blockchain' + ? dpmPositionData.collateralTokenAddress + : dpmPositionData.collateralToken, + quoteToken: + identifiedTokensData[dpmPositionData.quoteTokenAddress.toLowerCase()].source === + 'blockchain' + ? dpmPositionData.quoteTokenAddress + : dpmPositionData.quoteToken, + } + : dpmPositionData + ? { + collateralToken: dpmPositionData.collateralToken, + quoteToken: dpmPositionData.quoteToken, + } + : undefined }, [identifiedTokensData, collateralToken, quoteToken, isOracless, dpmPositionData]) return { diff --git a/features/omni-kit/hooks/useOmniTransition.ts b/features/omni-kit/hooks/useOmniTransition.ts index 807333e0c1..4ff6f4362a 100644 --- a/features/omni-kit/hooks/useOmniTransition.ts +++ b/features/omni-kit/hooks/useOmniTransition.ts @@ -37,8 +37,8 @@ export function useOmniProductTypeTransition({ productType === OmniProductType.Borrow ? VaultType.Multiply : productType === OmniProductType.Multiply - ? VaultType.Borrow - : undefined + ? VaultType.Borrow + : undefined const transitionHandler = () => { const jwtToken = jwtAuthGetToken(walletAddress || '') diff --git a/features/omni-kit/observables/getDpmPositionData.ts b/features/omni-kit/observables/getDpmPositionData.ts index 3f802c3b02..b8d36b01f2 100644 --- a/features/omni-kit/observables/getDpmPositionData.ts +++ b/features/omni-kit/observables/getDpmPositionData.ts @@ -173,8 +173,8 @@ export function getDpmPositionDataV2$( hasMultiplePositions, } : Array.isArray(positions) || !dpmProxy - ? null - : undefined, + ? null + : undefined, ), ) }), diff --git a/features/omni-kit/observables/sendOmniTransaction.ts b/features/omni-kit/observables/sendOmniTransaction.ts index 25185a86af..01910273da 100644 --- a/features/omni-kit/observables/sendOmniTransaction.ts +++ b/features/omni-kit/observables/sendOmniTransaction.ts @@ -92,8 +92,8 @@ export const sendOmniTransaction$ = ({ const status = isSuccess ? TxStatus.Success : isError - ? TxStatus.Error - : TxStatus.WaitingForConfirmation + ? TxStatus.Error + : TxStatus.WaitingForConfirmation return { status, diff --git a/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultAction.ts b/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultAction.ts index ec82d6b5c3..f238546e31 100644 --- a/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultAction.ts +++ b/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultAction.ts @@ -6,5 +6,5 @@ export const getAjnaEarnDefaultAction = (isOpening: boolean, ajnaPosition: AjnaE ajnaPosition.collateralTokenAmount.gt(zero) ? OmniEarnFormAction.ClaimEarn : isOpening - ? OmniEarnFormAction.OpenEarn - : OmniEarnFormAction.DepositEarn + ? OmniEarnFormAction.OpenEarn + : OmniEarnFormAction.DepositEarn diff --git a/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultUiDropdown.ts b/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultUiDropdown.ts index fd90b63a60..b9fa8f2329 100644 --- a/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultUiDropdown.ts +++ b/features/omni-kit/protocols/ajna/helpers/getAjnaEarnDefaultUiDropdown.ts @@ -6,5 +6,5 @@ export const getAjnaEarnDefaultUiDropdown = (ajnaPosition: AjnaEarnPosition) => ajnaPosition.collateralTokenAmount.gt(zero) ? OmniSidebarEarnPanel.ClaimCollateral : ajnaPosition.quoteTokenAmount.isZero() - ? OmniSidebarEarnPanel.Liquidity - : OmniSidebarEarnPanel.Adjust + ? OmniSidebarEarnPanel.Liquidity + : OmniSidebarEarnPanel.Adjust diff --git a/features/omni-kit/protocols/ajna/helpers/getEarnDefaultPrice.ts b/features/omni-kit/protocols/ajna/helpers/getEarnDefaultPrice.ts index 7cbf94b4f9..1adfd88394 100644 --- a/features/omni-kit/protocols/ajna/helpers/getEarnDefaultPrice.ts +++ b/features/omni-kit/protocols/ajna/helpers/getEarnDefaultPrice.ts @@ -5,6 +5,6 @@ export const getEarnDefaultPrice = (position: AjnaEarnPosition) => { return position.price.gt(zero) ? position.price : !position.pool.lowestUtilizedPriceIndex.isZero() - ? position.pool.lowestUtilizedPrice - : undefined + ? position.pool.lowestUtilizedPrice + : undefined } diff --git a/features/omni-kit/protocols/ajna/hooks/useAjnaData.ts b/features/omni-kit/protocols/ajna/hooks/useAjnaData.ts index 614006112b..688029ae1a 100644 --- a/features/omni-kit/protocols/ajna/hooks/useAjnaData.ts +++ b/features/omni-kit/protocols/ajna/hooks/useAjnaData.ts @@ -45,8 +45,8 @@ export function useAjnaData({ dpmPositionData.quoteTokenAddress, ) : isOracless && dpmPositionData && tokenPriceUSDData - ? ajnaPosition$(one, one, dpmPositionData, networkId, collateralToken, quoteToken) - : EMPTY, + ? ajnaPosition$(one, one, dpmPositionData, networkId, collateralToken, quoteToken) + : EMPTY, [dpmPositionData, isOracless, tokenPriceUSDData], ), ) diff --git a/features/omni-kit/protocols/ajna/metadata/AjnaEarnFormOrderInformation.tsx b/features/omni-kit/protocols/ajna/metadata/AjnaEarnFormOrderInformation.tsx index e977037c1f..3ac8c88822 100644 --- a/features/omni-kit/protocols/ajna/metadata/AjnaEarnFormOrderInformation.tsx +++ b/features/omni-kit/protocols/ajna/metadata/AjnaEarnFormOrderInformation.tsx @@ -117,14 +117,14 @@ export const AjnaEarnFormOrderInformation: FC = () => { }, ] : isFlowStateReady - ? [ - { - label: t('system.max-transaction-cost'), - value: , - isLoading, - }, - ] - : []), + ? [ + { + label: t('system.max-transaction-cost'), + value: , + isLoading, + }, + ] + : []), ]} /> ) diff --git a/features/omni-kit/protocols/erc-4626/components/sidebar/Erc4626FormOrder.tsx b/features/omni-kit/protocols/erc-4626/components/sidebar/Erc4626FormOrder.tsx index e9cb1da66e..99c8c8cbaa 100644 --- a/features/omni-kit/protocols/erc-4626/components/sidebar/Erc4626FormOrder.tsx +++ b/features/omni-kit/protocols/erc-4626/components/sidebar/Erc4626FormOrder.tsx @@ -171,38 +171,38 @@ export const Erc4626FormOrder: FC = () => { }, ] : isFlowStateReady - ? oasisFee - ? [ - { - label: t('transaction-fee'), - value: ( - - {formatted.oasisFee} - + - - - ), - dropdownValues: [ - { - label: t('vault-changes.oasis-fee'), - value: formatted.oasisFee, - }, - { - label: t('max-gas-fee'), - value: , - }, - ], - isLoading, - }, - ] - : [ - { - label: t('system.max-transaction-cost'), - value: , - isLoading, - }, - ] - : []), + ? oasisFee + ? [ + { + label: t('transaction-fee'), + value: ( + + {formatted.oasisFee} + + + + + ), + dropdownValues: [ + { + label: t('vault-changes.oasis-fee'), + value: formatted.oasisFee, + }, + { + label: t('max-gas-fee'), + value: , + }, + ], + isLoading, + }, + ] + : [ + { + label: t('system.max-transaction-cost'), + value: , + isLoading, + }, + ] + : []), ]} /> ) diff --git a/features/omni-kit/state/automation/common/getAutomationFormDefaults.ts b/features/omni-kit/state/automation/common/getAutomationFormDefaults.ts index a462ca1489..63b28d9d2e 100644 --- a/features/omni-kit/state/automation/common/getAutomationFormDefaults.ts +++ b/features/omni-kit/state/automation/common/getAutomationFormDefaults.ts @@ -20,14 +20,14 @@ export const getAutomationFormDefaults = ( uiDropdownProtection: isTrailingStopLossEnabled ? AutomationFeatures.TRAILING_STOP_LOSS : isStopLossEnabled - ? AutomationFeatures.STOP_LOSS - : isAutoSellEnabled - ? AutomationFeatures.AUTO_SELL - : undefined, + ? AutomationFeatures.STOP_LOSS + : isAutoSellEnabled + ? AutomationFeatures.AUTO_SELL + : undefined, uiDropdownOptimization: isPartialTakeProfitEnabled ? AutomationFeatures.PARTIAL_TAKE_PROFIT : isAutoBuyEnabled - ? AutomationFeatures.AUTO_BUY - : undefined, + ? AutomationFeatures.AUTO_BUY + : undefined, } } diff --git a/features/productHub/helpers/sortByDefault.ts b/features/productHub/helpers/sortByDefault.ts index 5176c1f2c7..f50e09cfc5 100644 --- a/features/productHub/helpers/sortByDefault.ts +++ b/features/productHub/helpers/sortByDefault.ts @@ -16,8 +16,8 @@ function sortByProductValue( .times(asc) .toNumber() : a[param] - ? -1 - : 1, + ? -1 + : 1, ) } diff --git a/features/stateMachines/transaction/ethersTransactionStateMachine.ts b/features/stateMachines/transaction/ethersTransactionStateMachine.ts index d344bbcdd9..39a264d090 100644 --- a/features/stateMachines/transaction/ethersTransactionStateMachine.ts +++ b/features/stateMachines/transaction/ethersTransactionStateMachine.ts @@ -39,7 +39,7 @@ export function createEthersTransactionStateMachine Promise.resolve({} as ethers.ContractTransaction), - extract: () => ({} as TResult), + extract: () => ({}) as TResult, }, schema: { context: {} as EthersTransactionStateMachineContext, diff --git a/features/termsOfService/termsAcceptance.test.ts b/features/termsOfService/termsAcceptance.test.ts index a26e4b7115..ae52d0bb66 100644 --- a/features/termsOfService/termsAcceptance.test.ts +++ b/features/termsOfService/termsAcceptance.test.ts @@ -1,3 +1,4 @@ +import { NetworkIds } from 'blockchain/networks' import type { Web3Context } from 'features/web3Context' import { getStateUnpacker } from 'helpers/testHelpers' import { mapValues } from 'lodash' @@ -21,7 +22,7 @@ const defaultParams: PipelineInput = { account: '0x123', web3: {} as Web3, connectionKind: 'injected', - chainId: 42, + chainId: NetworkIds.MAINNET, deactivate: () => null, walletLabel: 'MetaMask', connectionMethod: 'web3-onboard', diff --git a/features/userSettings/userSettings.ts b/features/userSettings/userSettings.ts index 1a8b425b81..ba600bc136 100644 --- a/features/userSettings/userSettings.ts +++ b/features/userSettings/userSettings.ts @@ -53,7 +53,7 @@ function saveSettings( ) { return saveUserSettings$(slippageInput) .pipe( - map(() => ({ kind: 'settingsSaved', slippageInput } as UserSettingsChange)), + map(() => ({ kind: 'settingsSaved', slippageInput }) as UserSettingsChange), startWith({ kind: 'stage', stage: 'inProgress' } as UserSettingsChange), catchError(() => of({ kind: 'stage', stage: 'failure' } as UserSettingsChange)), ) diff --git a/features/vaultHistory/groupHistoryEventsByHash.ts b/features/vaultHistory/groupHistoryEventsByHash.ts index e339372ffc..f979eaaf35 100644 --- a/features/vaultHistory/groupHistoryEventsByHash.ts +++ b/features/vaultHistory/groupHistoryEventsByHash.ts @@ -1,10 +1,13 @@ import type { VaultHistoryEvent } from './vaultHistory.types' export function groupHistoryEventsByHash(events: VaultHistoryEvent[]) { - return events.reduce((acc, curr) => { - return { - ...acc, - [curr.hash]: [...(acc[curr.hash] ? acc[curr.hash] : []), curr], - } - }, {} as Record) + return events.reduce( + (acc, curr) => { + return { + ...acc, + [curr.hash]: [...(acc[curr.hash] ? acc[curr.hash] : []), curr], + } + }, + {} as Record, + ) } diff --git a/features/vaultHistory/vaultHistory.ts b/features/vaultHistory/vaultHistory.ts index 9a3ca20ebc..401c380cb6 100644 --- a/features/vaultHistory/vaultHistory.ts +++ b/features/vaultHistory/vaultHistory.ts @@ -199,7 +199,7 @@ export function getOverrideTriggers(events: VaultHistoryEvent[]) { removeTriggerData: [unpackTriggerDataForHistory(item)], eventType: 'removed', autoKind: item.kind, - } as VaultHistoryEvent), + }) as VaultHistoryEvent, ), ] } @@ -226,7 +226,7 @@ export function getExecuteTrigger(events: VaultHistoryEvent[]) { groupId: 'groupId' in autoEvent && autoEvent.groupId, eventType: 'executed', autoKind: autoEvent.kind, - } as VaultHistoryEvent + } as unknown as VaultHistoryEvent } return undefined @@ -235,33 +235,36 @@ export function getExecuteTrigger(events: VaultHistoryEvent[]) { export function mapAutomationEvents(events: VaultHistoryEvent[]) { const groupedByHash = groupHistoryEventsByHash(events) - const wrappedByHash = Object.keys(groupedByHash).reduce((acc, key) => { - const updateTriggerEvent = getUpdateTrigger(groupedByHash[key]) - const executeTriggerEvent = getExecuteTrigger(groupedByHash[key]) - const addOrRemoveEvent = getAddOrRemoveTrigger(groupedByHash[key]) - const overrideEvents = getOverrideTriggers(groupedByHash[key]) + const wrappedByHash = Object.keys(groupedByHash).reduce( + (acc, key) => { + const updateTriggerEvent = getUpdateTrigger(groupedByHash[key]) + const executeTriggerEvent = getExecuteTrigger(groupedByHash[key]) + const addOrRemoveEvent = getAddOrRemoveTrigger(groupedByHash[key]) + const overrideEvents = getOverrideTriggers(groupedByHash[key]) - if (overrideEvents) { - return { ...acc, [key]: overrideEvents } - } + if (overrideEvents) { + return { ...acc, [key]: overrideEvents } + } - if (updateTriggerEvent) { - return { ...acc, [key]: [updateTriggerEvent] } - } + if (updateTriggerEvent) { + return { ...acc, [key]: [updateTriggerEvent] } + } - if (executeTriggerEvent) { - return { - ...acc, - [key]: [executeTriggerEvent], + if (executeTriggerEvent) { + return { + ...acc, + [key]: [executeTriggerEvent], + } } - } - if (addOrRemoveEvent) { - return { ...acc, [key]: [addOrRemoveEvent] } - } + if (addOrRemoveEvent) { + return { ...acc, [key]: [addOrRemoveEvent] } + } - return { ...acc, [key]: groupedByHash[key] } - }, {} as Record) + return { ...acc, [key]: groupedByHash[key] } + }, + {} as Record, + ) return flatten(Object.values(wrappedByHash)) } diff --git a/features/vaultTransitions/openVaultTransitions.ts b/features/vaultTransitions/openVaultTransitions.ts index 294d6c7fd5..1964f4d424 100644 --- a/features/vaultTransitions/openVaultTransitions.ts +++ b/features/vaultTransitions/openVaultTransitions.ts @@ -55,11 +55,11 @@ export function createApplyOpenVaultTransition< const stage = !hasProxy ? 'proxyWaitingForConfirmation' : !hasAllowance - ? 'allowanceWaitingForConfirmation' - : state.withStopLossStage && - (state.generateAmount?.gt(zero) || state.afterOutstandingDebt?.gt(zero)) - ? 'stopLossEditing' - : 'txWaitingForConfirmation' + ? 'allowanceWaitingForConfirmation' + : state.withStopLossStage && + (state.generateAmount?.gt(zero) || state.afterOutstandingDebt?.gt(zero)) + ? 'stopLossEditing' + : 'txWaitingForConfirmation' if (canProgress) { return { diff --git a/handlers/portfolio/positions/handlers/ajna/helpers/getAjnaPositionDetails.ts b/handlers/portfolio/positions/handlers/ajna/helpers/getAjnaPositionDetails.ts index 711f4f3b13..2b4935ebc8 100644 --- a/handlers/portfolio/positions/handlers/ajna/helpers/getAjnaPositionDetails.ts +++ b/handlers/portfolio/positions/handlers/ajna/helpers/getAjnaPositionDetails.ts @@ -105,10 +105,10 @@ export function getAjnaPositionDetails({ value: getIsActiveWhenLupBelowHtp({ price, lowestUtilizedPrice, highestThresholdPrice }) ? LendingRangeType.Active : price.lt(highestThresholdPrice) - ? LendingRangeType.Unutilized - : price.lt(lowestUtilizedPrice) - ? LendingRangeType.Available - : LendingRangeType.Active, + ? LendingRangeType.Unutilized + : price.lt(lowestUtilizedPrice) + ? LendingRangeType.Available + : LendingRangeType.Active, ...(price.gte(lowestUtilizedPrice) && { accent: 'positive' }), }, { diff --git a/handlers/product-hub/update-handlers/maker/makerHandler.ts b/handlers/product-hub/update-handlers/maker/makerHandler.ts index c035e9121a..8fa728a03b 100644 --- a/handlers/product-hub/update-handlers/maker/makerHandler.ts +++ b/handlers/product-hub/update-handlers/maker/makerHandler.ts @@ -52,13 +52,16 @@ async function getMakerData( const PotContract = PotFactory.connect(PotContractAddress, rpcProvider) const daiPrice = new BigNumber(getTokenPrice('DAI', tickers, 'makerHandler')) - const ilksListWithHexValues = makerProductHubProducts.reduce((acc, product) => { - const ilk = getIlk(product.label) - return { - ...acc, - [ilk]: Web3.utils.padRight(Web3.utils.stringToHex(ilk), 64), - } - }, {} as { [key: string]: string }) + const ilksListWithHexValues = makerProductHubProducts.reduce( + (acc, product) => { + const ilk = getIlk(product.label) + return { + ...acc, + [ilk]: Web3.utils.padRight(Web3.utils.stringToHex(ilk), 64), + } + }, + {} as { [key: string]: string }, + ) const vatIlkPromises = Object.keys(ilksListWithHexValues).map(async (ilk) => { const vatIlkData = await VatContract.ilks(ilksListWithHexValues[ilk]) diff --git a/helpers/api/tokenTickers.ts b/helpers/api/tokenTickers.ts index 1534bcb9cb..0939da2ea5 100644 --- a/helpers/api/tokenTickers.ts +++ b/helpers/api/tokenTickers.ts @@ -1,4 +1,5 @@ import axios from 'axios' +import type { PriceServiceResponse } from 'helpers/types' import { getCoinbaseTickers } from 'server/services/coinbase' import { getCoingeckoTickers } from 'server/services/coingecko' import { getCoinPaprikaTickers } from 'server/services/coinPaprika' @@ -7,7 +8,7 @@ import { getSUSDEOracleTicker } from 'server/services/susdeOracle' import { getUSDEOracleTicker } from 'server/services/usdeOracle' import { getWSTETHOracleTicker } from 'server/services/wstethOracle' -export async function tokenTickers() { +export async function tokenTickers(): Promise { if (process.env.TOKEN_TICKERS_OVERRIDE) { return (await axios.get(process.env.TOKEN_TICKERS_OVERRIDE)).data } diff --git a/helpers/form.tsx b/helpers/form.tsx index 8b8fec2670..c84a9ff31d 100644 --- a/helpers/form.tsx +++ b/helpers/form.tsx @@ -171,7 +171,7 @@ export function toGasPriceChange(gasPrice$: Observable): Observable Observable, ): Observable { return theAllowance$(token).pipe( - map((allowance: boolean) => ({ kind, allowance } as AllowanceChange)), + map((allowance: boolean) => ({ kind, allowance }) as AllowanceChange), ) } @@ -207,7 +207,7 @@ export function toAccountChange(account$: Observable) { ({ value, kind: FormChangeKind.accountChange, - } as AccountChange), + }) as AccountChange, ), ) } diff --git a/helpers/formatters/Formatters.tsx b/helpers/formatters/Formatters.tsx index 1c50112a3f..759836419d 100644 --- a/helpers/formatters/Formatters.tsx +++ b/helpers/formatters/Formatters.tsx @@ -27,10 +27,10 @@ const FormatNumber = (props: FormatNumberProps) => { const groups = dontGroup ? [formatted] : !match - ? [] - : match[2] - ? [`${match[1]}${match[3]}${match[4]}`, match[5]] - : [`${match[1]}.0`] + ? [] + : match[2] + ? [`${match[1]}${match[3]}${match[4]}`, match[5]] + : [`${match[1]}.0`] return ( {value.lt(zero) ? '-' : ''} diff --git a/helpers/formatters/format.ts b/helpers/formatters/format.ts index 7c8a653fb5..af5cd69f0e 100644 --- a/helpers/formatters/format.ts +++ b/helpers/formatters/format.ts @@ -74,10 +74,10 @@ export function formatUsdValue(amount: BigNumber, decimalPlaces = 2): string { return amount.isZero() ? '$0.00' : absoluteAmount.lt(0.01) - ? `$<${amount.isNegative() ? '-' : ''}0.01` - : absoluteAmount.lt(million) - ? `$${amount.toFormat(decimalPlaces, BigNumber.ROUND_DOWN)}` - : `$${formatAsShorthandNumbers(amount, decimalPlaces)}` + ? `$<${amount.isNegative() ? '-' : ''}0.01` + : absoluteAmount.lt(million) + ? `$${amount.toFormat(decimalPlaces, BigNumber.ROUND_DOWN)}` + : `$${formatAsShorthandNumbers(amount, decimalPlaces)}` } export function formatFiatBalance(amount: BigNumber): string { diff --git a/helpers/mocks/manageMultiplyVault.mock.ts b/helpers/mocks/manageMultiplyVault.mock.ts index aae326f9c4..564472820a 100644 --- a/helpers/mocks/manageMultiplyVault.mock.ts +++ b/helpers/mocks/manageMultiplyVault.mock.ts @@ -136,8 +136,8 @@ export function mockManageMultiplyVault$({ ? of(daiAllowance || zero) : of(maxUint256) : _collateralAllowance$ || collateralAllowance - ? of(collateralAllowance || zero) - : of(maxUint256) + ? of(collateralAllowance || zero) + : of(maxUint256) } function vault$() { diff --git a/helpers/mocks/web3Context.mock.ts b/helpers/mocks/web3Context.mock.ts index 4679f08859..6816affc8e 100644 --- a/helpers/mocks/web3Context.mock.ts +++ b/helpers/mocks/web3Context.mock.ts @@ -46,10 +46,10 @@ export function mockWeb3Context$({ status === 'notConnected' ? mockWeb3ContextNotConnected : status === 'connectedReadonly' - ? mockWeb3ContextConnectedReadonly - : { - ...mockWeb3ContextConnected, - ...(account && { account }), - }, + ? mockWeb3ContextConnectedReadonly + : { + ...mockWeb3ContextConnected, + ...(account && { account }), + }, ) } diff --git a/helpers/productToVaultType.ts b/helpers/productToVaultType.ts index 70623ed192..eac2e7d6a6 100644 --- a/helpers/productToVaultType.ts +++ b/helpers/productToVaultType.ts @@ -6,8 +6,8 @@ export function productToVaultType( return productType === 'Borrow' ? VaultType.Borrow : productType === 'Multiply' - ? VaultType.Multiply - : productType === 'Earn' - ? VaultType.Earn - : undefined + ? VaultType.Multiply + : productType === 'Earn' + ? VaultType.Earn + : undefined } diff --git a/helpers/totalSteps.ts b/helpers/totalSteps.ts index f5c832d51e..2468e807bb 100644 --- a/helpers/totalSteps.ts +++ b/helpers/totalSteps.ts @@ -25,15 +25,15 @@ export function getTotalStepsForOpenVaultFlow({ (!proxyAddress && !hasAllowance) || withProxyStep ? 5 : !hasAllowance || withAllowanceStep - ? 4 - : 3 + ? 4 + : 3 const stepsWithoutSlAndWithOtherToken = (!proxyAddress && !hasAllowance) || withProxyStep ? 4 : !hasAllowance || withAllowanceStep - ? 3 - : 2 + ? 3 + : 2 const stepsWithSlAndWithETH = !proxyAddress || withProxyStep ? 4 : 3 @@ -42,8 +42,8 @@ export function getTotalStepsForOpenVaultFlow({ return withStopLossStep && isEthToken ? stepsWithSlAndWithETH : !withStopLossStep && isEthToken - ? stepsWithoutSlAndWithETH - : withStopLossStep && !isEthToken - ? stepsWithSlAndWithOtherToken - : stepsWithoutSlAndWithOtherToken + ? stepsWithoutSlAndWithETH + : withStopLossStep && !isEthToken + ? stepsWithSlAndWithOtherToken + : stepsWithoutSlAndWithOtherToken } diff --git a/helpers/types.ts b/helpers/types.ts index c5a4319bb1..dc622b34a4 100644 --- a/helpers/types.ts +++ b/helpers/types.ts @@ -29,8 +29,8 @@ type GrowExp< export type FixedSizeArray = N extends 0 ? [] : N extends 1 - ? [T] - : GrowExp<[T, T], N, [[T]]> + ? [T] + : GrowExp<[T, T], N, [[T]]> export type TxError = { name: string diff --git a/package.json b/package.json index 178a506432..8920969301 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "12.17.2", "license": "Apache-2.0", "engines": { - "node": ">=18.12" + "node": ">=18.19" }, "packageManager": "yarn@1.22.21", "scripts": { @@ -18,11 +18,13 @@ "build": "next build && node sitemapGenerator.js", "build:8gb": "NODE_OPTIONS=--max-old-space-size=8192 next build", "build:server": "tsc --project ./tsconfig.prod.json", - "format": "prettier --loglevel silent --check \"./**/*.{ts,tsx,js,jsx}\"", - "format:fix": "prettier --loglevel silent --write \"./**/*.{ts,tsx,js,jsx}\"", - "lint": "eslint --quiet --ext .ts --ext .tsx .", + "format": "prettier --log-level silent --cache --cache-location ./node_modules/.cache/prettier.cache --check \"./**/*.{ts,tsx,js,jsx}\"", + "format:fix": "prettier --loglevel silent --cache --cache-location ./node_modules/.cache/prettier.cache --write \"./**/*.{ts,tsx,js,jsx}\"", + "lint": "eslint --quiet --cache --cache-location ./node_modules/.cache/eslint.cache --ext .ts --ext .tsx .", "lint:fix": "yarn lint --fix", - "typecheck": "tsc -p ./tsconfig.test.json --noEmit && tsc -p ./tsconfig.json --noEmit", + "typecheck-test": "tsc -p ./tsconfig.test.json --noEmit --incremental --tsBuildInfoFile './node_modules/.cache/.test-tsbuildinfo'", + "typecheck-app": "tsc -p ./tsconfig.json --noEmit --incremental --tsBuildInfoFile './node_modules/.cache/.app-tsbuildinfo'", + "typecheck": "yarn typecheck-app && yarn typecheck-test", "typecheck:watch": "tsc -p ./tsconfig.json --noEmit --watch", "test": "jest", "test:fix": "yarn lint:fix && yarn tsc && yarn format:fix && yarn test && yarn typecheck", @@ -111,7 +113,6 @@ "rxjs-take-while-inclusive": "^2.1.0", "sass": "^1.49.4", "snowflake-sdk": "^1.6.10", - "socket.io": "^4.5.1", "terser-webpack-plugin": "^5.3.9", "text-mask-addons": "^3.7.2", "theme-ui": "^0.16.1", @@ -170,14 +171,13 @@ "@types/react-select": "^3.0.16", "@types/react-text-mask": "^5.4.0", "@types/snowflake-sdk": "^1.6.7", - "@types/socket.io-client": "^3.0.0", - "@typescript-eslint/eslint-plugin": "^6.9.1", - "@typescript-eslint/parser": "^6.9.1", + "@typescript-eslint/eslint-plugin": "^7.3.1", + "@typescript-eslint/parser": "^7.3.1", "@xstate/cli": "^0.5.1", "@xstate/inspect": "^0.8.0", "@xstate/test": "^0.5.1", "circular-dependency-plugin": "^5.2.2", - "eslint": "^7.10.0", + "eslint": "^8.57.0", "eslint-config-typestrict": "^1.0.0", "eslint-plugin-deprecation": "^2.0.0", "eslint-plugin-import": "^2.29.0", @@ -195,10 +195,10 @@ "jest-canvas-mock": "^2.5.0", "jest-environment-jsdom": "^29.5.0", "json-to-ts": "^1.7.0", - "prettier": "^2.2.0", + "prettier": "3.2.5", "prisma": "4.8.0", "typechain": "^8.1.1", - "typescript": "^4.9.5" + "typescript": "^5.4.3" }, "nextBundleAnalysis": { "budget": null, diff --git a/server/rewrites.ts b/server/rewrites.ts index bf53891bab..d3187a9e69 100644 --- a/server/rewrites.ts +++ b/server/rewrites.ts @@ -56,10 +56,13 @@ export function handleRewrite(request: NextRequest): NextResponse | null { const matches = regex.exec(request.nextUrl.pathname) if (matches) { - const params = names.reduce((acc, name, index) => { - acc[name] = matches[index + 1] - return acc - }, {} as Record) + const params = names.reduce( + (acc, name, index) => { + acc[name] = matches[index + 1] + return acc + }, + {} as Record, + ) const destination = constructDestination(rule.destination, params) const url = request.nextUrl.clone() diff --git a/yarn.lock b/yarn.lock index 103970f2f2..ca22c0fc13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== + "@adobe/css-tools@^4.3.0": version "4.3.1" resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28" @@ -920,34 +925,38 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6" integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww== -"@eslint-community/eslint-utils@^4.4.0": +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.5.1": +"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": version "4.10.0" resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== -"@eslint/eslintrc@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085" - integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA== +"@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== dependencies: ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^12.1.0" - ignore "^4.0.6" + debug "^4.3.2" + espree "^9.6.0" + globals "^13.19.0" + ignore "^5.2.0" import-fresh "^3.2.1" - js-yaml "^3.13.1" - lodash "^4.17.19" - minimatch "^3.0.4" + js-yaml "^4.1.0" + minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== + "@ethereumjs/common@2.6.2": version "2.6.2" resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.2.tgz#eb006c9329c75c80f634f340dc1719a5258244df" @@ -1579,6 +1588,25 @@ dependencies: "@hapi/hoek" "^9.0.0" +"@humanwhocodes/config-array@^0.11.14": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== + dependencies: + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" + integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== + "@inrupt/jest-jsdom-polyfills@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@inrupt/jest-jsdom-polyfills/-/jest-jsdom-polyfills-2.4.0.tgz#ccc6715a0145f5516d5a442da00956e135a449da" @@ -2377,7 +2405,7 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.3": +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -3898,11 +3926,6 @@ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== -"@types/component-emitter@^1.2.10": - version "1.2.11" - resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506" - integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ== - "@types/connect@*": version "3.4.33" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" @@ -3917,16 +3940,6 @@ dependencies: "@types/node" "*" -"@types/cookie@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" - integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== - -"@types/cors@^2.8.12": - version "2.8.12" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" - integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== - "@types/debug@^4.1.7": version "4.1.8" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" @@ -4135,11 +4148,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.18.tgz#acae19ad9011a2ab3d792232501c95085ba1838f" integrity sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw== -"@types/node@>=10.0.0": - version "18.6.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.1.tgz#828e4785ccca13f44e2fb6852ae0ef11e3e20ba5" - integrity sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg== - "@types/node@>=13.7.0": version "20.3.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" @@ -4327,13 +4335,6 @@ "@types/generic-pool" "*" "@types/node" "*" -"@types/socket.io-client@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-3.0.0.tgz#d0b8ea22121b7c1df68b6a923002f9c8e3cefb42" - integrity sha512-s+IPvFoEIjKA3RdJz/Z2dGR4gLgysKi8owcnrVwNjgvc01Lk68LJDDsG2GRqegFITcxmvCMYM7bhMpwEMlHmDg== - dependencies: - socket.io-client "*" - "@types/stack-utils@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" @@ -4404,16 +4405,16 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz#d8ce497dc0ed42066e195c8ecc40d45c7b1254f4" - integrity sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg== +"@typescript-eslint/eslint-plugin@^7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.3.1.tgz#0d8f38a6c8a1802139e62184ee7a68ed024f30a1" + integrity sha512-STEDMVQGww5lhCuNXVSQfbfuNII5E08QWkvAw5Qwf+bj2WT+JkG1uc+5/vXA3AOYMDHVOSpL+9rcbEUiHIm2dw== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/type-utils" "6.9.1" - "@typescript-eslint/utils" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/scope-manager" "7.3.1" + "@typescript-eslint/type-utils" "7.3.1" + "@typescript-eslint/utils" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -4421,15 +4422,15 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@^6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.9.1.tgz#4f685f672f8b9580beb38d5fb99d52fc3e34f7a3" - integrity sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg== +"@typescript-eslint/parser@^7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.3.1.tgz#c4ba7dc2744318a5e4506596cbc3a0086255c526" + integrity sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw== dependencies: - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/typescript-estree" "6.9.1" - "@typescript-eslint/visitor-keys" "6.9.1" + "@typescript-eslint/scope-manager" "7.3.1" + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/typescript-estree" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" debug "^4.3.4" "@typescript-eslint/scope-manager@6.9.1": @@ -4440,13 +4441,21 @@ "@typescript-eslint/types" "6.9.1" "@typescript-eslint/visitor-keys" "6.9.1" -"@typescript-eslint/type-utils@6.9.1": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz#efd5db20ed35a74d3c7d8fba51b830ecba09ce32" - integrity sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg== +"@typescript-eslint/scope-manager@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.3.1.tgz#73fd0cb4211a7be23e49e5b6efec8820caa6ec36" + integrity sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag== dependencies: - "@typescript-eslint/typescript-estree" "6.9.1" - "@typescript-eslint/utils" "6.9.1" + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" + +"@typescript-eslint/type-utils@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.3.1.tgz#cbf90d3d7e788466aa8a5c0ab3f46103f098aa0d" + integrity sha512-iFhaysxFsMDQlzJn+vr3OrxN8NmdQkHks4WaqD4QBnt5hsq234wcYdyQ9uquzJJIDAj5W4wQne3yEsYA6OmXGw== + dependencies: + "@typescript-eslint/typescript-estree" "7.3.1" + "@typescript-eslint/utils" "7.3.1" debug "^4.3.4" ts-api-utils "^1.0.1" @@ -4455,6 +4464,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.9.1.tgz#a6cfc20db0fcedcb2f397ea728ef583e0ee72459" integrity sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ== +"@typescript-eslint/types@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.3.1.tgz#ae104de8efa4227a462c0874d856602c5994413c" + integrity sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw== + "@typescript-eslint/typescript-estree@6.9.1": version "6.9.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz#8c77910a49a04f0607ba94d78772da07dab275ad" @@ -4468,7 +4482,34 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.9.1", "@typescript-eslint/utils@^6.0.0": +"@typescript-eslint/typescript-estree@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.3.1.tgz#598848195fad34c7aa73f548bd00a4d4e5f5e2bb" + integrity sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ== + dependencies: + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/visitor-keys" "7.3.1" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "9.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/utils@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.3.1.tgz#fc28fd508ccf89495012561b7c02a6fdad162460" + integrity sha512-jIERm/6bYQ9HkynYlNZvXpzmXWZGhMbrOvq3jJzOSOlKXsVjrrolzWBjDW6/TvT5Q3WqaN4EkmcfdQwi9tDjBQ== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "7.3.1" + "@typescript-eslint/types" "7.3.1" + "@typescript-eslint/typescript-estree" "7.3.1" + semver "^7.5.4" + +"@typescript-eslint/utils@^6.0.0": version "6.9.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.9.1.tgz#763da41281ef0d16974517b5f0d02d85897a1c1e" integrity sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA== @@ -4489,6 +4530,19 @@ "@typescript-eslint/types" "6.9.1" eslint-visitor-keys "^3.4.1" +"@typescript-eslint/visitor-keys@7.3.1": + version "7.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.3.1.tgz#6ddef14a3ce2a79690f01176f5305c34d7b93d8c" + integrity sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw== + dependencies: + "@typescript-eslint/types" "7.3.1" + eslint-visitor-keys "^3.4.1" + +"@ungap/structured-clone@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" + integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== + "@walletconnect/browser-utils@^1.8.0": version "1.8.0" resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.8.0.tgz#33c10e777aa6be86c713095b5206d63d32df0951" @@ -5769,7 +5823,7 @@ abitype@0.9.8: resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.9.8.tgz#1f120b6b717459deafd213dfbf3a3dd1bf10ae8c" integrity sha512-puLifILdm+8sjyss4S+fsUN09obiT1g2YW6CtcQF+QDzxR0euzgEB29MZujC6zMk2a6SVmtttq1fc6+YFA7WYQ== -accepts@~1.3.4, accepts@~1.3.8: +accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -5790,10 +5844,10 @@ acorn-import-assertions@^1.7.6: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn-jsx@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" - integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== +acorn-jsx@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^8.0.0: version "8.0.2" @@ -5805,7 +5859,7 @@ acorn-walk@^8.0.2, acorn-walk@^8.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@7.1.1, acorn@8.5.0, acorn@^7.4.0, acorn@^8.0.4, acorn@^8.1.0, acorn@^8.10.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.1, acorn@^8.8.2: +acorn@7.1.1, acorn@8.5.0, acorn@^8.0.4, acorn@^8.1.0, acorn@^8.10.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: version "8.5.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== @@ -5841,16 +5895,6 @@ ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.10.0, ajv@^6.10.2: - version "6.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" - integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ajv@^6.12.3, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -5871,7 +5915,7 @@ ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-colors@4.1.1, ansi-colors@^4.1.1: +ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== @@ -6172,11 +6216,6 @@ ast-types@^0.16.1: dependencies: tslib "^2.0.1" -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== - async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" @@ -6392,11 +6431,6 @@ base64-js@^1.0.2, base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64id@2.0.0, base64id@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" - integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== - base64url@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" @@ -7279,11 +7313,6 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== -component-emitter@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -7357,11 +7386,6 @@ cookie@0.5.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== -cookie@~0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== - cookiejar@^2.1.1: version "2.1.4" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b" @@ -7394,7 +7418,7 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== -cors@^2.8.1, cors@~2.8.5: +cors@^2.8.1: version "2.8.5" resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== @@ -7646,7 +7670,7 @@ dayjs@^1.11.9: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.9.tgz#9ca491933fadd0a60a2c19f6c237c03517d71d1a" integrity sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA== -debug@2.6.9, debug@4, debug@4.3.4, debug@^2.2.0, debug@^3.2.6, debug@^3.2.7, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: +debug@2.6.9, debug@4, debug@4.3.4, debug@^2.2.0, debug@^3.2.6, debug@^3.2.7, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -8099,17 +8123,6 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4: dependencies: once "^1.4.0" -engine.io-client@~6.2.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.2.tgz#c6c5243167f5943dcd9c4abee1bfc634aa2cbdd0" - integrity sha512-8ZQmx0LQGRTYkHuogVZuGSpDqYZtCM/nv8zQ68VZ+JkOpazJ7ICdsSpaO6iXwvaU30oFg5QJOJWj8zWqhbKjkQ== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - xmlhttprequest-ssl "~2.0.0" - engine.io-client@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.4.0.tgz#88cd3082609ca86d7d3c12f0e746d12db4f47c91" @@ -8126,22 +8139,6 @@ engine.io-parser@~5.0.3: resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== -engine.io@~6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.0.tgz#003bec48f6815926f2b1b17873e576acd54f41d0" - integrity sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg== - dependencies: - "@types/cookie" "^0.4.1" - "@types/cors" "^2.8.12" - "@types/node" ">=10.0.0" - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - cors "~2.8.5" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - enhanced-resolve@^5.9.3: version "5.9.3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88" @@ -8150,13 +8147,6 @@ enhanced-resolve@^5.9.3: graceful-fs "^4.2.4" tapable "^2.2.0" -enquirer@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== - dependencies: - ansi-colors "^4.1.1" - entities@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" @@ -8565,7 +8555,7 @@ eslint-rule-composer@^0.3.0: resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== -eslint-scope@5.1.1, eslint-scope@^5.1.1: +eslint-scope@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -8573,94 +8563,86 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== +eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-visitor-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" - integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== - -eslint-visitor-keys@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + esrecurse "^4.3.0" + estraverse "^5.2.0" eslint-visitor-keys@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint-visitor-keys@^3.4.1: +eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@^7.10.0: - version "7.10.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9" - integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA== - dependencies: - "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.1.3" - ajv "^6.10.0" +eslint@^8.57.0: + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + "@ungap/structured-clone" "^1.2.0" + ajv "^6.12.4" chalk "^4.0.0" cross-spawn "^7.0.2" - debug "^4.0.1" + debug "^4.3.2" doctrine "^3.0.0" - enquirer "^2.3.5" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^1.3.0" - espree "^7.3.0" - esquery "^1.2.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" + esquery "^1.4.2" esutils "^2.0.2" - file-entry-cache "^5.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" - ignore "^4.0.6" - import-fresh "^3.0.0" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" imurmurhash "^0.1.4" is-glob "^4.0.0" - js-yaml "^3.13.1" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.19" - minimatch "^3.0.4" + lodash.merge "^4.6.2" + minimatch "^3.1.2" natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^5.2.3" + optionator "^0.9.3" + strip-ansi "^6.0.1" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -espree@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" - integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw== +espree@^9.6.0, espree@^9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== dependencies: - acorn "^7.4.0" - acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.3.0" + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== +esquery@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== dependencies: estraverse "^5.1.0" @@ -9143,12 +9125,12 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== -file-entry-cache@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" - integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: - flat-cache "^2.0.1" + flat-cache "^3.0.4" file-uri-to-path@1.0.0: version "1.0.0" @@ -9197,7 +9179,7 @@ find-root@^1.1.0: resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== -find-up@5.0.0: +find-up@5.0.0, find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== @@ -9220,24 +9202,24 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -flat-cache@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" - integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== +flat-cache@^3.0.4: + version "3.2.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" + integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== dependencies: - flatted "^2.0.0" - rimraf "2.6.3" - write "1.0.3" + flatted "^3.2.9" + keyv "^4.5.3" + rimraf "^3.0.2" flat@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatted@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" - integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== +flatted@^3.2.9: + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== fn.name@1.x.x: version "1.1.0" @@ -9368,11 +9350,6 @@ function.prototype.name@^1.1.6: es-abstract "^1.22.1" functions-have-names "^1.2.3" -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== - functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" @@ -9466,13 +9443,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob-parent@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== - dependencies: - is-glob "^4.0.1" - glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -9480,6 +9450,13 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" +glob-parent@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" @@ -9509,12 +9486,12 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== +globals@^13.19.0: + version "13.24.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" + integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== dependencies: - type-fest "^0.8.1" + type-fest "^0.20.2" globalthis@^1.0.3: version "1.0.3" @@ -9967,11 +9944,6 @@ ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== - ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" @@ -9992,7 +9964,7 @@ immutable@^4.0.0: resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== -import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: +import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== @@ -10273,6 +10245,11 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + is-plain-obj@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" @@ -11013,7 +10990,7 @@ js-sha3@^0.5.7: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@4.1.0: +js-yaml@4.1.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -11281,6 +11258,13 @@ keyv@^4.0.0: dependencies: json-buffer "3.0.1" +keyv@^4.5.3: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== + dependencies: + json-buffer "3.0.1" + keyvaluestorage-interface@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/keyvaluestorage-interface/-/keyvaluestorage-interface-1.0.0.tgz#13ebdf71f5284ad54be94bd1ad9ed79adad515ff" @@ -11516,7 +11500,7 @@ lodash.uniqby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww== -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: +lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -11796,7 +11780,14 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.4, minimatch@^3.1.2: +minimatch@9.0.3: + 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" + +minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -11815,7 +11806,7 @@ minimist@^1.2.0, minimist@~1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== -minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -11864,13 +11855,6 @@ mkdirp@*: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== -mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - mkdirp@^0.5.5: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -12511,17 +12495,17 @@ optionator@^0.8.1: type-check "~0.3.2" word-wrap "~1.2.3" -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== +optionator@^0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" - word-wrap "^1.2.3" os-browserify@^0.3.0: version "0.3.0" @@ -12940,10 +12924,10 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== -prettier@^2.2.0: - version "2.8.7" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450" - integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw== +prettier@3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" + integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A== prettier@^2.3.1: version "2.8.6" @@ -12999,7 +12983,7 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -progress@^2.0.0, progress@^2.0.3: +progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== @@ -13617,11 +13601,6 @@ regexp.prototype.flags@^1.5.1: define-properties "^1.2.0" set-function-name "^2.0.0" -regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -13736,14 +13715,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -14071,11 +14043,6 @@ semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.2.1: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - semver@^7.3.8: version "7.5.1" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" @@ -14257,15 +14224,6 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== - dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" - smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" @@ -14309,21 +14267,6 @@ snowflake-sdk@^1.6.10: uuid "^3.3.2" winston "^3.1.0" -socket.io-adapter@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" - integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== - -socket.io-client@*: - version "4.5.1" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.1.tgz#cab8da71976a300d3090414e28c2203a47884d84" - integrity sha512-e6nLVgiRYatS+AHXnOnGi4ocOpubvOUCGhyWw8v+/FxW8saHkinG6Dfhi9TU0Kt/8mwJIAASxvw6eujQmjdZVA== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.2" - engine.io-client "~6.2.1" - socket.io-parser "~4.2.0" - socket.io-client@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.6.1.tgz#80d97d5eb0feca448a0fb6d69a7b222d3d547eab" @@ -14334,23 +14277,6 @@ socket.io-client@^4.6.1: engine.io-client "~6.4.0" socket.io-parser "~4.2.1" -socket.io-parser@~4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df" - integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig== - dependencies: - "@types/component-emitter" "^1.2.10" - component-emitter "~1.3.0" - debug "~4.3.1" - -socket.io-parser@~4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" - integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - socket.io-parser@~4.2.1: version "4.2.2" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" @@ -14359,18 +14285,6 @@ socket.io-parser@~4.2.1: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io@^4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.1.tgz#aa7e73f8a6ce20ee3c54b2446d321bbb6b1a9029" - integrity sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ== - dependencies: - accepts "~1.3.4" - base64id "~2.0.0" - debug "~4.3.2" - engine.io "~6.2.0" - socket.io-adapter "~2.4.0" - socket.io-parser "~4.0.4" - socks-proxy-agent@6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87" @@ -14835,7 +14749,7 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +strip-json-comments@3.1.1, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -14968,16 +14882,6 @@ table-layout@^1.0.2: typical "^5.2.0" wordwrapjs "^4.0.0" -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== - dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" - tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" @@ -15387,7 +15291,7 @@ type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@0.20.2, type-fest@^0.11.0, type-fest@^0.7.1, type-fest@^0.8.1: +type-fest@0.20.2, type-fest@^0.11.0, type-fest@^0.20.2, type-fest@^0.7.1: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== @@ -15477,10 +15381,10 @@ typeforce@^1.18.0: resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc" integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g== -typescript@^4.9.5: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.4.3: + version "5.4.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" + integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== typical@^4.0.0: version "4.0.0" @@ -15777,11 +15681,6 @@ v8-compile-cache-lib@^3.0.1: resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== -v8-compile-cache@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" - integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== - v8-to-istanbul@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265" @@ -16348,7 +16247,7 @@ winston@^3.1.0: triple-beam "^1.3.0" winston-transport "^4.5.0" -word-wrap@^1.2.3, word-wrap@~1.2.3: +word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -16406,13 +16305,6 @@ write-file-atomic@^4.0.2: imurmurhash "^0.1.4" signal-exit "^3.0.7" -write@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" - integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== - dependencies: - mkdirp "^0.5.1" - ws@7.4.6: version "7.4.6" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" @@ -16452,11 +16344,6 @@ ws@~8.11.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== -ws@~8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - xhr-request-promise@^0.1.2: version "0.1.3" resolved "https://registry.yarnpkg.com/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz#2d5f4b16d8c6c893be97f1a62b0ed4cf3ca5f96c"