From a1a23f3a55ed201ced2e4c9d32ddc35d341b9c87 Mon Sep 17 00:00:00 2001 From: Dewansh Date: Tue, 17 Dec 2024 21:37:43 +0530 Subject: [PATCH 1/3] build: bump @offchainlabs/cobalt (#2145) --- packages/arb-token-bridge-ui/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/arb-token-bridge-ui/package.json b/packages/arb-token-bridge-ui/package.json index 9a78630c7b..26ccf11705 100644 --- a/packages/arb-token-bridge-ui/package.json +++ b/packages/arb-token-bridge-ui/package.json @@ -10,7 +10,7 @@ "@headlessui/react": "^1.7.8", "@headlessui/tailwindcss": "^0.1.2", "@heroicons/react": "^2.0.18", - "@offchainlabs/cobalt": "^0.3.11", + "@offchainlabs/cobalt": "^0.3.12", "@rainbow-me/rainbowkit": "^0.12.16", "@rehooks/local-storage": "^2.4.4", "@sentry/react": "^8.33.1", diff --git a/yarn.lock b/yarn.lock index c5cc61f6ae..00b3d9a947 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2069,10 +2069,10 @@ dependencies: "@octokit/openapi-types" "^22.2.0" -"@offchainlabs/cobalt@^0.3.11": - version "0.3.11" - resolved "https://registry.yarnpkg.com/@offchainlabs/cobalt/-/cobalt-0.3.11.tgz#6d6ec1c81bf77f897952cbd33f151e1a7cb596a1" - integrity sha512-xczC0CkMzAkbIFnvtX8EqKRUq3FPT/7MtP0sXBkbcaHvcgxNYs/fafmvn8/zmQxM+RBOJ/no17UNL4I3Cp9s+w== +"@offchainlabs/cobalt@^0.3.12": + version "0.3.12" + resolved "https://registry.yarnpkg.com/@offchainlabs/cobalt/-/cobalt-0.3.12.tgz#f841028f0e698b57adbaa75c2225aec59baef821" + integrity sha512-ULbCD0DfxO8xmrPOmHcB4HuW+c81qAdbvXw5it5jMilb2bVjPoE4gtCALbVppkGbcft0P3FgEpKHbtfS7sEfeg== "@parcel/watcher-android-arm64@2.4.1": version "2.4.1" From 9cacd2dc2685cc7e03cb861e33e9e7107f62adfe Mon Sep 17 00:00:00 2001 From: Christophe Deveaux Date: Tue, 17 Dec 2024 18:08:37 +0100 Subject: [PATCH 2/3] feat: dynamically load token lists for Orbit chains (#2135) --- .../src/components/TransferPanel/TokenRow.tsx | 6 +- .../components/TransferPanel/TokenSearch.tsx | 4 +- .../TransferPanel/TransferPanelMain/hooks.ts | 2 +- .../src/hooks/arbTokenBridge.types.ts | 6 +- .../src/hooks/useArbTokenBridge.ts | 4 +- .../src/util/TokenListUtils.ts | 102 ++++++++---------- 6 files changed, 54 insertions(+), 70 deletions(-) diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenRow.tsx b/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenRow.tsx index 65fcb9dafe..6d95a50d2a 100644 --- a/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenRow.tsx +++ b/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenRow.tsx @@ -34,9 +34,9 @@ import { TokenLogoFallback } from './TokenInfo' import { useBalanceOnSourceChain } from '../../hooks/useBalanceOnSourceChain' import { useSourceChainNativeCurrencyDecimals } from '../../hooks/useSourceChainNativeCurrencyDecimals' -function tokenListIdsToNames(ids: number[]): string { +function tokenListIdsToNames(ids: string[]): string { return ids - .map((tokenListId: number) => listIdsToNames[tokenListId]) + .map((tokenListId: string) => listIdsToNames[tokenListId]) .join(', ') } @@ -90,7 +90,7 @@ function TokenListInfo({ token }: { token: ERC20BridgeToken | null }) { return 'Native USDC on Arbitrum Sepolia' } - const listIds: Set = token.listIds + const listIds: Set = token.listIds const listIdsSize = listIds.size if (listIdsSize === 0) { return 'Added by User' diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenSearch.tsx b/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenSearch.tsx index 93af1c6977..8d90a95caa 100644 --- a/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenSearch.tsx +++ b/packages/arb-token-bridge-ui/src/components/TransferPanel/TokenSearch.tsx @@ -47,7 +47,7 @@ import { useSetInputAmount } from '../../hooks/TransferPanel/useSetInputAmount' export const ARB_ONE_NATIVE_USDC_TOKEN = { ...ArbOneNativeUSDC, - listIds: new Set(), + listIds: new Set(), type: TokenType.ERC20, // the address field is for L1 address but native USDC does not have an L1 address // the L2 address is used instead to avoid errors @@ -57,7 +57,7 @@ export const ARB_ONE_NATIVE_USDC_TOKEN = { export const ARB_SEPOLIA_NATIVE_USDC_TOKEN = { ...ArbOneNativeUSDC, - listIds: new Set(), + listIds: new Set(), type: TokenType.ERC20, address: CommonAddress.ArbitrumSepolia.USDC, l2Address: CommonAddress.ArbitrumSepolia.USDC diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelMain/hooks.ts b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelMain/hooks.ts index 4d748b11ca..9cb4413a42 100644 --- a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelMain/hooks.ts +++ b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelMain/hooks.ts @@ -16,7 +16,7 @@ const commonUSDC = { type: TokenType.ERC20, symbol: 'USDC', decimals: 6, - listIds: new Set() + listIds: new Set() } export function useUpdateUSDCTokenData() { diff --git a/packages/arb-token-bridge-ui/src/hooks/arbTokenBridge.types.ts b/packages/arb-token-bridge-ui/src/hooks/arbTokenBridge.types.ts index 8c2d259e1a..2b62dd9bc8 100644 --- a/packages/arb-token-bridge-ui/src/hooks/arbTokenBridge.types.ts +++ b/packages/arb-token-bridge-ui/src/hooks/arbTokenBridge.types.ts @@ -90,7 +90,7 @@ export interface BridgeToken { address: string l2Address?: string logoURI?: string - listIds: Set // no listID indicates added by user + listIds: Set // no listID indicates added by user isL2Native?: boolean } @@ -140,8 +140,8 @@ export interface ArbTokenBridgeEth { export interface ArbTokenBridgeToken { add: (erc20L1orL2Address: string) => Promise addL2NativeToken: (erc20L2Address: string) => void - addTokensFromList: (tokenList: TokenList, listID: number) => void - removeTokensFromList: (listID: number) => void + addTokensFromList: (tokenList: TokenList, listID: string) => void + removeTokensFromList: (listID: string) => void updateTokenData: (l1Address: string) => Promise triggerOutbox: (params: { event: L2ToL1EventResultPlus diff --git a/packages/arb-token-bridge-ui/src/hooks/useArbTokenBridge.ts b/packages/arb-token-bridge-ui/src/hooks/useArbTokenBridge.ts index 6d96383d1d..39e39f2b83 100644 --- a/packages/arb-token-bridge-ui/src/hooks/useArbTokenBridge.ts +++ b/packages/arb-token-bridge-ui/src/hooks/useArbTokenBridge.ts @@ -136,7 +136,7 @@ export const useArbTokenBridge = ( const l1NetworkID = useMemo(() => String(l1.network.id), [l1.network.id]) - const removeTokensFromList = (listID: number) => { + const removeTokensFromList = (listID: string) => { setBridgeTokens(prevBridgeTokens => { const newBridgeTokens = { ...prevBridgeTokens } for (const address in bridgeTokens) { @@ -153,7 +153,7 @@ export const useArbTokenBridge = ( }) } - const addTokensFromList = async (arbTokenList: TokenList, listId: number) => { + const addTokensFromList = async (arbTokenList: TokenList, listId: string) => { const l1ChainID = l1.network.id const l2ChainID = l2.network.id diff --git a/packages/arb-token-bridge-ui/src/util/TokenListUtils.ts b/packages/arb-token-bridge-ui/src/util/TokenListUtils.ts index 1622484a9d..4f9f629475 100644 --- a/packages/arb-token-bridge-ui/src/util/TokenListUtils.ts +++ b/packages/arb-token-bridge-ui/src/util/TokenListUtils.ts @@ -9,11 +9,14 @@ import CoinGeckoLogo from '@/images/lists/coinGecko.svg' import ArbitrumLogo from '@/images/lists/ArbitrumLogo.png' import { ArbTokenBridge } from '../hooks/arbTokenBridge.types' import { ChainId } from './networks' +import orbitChainsData from './orbitChainsData.json' -export const SPECIAL_ARBITRUM_TOKEN_TOKEN_LIST_ID = 0 +export const SPECIAL_ARBITRUM_TOKEN_TOKEN_LIST_ID = + 'SPECIAL_ARBITRUM_TOKEN_TOKEN_LIST_ID' export interface BridgeTokenList { - id: number + // string is required here to avoid duplicates when mapping orbit chains to tokenlists + id: string originChainID: number url: string name: string @@ -34,7 +37,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ isArbitrumTokenTokenList: true }, { - id: 1, + id: '1', originChainID: ChainId.ArbitrumOne, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/arbed_arb_whitelist_era.json', name: 'Arbitrum Whitelist Era', @@ -42,7 +45,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ logoURI: ArbitrumLogo }, { - id: 2, + id: '2', originChainID: ChainId.ArbitrumOne, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/arbed_uniswap_labs_default.json', name: 'Arbed Uniswap List', @@ -50,7 +53,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ logoURI: UniswapLogo }, { - id: 4, + id: '4', originChainID: ChainId.ArbitrumOne, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/arbed_coingecko.json', name: 'Arbed CoinGecko List', @@ -58,7 +61,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ logoURI: CoinGeckoLogo }, { - id: 5, + id: '5', originChainID: ChainId.ArbitrumOne, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/arbed_coinmarketcap.json', name: 'Arbed CMC List', @@ -66,7 +69,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ logoURI: CMCLogo }, { - id: 6, + id: '6', originChainID: ChainId.ArbitrumNova, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/42170_arbed_uniswap_labs_default.json', name: 'Arbed Uniswap List', @@ -78,7 +81,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ // TODO: remove list for chain ID 412346 after fix: // https://github.com/OffchainLabs/arb-token-bridge/issues/564 { - id: 9, + id: '9', // Local node originChainID: ChainId.ArbitrumLocal, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/421613_arbed_coinmarketcap.json', @@ -87,7 +90,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ logoURI: CMCLogo }, { - id: 10, + id: '10', originChainID: ChainId.ArbitrumSepolia, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/421614_arbed_uniswap_labs.json', name: 'Arbed Uniswap List', @@ -96,7 +99,7 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ }, // CoinGecko { - id: 11, + id: '11', originChainID: ChainId.ArbitrumNova, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/42170_arbed_coingecko.json', name: 'Arbed CoinGecko List', @@ -104,25 +107,15 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ logoURI: CoinGeckoLogo }, { - id: 13, + id: '13', originChainID: ChainId.ArbitrumSepolia, url: 'https://tokenlist.arbitrum.io/ArbTokenLists/421614_arbed_coingecko.json', name: 'Arbed CoinGecko List', isDefault: true, logoURI: CoinGeckoLogo }, - // Orbit { - id: 14, - // Xai - originChainID: 660279, - url: 'https://tokenlist.arbitrum.io/ArbTokenLists/660279_arbed_uniswap_labs.json', - name: 'Arbed Uniswap List', - isDefault: true, - logoURI: UniswapLogo - }, - { - id: 660279, + id: '660279', // Xai originChainID: 660279, url: 'tokenLists/660279_default.json', @@ -130,42 +123,33 @@ export const BRIDGE_TOKEN_LISTS: BridgeTokenList[] = [ isDefault: true, logoURI: '/images/XaiLogo.svg' }, - { - id: 15, - // Rari - originChainID: 1380012617, - url: 'https://tokenlist.arbitrum.io/ArbTokenLists/1380012617_arbed_uniswap_labs.json', - name: 'Arbed Uniswap List', - isDefault: true, - logoURI: UniswapLogo - }, - { - id: 16, - // Muster - originChainID: 4078, - url: 'https://tokenlist.arbitrum.io/ArbTokenLists/4078_arbed_uniswap_labs.json', - name: 'Arbed Uniswap List', - isDefault: true, - logoURI: UniswapLogo - }, - { - id: 17, - // Proof of Play Apex - originChainID: 70700, - url: 'https://tokenlist.arbitrum.io/ArbTokenLists/70700_arbed_uniswap_labs.json', - name: 'Arbed Uniswap List', - isDefault: true, - logoURI: UniswapLogo - }, - { - id: 19, - // SX Network - originChainID: 4162, - url: 'https://tokenlist.arbitrum.io/ArbTokenLists/4162_arbed_uniswap_labs.json', - name: 'Arbed Uniswap List', - isDefault: true, - logoURI: UniswapLogo - } + // For all orbit chains, + ...orbitChainsData.mainnet + .concat(orbitChainsData.testnet) + .reduce((acc, chain) => { + // Only include arbified native token list for L3 settling to ArbOne + if (chain.parentChainId === ChainId.ArbitrumOne) { + acc.push({ + id: `${chain.chainId}_native`, + originChainID: chain.chainId, + url: `https://tokenlist.arbitrum.io/ArbTokenLists/${chain.chainId}_arbed_native_list.json`, + name: `${chain.name} Default List`, + isDefault: true, + logoURI: ArbitrumLogo + }) + } + + acc.push({ + id: `${chain.chainId}_uniswap`, + originChainID: chain.chainId, + url: `https://tokenlist.arbitrum.io/ArbTokenLists/${chain.chainId}_arbed_uniswap_labs.json`, + name: `${chain.name} Arbed Uniswap List`, + isDefault: true, + logoURI: UniswapLogo + }) + + return acc + }, [] as BridgeTokenList[]) ] export const listIdsToNames: { [key: string]: string } = {} @@ -176,7 +160,7 @@ BRIDGE_TOKEN_LISTS.forEach(bridgeTokenList => { export interface TokenListWithId extends TokenList { l2ChainId: string - bridgeTokenListId: number + bridgeTokenListId: string isValid?: boolean } From 0412672f4ac889464b25d3178ccd5f8bbe5fe25c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 05:12:35 -0500 Subject: [PATCH 3/3] build(deps): bump next from 14.2.14 to 14.2.15 (#2148) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/arb-token-bridge-ui/package.json | 2 +- yarn.lock | 147 ++++++++++------------ 2 files changed, 65 insertions(+), 84 deletions(-) diff --git a/packages/arb-token-bridge-ui/package.json b/packages/arb-token-bridge-ui/package.json index 26ccf11705..22540e5993 100644 --- a/packages/arb-token-bridge-ui/package.json +++ b/packages/arb-token-bridge-ui/package.json @@ -28,7 +28,7 @@ "exponential-backoff": "^3.1.1", "graphql": "^16.9.0", "lodash-es": "^4.17.21", - "next": "^14.2.12", + "next": "^14.2.15", "next-query-params": "^5.0.0", "overmind": "^28.0.1", "overmind-react": "^29.0.1", diff --git a/yarn.lock b/yarn.lock index 00b3d9a947..936d7eb588 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1768,10 +1768,10 @@ "@motionone/dom" "^10.16.2" tslib "^2.3.1" -"@next/env@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.14.tgz#08f5175dab727102da02301ba61f7239773670fa" - integrity sha512-/0hWQfiaD5//LvGNgc8PjvyqV50vGK0cADYzaoOOGN8fxzBn3iAiaq3S0tCRnFBldq0LVveLcxCTi41ZoYgAgg== +"@next/env@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.15.tgz#06d984e37e670d93ddd6790af1844aeb935f332f" + integrity sha512-S1qaj25Wru2dUpcIZMjxeMVSwkt8BK4dmWHHiBuRstcIyOsMapqT4A4jSB6onvqeygkSSmOkyny9VVx8JIGamQ== "@next/eslint-plugin-next@14.2.5": version "14.2.5" @@ -1787,50 +1787,50 @@ dependencies: glob "7.1.7" -"@next/swc-darwin-arm64@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.14.tgz#6dde2dac699dfe948b527385f2b350b3151989f4" - integrity sha512-bsxbSAUodM1cjYeA4o6y7sp9wslvwjSkWw57t8DtC8Zig8aG8V6r+Yc05/9mDzLKcybb6EN85k1rJDnMKBd9Gw== - -"@next/swc-darwin-x64@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.14.tgz#25800213c4dc0f8cd765c88073d28a3144698e31" - integrity sha512-cC9/I+0+SK5L1k9J8CInahduTVWGMXhQoXFeNvF0uNs3Bt1Ub0Azb8JzTU9vNCr0hnaMqiWu/Z0S1hfKc3+dww== - -"@next/swc-linux-arm64-gnu@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.14.tgz#9c66bd1287d0c3633e7bf354f9c01e1b79747615" - integrity sha512-RMLOdA2NU4O7w1PQ3Z9ft3PxD6Htl4uB2TJpocm+4jcllHySPkFaUIFacQ3Jekcg6w+LBaFvjSPthZHiPmiAUg== - -"@next/swc-linux-arm64-musl@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.14.tgz#da2ae16a24bb2b2a46447154e95da85c557ab09a" - integrity sha512-WgLOA4hT9EIP7jhlkPnvz49iSOMdZgDJVvbpb8WWzJv5wBD07M2wdJXLkDYIpZmCFfo/wPqFsFR4JS4V9KkQ2A== - -"@next/swc-linux-x64-gnu@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.14.tgz#635c62109b9cf0464e6322955a36931ebb9ed3e2" - integrity sha512-lbn7svjUps1kmCettV/R9oAvEW+eUI0lo0LJNFOXoQM5NGNxloAyFRNByYeZKL3+1bF5YE0h0irIJfzXBq9Y6w== - -"@next/swc-linux-x64-musl@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.14.tgz#1565caf6fa77c3280d8b05ffc8c542ff144a4855" - integrity sha512-7TcQCvLQ/hKfQRgjxMN4TZ2BRB0P7HwrGAYL+p+m3u3XcKTraUFerVbV3jkNZNwDeQDa8zdxkKkw2els/S5onQ== - -"@next/swc-win32-arm64-msvc@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.14.tgz#8df4feb3c9280155e9299f3cdfa32f3cface336a" - integrity sha512-8i0Ou5XjTLEje0oj0JiI0Xo9L/93ghFtAUYZ24jARSeTMXLUx8yFIdhS55mTExq5Tj4/dC2fJuaT4e3ySvXU1A== - -"@next/swc-win32-ia32-msvc@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.14.tgz#1f0a2bafbb63147c8db102ca1524db9ffa959d0c" - integrity sha512-2u2XcSaDEOj+96eXpyjHjtVPLhkAFw2nlaz83EPeuK4obF+HmtDJHqgR1dZB7Gb6V/d55FL26/lYVd0TwMgcOQ== - -"@next/swc-win32-x64-msvc@14.2.14": - version "14.2.14" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.14.tgz#9d6446b3a8d5e67e199049d59ce7c0b8bd33ab51" - integrity sha512-MZom+OvZ1NZxuRovKt1ApevjiUJTcU2PmdJKL66xUPaJeRywnbGGRWUlaAOwunD6dX+pm83vj979NTC8QXjGWg== +"@next/swc-darwin-arm64@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.15.tgz#6386d585f39a1c490c60b72b1f76612ba4434347" + integrity sha512-Rvh7KU9hOUBnZ9TJ28n2Oa7dD9cvDBKua9IKx7cfQQ0GoYUwg9ig31O2oMwH3wm+pE3IkAQ67ZobPfEgurPZIA== + +"@next/swc-darwin-x64@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.15.tgz#b7baeedc6a28f7545ad2bc55adbab25f7b45cb89" + integrity sha512-5TGyjFcf8ampZP3e+FyCax5zFVHi+Oe7sZyaKOngsqyaNEpOgkKB3sqmymkZfowy3ufGA/tUgDPPxpQx931lHg== + +"@next/swc-linux-arm64-gnu@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.15.tgz#fa13c59d3222f70fb4cb3544ac750db2c6e34d02" + integrity sha512-3Bwv4oc08ONiQ3FiOLKT72Q+ndEMyLNsc/D3qnLMbtUYTQAmkx9E/JRu0DBpHxNddBmNT5hxz1mYBphJ3mfrrw== + +"@next/swc-linux-arm64-musl@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.15.tgz#30e45b71831d9a6d6d18d7ac7d611a8d646a17f9" + integrity sha512-k5xf/tg1FBv/M4CMd8S+JL3uV9BnnRmoe7F+GWC3DxkTCD9aewFRH1s5rJ1zkzDa+Do4zyN8qD0N8c84Hu96FQ== + +"@next/swc-linux-x64-gnu@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.15.tgz#5065db17fc86f935ad117483f21f812dc1b39254" + integrity sha512-kE6q38hbrRbKEkkVn62reLXhThLRh6/TvgSP56GkFNhU22TbIrQDEMrO7j0IcQHcew2wfykq8lZyHFabz0oBrA== + +"@next/swc-linux-x64-musl@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.15.tgz#3c4a4568d8be7373a820f7576cf33388b5dab47e" + integrity sha512-PZ5YE9ouy/IdO7QVJeIcyLn/Rc4ml9M2G4y3kCM9MNf1YKvFY4heg3pVa/jQbMro+tP6yc4G2o9LjAz1zxD7tQ== + +"@next/swc-win32-arm64-msvc@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.15.tgz#fb812cc4ca0042868e32a6a021da91943bb08b98" + integrity sha512-2raR16703kBvYEQD9HNLyb0/394yfqzmIeyp2nDzcPV4yPjqNUG3ohX6jX00WryXz6s1FXpVhsCo3i+g4RUX+g== + +"@next/swc-win32-ia32-msvc@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.15.tgz#ec26e6169354f8ced240c1427be7fd485c5df898" + integrity sha512-fyTE8cklgkyR1p03kJa5zXEaZ9El+kDNM5A+66+8evQS5e/6v0Gk28LqA0Jet8gKSOyP+OTm/tJHzMlGdQerdQ== + +"@next/swc-win32-x64-msvc@14.2.15": + version "14.2.15" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.15.tgz#18d68697002b282006771f8d92d79ade9efd35c4" + integrity sha512-SzqGbsLsP9OwKNUG9nekShTwhj6JSB9ZLMWQ8g1gG6hdE5gQLncbnbymrwy2yVmH9nikSLYRYxYMFu78Ggp7/g== "@noble/curves@1.2.0", "@noble/curves@~1.2.0": version "1.2.0" @@ -5300,12 +5300,7 @@ camelize@^1.0.0: resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz" integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== -caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503: - version "1.0.30001503" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz" - integrity sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw== - -caniuse-lite@^1.0.30001579: +caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503, caniuse-lite@^1.0.30001579: version "1.0.30001643" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz" integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== @@ -10809,12 +10804,12 @@ next-query-params@^5.0.0: dependencies: tslib "^2.0.3" -next@^14.2.12: - version "14.2.14" - resolved "https://registry.yarnpkg.com/next/-/next-14.2.14.tgz#115f29443dfb96d23b4b5ab5c4547de339202ba7" - integrity sha512-Q1coZG17MW0Ly5x76shJ4dkC23woLAhhnDnw+DfTc7EpZSGuWrlsZ3bZaO8t6u1Yu8FVfhkqJE+U8GC7E0GLPQ== +next@^14.2.15: + version "14.2.15" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.15.tgz#348e5603e22649775d19c785c09a89c9acb5189a" + integrity sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw== dependencies: - "@next/env" "14.2.14" + "@next/env" "14.2.15" "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -10822,15 +10817,15 @@ next@^14.2.12: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.14" - "@next/swc-darwin-x64" "14.2.14" - "@next/swc-linux-arm64-gnu" "14.2.14" - "@next/swc-linux-arm64-musl" "14.2.14" - "@next/swc-linux-x64-gnu" "14.2.14" - "@next/swc-linux-x64-musl" "14.2.14" - "@next/swc-win32-arm64-msvc" "14.2.14" - "@next/swc-win32-ia32-msvc" "14.2.14" - "@next/swc-win32-x64-msvc" "14.2.14" + "@next/swc-darwin-arm64" "14.2.15" + "@next/swc-darwin-x64" "14.2.15" + "@next/swc-linux-arm64-gnu" "14.2.15" + "@next/swc-linux-arm64-musl" "14.2.15" + "@next/swc-linux-x64-gnu" "14.2.15" + "@next/swc-linux-x64-musl" "14.2.15" + "@next/swc-win32-arm64-msvc" "14.2.15" + "@next/swc-win32-ia32-msvc" "14.2.15" + "@next/swc-win32-x64-msvc" "14.2.15" no-case@^3.0.4: version "3.0.4" @@ -11567,11 +11562,6 @@ picocolors@^1.0.0: resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picocolors@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz" - integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== - picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" @@ -11737,16 +11727,7 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.4.43: - version "8.4.47" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz" - integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ== - dependencies: - nanoid "^3.3.7" - picocolors "^1.1.0" - source-map-js "^1.2.1" - -postcss@^8.4.47, postcss@^8.4.49: +postcss@^8.4.43, postcss@^8.4.47, postcss@^8.4.49: version "8.4.49" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19" integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==