From 174c87b6bae8e10cb053537f5a360f847de97728 Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:29:50 -0300 Subject: [PATCH] feat: centralize instances of hex address type in app commons package --- packages/app-commons/src/index.ts | 1 + packages/app-commons/src/types/address.ts | 1 + packages/app-commons/src/types/index.ts | 1 + packages/app-commons/src/utils/contractIds.ts | 13 +- .../src/systems/Assets/services/asset.tsx | 6 +- .../app-portal/src/systems/Bridge/events.tsx | 5 +- .../src/systems/Bridge/hooks/useBridge.tsx | 6 +- .../Bridge/machines/bridgeTxsMachine.tsx | 9 +- .../Chains/eth/contracts/FuelChainState.ts | 8 +- .../Chains/eth/contracts/FuelErc20Gateway.ts | 5 +- .../Chains/eth/contracts/FuelMessagePortal.ts | 9 +- .../Chains/eth/hooks/useEthBalance.tsx | 3 +- .../Chains/eth/hooks/useTxEthToFuel.tsx | 5 +- .../eth/machines/txEthToFuelMachine.tsx | 3 +- .../systems/Chains/eth/services/connectors.ts | 4 +- .../Chains/eth/services/txEthToFuel.ts | 13 +- .../src/systems/Chains/eth/utils/block.ts | 3 +- .../Chains/fuel/services/txFuelToEth.ts | 8 +- .../src/systems/Chains/fuel/utils/contract.ts | 5 +- packages/e2e-tests/package.json | 1 + .../tests/hard/bridge/Bridge.test.ts | 3 +- .../tests/hard/bridge/utils/contractIds.ts | 10 +- pnpm-lock.yaml | 305 +++++++++++------- 23 files changed, 257 insertions(+), 170 deletions(-) create mode 100644 packages/app-commons/src/types/address.ts create mode 100644 packages/app-commons/src/types/index.ts diff --git a/packages/app-commons/src/index.ts b/packages/app-commons/src/index.ts index 0d27c1835..adff0c924 100644 --- a/packages/app-commons/src/index.ts +++ b/packages/app-commons/src/index.ts @@ -2,3 +2,4 @@ export * from './chains'; export * from './components'; export * from './config'; export * from './utils'; +export * from './types'; diff --git a/packages/app-commons/src/types/address.ts b/packages/app-commons/src/types/address.ts new file mode 100644 index 000000000..aa48decf8 --- /dev/null +++ b/packages/app-commons/src/types/address.ts @@ -0,0 +1 @@ +export type HexAddress = `0x${string}`; diff --git a/packages/app-commons/src/types/index.ts b/packages/app-commons/src/types/index.ts new file mode 100644 index 000000000..cef16803f --- /dev/null +++ b/packages/app-commons/src/types/index.ts @@ -0,0 +1 @@ +export * from './address'; diff --git a/packages/app-commons/src/utils/contractIds.ts b/packages/app-commons/src/utils/contractIds.ts index 1aecbd4bf..579810b61 100644 --- a/packages/app-commons/src/utils/contractIds.ts +++ b/packages/app-commons/src/utils/contractIds.ts @@ -2,6 +2,7 @@ import { toUtf8Bytes, zeroPadValue } from 'ethers'; import { ZeroBytes32, concat, sha256 } from 'fuels'; import { ETH_CHAIN_NAME, FUEL_CHAIN_NAME } from '../config'; +import type { HexAddress } from '../types/address'; export type BridgeTokenContracts = { ETH_ERC20: string; @@ -10,10 +11,10 @@ export type BridgeTokenContracts = { FUEL_TokenContractImplementation?: string; }; export type BridgeSolidityContracts = { - FuelChainState: `0x${string}`; - FuelMessagePortal: `0x${string}`; - FuelERC20GatewayV4: `0x${string}`; - FuelERC721Gateway: `0x${string}`; + FuelChainState: HexAddress; + FuelMessagePortal: HexAddress; + FuelERC20GatewayV4: HexAddress; + FuelERC721Gateway: HexAddress; }; let bridgeTokenContract: BridgeTokenContracts; @@ -115,8 +116,8 @@ export async function getBridgeSolidityContracts() { } export function getContractTokenId( - contractId: `0x${string}`, - erc20Address: `0x${string}`, + contractId: HexAddress, + erc20Address: HexAddress, tokenId = ZeroBytes32, chainId = '1', ) { diff --git a/packages/app-portal/src/systems/Assets/services/asset.tsx b/packages/app-portal/src/systems/Assets/services/asset.tsx index f806faf25..43596c3e8 100644 --- a/packages/app-portal/src/systems/Assets/services/asset.tsx +++ b/packages/app-portal/src/systems/Assets/services/asset.tsx @@ -1,7 +1,7 @@ import { assets } from '@fuel-ts/account'; import type { Asset } from '@fuel-ts/account'; -import { BridgeTokenContracts } from 'app-commons'; -import { Provider, bn } from 'fuels'; +import type { BridgeTokenContracts, HexAddress } from 'app-commons'; +import { type Provider, bn } from 'fuels'; import { isAddress } from 'viem'; import type { PublicClient, WalletClient } from 'viem'; import { ETH_CHAIN } from '~portal/systems/Chains'; @@ -37,7 +37,7 @@ export class AssetService { const erc20 = EthConnectorService.connectToErc20({ walletClient, - address: address as `0x${string}`, + address: address as HexAddress, }); const erc20MintHash = await erc20.write.mint( diff --git a/packages/app-portal/src/systems/Bridge/events.tsx b/packages/app-portal/src/systems/Bridge/events.tsx index 1f27c9cb7..50775d63c 100644 --- a/packages/app-portal/src/systems/Bridge/events.tsx +++ b/packages/app-portal/src/systems/Bridge/events.tsx @@ -6,6 +6,7 @@ import type { FromToNetworks } from '../Chains'; import type { Store } from '../Store'; import { Services } from '../Store'; +import type { HexAddress } from 'app-commons'; import type { BridgeInputs, PossibleBridgeInputs } from './services'; export function bridgeEvents(store: Store) { @@ -31,7 +32,7 @@ export function bridgeEvents(store: Store) { store.send(Services.bridgeTxs, { type: 'FETCH_NEXT_PAGE' }); }, addTxEthToFuel( - input?: { ethTxId?: `0x${string}` } & BridgeInputs['fetchTxs'], + input?: { ethTxId?: HexAddress } & BridgeInputs['fetchTxs'], ) { if (!input) return; @@ -70,7 +71,7 @@ export function bridgeEvents(store: Store) { input?: { fuelWallet: FuelWallet; }; - ethTxId: `0x${string}`; + ethTxId: HexAddress; }) { if (!input) return; diff --git a/packages/app-portal/src/systems/Bridge/hooks/useBridge.tsx b/packages/app-portal/src/systems/Bridge/hooks/useBridge.tsx index 3467c30cf..2f26a15f7 100644 --- a/packages/app-portal/src/systems/Bridge/hooks/useBridge.tsx +++ b/packages/app-portal/src/systems/Bridge/hooks/useBridge.tsx @@ -15,7 +15,7 @@ import { useFuelAccountConnection, } from '~portal/systems/Chains'; -import { FUEL_CHAIN } from 'app-commons'; +import { FUEL_CHAIN, type HexAddress } from 'app-commons'; import { useEthBalance } from '~portal/systems/Chains/eth/hooks/useEthBalance'; import { useSyncEthWallets } from '~portal/systems/Chains/eth/hooks/useSyncEthWallets'; import { BridgeStatus } from '../machines'; @@ -85,7 +85,7 @@ export function useBridge() { } = useEthAccountConnection(); const { ethBalance } = useEthBalance( ethAssetAddress?.startsWith('0x') - ? (ethAssetAddress as `0x${string}`) + ? (ethAssetAddress as HexAddress) : undefined, ); @@ -99,7 +99,7 @@ export function useBridge() { provider: fuelProvider, } = useFuelAccountConnection({ assetId: fuelAssetAddress?.startsWith('0x') - ? (fuelAssetAddress as `0x${string}`) + ? (fuelAssetAddress as HexAddress) : undefined, }); diff --git a/packages/app-portal/src/systems/Bridge/machines/bridgeTxsMachine.tsx b/packages/app-portal/src/systems/Bridge/machines/bridgeTxsMachine.tsx index cb8e251a0..efe8cc149 100644 --- a/packages/app-portal/src/systems/Bridge/machines/bridgeTxsMachine.tsx +++ b/packages/app-portal/src/systems/Bridge/machines/bridgeTxsMachine.tsx @@ -10,6 +10,7 @@ import { txEthToFuelMachine } from '~portal/systems/Chains/eth/machines'; import { FetchMachine } from '~portal/systems/Core/machines'; import { delay } from '~portal/systems/Core/utils'; +import type { HexAddress } from 'app-commons'; import type { PublicClient } from 'viem'; import { BridgeService } from '../services'; import type { BridgeInputs } from '../services'; @@ -48,7 +49,7 @@ export type BridgeTxsMachineEvents = | { type: 'ADD_TX_ETH_TO_FUEL'; input: { - ethTxId?: `0x${string}`; + ethTxId?: HexAddress; } & BridgeInputs['fetchTxs']; } | { @@ -153,7 +154,7 @@ export const bridgeTxsMachine = createMachine( ...prev, [tx.txHash]: spawn( txEthToFuelMachine.withContext({ - ethTxId: tx.txHash as `0x${string}`, + ethTxId: tx.txHash as HexAddress, fuelAddress: ctx.fuelAddress, fuelProvider: ctx.fuelProvider, ethPublicClient: ctx.ethPublicClient, @@ -207,7 +208,7 @@ export const bridgeTxsMachine = createMachine( const newRef = { [ethTxId]: spawn( txEthToFuelMachine.withContext({ - ethTxId: ethTxId as `0x${string}`, + ethTxId: ethTxId as HexAddress, fuelAddress: fuelAddress, fuelProvider: fuelProvider, ethPublicClient: ethPublicClient, @@ -233,7 +234,7 @@ export const bridgeTxsMachine = createMachine( const newRef = { [fuelTxId]: spawn( txFuelToEthMachine.withContext({ - fuelTxId: fuelTxId as `0x${string}`, + fuelTxId: fuelTxId as HexAddress, fuelProvider: fuelProvider, ethPublicClient: ethPublicClient, }), diff --git a/packages/app-portal/src/systems/Chains/eth/contracts/FuelChainState.ts b/packages/app-portal/src/systems/Chains/eth/contracts/FuelChainState.ts index 796b10f8c..874e3074a 100644 --- a/packages/app-portal/src/systems/Chains/eth/contracts/FuelChainState.ts +++ b/packages/app-portal/src/systems/Chains/eth/contracts/FuelChainState.ts @@ -1,5 +1,5 @@ import { FuelChainState } from '@fuel-bridge/solidity-contracts'; -import { getBridgeSolidityContracts } from 'app-commons'; +import { type HexAddress, getBridgeSolidityContracts } from 'app-commons'; import type { PublicClient } from 'viem'; export const FUEL_CHAIN_STATE = { @@ -33,7 +33,7 @@ export const FUEL_CHAIN_STATE = { const logs = await FUEL_CHAIN_STATE.getCommitSubmitted({ ethPublicClient }); const lastCommitBlockHash = logs[logs.length - 1]?.blockHash; const lastBlockCommited = await ethPublicClient.getBlock({ - blockHash: lastCommitBlockHash as `0x${string}`, + blockHash: lastCommitBlockHash as HexAddress, }); return lastBlockCommited; @@ -46,12 +46,12 @@ export const FUEL_CHAIN_STATE = { fuelBlockHashCommited: string; }) => { const logs = await FUEL_CHAIN_STATE.getCommitSubmitted({ ethPublicClient }); - let ethBlockHash: `0x${string}` | undefined = undefined; + let ethBlockHash: HexAddress | undefined = undefined; for (let i = logs.length - 1; i >= 0; i--) { const log = logs[i]; const args = log.args as unknown as { blockHash: string }; if (args.blockHash === fuelBlockHashCommited) { - ethBlockHash = log.blockHash as `0x${string}`; + ethBlockHash = log.blockHash as HexAddress; break; } } diff --git a/packages/app-portal/src/systems/Chains/eth/contracts/FuelErc20Gateway.ts b/packages/app-portal/src/systems/Chains/eth/contracts/FuelErc20Gateway.ts index 07ae4212d..cea1b921a 100644 --- a/packages/app-portal/src/systems/Chains/eth/contracts/FuelErc20Gateway.ts +++ b/packages/app-portal/src/systems/Chains/eth/contracts/FuelErc20Gateway.ts @@ -1,10 +1,11 @@ import FuelERC20Gateway from '@fuel-bridge/solidity-contracts/artifacts/contracts/messaging/gateway/FuelERC20Gateway/FuelERC20GatewayV4.sol/FuelERC20GatewayV4.json'; +import type { HexAddress } from 'app-commons'; export type FuelERC20GatewayArgs = { Deposit: { amount: bigint; - sender: `0x${string}`; - tokenAddress: `0x${string}`; + sender: HexAddress; + tokenAddress: HexAddress; }; }; diff --git a/packages/app-portal/src/systems/Chains/eth/contracts/FuelMessagePortal.ts b/packages/app-portal/src/systems/Chains/eth/contracts/FuelMessagePortal.ts index c7d6a2acc..f373ed29c 100644 --- a/packages/app-portal/src/systems/Chains/eth/contracts/FuelMessagePortal.ts +++ b/packages/app-portal/src/systems/Chains/eth/contracts/FuelMessagePortal.ts @@ -1,17 +1,18 @@ import FuelMessagePortal from '@fuel-bridge/solidity-contracts/artifacts/contracts/fuelchain/FuelMessagePortal/v3/FuelMessagePortalV3.sol/FuelMessagePortalV3.json'; +import type { HexAddress } from 'app-commons'; export type FuelMessagePortalArgs = { MessageSent: { amount: bigint; nonce: bigint; - sender: `0x${string}`; - recipient: `0x${string}`; - data: `0x${string}`; + sender: HexAddress; + recipient: HexAddress; + data: HexAddress; }; }; export const decodeMessageSentData = { - erc20Deposit: (data: `0x${string}`) => { + erc20Deposit: (data: HexAddress) => { const pattern = /^0x([A-f0-9]{64})([A-f0-9]{64})([A-f0-9]{64})([A-f0-9]{64})([A-f0-9]{64})([A-f0-9]{64})([A-f0-9]{64})([A-f0-9]{64})$/; const match = data.match(pattern); diff --git a/packages/app-portal/src/systems/Chains/eth/hooks/useEthBalance.tsx b/packages/app-portal/src/systems/Chains/eth/hooks/useEthBalance.tsx index fb926f29b..d60fe9ba5 100644 --- a/packages/app-portal/src/systems/Chains/eth/hooks/useEthBalance.tsx +++ b/packages/app-portal/src/systems/Chains/eth/hooks/useEthBalance.tsx @@ -1,6 +1,7 @@ +import type { HexAddress } from 'app-commons'; import { useAccount, useBalance } from 'wagmi'; -export function useEthBalance(token?: `0x${string}`) { +export function useEthBalance(token?: HexAddress) { const { address } = useAccount(); const { data: ethBalance } = useBalance({ address, diff --git a/packages/app-portal/src/systems/Chains/eth/hooks/useTxEthToFuel.tsx b/packages/app-portal/src/systems/Chains/eth/hooks/useTxEthToFuel.tsx index d0dea05d5..456e758d9 100644 --- a/packages/app-portal/src/systems/Chains/eth/hooks/useTxEthToFuel.tsx +++ b/packages/app-portal/src/systems/Chains/eth/hooks/useTxEthToFuel.tsx @@ -9,10 +9,11 @@ import { useFuelAccountConnection } from '../../fuel'; import type { TxEthToFuelMachineState } from '../machines'; import { isErc20Address } from '../utils'; +import type { HexAddress } from 'app-commons'; import { deepCompare } from '../utils/deepCompare'; const bridgeTxsSelectors = { - txEthToFuel: (txId?: `0x${string}`) => (state: BridgeTxsMachineState) => { + txEthToFuel: (txId?: HexAddress) => (state: BridgeTxsMachineState) => { if (!txId) return undefined; const machine = state.context?.ethToFuelTxRefs?.[txId]?.getSnapshot(); @@ -114,7 +115,7 @@ const txEthToFuelSelectors = { export function useTxEthToFuel({ id }: { id: string }) { const { wallet: fuelWallet } = useFuelAccountConnection(); - const txId = id.startsWith('0x') ? (id as `0x${string}`) : undefined; + const txId = id.startsWith('0x') ? (id as HexAddress) : undefined; const { href: explorerLink } = useExplorerLink({ network: 'ethereum', id, diff --git a/packages/app-portal/src/systems/Chains/eth/machines/txEthToFuelMachine.tsx b/packages/app-portal/src/systems/Chains/eth/machines/txEthToFuelMachine.tsx index 79c091a03..9471dd4f2 100644 --- a/packages/app-portal/src/systems/Chains/eth/machines/txEthToFuelMachine.tsx +++ b/packages/app-portal/src/systems/Chains/eth/machines/txEthToFuelMachine.tsx @@ -11,6 +11,7 @@ import type { InterpreterFrom, StateFrom } from 'xstate'; import { assign, createMachine } from 'xstate'; import { FetchMachine } from '~portal/systems/Core/machines'; +import type { HexAddress } from 'app-commons'; import type { PublicClient } from 'viem'; import type { GetReceiptsInfoReturn, TxEthToFuelInputs } from '../services'; import { TxEthToFuelService } from '../services'; @@ -19,7 +20,7 @@ import { EthTxCache } from '../utils'; const FUEL_MESSAGE_GET_INTERVAL = 10000; type MachineContext = { - ethTxId?: `0x${string}`; + ethTxId?: HexAddress; ethTxNonce?: BN; fuelAddress?: FuelAddress; fuelProvider?: FuelProvider; diff --git a/packages/app-portal/src/systems/Chains/eth/services/connectors.ts b/packages/app-portal/src/systems/Chains/eth/services/connectors.ts index bb19d7451..78c763f19 100644 --- a/packages/app-portal/src/systems/Chains/eth/services/connectors.ts +++ b/packages/app-portal/src/systems/Chains/eth/services/connectors.ts @@ -1,7 +1,7 @@ import type { GetContractReturnType, PublicClient, WalletClient } from 'viem'; import { getContract } from 'viem'; -import type { BridgeSolidityContracts } from 'app-commons'; +import type { BridgeSolidityContracts, HexAddress } from 'app-commons'; import { ERC_20 } from '../contracts/Erc20'; import { FUEL_CHAIN_STATE } from '../contracts/FuelChainState'; import { FUEL_ERC_20_GATEWAY } from '../contracts/FuelErc20Gateway'; @@ -49,7 +49,7 @@ export class EthConnectorService { static connectToErc20(options: { walletClient?: WalletClient; publicClient?: PublicClient; - address: `0x${string}`; + address: HexAddress; }) { const { walletClient, publicClient, address } = options; diff --git a/packages/app-portal/src/systems/Chains/eth/services/txEthToFuel.ts b/packages/app-portal/src/systems/Chains/eth/services/txEthToFuel.ts index 88db264c6..db96fc146 100644 --- a/packages/app-portal/src/systems/Chains/eth/services/txEthToFuel.ts +++ b/packages/app-portal/src/systems/Chains/eth/services/txEthToFuel.ts @@ -27,6 +27,7 @@ import { import { getBlockDate, isErc20Address } from '../utils'; import { + type HexAddress, getBridgeSolidityContracts, getBridgeTokenContracts, } from 'app-commons'; @@ -49,7 +50,7 @@ export type TxEthToFuelInputs = { asset?: Asset; }; getReceiptsInfo: { - ethTxId?: `0x${string}`; + ethTxId?: HexAddress; ethPublicClient?: PublicClient; }; getFuelMessage: { @@ -73,7 +74,7 @@ export type TxEthToFuelInputs = { export type GetReceiptsInfoReturn = { erc20Token?: { - address: `0x${string}`; + address: HexAddress; decimals: number; }; amount?: BN; @@ -132,7 +133,7 @@ export class TxEthToFuelService { }); const txHash = await fuelPortal.write.depositETH( - [fuelAddress.toB256() as `0x${string}`], + [fuelAddress.toB256() as HexAddress], { value: BigInt(amount), account: ethWalletClient.account, @@ -172,7 +173,7 @@ export class TxEthToFuelService { ethPublicClient ) { const erc20Token = EthConnectorService.connectToErc20({ - address: ethAssetAddress as `0x${string}`, + address: ethAssetAddress as HexAddress, walletClient: ethWalletClient, }); @@ -205,7 +206,7 @@ export class TxEthToFuelService { bridgeSolidityContracts, }); const depositTxHash = await fuelErc20Gateway.write.deposit([ - fuelAddress.toB256() as `0x${string}`, + fuelAddress.toB256() as HexAddress, ethAssetAddress, amount, ]); @@ -431,7 +432,7 @@ export class TxEthToFuelService { inputs: abiMessageSent?.inputs || [], }, args: { - recipient: fuelAddress?.toHexString() as `0x${string}`, + recipient: fuelAddress?.toHexString() as HexAddress, }, fromBlock: 'earliest' as const, }); diff --git a/packages/app-portal/src/systems/Chains/eth/utils/block.ts b/packages/app-portal/src/systems/Chains/eth/utils/block.ts index dd68120a3..e3d9580ea 100644 --- a/packages/app-portal/src/systems/Chains/eth/utils/block.ts +++ b/packages/app-portal/src/systems/Chains/eth/utils/block.ts @@ -1,5 +1,6 @@ import { bn } from 'fuels'; +import type { HexAddress } from 'app-commons'; import type { PublicClient } from 'viem'; import { EthTxCache } from './txCache'; @@ -7,7 +8,7 @@ export const getBlockDate = async ({ blockHash, publicClient, }: { - blockHash: `0x${string}`; + blockHash: HexAddress; publicClient: PublicClient; }) => { const cachedBlockDate = EthTxCache.getBlockDate(blockHash); diff --git a/packages/app-portal/src/systems/Chains/fuel/services/txFuelToEth.ts b/packages/app-portal/src/systems/Chains/fuel/services/txFuelToEth.ts index 5323f7d87..64d38fceb 100644 --- a/packages/app-portal/src/systems/Chains/fuel/services/txFuelToEth.ts +++ b/packages/app-portal/src/systems/Chains/fuel/services/txFuelToEth.ts @@ -15,7 +15,7 @@ import { import type { WalletClient } from 'viem'; import type { PublicClient as EthPublicClient } from 'viem'; -import { getBridgeSolidityContracts } from 'app-commons'; +import { type HexAddress, getBridgeSolidityContracts } from 'app-commons'; import { FUEL_CHAIN_STATE } from '../../eth/contracts/FuelChainState'; import { FUEL_MESSAGE_PORTAL } from '../../eth/contracts/FuelMessagePortal'; import { EthConnectorService } from '../../eth/services'; @@ -67,7 +67,7 @@ export type TxFuelToEthInputs = { ethWalletClient: WalletClient; }; waitTxMessageRelayed: { - txHash: `0x${string}`; + txHash: HexAddress; ethPublicClient: EthPublicClient; }; fetchTxs: { @@ -242,7 +242,7 @@ export class TxFuelToEthService { if (isCommited) { return { - blockHashCommited: commitHashAtL1 as `0x${string}`, + blockHashCommited: commitHashAtL1 as HexAddress, }; } @@ -383,7 +383,7 @@ export class TxFuelToEthService { inputs: abiMessageRelayed?.inputs || [], }, args: { - messageId: input.messageId as `0x${string}`, + messageId: input.messageId as HexAddress, }, fromBlock: 'earliest', }); diff --git a/packages/app-portal/src/systems/Chains/fuel/utils/contract.ts b/packages/app-portal/src/systems/Chains/fuel/utils/contract.ts index 425800d12..d5cda053b 100644 --- a/packages/app-portal/src/systems/Chains/fuel/utils/contract.ts +++ b/packages/app-portal/src/systems/Chains/fuel/utils/contract.ts @@ -1,9 +1,10 @@ +import type { HexAddress } from 'app-commons'; import { zeroPadValue } from 'ethers'; import { ZeroBytes32, concat, sha256 } from 'fuels'; export function getContractTokenId( - contractId: `0x${string}`, - erc20Address: `0x${string}`, + contractId: HexAddress, + erc20Address: HexAddress, tokenId = ZeroBytes32, ) { const subId = sha256(concat([zeroPadValue(erc20Address, 32), tokenId])); diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index eda854027..2f812683b 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -5,6 +5,7 @@ "@fuels/playwright-utils": "0.20.0", "@synthetixio/synpress": "https://github.com/LuizAsFight/synpress", "fuels": "0.94.4", + "app-commons": "workspace:*", "viem": "2.20.1", "wagmi": "2.12.7" } diff --git a/packages/e2e-tests/tests/hard/bridge/Bridge.test.ts b/packages/e2e-tests/tests/hard/bridge/Bridge.test.ts index 18ef77c92..75a358079 100644 --- a/packages/e2e-tests/tests/hard/bridge/Bridge.test.ts +++ b/packages/e2e-tests/tests/hard/bridge/Bridge.test.ts @@ -5,6 +5,7 @@ import { hasText, } from '@fuels/playwright-utils'; import * as metamask from '@synthetixio/synpress/commands/metamask'; +import type { HexAddress } from 'app-commons'; import type { BigNumberish, WalletUnlocked } from 'fuels'; import { bn, format } from 'fuels'; import type { HDAccount, PublicClient } from 'viem'; @@ -81,7 +82,7 @@ test.describe('Bridge', () => { erc20Contract = getContract({ abi: ERC_20.abi, - address: ETH_ERC20 as `0x${string}`, + address: ETH_ERC20 as HexAddress, client: { public: client, }, diff --git a/packages/e2e-tests/tests/hard/bridge/utils/contractIds.ts b/packages/e2e-tests/tests/hard/bridge/utils/contractIds.ts index 4fe483e94..e2ac4850f 100644 --- a/packages/e2e-tests/tests/hard/bridge/utils/contractIds.ts +++ b/packages/e2e-tests/tests/hard/bridge/utils/contractIds.ts @@ -1,3 +1,5 @@ +import type { HexAddress } from 'app-commons'; + /** * due to error on importing `app-commons` to test environment, * we get the contracts id here inntead of from there @@ -8,10 +10,10 @@ export type BridgeTokenContracts = { FUEL_TokenAsset?: string; }; export type BridgeSolidityContracts = { - FuelChainState: `0x${string}`; - FuelMessagePortal: `0x${string}`; - FuelERC20GatewayV4: `0x${string}`; - FuelERC721Gateway: `0x${string}`; + FuelChainState: HexAddress; + FuelMessagePortal: HexAddress; + FuelERC20GatewayV4: HexAddress; + FuelERC721Gateway: HexAddress; }; export async function getBridgeTokenContracts() { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cc26f3e8..1ec9b523a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -554,6 +554,9 @@ importers: '@synthetixio/synpress': specifier: https://github.com/LuizAsFight/synpress version: github.com/LuizAsFight/synpress/edb6468a237b341a0014d2944cb43a33f22d2ff1(@babel/core@7.23.9)(typescript@5.4.5) + app-commons: + specifier: workspace:* + version: link:../app-commons fuels: specifier: 0.94.4 version: 0.94.4 @@ -976,7 +979,7 @@ packages: engines: {node: '>=0.8'} dependencies: buffer-more-ints: 1.0.0 - debug: 4.3.6(supports-color@8.1.1) + debug: 4.3.4(supports-color@8.1.1) safe-buffer: 5.1.2 transitivePeerDependencies: - supports-color @@ -1013,7 +1016,7 @@ packages: '@babel/generator': 7.23.6 '@babel/parser': 7.23.9 '@babel/runtime': 7.25.0 - '@babel/traverse': 7.23.9(supports-color@5.5.0) + '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 babel-preset-fbjs: 3.4.0(@babel/core@7.23.9) chalk: 4.1.2 @@ -1089,7 +1092,7 @@ packages: engines: {node: '>=14.0.0'} dependencies: '@smithy/types': 2.9.1 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /@aws-sdk/util-utf8-browser@3.259.0: @@ -1121,10 +1124,10 @@ packages: '@babel/helpers': 7.23.9 '@babel/parser': 7.23.9 '@babel/template': 7.23.9 - '@babel/traverse': 7.23.9(supports-color@5.5.0) + '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 convert-source-map: 2.0.0 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 7.6.0 @@ -1331,7 +1334,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.23.9 - '@babel/traverse': 7.23.9(supports-color@5.5.0) + '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 transitivePeerDependencies: - supports-color @@ -2450,6 +2453,23 @@ packages: '@babel/parser': 7.23.9 '@babel/types': 7.23.9 + /@babel/traverse@7.23.9: + resolution: {integrity: sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.23.5 + '@babel/generator': 7.23.6 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.23.9 + '@babel/types': 7.23.9 + debug: 4.3.4(supports-color@8.1.1) + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + /@babel/traverse@7.23.9(supports-color@5.5.0): resolution: {integrity: sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==} engines: {node: '>=6.9.0'} @@ -2466,6 +2486,7 @@ packages: globals: 11.12.0 transitivePeerDependencies: - supports-color + dev: false /@babel/types@7.23.9: resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==} @@ -2671,7 +2692,7 @@ packages: chalk: 4.1.2 cypress: 12.17.3 dayjs: 1.11.10 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) execa: 4.1.0 globby: 11.1.0 istanbul-lib-coverage: 3.2.2 @@ -4470,13 +4491,13 @@ packages: resolution: {integrity: sha512-+QoPW4csYALsQIl8GbN14igZzDbuwzcpWrku9nyMXlaqAlwRBgl5V+p0vWMGFqHOw37czNXaP/lEk4wbLgcmtA==} dependencies: '@formatjs/intl-localematcher': 0.5.4 - tslib: 2.6.3 + tslib: 2.6.2 dev: false /@formatjs/fast-memoize@2.2.0: resolution: {integrity: sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==} dependencies: - tslib: 2.6.3 + tslib: 2.6.2 dev: false /@formatjs/icu-messageformat-parser@2.7.6: @@ -4484,7 +4505,7 @@ packages: dependencies: '@formatjs/ecma402-abstract': 1.18.2 '@formatjs/icu-skeleton-parser': 1.8.0 - tslib: 2.6.3 + tslib: 2.6.2 dev: false /@formatjs/icu-skeleton-parser@1.8.0: @@ -5121,11 +5142,6 @@ packages: resolution: {integrity: sha512-W44xiE0Y4WMDoJkfUO1tTYm4LdSz4953HCFaojKRRdFkcaDYhiipjUseFIOgZMt9MGe7AxtikQ8Yr6iqvPX2mg==} peerDependencies: jest: ^29.6.4 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true dependencies: '@ariakit/test': 0.2.5(@testing-library/dom@9.3.4)(@testing-library/react@14.2.1)(react@18.2.0) '@chakra-ui/utils': 2.0.15 @@ -5624,7 +5640,7 @@ packages: '@graphql-tools/utils': 10.5.3(graphql@16.8.1) dataloader: 2.2.2 graphql: 16.8.1 - tslib: 2.6.3 + tslib: 2.6.2 value-or-promise: 1.0.12 dev: true @@ -5839,7 +5855,7 @@ packages: '@babel/core': 7.23.9 '@babel/parser': 7.23.9 '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.9) - '@babel/traverse': 7.23.9(supports-color@5.5.0) + '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 '@graphql-tools/utils': 10.5.3(graphql@16.8.1) graphql: 16.8.1 @@ -5938,7 +5954,7 @@ packages: '@types/json-stable-stringify': 1.0.36 '@whatwg-node/fetch': 0.9.16 chalk: 4.1.2 - debug: 4.3.6(supports-color@8.1.1) + debug: 4.3.4(supports-color@8.1.1) dotenv: 16.4.5 graphql: 16.8.1 graphql-request: 6.1.0(graphql@16.8.1) @@ -6827,7 +6843,7 @@ packages: '@motionone/easing': 10.17.0 '@motionone/types': 10.17.0 '@motionone/utils': 10.17.0 - tslib: 2.6.3 + tslib: 2.6.2 /@motionone/dom@10.12.0: resolution: {integrity: sha512-UdPTtLMAktHiqV0atOczNYyDd/d8Cf5fFsd1tua03PqTwwCe/6lwhLSQ8a7TbnQ5SN0gm44N1slBfj+ORIhrqw==} @@ -6854,14 +6870,14 @@ packages: resolution: {integrity: sha512-Bxe2wSuLu/qxqW4rBFS5m9tMLOw+QBh8v5A7Z5k4Ul4sTj5jAOfZG5R0bn5ywmk+Fs92Ij1feZ5pmC4TeXA8Tg==} dependencies: '@motionone/utils': 10.17.0 - tslib: 2.6.3 + tslib: 2.6.2 /@motionone/generators@10.17.0: resolution: {integrity: sha512-T6Uo5bDHrZWhIfxG/2Aut7qyWQyJIWehk6OB4qNvr/jwA/SRmixwbd7SOrxZi1z5rH3LIeFFBKK1xHnSbGPZSQ==} dependencies: '@motionone/types': 10.17.0 '@motionone/utils': 10.17.0 - tslib: 2.6.3 + tslib: 2.6.2 /@motionone/svelte@10.16.4: resolution: {integrity: sha512-zRVqk20lD1xqe+yEDZhMYgftsuHc25+9JSo+r0a0OWUJFocjSV9D/+UGhX4xgJsuwB9acPzXLr20w40VnY2PQA==} @@ -6877,7 +6893,7 @@ packages: dependencies: '@motionone/types': 10.17.0 hey-listen: 1.0.8 - tslib: 2.6.3 + tslib: 2.6.2 /@motionone/vue@10.16.4: resolution: {integrity: sha512-z10PF9JV6SbjFq+/rYabM+8CVlMokgl8RFGvieSGNTmrkQanfHn+15XBrhG3BgUfvmTeSeyShfOHpG0i9zEdcg==} @@ -7029,7 +7045,7 @@ packages: '@ethersproject/address': 5.7.0 cbor: 8.1.0 chalk: 2.4.2 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) fs-extra: 7.0.1 lodash: 4.17.21 semver: 7.6.0 @@ -7117,7 +7133,7 @@ packages: '@openzeppelin/defender-sdk-network-client': 1.11.0(debug@4.3.4) '@openzeppelin/upgrades-core': 1.32.4 chalk: 4.1.2 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) ethereumjs-util: 7.1.5 proper-lockfile: 4.1.2 undici: 6.18.1 @@ -7284,14 +7300,14 @@ packages: dependencies: asn1js: 3.0.5 pvtsutils: 1.3.5 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /@peculiar/json-schema@1.1.12: resolution: {integrity: sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==} engines: {node: '>=8.0.0'} dependencies: - tslib: 2.6.3 + tslib: 2.6.2 dev: true /@peculiar/webcrypto@1.4.5: @@ -12389,7 +12405,7 @@ packages: dependencies: '@babel/generator': 7.23.6 '@babel/parser': 7.23.9 - '@babel/traverse': 7.23.9(supports-color@5.5.0) + '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 '@storybook/csf': 0.1.2 '@storybook/types': 8.0.8 @@ -13246,7 +13262,7 @@ packages: resolution: {integrity: sha512-5lxnyLEYFskErRPenYItLRSge5DjrJngYKdVjRSrWfza9G6KkgHEXi0vUZiyUeMU5JfXH1YnvXZzSp8ul88o2Q==} dependencies: legacy-swc-helpers: /@swc/helpers@0.4.14 - tslib: 2.6.3 + tslib: 2.6.2 dev: false /@swc/helpers@0.5.12: @@ -15715,7 +15731,7 @@ packages: xstate: ^4 dependencies: '@babel/parser': 7.23.9 - '@babel/traverse': 7.23.9(supports-color@5.5.0) + '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 recast: 0.23.4 xstate: 4.38.3 @@ -15773,7 +15789,7 @@ packages: esbuild: '>=0.10.0' dependencies: esbuild: 0.20.2 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /@yarnpkg/fslib@2.10.3: @@ -15964,9 +15980,6 @@ packages: /ajv-formats@2.1.1: resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} - peerDependenciesMeta: - ajv: - optional: true dependencies: ajv: 8.12.0 dev: true @@ -16235,7 +16248,7 @@ packages: resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 is-array-buffer: 3.0.4 /array-flatten@3.0.0: @@ -16286,11 +16299,11 @@ packages: engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 es-errors: 1.3.0 - get-intrinsic: 1.2.4 + get-intrinsic: 1.2.3 is-array-buffer: 3.0.4 is-shared-array-buffer: 1.0.2 @@ -16319,7 +16332,7 @@ packages: dependencies: pvtsutils: 1.3.5 pvutils: 1.1.3 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /assert-options@0.8.1: @@ -16335,7 +16348,7 @@ packages: /assert@2.1.0: resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 is-nan: 1.3.2 object-is: 1.1.5 object.assign: 4.1.5 @@ -16357,7 +16370,7 @@ packages: resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==} engines: {node: '>=4'} dependencies: - tslib: 2.6.3 + tslib: 2.6.2 dev: true /astral-regex@2.0.0: @@ -17197,8 +17210,8 @@ packages: resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==} dependencies: function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 + get-intrinsic: 1.2.3 + set-function-length: 1.2.0 /call-bind@1.0.7: resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} @@ -17219,7 +17232,7 @@ packages: resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==} dependencies: pascal-case: 3.1.2 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /camelcase-css@2.0.1: @@ -17246,7 +17259,7 @@ packages: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} dependencies: no-case: 3.0.4 - tslib: 2.6.3 + tslib: 2.6.2 upper-case-first: 2.0.2 dev: true @@ -17817,7 +17830,7 @@ packages: resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==} dependencies: no-case: 3.0.4 - tslib: 2.6.3 + tslib: 2.6.2 upper-case: 2.0.2 dev: true @@ -18261,7 +18274,7 @@ packages: commander: 6.2.1 common-tags: 1.8.2 dayjs: 1.11.11 - debug: 4.3.6(supports-color@8.1.1) + debug: 4.3.4(supports-color@8.1.1) enquirer: 2.4.1 eventemitter2: 6.4.7 execa: 4.1.0 @@ -18409,6 +18422,19 @@ packages: dependencies: ms: 2.1.2 supports-color: 5.5.0 + dev: false + + /debug@4.3.4(supports-color@8.1.1): + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + supports-color: 8.1.1 /debug@4.3.6(supports-color@8.1.1): resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==} @@ -18526,9 +18552,9 @@ packages: engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 - call-bind: 1.0.7 + call-bind: 1.0.5 es-get-iterator: 1.1.3 - get-intrinsic: 1.2.4 + get-intrinsic: 1.2.3 is-arguments: 1.1.1 is-array-buffer: 3.0.4 is-date-object: 1.0.5 @@ -18583,6 +18609,14 @@ packages: clone: 1.0.4 dev: true + /define-data-property@1.1.1: + resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.3 + gopd: 1.0.1 + has-property-descriptors: 1.0.1 + /define-data-property@1.1.4: resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} @@ -18599,8 +18633,8 @@ packages: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.4 - has-property-descriptors: 1.0.2 + define-data-property: 1.1.1 + has-property-descriptors: 1.0.1 object-keys: 1.1.1 /defu@6.1.4: @@ -18900,7 +18934,7 @@ packages: resolution: {integrity: sha512-/Tezlx6xpDqR6zKg1V4vLCeQtHWiELhWoBz5A/E0+A1lXN9iIkNbbfc4THSymS0LQUo8F1PMiIwVG8ai/HrnSA==} engines: {node: '>= 8.3.0'} dependencies: - debug: 4.3.6(supports-color@8.1.1) + debug: 4.3.4(supports-color@8.1.1) is-string-and-not-blank: 0.0.2 transitivePeerDependencies: - supports-color @@ -19236,18 +19270,18 @@ packages: array-buffer-byte-length: 1.0.1 arraybuffer.prototype.slice: 1.0.3 available-typed-arrays: 1.0.6 - call-bind: 1.0.7 + call-bind: 1.0.5 es-set-tostringtag: 2.0.2 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.4 + get-intrinsic: 1.2.3 get-symbol-description: 1.0.0 globalthis: 1.0.3 gopd: 1.0.1 - has-property-descriptors: 1.0.2 - has-proto: 1.0.3 + has-property-descriptors: 1.0.1 + has-proto: 1.0.1 has-symbols: 1.0.3 - hasown: 2.0.2 + hasown: 2.0.0 internal-slot: 1.0.6 is-array-buffer: 3.0.4 is-callable: 1.2.7 @@ -19342,8 +19376,8 @@ packages: /es-get-iterator@1.1.3: resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 has-symbols: 1.0.3 is-arguments: 1.1.1 is-map: 2.0.2 @@ -19372,9 +19406,9 @@ packages: resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.4 + get-intrinsic: 1.2.3 has-tostringtag: 1.0.2 - hasown: 2.0.2 + hasown: 2.0.0 /es-set-tostringtag@2.0.3: resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} @@ -19422,7 +19456,7 @@ packages: peerDependencies: esbuild: '>=0.12 <1' dependencies: - debug: 4.3.6(supports-color@8.1.1) + debug: 4.3.4(supports-color@8.1.1) esbuild: 0.19.12 transitivePeerDependencies: - supports-color @@ -19433,7 +19467,7 @@ packages: peerDependencies: esbuild: '>=0.12 <1' dependencies: - debug: 4.3.6(supports-color@8.1.1) + debug: 4.3.4(supports-color@8.1.1) esbuild: 0.20.0 transitivePeerDependencies: - supports-color @@ -20433,7 +20467,7 @@ packages: debug: optional: true dependencies: - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) dev: true /follow-redirects@1.15.6(debug@4.3.6): @@ -20739,7 +20773,7 @@ packages: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 functions-have-names: 1.2.3 @@ -20784,6 +20818,16 @@ packages: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} dev: true + /get-intrinsic@1.2.3: + resolution: {integrity: sha512-JIcZczvcMVE7AUOP+X72bh8HqHBRxFdz5PDHYtNG/lE3yk9b3KZBJlwFcTyPYjg3L4RLLmZJzvjxhaZVapxFrQ==} + engines: {node: '>= 0.4'} + dependencies: + es-errors: 1.3.0 + function-bind: 1.1.2 + has-proto: 1.0.1 + has-symbols: 1.0.3 + hasown: 2.0.0 + /get-intrinsic@1.2.4: resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} engines: {node: '>= 0.4'} @@ -20867,8 +20911,8 @@ packages: resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 /get-symbol-description@1.0.2: resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} @@ -21071,7 +21115,7 @@ packages: /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: - get-intrinsic: 1.2.4 + get-intrinsic: 1.2.3 /got@8.3.2: resolution: {integrity: sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==} @@ -21308,11 +21352,20 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} + /has-property-descriptors@1.0.1: + resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==} + dependencies: + get-intrinsic: 1.2.3 + /has-property-descriptors@1.0.2: resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} dependencies: es-define-property: 1.0.0 + /has-proto@1.0.1: + resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} + engines: {node: '>= 0.4'} + /has-proto@1.0.3: resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} engines: {node: '>= 0.4'} @@ -21360,6 +21413,12 @@ packages: type-fest: 0.8.1 dev: true + /hasown@2.0.0: + resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==} + engines: {node: '>= 0.4'} + dependencies: + function-bind: 1.1.2 + /hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} @@ -21393,7 +21452,7 @@ packages: resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==} dependencies: capital-case: 1.0.4 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /help-me@5.0.0: @@ -21841,8 +21900,8 @@ packages: resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.4 - hasown: 2.0.2 + get-intrinsic: 1.2.3 + hasown: 2.0.0 side-channel: 1.0.4 /internal-slot@1.0.7: @@ -21860,7 +21919,7 @@ packages: '@formatjs/ecma402-abstract': 1.18.2 '@formatjs/fast-memoize': 2.2.0 '@formatjs/icu-messageformat-parser': 2.7.6 - tslib: 2.6.3 + tslib: 2.6.2 dev: false /into-stream@3.1.0: @@ -21933,15 +21992,15 @@ packages: resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 has-tostringtag: 1.0.2 /is-array-buffer@3.0.4: resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 /is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} @@ -21964,7 +22023,7 @@ packages: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 has-tostringtag: 1.0.2 /is-callable@1.2.7: @@ -21981,7 +22040,7 @@ packages: /is-core-module@2.13.1: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: - hasown: 2.0.2 + hasown: 2.0.0 /is-data-view@1.0.1: resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} @@ -22091,7 +22150,7 @@ packages: resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 dev: true @@ -22165,7 +22224,7 @@ packages: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 has-tostringtag: 1.0.2 /is-relative@1.0.0: @@ -22187,7 +22246,7 @@ packages: /is-shared-array-buffer@1.0.2: resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 /is-shared-array-buffer@1.0.3: resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} @@ -22267,13 +22326,13 @@ packages: /is-weakref@1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 /is-weakset@2.0.2: resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 dev: true /is-windows@1.0.2: @@ -23353,7 +23412,7 @@ packages: dependencies: chalk: 5.3.0 commander: 11.1.0 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) execa: 8.0.1 lilconfig: 3.0.0 listr2: 8.0.1 @@ -24526,7 +24585,7 @@ packages: resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 dev: true @@ -24538,7 +24597,7 @@ packages: resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 has-symbols: 1.0.3 object-keys: 1.1.1 @@ -24808,7 +24867,7 @@ packages: resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==} dependencies: dot-case: 3.0.4 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /parent-module@1.0.1: @@ -24884,7 +24943,7 @@ packages: resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==} dependencies: dot-case: 3.0.4 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /path-exists@3.0.0: @@ -25354,7 +25413,7 @@ packages: commander: 2.15.1 croner: 4.1.97 dayjs: 1.11.11 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) enquirer: 2.3.6 eventemitter2: 5.0.1 fclone: 1.0.11 @@ -25920,7 +25979,7 @@ packages: /pvtsutils@1.3.5: resolution: {integrity: sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA==} dependencies: - tslib: 2.6.3 + tslib: 2.6.2 dev: true /pvutils@1.1.3: @@ -26160,7 +26219,7 @@ packages: engines: {node: '>=16.14.0'} dependencies: '@babel/core': 7.23.9 - '@babel/traverse': 7.23.9(supports-color@5.5.0) + '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.20.5 @@ -26619,7 +26678,7 @@ packages: resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 set-function-name: 2.0.1 @@ -27012,8 +27071,8 @@ packages: resolution: {integrity: sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==} engines: {node: '>=0.4'} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 has-symbols: 1.0.3 isarray: 2.0.5 @@ -27037,8 +27096,8 @@ packages: resolution: {integrity: sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 is-regex: 1.1.4 /safe-regex-test@1.0.3: @@ -27258,6 +27317,16 @@ packages: /set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} + /set-function-length@1.2.0: + resolution: {integrity: sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==} + engines: {node: '>= 0.4'} + dependencies: + define-data-property: 1.1.1 + function-bind: 1.1.2 + get-intrinsic: 1.2.3 + gopd: 1.0.1 + has-property-descriptors: 1.0.1 + /set-function-length@1.2.2: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} @@ -27273,9 +27342,9 @@ packages: resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.4 + define-data-property: 1.1.1 functions-have-names: 1.2.3 - has-property-descriptors: 1.0.2 + has-property-descriptors: 1.0.1 /set-harmonic-interval@1.0.1: resolution: {integrity: sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==} @@ -27360,8 +27429,8 @@ packages: /side-channel@1.0.4: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 object-inspect: 1.13.1 /side-channel@1.0.6: @@ -27938,7 +28007,7 @@ packages: resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 @@ -27955,7 +28024,7 @@ packages: /string.prototype.trimend@1.0.7: resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 @@ -27970,7 +28039,7 @@ packages: /string.prototype.trimstart@1.0.7: resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 @@ -28869,7 +28938,7 @@ packages: bundle-require: 4.0.2(esbuild@0.19.12) cac: 6.7.14 chokidar: 3.5.3 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) esbuild: 0.19.12 execa: 5.1.1 globby: 11.1.0 @@ -28910,7 +28979,7 @@ packages: bundle-require: 4.0.2(esbuild@0.19.12) cac: 6.7.14 chokidar: 3.6.0 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) esbuild: 0.19.12 execa: 5.1.1 globby: 11.1.0 @@ -28950,7 +29019,7 @@ packages: bundle-require: 4.0.2(esbuild@0.21.5) cac: 6.7.14 chokidar: 3.6.0 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) esbuild: 0.21.5 execa: 5.1.1 globby: 11.1.0 @@ -29137,8 +29206,8 @@ packages: resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.5 + get-intrinsic: 1.2.3 is-typed-array: 1.1.13 /typed-array-buffer@1.0.2: @@ -29154,9 +29223,9 @@ packages: resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 for-each: 0.3.3 - has-proto: 1.0.3 + has-proto: 1.0.1 is-typed-array: 1.1.13 /typed-array-byte-length@1.0.1: @@ -29175,9 +29244,9 @@ packages: engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.6 - call-bind: 1.0.7 + call-bind: 1.0.5 for-each: 0.3.3 - has-proto: 1.0.3 + has-proto: 1.0.1 is-typed-array: 1.1.13 /typed-array-byte-offset@1.0.2: @@ -29195,7 +29264,7 @@ packages: /typed-array-length@1.0.4: resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 for-each: 0.3.3 is-typed-array: 1.1.13 @@ -29253,7 +29322,7 @@ packages: /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.5 has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 @@ -29744,7 +29813,7 @@ packages: hasBin: true dependencies: cac: 6.7.14 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) pathe: 1.1.2 picocolors: 1.0.0 vite: 5.2.6(@types/node@20.11.6) @@ -29767,7 +29836,7 @@ packages: vite: optional: true dependencies: - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) globrex: 0.1.2 tsconfck: 3.0.1(typescript@5.4.5) vite: 5.2.6(@types/node@20.11.6) @@ -29845,7 +29914,7 @@ packages: acorn-walk: 8.3.2 cac: 6.7.14 chai: 4.4.1 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) execa: 8.0.1 local-pkg: 0.5.0 magic-string: 0.30.7 @@ -30080,7 +30149,7 @@ packages: '@peculiar/json-schema': 1.1.12 asn1js: 3.0.5 pvtsutils: 1.3.5 - tslib: 2.6.3 + tslib: 2.6.2 dev: true /webextension-polyfill@0.10.0: @@ -30326,7 +30395,7 @@ packages: engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.6 - call-bind: 1.0.7 + call-bind: 1.0.5 for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.2 @@ -30711,7 +30780,7 @@ packages: commander: 11.1.0 cypress: 12.17.3 cypress-wait-until: 2.0.1 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4(supports-color@8.1.1) dotenv: 16.4.1 dotenv-parse-variables: 2.0.0 download: 8.0.0