From d70d913ddb14f52d2ca950272e826b93fe0679d0 Mon Sep 17 00:00:00 2001 From: Matthew Lilley Date: Tue, 1 Oct 2024 17:35:57 +0100 Subject: [PATCH] SAVEPOINT --- .github/workflows/e2e.yml | 5 +- .github/workflows/verify.yml | 1 + .gitignore | 51 +- .npmrc | 1 - .vscode/settings.json | 5 - apps/README.md | 7 +- apps/web/next.config.mjs | 24 +- apps/web/package.json | 1 - apps/web/sentry.client.config.ts | 34 +- apps/web/sentry.edge.config.ts | 6 +- apps/web/sentry.server.config.ts | 9 +- apps/web/src/app/(evm)/(trade)/error.tsx | 9 - .../tables/pools/cells/pool-name-cell.tsx | 4 +- .../src/app/api/sentry-example-api/route.ts | 10 + apps/web/src/app/sentry-example-page/page.tsx | 85 ++++ apps/web/src/instrumentation.ts | 4 +- apps/web/src/lib/hooks/useSimulateTrade.ts | 3 +- .../cross-chain-swap-trade-review-dialog.tsx | 54 +-- .../derivedstate-simple-swap-provider.tsx | 9 +- .../simple-swap-trade-review-dialog.tsx | 47 +- biome.json | 8 - config/nextjs/index.js | 2 - package.json | 6 +- packages/graph-client/package.json | 14 +- packages/hooks/CHANGELOG.md | 22 - packages/notifications/package.json | 2 +- packages/steer-sdk/package.json | 10 +- packages/sushiswap/README.md | 2 + packages/sushiswap/package.json | 10 + packages/ui/package.json | 5 + pnpm-lock.yaml | 443 ++---------------- pnpm-workspace.yaml | 4 +- turbo.json | 19 +- 33 files changed, 249 insertions(+), 667 deletions(-) delete mode 100644 .npmrc create mode 100644 apps/web/src/app/api/sentry-example-api/route.ts create mode 100644 apps/web/src/app/sentry-example-page/page.tsx delete mode 100644 packages/hooks/CHANGELOG.md create mode 100644 packages/sushiswap/README.md create mode 100644 packages/sushiswap/package.json diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index f1e9bbb9b8..50d3431efd 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -13,11 +13,10 @@ on: workflow_dispatch: env: - CI: true NODE_OPTIONS: --max-old-space-size=8192 TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ secrets.TURBO_TEAM }} - TURBO_FORCE: false + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -48,8 +47,6 @@ jobs: env: ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }} ANVIL_BLOCK_NUMBER: ${{ matrix.block-number }} - DATABASE_URL: ${{ secrets.DATABASE_URL }} - REDIS_URL: ${{ secrets.REDIS_URL }} EDGE_CONFIG: ${{ secrets.EDGE_CONFIG }} NEXT_PUBLIC_APP_ENV: 'test' NEXT_PUBLIC_CHAIN_ID: ${{ matrix.chain-id }} diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index f9f26837b1..a2d870a80b 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -3,6 +3,7 @@ on: workflow_call: workflow_dispatch: env: + NODE_OPTIONS: --max-old-space-size=8192 TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ secrets.TURBO_TEAM }} diff --git a/.gitignore b/.gitignore index 76213956bf..9956edc083 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,9 @@ yarn-debug.log* yarn-error.log* .pnpm-debug.log* +# env +.env + # local env files .env.local .env.development.local @@ -43,50 +46,9 @@ yarn-error.log* # vercel .vercel -# env -.env -skaffold.env - -# mesh -.mesh - -# graphql -.graphclient - -# typechain -typechain - -# exports -exports - -# cache -cache - # generated generated -# artifacts -artifacts - -# artifacts zk -artifacts-zk - -# cache zk -cache-zk - -# workers -**/public/sw.js -**/public/workbox-*.js -**/public/worker-*.js -**/public/sw.js.map -**/public/workbox-*.js.map -**/public/worker-*.js.map - -# prisma - -# screenshots -screenshots - # playwright playwright-report test-results @@ -94,9 +56,6 @@ test-results # Sentry .sentryclirc -test-results/ -results/ - # typescript *.tsbuildinfo next-env.d.ts @@ -104,13 +63,11 @@ next-env.d.ts # storybook storybook-static -# tines snapshots -test/snapshots/ - # Sentry Config File .env.sentry-build-plugin # npm lock file (we use pnpm) package-lock.json + # yarn lock file (we use pnpm) yarn.lock \ No newline at end of file diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 39c9b231b3..0000000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -public-hoist-pattern[]=*prisma* \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 38e9c750e7..1530b68d22 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -32,8 +32,6 @@ "editor.defaultFormatter": "biomejs.biome", "editor.formatOnSave": true }, - "typescript.tsdk": "apps/web/node_modules/typescript/lib", - "typescript.enablePromptUseWorkspaceTsdk": true, "[typescript]": { "editor.defaultFormatter": "biomejs.biome", "editor.formatOnSave": true @@ -50,9 +48,6 @@ "editor.defaultFormatter": "biomejs.biome", "editor.formatOnSave": true }, - "[solidity]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, "yaml.schemas": { "https://www.artillery.io/schema.json": [ "file:///home/feedme/sushi/sushiswap/apis/router/test/load.yml" diff --git a/apps/README.md b/apps/README.md index 1646f4eaa7..72abc4c6d6 100644 --- a/apps/README.md +++ b/apps/README.md @@ -1,3 +1,8 @@ # Apps -... +The `apps` directory contains all the code for the different applications that are part of the project. Each application is a separate directory with its own `README.md` file. + +## [Web](web/README.md) +## [Mobile](mobile/README.md) +## [Extension](extension/README.md) +## [Desktop](desktop/README.md) diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs index 7f055c839f..d118097122 100644 --- a/apps/web/next.config.mjs +++ b/apps/web/next.config.mjs @@ -1,8 +1,7 @@ +import withBundleAnalyzer from '@next/bundle-analyzer' import { withSentryConfig } from '@sentry/nextjs' import defaultNextConfig from '@sushiswap/nextjs-config' -import { withAxiom } from 'next-axiom' -import withBundleAnalyzer from '@next/bundle-analyzer' const bundleAnalyzer = withBundleAnalyzer({ enabled: false && process.env.NODE_ENV !== 'development', }) @@ -95,15 +94,12 @@ const nextConfig = bundleAnalyzer({ }, }) -export default withAxiom(withSentryConfig(nextConfig), { +export default withSentryConfig(nextConfig, { // For all available options, see: // https://github.com/getsentry/sentry-webpack-plugin#options - org: process.env.SENTRY_ORG, - project: process.env.SENTRY_PROJECT, - - // An auth token is required for uploading source maps. - authToken: process.env.SENTRY_AUTH_TOKEN, + org: 'sushi-j9', + project: 'web', // Only print logs for uploading source maps in CI silent: !process.env.CI, @@ -114,6 +110,11 @@ export default withAxiom(withSentryConfig(nextConfig), { // Upload a larger set of source maps for prettier stack traces (increases build time) widenClientFileUpload: true, + // Automatically annotate React components to show their full name in breadcrumbs and session replay + reactComponentAnnotation: { + enabled: true, + }, + // Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers. // This can increase your server load as well as your hosting bill. // Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client- @@ -124,7 +125,7 @@ export default withAxiom(withSentryConfig(nextConfig), { hideSourceMaps: true, // Automatically tree-shake Sentry logger statements to reduce bundle size - disableLogger: process.NODE_ENV === 'production', + disableLogger: true, // Enables automatic instrumentation of Vercel Cron Monitors. (Does not yet work with App Router route handlers.) // See the following for more information: @@ -132,7 +133,6 @@ export default withAxiom(withSentryConfig(nextConfig), { // https://vercel.com/docs/cron-jobs automaticVercelMonitors: true, - unstable_sentryWebpackPluginOptions: { - applicationKey: 'web', - }, + // Disables Sentry's telemetry features + telemetry: false, }) diff --git a/apps/web/package.json b/apps/web/package.json index 2ce495031d..f231f81514 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -74,7 +74,6 @@ "ms": "2.1.3", "nanoid": "4.0.0", "next": "14.2.11", - "next-axiom": "1.5.0", "next-themes": "0.2.1", "octokit": "2.1.0", "petra-plugin-wallet-adapter": "0.4.5", diff --git a/apps/web/sentry.client.config.ts b/apps/web/sentry.client.config.ts index 2394e090f0..c9e1494719 100644 --- a/apps/web/sentry.client.config.ts +++ b/apps/web/sentry.client.config.ts @@ -5,41 +5,11 @@ import * as Sentry from '@sentry/nextjs' Sentry.init({ - dsn: 'https://28c197e66594eea8cf3014697e6fc0d3@o960777.ingest.us.sentry.io/4507941516410880', + dsn: 'https://76d7b33cc5bf60055e9ecc86faab0c64@o960777.ingest.us.sentry.io/4508045239320576', - enabled: process.env.NEXT_PUBLIC_APP_ENV !== 'test', - - // Adjust this value in production, or use tracesSampler for greater control + // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control. tracesSampleRate: 1, // Setting this option to true will print useful information to the console while you're setting up Sentry. debug: false, - - replaysOnErrorSampleRate: 1.0, - - // This sets the sample rate to be 10%. You may want this to be 100% while - // in development and sample at a lower rate in production - replaysSessionSampleRate: 0.1, - - // You can remove this option if you're not planning to use the Sentry Session Replay feature: - integrations: [ - Sentry.thirdPartyErrorFilterIntegration({ - // Specify the application keys that you specified in the Sentry bundler plugin - filterKeys: ['web'], - - // Defines how to handle errors that contain third party stack frames. - // Possible values are: - // - 'drop-error-if-contains-third-party-frames' - // - 'drop-error-if-exclusively-contains-third-party-frames' - // - 'apply-tag-if-contains-third-party-frames' - // - 'apply-tag-if-exclusively-contains-third-party-frames' - behaviour: 'apply-tag-if-contains-third-party-frames', - }), - Sentry.replayIntegration({ - // Additional Replay configuration goes in here, for example: - maskAllText: false, - maskAllInputs: false, - blockAllMedia: false, - }), - ], }) diff --git a/apps/web/sentry.edge.config.ts b/apps/web/sentry.edge.config.ts index cdb1abbd2b..9076703709 100644 --- a/apps/web/sentry.edge.config.ts +++ b/apps/web/sentry.edge.config.ts @@ -6,11 +6,9 @@ import * as Sentry from '@sentry/nextjs' Sentry.init({ - dsn: 'https://28c197e66594eea8cf3014697e6fc0d3@o960777.ingest.us.sentry.io/4507941516410880', + dsn: 'https://76d7b33cc5bf60055e9ecc86faab0c64@o960777.ingest.us.sentry.io/4508045239320576', - enabled: process.env.NEXT_PUBLIC_APP_ENV !== 'test', - - // Adjust this value in production, or use tracesSampler for greater control + // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control. tracesSampleRate: 1, // Setting this option to true will print useful information to the console while you're setting up Sentry. diff --git a/apps/web/sentry.server.config.ts b/apps/web/sentry.server.config.ts index be2db77990..2d6a885260 100644 --- a/apps/web/sentry.server.config.ts +++ b/apps/web/sentry.server.config.ts @@ -5,16 +5,11 @@ import * as Sentry from '@sentry/nextjs' Sentry.init({ - dsn: 'https://28c197e66594eea8cf3014697e6fc0d3@o960777.ingest.us.sentry.io/4507941516410880', + dsn: 'https://76d7b33cc5bf60055e9ecc86faab0c64@o960777.ingest.us.sentry.io/4508045239320576', - enabled: process.env.NEXT_PUBLIC_APP_ENV !== 'test', - - // Adjust this value in production, or use tracesSampler for greater control + // Define how likely traces are sampled. Adjust this value in production, or use tracesSampler for greater control. tracesSampleRate: 1, // Setting this option to true will print useful information to the console while you're setting up Sentry. debug: false, - - // Uncomment the line below to enable Spotlight (https://spotlightjs.com) - // spotlight: process.env.NODE_ENV === 'development', }) diff --git a/apps/web/src/app/(evm)/(trade)/error.tsx b/apps/web/src/app/(evm)/(trade)/error.tsx index 5b6fe56366..c2d7c0bb5c 100644 --- a/apps/web/src/app/(evm)/(trade)/error.tsx +++ b/apps/web/src/app/(evm)/(trade)/error.tsx @@ -7,25 +7,16 @@ import { classNames, typographyVariants, } from '@sushiswap/ui' - -import { useLogger } from 'next-axiom' import { useEffect } from 'react' export default function SwapError({ error, reset, }: { error: Error & { digest?: string }; reset: () => void }) { - const log = useLogger() - useEffect(() => { // Capture the error and send it to Sentry Sentry.captureException(error) }, [error]) - - useEffect(() => { - // Log the error to an error reporting service - log.error('swap page error', error) - }, [log, error]) return ( <>

+ + Sentry Onboarding + + + +
+

+ + + +

+ +

Get started by sending us a sample error:

+ + +

+ Next, look for the error on the{' '} + + Issues Page + + . +

+

+ For more information, see{' '} + + https://docs.sentry.io/platforms/javascript/guides/nextjs/ + +

+
+ + ) +} diff --git a/apps/web/src/instrumentation.ts b/apps/web/src/instrumentation.ts index 90587d52c8..c375ecc8e9 100644 --- a/apps/web/src/instrumentation.ts +++ b/apps/web/src/instrumentation.ts @@ -1,4 +1,4 @@ -import { captureRequestError } from '@sentry/nextjs' +import * as Sentry from '@sentry/nextjs' function bigintSeriliazer() { const originalStringify = JSON.stringify @@ -67,4 +67,4 @@ export async function register() { } } -export const onRequestError = captureRequestError +export const onRequestError = Sentry.captureRequestError diff --git a/apps/web/src/lib/hooks/useSimulateTrade.ts b/apps/web/src/lib/hooks/useSimulateTrade.ts index 1655901543..8340cb048b 100644 --- a/apps/web/src/lib/hooks/useSimulateTrade.ts +++ b/apps/web/src/lib/hooks/useSimulateTrade.ts @@ -42,8 +42,9 @@ export function useSimulateTrade({ trade && typeof trade.tokenTax === 'undefined' && isMinOutError(error) - ) + ) { return false + } return i < 3 }, enabled: diff --git a/apps/web/src/ui/swap/cross-chain/cross-chain-swap-trade-review-dialog.tsx b/apps/web/src/ui/swap/cross-chain/cross-chain-swap-trade-review-dialog.tsx index a3163ed056..ca9feea690 100644 --- a/apps/web/src/ui/swap/cross-chain/cross-chain-swap-trade-review-dialog.tsx +++ b/apps/web/src/ui/swap/cross-chain/cross-chain-swap-trade-review-dialog.tsx @@ -32,7 +32,6 @@ import { Dots } from '@sushiswap/ui' import { List } from '@sushiswap/ui' import { SkeletonText } from '@sushiswap/ui' import { nanoid } from 'nanoid' -import { log } from 'next-axiom' import React, { FC, ReactNode, @@ -181,13 +180,8 @@ export const CrossChainSwapTradeReviewDialog: FC<{ children: ReactNode }> = ({ sendAnalyticsEvent(SwapEventName.XSWAP_ESTIMATE_GAS_CALL_FAILED, { error: error.message, }) - - log.error('cross chain swap prepare error', { - trade: stringify(trade), - error: stringify(error), - }) } - }, [error, trade]) + }, [error]) const trace = useTrace() @@ -241,9 +235,6 @@ export const CrossChainSwapTradeReviewDialog: FC<{ children: ReactNode }> = ({ dst_chain_id: trade?.amountOut?.currency?.chainId, transaction_type: trade?.transactionType, }) - log.info('cross chain swap success (source)', { - trade: stringify(trade), - }) } else { sendAnalyticsEvent(SwapEventName.XSWAP_SRC_TRANSACTION_FAILED, { txHash: hash, @@ -252,9 +243,6 @@ export const CrossChainSwapTradeReviewDialog: FC<{ children: ReactNode }> = ({ dst_chain_id: trade?.amountOut?.currency?.chainId, transaction_type: trade?.transactionType, }) - log.error('cross chain swap failed (source)', { - trade: stringify(trade), - }) setStepStates({ source: StepState.Failed, @@ -269,9 +257,6 @@ export const CrossChainSwapTradeReviewDialog: FC<{ children: ReactNode }> = ({ dest: StepState.NotStarted, }) } catch { - log.error('cross chain swap error (source)', { - trade: stringify(trade), - }) setStepStates({ source: StepState.Failed, bridge: StepState.NotStarted, @@ -288,37 +273,28 @@ export const CrossChainSwapTradeReviewDialog: FC<{ children: ReactNode }> = ({ chainId0, client0, address, - trade, refetchBalances, setTradeId, ], ) - const onWriteError = useCallback( - (e: Error) => { - setStepStates({ - source: StepState.Failed, - bridge: StepState.NotStarted, - dest: StepState.NotStarted, - }) - - if (e.cause instanceof UserRejectedRequestError) { - return - } + const onWriteError = useCallback((e: Error) => { + setStepStates({ + source: StepState.Failed, + bridge: StepState.NotStarted, + dest: StepState.NotStarted, + }) - createErrorToast(e.message, false) + if (e.cause instanceof UserRejectedRequestError) { + return + } - sendAnalyticsEvent(SwapEventName.XSWAP_ERROR, { - error: e instanceof Error ? e.message : undefined, - }) + createErrorToast(e.message, false) - log.error('cross chain swap error', { - trade: stringify(trade), - error: stringify(e), - }) - }, - [trade], - ) + sendAnalyticsEvent(SwapEventName.XSWAP_ERROR, { + error: e instanceof Error ? e.message : undefined, + }) + }, []) const { writeContractAsync, diff --git a/apps/web/src/ui/swap/simple/derivedstate-simple-swap-provider.tsx b/apps/web/src/ui/swap/simple/derivedstate-simple-swap-provider.tsx index 6bb6a1ab46..fbaf63de62 100644 --- a/apps/web/src/ui/swap/simple/derivedstate-simple-swap-provider.tsx +++ b/apps/web/src/ui/swap/simple/derivedstate-simple-swap-provider.tsx @@ -1,7 +1,6 @@ 'use client' import { watchChainId } from '@wagmi/core' -import { useLogger } from 'next-axiom' import { usePathname, useRouter, useSearchParams } from 'next/navigation' import { FC, @@ -398,7 +397,6 @@ const useDerivedStateSimpleSwap = () => { } const useSimpleSwapTrade = () => { - const log = useLogger() const { state: { token0, chainId, swapAmount, token1, recipient, tokenTax }, mutate: { setTokenTax }, @@ -413,7 +411,7 @@ const useSimpleSwapTrade = () => { [slippagePercent, tokenTax], ) - const apiTrade = useApiTrade({ + const trade = useApiTrade({ chainId, fromToken: token0, toToken: token1, @@ -423,9 +421,6 @@ const useSimpleSwapTrade = () => { recipient: recipient as Address, enabled: Boolean(swapAmount?.greaterThan(ZERO)), carbonOffset, - onError: () => { - log.error('api trade error') - }, tokenTax, }) @@ -435,7 +430,7 @@ const useSimpleSwapTrade = () => { setTokenTax(undefined) }, [token0, token1, setTokenTax]) - return apiTrade + return trade } export { diff --git a/apps/web/src/ui/swap/simple/simple-swap-trade-review-dialog.tsx b/apps/web/src/ui/swap/simple/simple-swap-trade-review-dialog.tsx index db4d1ff863..d7b9fbe572 100644 --- a/apps/web/src/ui/swap/simple/simple-swap-trade-review-dialog.tsx +++ b/apps/web/src/ui/swap/simple/simple-swap-trade-review-dialog.tsx @@ -1,5 +1,6 @@ 'use client' +import * as Sentry from '@sentry/nextjs' import { createErrorToast, createToast } from '@sushiswap/notifications' import { BrowserEvent, @@ -26,7 +27,6 @@ import { SkeletonText, classNames, } from '@sushiswap/ui' -import { log } from 'next-axiom' import React, { FC, ReactNode, @@ -43,7 +43,7 @@ import { useApproved } from 'src/lib/wagmi/systems/Checker/Provider' import { Chain, ChainId } from 'sushi/chain' import { Native } from 'sushi/currency' import { shortenAddress } from 'sushi/format' -import { ZERO } from 'sushi/math' +import { Percent, ZERO } from 'sushi/math' import { SendTransactionReturnType, UserRejectedRequestError, @@ -86,6 +86,24 @@ export const SimpleSwapTradeReviewDialog: FC<{ const refetchBalances = useBalanceWeb3Refetch() + useEffect(() => { + if (!trade) return + Sentry.setContext('swap-context', { + chainId, + amountIn: trade?.amountIn?.toSignificant(6), + amountOut: trade?.amountOut?.toSignificant(6), + minAmountOut: trade?.minAmountOut?.toSignificant(6), + fromToken: trade?.route?.fromToken, + toToken: trade?.route?.toToken, + priceImpact: trade?.priceImpact?.toPercentageString(), + tokenTax: + trade?.tokenTax instanceof Percent + ? trade.tokenTax.toPercentageString() + : trade?.tokenTax, + tx: trade.tx, + }) + }, [trade, chainId]) + const isWrap = token0?.isNative && token1?.wrapped.address === Native.onChain(chainId).wrapped.address @@ -124,12 +142,6 @@ export const SimpleSwapTradeReviewDialog: FC<{ slippageTolerance: slippagePercent.toPercentageString(), error: error.message, }) - - log.error('swap prepare error', { - route: stringify(trade?.route), - slippageTolerance: slippagePercent.toPercentageString(), - error: stringify(error), - }) }, [error, slippagePercent, trade?.route]) const trace = useTrace() @@ -140,7 +152,9 @@ export const SimpleSwapTradeReviewDialog: FC<{ try { const ts = new Date().getTime() - const receiptPromise = client.waitForTransactionReceipt({ hash }) + const promise = client.waitForTransactionReceipt({ + hash, + }) sendAnalyticsEvent(SwapEventName.SWAP_SIGNED, { ...trace, @@ -153,7 +167,7 @@ export const SimpleSwapTradeReviewDialog: FC<{ type: 'swap', chainId: chainId, txHash: hash, - promise: receiptPromise, + promise, summary: { pending: `${ isWrap ? 'Wrapping' : isUnwrap ? 'Unwrapping' : 'Swapping' @@ -183,7 +197,7 @@ export const SimpleSwapTradeReviewDialog: FC<{ groupTimestamp: ts, }) - const receipt = await receiptPromise + const receipt = await promise { const trade = tradeRef.current if (receipt.status === 'success') { @@ -233,12 +247,6 @@ export const SimpleSwapTradeReviewDialog: FC<{ tx: stringify(trade?.tx), error: e instanceof Error ? e.message : undefined, }) - - log.error('swap error', { - route: stringify(trade?.route), - tx: stringify(trade?.tx), - error: stringify(e), - }) createErrorToast(e.message, false) }, [trade?.route, trade?.tx], @@ -268,7 +276,10 @@ export const SimpleSwapTradeReviewDialog: FC<{ try { await sendTransactionAsync(simulation) confirm() - } catch {} + } catch (e) { + Sentry.captureException(e) + throw e + } } }, [simulation, sendTransactionAsync]) diff --git a/biome.json b/biome.json index 8fb6a872a9..ce58616fab 100644 --- a/biome.json +++ b/biome.json @@ -7,21 +7,13 @@ "_types", ".turbo", ".next", - ".mesh", - ".graphclient", ".storybook", "storybook-static", "node_modules", "**/node_modules", "CHANGELOG.md", "dist", - "artifacts", - "cache", "coverage", - "deployments", - "test-results", - "test/contracts", - "typechain", "tsconfig.json", "tsconfig.*.json", "packages/graph-client", diff --git a/config/nextjs/index.js b/config/nextjs/index.js index 6e44dc3e83..7a94201eb9 100644 --- a/config/nextjs/index.js +++ b/config/nextjs/index.js @@ -14,8 +14,6 @@ const defaultNextConfig = { '@heroicons/react-v1/outline', '@sushiswap/graph-client', '@sushiswap/hooks', - '@sushiswap/router', - '@sushiswap/tines', '@sushiswap/ui', 'sushi', 'date-fns', diff --git a/package.json b/package.json index 6747e69a31..9a96a89359 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "sushi", - "version": "0.0.0", "private": true, "scripts": { "build": "dotenv -- turbo run build", @@ -13,8 +12,8 @@ "generate": "dotenv -- turbo run generate --no-cache --parallel --continue", "lint": "biome check .", "lint:fix": "biome check . --apply", - "sort": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json' 'protocols/*/package.json'", - "sort-check": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json' 'protocols/*/package.json' --check", + "sort": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json'", + "sort-check": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json' --check", "test": "dotenv -- turbo run test --parallel", "test-web-app": "dotenv -- turbo run test --filter=web", "web": "pnpm exec turbo run dev --filter web" @@ -37,7 +36,6 @@ }, "pnpm": { "overrides": { - "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.13", "graphql": "16.6.0", "typescript": "5.5.4", "@types/react": "18.2.14", diff --git a/packages/graph-client/package.json b/packages/graph-client/package.json index f88a2048f3..f91e7aca0a 100644 --- a/packages/graph-client/package.json +++ b/packages/graph-client/package.json @@ -65,21 +65,21 @@ }, "dependencies": { "@sushiswap/steer-sdk": "workspace:*", - "gql.tada": "^1.7.5", + "gql.tada": "1.7.5", "graphql": "16.6.0", - "graphql-request": "^7.0.1", - "json-bigint": "^1.0.0", + "graphql-request": "7.1.0", + "json-bigint": "1.0.0", "sushi": "4.0.5", "viem": "2.21.4" }, "devDependencies": { - "@0no-co/graphqlsp": "^1.12.3", + "@0no-co/graphqlsp": "1.12.3", "@tsconfig/esm": "1.0.4", "@tsconfig/strictest": "2.0.2", - "@types/json-bigint": "^1.0.4", + "@types/json-bigint": "1.0.4", "@types/node": "20", - "tsc-alias": "^1.8.10", - "tsx": "^4.7.1", + "tsc-alias": "1.8.10", + "tsx": "4.19.0", "typescript": "5.5.4" } } diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md deleted file mode 100644 index 8a934fcd6d..0000000000 --- a/packages/hooks/CHANGELOG.md +++ /dev/null @@ -1,22 +0,0 @@ -# @sushiswap/hooks - -## 3.0.0 - -### Patch Changes - -- Updated dependencies [[`63d4ebe64`](https://github.com/sushiswap/sushiswap/commit/63d4ebe645f546a47401e34f7d2da2d95da6edcb)]: - - sushi@3.1.0 - -## 2.0.0 - -### Patch Changes - -- Updated dependencies [[`83d813fb3`](https://github.com/sushiswap/sushiswap/commit/83d813fb338eb5488cbd47513fd525342fbcf81b)]: - - sushi@3.0.0 - -## 1.0.0 - -### Patch Changes - -- Updated dependencies [[`90784ce08`](https://github.com/sushiswap/sushiswap/commit/90784ce0876741b8f7f41552e181677d0746884b)]: - - @sushiswap/currency@0.1.0 diff --git a/packages/notifications/package.json b/packages/notifications/package.json index b04713a2a5..74374e5782 100644 --- a/packages/notifications/package.json +++ b/packages/notifications/package.json @@ -45,7 +45,7 @@ "dependencies": { "@heroicons/react": "2.0.13", "@sushiswap/ui": "workspace:*", - "idb": "^8.0.0", + "idb": "8.0.0", "nanoid": "4.0.0", "react-toastify": "9.1.3" }, diff --git a/packages/steer-sdk/package.json b/packages/steer-sdk/package.json index 14b9dacb54..be9dea6228 100644 --- a/packages/steer-sdk/package.json +++ b/packages/steer-sdk/package.json @@ -55,24 +55,19 @@ "dependencies": { "@steerprotocol/contracts": "2.1.0-beta.14", "sushi": "4.0.5", - "tslib": "latest", "viem": "2.21.4" }, "devDependencies": { "@tsconfig/esm": "1.0.4", "@tsconfig/strictest": "2.0.2", "@types/node": "20", - "@wagmi/core": "2.13.5", - "next": "14.2.11", "react": "18.2.0", "react-dom": "18.2.0", "typescript": "5.5.4" }, "peerDependencies": { - "@wagmi/core": "2.13.5", "react": "18.2.0", - "react-dom": "18.2.0", - "wagmi": "2.12.10" + "react-dom": "18.2.0" }, "peerDependenciesMeta": { "react": { @@ -81,8 +76,5 @@ "react-dom": { "optional": true } - }, - "optionalDependencies": { - "next": "14.2.11" } } diff --git a/packages/sushiswap/README.md b/packages/sushiswap/README.md new file mode 100644 index 0000000000..ff3ff9f9d9 --- /dev/null +++ b/packages/sushiswap/README.md @@ -0,0 +1,2 @@ +# SushiSwap + diff --git a/packages/sushiswap/package.json b/packages/sushiswap/package.json new file mode 100644 index 0000000000..5896d6e93f --- /dev/null +++ b/packages/sushiswap/package.json @@ -0,0 +1,10 @@ +{ + "name": "sushiswap", + "private": true, + "version": "0.0.0", + "repository": { + "type": "git", + "url": "https://github.com/sushi-labs/sushiswap.git", + "directory": "packages/sushiswap" + } +} \ No newline at end of file diff --git a/packages/ui/package.json b/packages/ui/package.json index f95a5cc572..ed43e43582 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -9,6 +9,11 @@ "react", "components" ], + "repository": { + "type": "git", + "url": "https://github.com/sushi-labs/sushiswap.git", + "directory": "packages/ui" + }, "license": "MIT", "author": "Matthew Lilley ", "sideEffects": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cf07a7090c..61723cec73 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,6 @@ settings: excludeLinksFromLockfile: false overrides: - '@nomiclabs/hardhat-ethers': npm:hardhat-deploy-ethers@^0.3.0-beta.13 graphql: 16.6.0 typescript: 5.5.4 '@types/react': 18.2.14 @@ -213,7 +212,7 @@ importers: version: 0.0.5 '@msafe/aptos-wallet-adapter': specifier: 1.1.3 - version: 1.1.3(patch_hash=ztcfam72g3tcfvfy23kjubyhqa)(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(bufferutil@4.0.8)(utf-8-validate@5.0.10) + version: 1.1.3(patch_hash=ztcfam72g3tcfvfy23kjubyhqa)(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(bufferutil@4.0.8)(utf-8-validate@5.0.10) '@next/bundle-analyzer': specifier: 14.2.11 version: 14.2.11(bufferutil@4.0.8)(utf-8-validate@5.0.10) @@ -355,9 +354,6 @@ importers: next: specifier: 14.2.11 version: 14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - next-axiom: - specifier: 1.5.0 - version: 1.5.0(next@14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0) next-themes: specifier: 0.2.1 version: 0.2.1(next@14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -571,16 +567,16 @@ importers: specifier: workspace:* version: link:../steer-sdk gql.tada: - specifier: ^1.7.5 + specifier: 1.7.5 version: 1.7.5(graphql@16.6.0)(svelte@4.2.17)(typescript@5.5.4) graphql: specifier: 16.6.0 version: 16.6.0 graphql-request: - specifier: ^7.0.1 - version: 7.0.1(graphql@16.6.0) + specifier: 7.1.0 + version: 7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0) json-bigint: - specifier: ^1.0.0 + specifier: 1.0.0 version: 1.0.0 sushi: specifier: 4.0.5 @@ -590,7 +586,7 @@ importers: version: 2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@6.0.3)(zod@3.23.8) devDependencies: '@0no-co/graphqlsp': - specifier: ^1.12.3 + specifier: 1.12.3 version: 1.12.3(graphql@16.6.0)(typescript@5.5.4) '@tsconfig/esm': specifier: 1.0.4 @@ -599,17 +595,17 @@ importers: specifier: 2.0.2 version: 2.0.2 '@types/json-bigint': - specifier: ^1.0.4 + specifier: 1.0.4 version: 1.0.4 '@types/node': specifier: '20' version: 20.14.14 tsc-alias: - specifier: ^1.8.10 + specifier: 1.8.10 version: 1.8.10 tsx: - specifier: ^4.7.1 - version: 4.7.1 + specifier: 4.19.0 + version: 4.19.0 typescript: specifier: 5.5.4 version: 5.5.4 @@ -663,7 +659,7 @@ importers: specifier: workspace:* version: link:../ui idb: - specifier: ^8.0.0 + specifier: 8.0.0 version: 8.0.0 nanoid: specifier: 4.0.0 @@ -705,19 +701,9 @@ importers: sushi: specifier: 4.0.5 version: 4.0.5(typescript@5.5.4)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8) - tslib: - specifier: latest - version: 2.6.2 viem: specifier: 2.21.4 version: 2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8) - wagmi: - specifier: 2.12.10 - version: 2.12.10(@tanstack/query-core@5.51.16)(@tanstack/react-query@5.51.16(react@18.2.0))(@types/react@18.2.14)(bufferutil@4.0.8)(encoding@0.1.13)(immer@9.0.21)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8) - optionalDependencies: - next: - specifier: 14.2.11 - version: 14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) devDependencies: '@tsconfig/esm': specifier: 1.0.4 @@ -728,9 +714,6 @@ importers: '@types/node': specifier: '20' version: 20.14.14 - '@wagmi/core': - specifier: 2.13.5 - version: 2.13.5(@tanstack/query-core@5.51.16)(@types/react@18.2.14)(immer@9.0.21)(react@18.2.0)(typescript@5.5.4)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8)) react: specifier: 18.2.0 version: 18.2.0 @@ -741,6 +724,8 @@ importers: specifier: 5.5.4 version: 5.5.4 + packages/sushiswap: {} + packages/telemetry: devDependencies: '@tsconfig/esm': @@ -968,7 +953,7 @@ importers: version: 5.5.4 wagmi: specifier: 2.12.10 - version: 2.12.10(@tanstack/query-core@5.51.16)(@tanstack/react-query@5.51.16(react@18.2.0))(@types/react@18.2.14)(bufferutil@4.0.8)(encoding@0.1.13)(immer@9.0.21)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8) + version: 2.12.10(@tanstack/query-core@5.51.16)(@tanstack/react-query@5.51.16(react@18.2.0))(@types/react@18.2.14)(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8) packages: @@ -2479,47 +2464,9 @@ packages: resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==} engines: {node: '>=10.0.0'} - '@dprint/darwin-arm64@0.45.1': - resolution: {integrity: sha512-pH0/uKLJ5SJPoHhOwLWFMhCmL0BY3FzWQbull8OGMK/FRkIPgOl2adZSovtUZpUMGWyDOzIWH1fW9X2DuMhnEg==} - cpu: [arm64] - os: [darwin] - - '@dprint/darwin-x64@0.45.1': - resolution: {integrity: sha512-YUj421LmBLDlxpIER3pORKfQmpmXD50n5mClHjpZrnl17WTiHtQ+jHvDJdJoxH2eS66W0mQyxLoGo5SfFfiM7A==} - cpu: [x64] - os: [darwin] - '@dprint/formatter@0.3.0': resolution: {integrity: sha512-N9fxCxbaBOrDkteSOzaCqwWjso5iAe+WJPsHC021JfHNj2ThInPNEF13ORDKta3llq5D1TlclODCvOvipH7bWQ==} - '@dprint/linux-arm64-glibc@0.45.1': - resolution: {integrity: sha512-lJ7s/pOQWRJ0mstjZQnVyX2/3QRXZ9cpFHJDZ7e81Y8QSn/iqxTrnK0DPgxUrDG8hYKQmWQdQLU4sP5DKBz0Jg==} - cpu: [arm64] - os: [linux] - - '@dprint/linux-arm64-musl@0.45.1': - resolution: {integrity: sha512-un2awe1L1sAJLsCPSEUrE0/cgupdzbYFoyBOutyU1zHR9KQn47AtIDw+chvuinU4xleHDuEGyXGuJ6NE+Ky6vw==} - cpu: [arm64] - os: [linux] - - '@dprint/linux-x64-glibc@0.45.1': - resolution: {integrity: sha512-5Civht90S/g8zlyYB7n4oH78p+sLbNqeFCFuImJRK7uRxZwCRya7lji6RwlB6DQ7qngVqovTHj9RLOYfZzfVlg==} - cpu: [x64] - os: [linux] - - '@dprint/linux-x64-musl@0.45.1': - resolution: {integrity: sha512-p2/gjnHDd8GRCvtey5HZO4o/He6pSmY/zpcCuIXprFW9P0vNlEj3DFhz4FPpOKXM+csrsVWWs2E0T/xr5QZtVg==} - cpu: [x64] - os: [linux] - - '@dprint/typescript@0.90.5': - resolution: {integrity: sha512-/1aP6saonFvJyQN3l2is6eTOec3GnLGyW+opid/eDm8pnlhwzYl8A9p36pI6WO5jLl/a9Ghod+LWpvSOuXFGUw==} - - '@dprint/win32-x64@0.45.1': - resolution: {integrity: sha512-2l78XM7KsW46P2Yv6uPB3fE+y92EsBlrCxi+RVQ0pbznPFdMdkLyGgaCuh683zdld14jHlaADpIQ7YchGAEMAg==} - cpu: [x64] - os: [win32] - '@edge-runtime/cookies@3.4.1': resolution: {integrity: sha512-z27BvgPxI73CgSlxU/NAUf1Q/shnqi6cobHEowf6VuLdSjGR3NjI2Y5dZUIBbK2zOJVZbXcHsVzJjz8LklteFQ==} engines: {node: '>=16'} @@ -2590,12 +2537,6 @@ packages: '@ensdomains/eth-ens-namehash@2.0.15': resolution: {integrity: sha512-JRDFP6+Hczb1E0/HhIg0PONgBYasfGfDheujmfxaZaAv/NAH4jE6Kf48WbqfRZdxt4IZI3jl3Ri7sZ1nP09lgw==} - '@esbuild/aix-ppc64@0.19.12': - resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - '@esbuild/aix-ppc64@0.21.5': resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} engines: {node: '>=12'} @@ -2620,12 +2561,6 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.19.12': - resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - '@esbuild/android-arm64@0.21.5': resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} engines: {node: '>=12'} @@ -2650,12 +2585,6 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.19.12': - resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - '@esbuild/android-arm@0.21.5': resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} engines: {node: '>=12'} @@ -2680,12 +2609,6 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.19.12': - resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - '@esbuild/android-x64@0.21.5': resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} engines: {node: '>=12'} @@ -2710,12 +2633,6 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.19.12': - resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - '@esbuild/darwin-arm64@0.21.5': resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} engines: {node: '>=12'} @@ -2740,12 +2657,6 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.19.12': - resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - '@esbuild/darwin-x64@0.21.5': resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} engines: {node: '>=12'} @@ -2770,12 +2681,6 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.19.12': - resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - '@esbuild/freebsd-arm64@0.21.5': resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} engines: {node: '>=12'} @@ -2800,12 +2705,6 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.19.12': - resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - '@esbuild/freebsd-x64@0.21.5': resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} engines: {node: '>=12'} @@ -2830,12 +2729,6 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.19.12': - resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - '@esbuild/linux-arm64@0.21.5': resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} engines: {node: '>=12'} @@ -2860,12 +2753,6 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.19.12': - resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - '@esbuild/linux-arm@0.21.5': resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} engines: {node: '>=12'} @@ -2890,12 +2777,6 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.19.12': - resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - '@esbuild/linux-ia32@0.21.5': resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} engines: {node: '>=12'} @@ -2920,12 +2801,6 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.19.12': - resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - '@esbuild/linux-loong64@0.21.5': resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} engines: {node: '>=12'} @@ -2950,12 +2825,6 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.19.12': - resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - '@esbuild/linux-mips64el@0.21.5': resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} engines: {node: '>=12'} @@ -2980,12 +2849,6 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.19.12': - resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - '@esbuild/linux-ppc64@0.21.5': resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} engines: {node: '>=12'} @@ -3010,12 +2873,6 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.19.12': - resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - '@esbuild/linux-riscv64@0.21.5': resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} engines: {node: '>=12'} @@ -3040,12 +2897,6 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.19.12': - resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - '@esbuild/linux-s390x@0.21.5': resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} engines: {node: '>=12'} @@ -3070,12 +2921,6 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.19.12': - resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - '@esbuild/linux-x64@0.21.5': resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} engines: {node: '>=12'} @@ -3100,12 +2945,6 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.19.12': - resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - '@esbuild/netbsd-x64@0.21.5': resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} engines: {node: '>=12'} @@ -3136,12 +2975,6 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.19.12': - resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - '@esbuild/openbsd-x64@0.21.5': resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} engines: {node: '>=12'} @@ -3166,12 +2999,6 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.19.12': - resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - '@esbuild/sunos-x64@0.21.5': resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} engines: {node: '>=12'} @@ -3196,12 +3023,6 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.19.12': - resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - '@esbuild/win32-arm64@0.21.5': resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} engines: {node: '>=12'} @@ -3226,12 +3047,6 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.19.12': - resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - '@esbuild/win32-ia32@0.21.5': resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} engines: {node: '>=12'} @@ -3256,12 +3071,6 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.19.12': - resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - '@esbuild/win32-x64@0.21.5': resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} engines: {node: '>=12'} @@ -9481,10 +9290,6 @@ packages: resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==} engines: {node: '>=12'} - dprint@0.45.1: - resolution: {integrity: sha512-OYefcDgxd6jSdig/Cfkw1vdvyiOIRruCPnqGBbXpc95buDt9kvwL+Lic1OHc+SaQSsQub0BUZMd5+TNgy8Sh3A==} - hasBin: true - duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} @@ -9855,11 +9660,6 @@ packages: engines: {node: '>=12'} hasBin: true - esbuild@0.19.12: - resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} - engines: {node: '>=12'} - hasBin: true - esbuild@0.21.5: resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} engines: {node: '>=12'} @@ -10676,9 +10476,6 @@ packages: resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} engines: {node: '>= 0.4'} - get-tsconfig@4.7.3: - resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} - get-tsconfig@4.7.6: resolution: {integrity: sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==} @@ -10791,11 +10588,21 @@ packages: graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - graphql-request@7.0.1: - resolution: {integrity: sha512-hfGBZF6o6lC3C0th+aTMOFP6p8Ev+ydXn4PUlT8rvqPDUFCbaynXszjBCyu0saZIP3VGbJ67GpxW8UGK+tphSw==} + graphql-request@7.1.0: + resolution: {integrity: sha512-Ouu/lYVFhARS1aXeZoVJWnGT6grFJXTLwXJuK4mUGGRo0EUk1JkyYp43mdGmRgUVezpRm6V5Sq3t8jBDQcajng==} hasBin: true peerDependencies: + '@dprint/formatter': ^0.3.0 + '@dprint/typescript': ^0.91.1 + dprint: ^0.46.2 graphql: 16.6.0 + peerDependenciesMeta: + '@dprint/formatter': + optional: true + '@dprint/typescript': + optional: true + dprint: + optional: true graphql@16.6.0: resolution: {integrity: sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==} @@ -12716,13 +12523,6 @@ packages: neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - next-axiom@1.5.0: - resolution: {integrity: sha512-tVgWvWaoQaZknz2qUPz1hnWkNpokXI4h0t/PHuqB1CRA7csd610M/FIsujlCPRUZP0a8AX4Rms1DJ0QEr92BqA==} - engines: {node: '>=18'} - peerDependencies: - next: '>=14.0' - react: '>=18.0.0' - next-themes@0.2.1: resolution: {integrity: sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==} peerDependencies: @@ -15246,11 +15046,6 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - tsx@4.7.1: - resolution: {integrity: sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==} - engines: {node: '>=18.0.0'} - hasBin: true - tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -15615,11 +15410,6 @@ packages: '@types/react': optional: true - use-deep-compare@1.3.0: - resolution: {integrity: sha512-94iG+dEdEP/Sl3WWde+w9StIunlV8Dgj+vkt5wTwMoFQLaijiEZSXXy8KtcStpmEDtIptRJiNeD4ACTtVvnIKA==} - peerDependencies: - react: '>=16.8.0' - use-resize-observer@9.1.0: resolution: {integrity: sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==} peerDependencies: @@ -16533,13 +16323,13 @@ snapshots: transitivePeerDependencies: - debug - '@aptos-labs/wallet-adapter-core@4.14.0(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10)': + '@aptos-labs/wallet-adapter-core@4.14.0(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10)': dependencies: '@aptos-connect/wallet-adapter-plugin': 1.0.1(@aptos-labs/ts-sdk@1.27.0)(@aptos-labs/wallet-standard@0.1.0(@aptos-labs/ts-sdk@1.27.0)(@wallet-standard/core@1.0.3))(aptos@1.21.0) '@aptos-labs/ts-sdk': 1.27.0 '@aptos-labs/wallet-standard': 0.1.0(@aptos-labs/ts-sdk@1.27.0)(@wallet-standard/core@1.0.3) '@atomrigslab/aptos-wallet-adapter': 0.1.21(@aptos-labs/ts-sdk@1.27.0) - '@mizuwallet-sdk/aptos-wallet-adapter': 0.1.5(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10) + '@mizuwallet-sdk/aptos-wallet-adapter': 0.1.5(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10) aptos: 1.21.0 buffer: 6.0.3 eventemitter3: 4.0.7 @@ -18509,29 +18299,7 @@ snapshots: '@discoveryjs/json-ext@0.5.7': {} - '@dprint/darwin-arm64@0.45.1': - optional: true - - '@dprint/darwin-x64@0.45.1': - optional: true - - '@dprint/formatter@0.3.0': {} - - '@dprint/linux-arm64-glibc@0.45.1': - optional: true - - '@dprint/linux-arm64-musl@0.45.1': - optional: true - - '@dprint/linux-x64-glibc@0.45.1': - optional: true - - '@dprint/linux-x64-musl@0.45.1': - optional: true - - '@dprint/typescript@0.90.5': {} - - '@dprint/win32-x64@0.45.1': + '@dprint/formatter@0.3.0': optional: true '@edge-runtime/cookies@3.4.1': {} @@ -18586,9 +18354,6 @@ snapshots: '@ensdomains/eth-ens-namehash@2.0.15': {} - '@esbuild/aix-ppc64@0.19.12': - optional: true - '@esbuild/aix-ppc64@0.21.5': optional: true @@ -18601,9 +18366,6 @@ snapshots: '@esbuild/android-arm64@0.18.20': optional: true - '@esbuild/android-arm64@0.19.12': - optional: true - '@esbuild/android-arm64@0.21.5': optional: true @@ -18616,9 +18378,6 @@ snapshots: '@esbuild/android-arm@0.18.20': optional: true - '@esbuild/android-arm@0.19.12': - optional: true - '@esbuild/android-arm@0.21.5': optional: true @@ -18631,9 +18390,6 @@ snapshots: '@esbuild/android-x64@0.18.20': optional: true - '@esbuild/android-x64@0.19.12': - optional: true - '@esbuild/android-x64@0.21.5': optional: true @@ -18646,9 +18402,6 @@ snapshots: '@esbuild/darwin-arm64@0.18.20': optional: true - '@esbuild/darwin-arm64@0.19.12': - optional: true - '@esbuild/darwin-arm64@0.21.5': optional: true @@ -18661,9 +18414,6 @@ snapshots: '@esbuild/darwin-x64@0.18.20': optional: true - '@esbuild/darwin-x64@0.19.12': - optional: true - '@esbuild/darwin-x64@0.21.5': optional: true @@ -18676,9 +18426,6 @@ snapshots: '@esbuild/freebsd-arm64@0.18.20': optional: true - '@esbuild/freebsd-arm64@0.19.12': - optional: true - '@esbuild/freebsd-arm64@0.21.5': optional: true @@ -18691,9 +18438,6 @@ snapshots: '@esbuild/freebsd-x64@0.18.20': optional: true - '@esbuild/freebsd-x64@0.19.12': - optional: true - '@esbuild/freebsd-x64@0.21.5': optional: true @@ -18706,9 +18450,6 @@ snapshots: '@esbuild/linux-arm64@0.18.20': optional: true - '@esbuild/linux-arm64@0.19.12': - optional: true - '@esbuild/linux-arm64@0.21.5': optional: true @@ -18721,9 +18462,6 @@ snapshots: '@esbuild/linux-arm@0.18.20': optional: true - '@esbuild/linux-arm@0.19.12': - optional: true - '@esbuild/linux-arm@0.21.5': optional: true @@ -18736,9 +18474,6 @@ snapshots: '@esbuild/linux-ia32@0.18.20': optional: true - '@esbuild/linux-ia32@0.19.12': - optional: true - '@esbuild/linux-ia32@0.21.5': optional: true @@ -18751,9 +18486,6 @@ snapshots: '@esbuild/linux-loong64@0.18.20': optional: true - '@esbuild/linux-loong64@0.19.12': - optional: true - '@esbuild/linux-loong64@0.21.5': optional: true @@ -18766,9 +18498,6 @@ snapshots: '@esbuild/linux-mips64el@0.18.20': optional: true - '@esbuild/linux-mips64el@0.19.12': - optional: true - '@esbuild/linux-mips64el@0.21.5': optional: true @@ -18781,9 +18510,6 @@ snapshots: '@esbuild/linux-ppc64@0.18.20': optional: true - '@esbuild/linux-ppc64@0.19.12': - optional: true - '@esbuild/linux-ppc64@0.21.5': optional: true @@ -18796,9 +18522,6 @@ snapshots: '@esbuild/linux-riscv64@0.18.20': optional: true - '@esbuild/linux-riscv64@0.19.12': - optional: true - '@esbuild/linux-riscv64@0.21.5': optional: true @@ -18811,9 +18534,6 @@ snapshots: '@esbuild/linux-s390x@0.18.20': optional: true - '@esbuild/linux-s390x@0.19.12': - optional: true - '@esbuild/linux-s390x@0.21.5': optional: true @@ -18826,9 +18546,6 @@ snapshots: '@esbuild/linux-x64@0.18.20': optional: true - '@esbuild/linux-x64@0.19.12': - optional: true - '@esbuild/linux-x64@0.21.5': optional: true @@ -18841,9 +18558,6 @@ snapshots: '@esbuild/netbsd-x64@0.18.20': optional: true - '@esbuild/netbsd-x64@0.19.12': - optional: true - '@esbuild/netbsd-x64@0.21.5': optional: true @@ -18859,9 +18573,6 @@ snapshots: '@esbuild/openbsd-x64@0.18.20': optional: true - '@esbuild/openbsd-x64@0.19.12': - optional: true - '@esbuild/openbsd-x64@0.21.5': optional: true @@ -18874,9 +18585,6 @@ snapshots: '@esbuild/sunos-x64@0.18.20': optional: true - '@esbuild/sunos-x64@0.19.12': - optional: true - '@esbuild/sunos-x64@0.21.5': optional: true @@ -18889,9 +18597,6 @@ snapshots: '@esbuild/win32-arm64@0.18.20': optional: true - '@esbuild/win32-arm64@0.19.12': - optional: true - '@esbuild/win32-arm64@0.21.5': optional: true @@ -18904,9 +18609,6 @@ snapshots: '@esbuild/win32-ia32@0.18.20': optional: true - '@esbuild/win32-ia32@0.19.12': - optional: true - '@esbuild/win32-ia32@0.21.5': optional: true @@ -18919,9 +18621,6 @@ snapshots: '@esbuild/win32-x64@0.18.20': optional: true - '@esbuild/win32-x64@0.19.12': - optional: true - '@esbuild/win32-x64@0.21.5': optional: true @@ -20018,12 +19717,12 @@ snapshots: '@microsoft/tsdoc@0.14.2': {} - '@mizuwallet-sdk/aptos-wallet-adapter@0.1.5(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10)': + '@mizuwallet-sdk/aptos-wallet-adapter@0.1.5(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10)': dependencies: '@aptos-labs/ts-sdk': 1.27.0 '@aptos-labs/wallet-standard': 0.1.0-ms.1(@aptos-labs/ts-sdk@1.27.0)(@wallet-standard/core@1.0.3) '@blocto/sdk': 0.10.3(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10) - '@mizuwallet-sdk/core': 1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0)) + '@mizuwallet-sdk/core': 1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0)) '@mizuwallet-sdk/protocol': 0.0.1 '@msafe/aptos-wallet': 6.1.1 buffer: 6.0.3 @@ -20035,11 +19734,11 @@ snapshots: - debug - utf-8-validate - '@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0))': + '@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0))': dependencies: '@aptos-labs/ts-sdk': 1.27.0 buffer: 6.0.3 - graphql-request: 7.0.1(graphql@16.6.0) + graphql-request: 7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0) jwt-decode: 4.0.0 '@mizuwallet-sdk/protocol@0.0.1': @@ -20111,9 +19810,9 @@ snapshots: '@motionone/dom': 10.16.2 tslib: 2.7.0 - '@msafe/aptos-wallet-adapter@1.1.3(patch_hash=ztcfam72g3tcfvfy23kjubyhqa)(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(bufferutil@4.0.8)(utf-8-validate@5.0.10)': + '@msafe/aptos-wallet-adapter@1.1.3(patch_hash=ztcfam72g3tcfvfy23kjubyhqa)(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(bufferutil@4.0.8)(utf-8-validate@5.0.10)': dependencies: - '@aptos-labs/wallet-adapter-core': 4.14.0(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.0.1(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10) + '@aptos-labs/wallet-adapter-core': 4.14.0(@aptos-labs/ts-sdk@1.27.0)(@mizuwallet-sdk/core@1.3.0(@aptos-labs/ts-sdk@1.27.0)(graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0)))(@mizuwallet-sdk/protocol@0.0.1)(@wallet-standard/core@1.0.3)(aptos@1.21.0)(bufferutil@4.0.8)(utf-8-validate@5.0.10) '@msafe/aptos-wallet': 6.1.1 aptos: 1.21.0 transitivePeerDependencies: @@ -25315,7 +25014,7 @@ snapshots: - utf-8-validate - zod - '@wagmi/connectors@5.1.10(@types/react@18.2.14)(@wagmi/core@2.13.5(@tanstack/query-core@5.51.16)(@types/react@18.2.14)(immer@9.0.21)(react@18.2.0)(typescript@5.5.4)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8)))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8)': + '@wagmi/connectors@5.1.10(@types/react@18.2.14)(@wagmi/core@2.13.5(@tanstack/query-core@5.51.16)(@types/react@18.2.14)(react@18.2.0)(typescript@5.5.4)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8)))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8)': dependencies: '@coinbase/wallet-sdk': 4.0.4 '@metamask/sdk': 0.28.2(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(utf-8-validate@5.0.10) @@ -28194,16 +27893,6 @@ snapshots: dotenv@16.3.1: {} - dprint@0.45.1: - optionalDependencies: - '@dprint/darwin-arm64': 0.45.1 - '@dprint/darwin-x64': 0.45.1 - '@dprint/linux-arm64-glibc': 0.45.1 - '@dprint/linux-arm64-musl': 0.45.1 - '@dprint/linux-x64-glibc': 0.45.1 - '@dprint/linux-x64-musl': 0.45.1 - '@dprint/win32-x64': 0.45.1 - duplexer@0.1.2: {} duplexify@3.7.1: @@ -28740,32 +28429,6 @@ snapshots: '@esbuild/win32-ia32': 0.18.20 '@esbuild/win32-x64': 0.18.20 - esbuild@0.19.12: - optionalDependencies: - '@esbuild/aix-ppc64': 0.19.12 - '@esbuild/android-arm': 0.19.12 - '@esbuild/android-arm64': 0.19.12 - '@esbuild/android-x64': 0.19.12 - '@esbuild/darwin-arm64': 0.19.12 - '@esbuild/darwin-x64': 0.19.12 - '@esbuild/freebsd-arm64': 0.19.12 - '@esbuild/freebsd-x64': 0.19.12 - '@esbuild/linux-arm': 0.19.12 - '@esbuild/linux-arm64': 0.19.12 - '@esbuild/linux-ia32': 0.19.12 - '@esbuild/linux-loong64': 0.19.12 - '@esbuild/linux-mips64el': 0.19.12 - '@esbuild/linux-ppc64': 0.19.12 - '@esbuild/linux-riscv64': 0.19.12 - '@esbuild/linux-s390x': 0.19.12 - '@esbuild/linux-x64': 0.19.12 - '@esbuild/netbsd-x64': 0.19.12 - '@esbuild/openbsd-x64': 0.19.12 - '@esbuild/sunos-x64': 0.19.12 - '@esbuild/win32-arm64': 0.19.12 - '@esbuild/win32-ia32': 0.19.12 - '@esbuild/win32-x64': 0.19.12 - esbuild@0.21.5: optionalDependencies: '@esbuild/aix-ppc64': 0.21.5 @@ -29985,10 +29648,6 @@ snapshots: es-errors: 1.3.0 get-intrinsic: 1.2.4 - get-tsconfig@4.7.3: - dependencies: - resolve-pkg-maps: 1.0.0 - get-tsconfig@4.7.6: dependencies: resolve-pkg-maps: 1.0.0 @@ -30171,15 +29830,14 @@ snapshots: graphemer@1.4.0: {} - graphql-request@7.0.1(graphql@16.6.0): + graphql-request@7.1.0(@dprint/formatter@0.3.0)(graphql@16.6.0): dependencies: - '@dprint/formatter': 0.3.0 - '@dprint/typescript': 0.90.5 '@graphql-typed-document-node/core': 3.2.0(graphql@16.6.0) '@molt/command': 0.9.0 - dprint: 0.45.1 graphql: 16.6.0 zod: 3.23.8 + optionalDependencies: + '@dprint/formatter': 0.3.0 graphql@16.6.0: {} @@ -32806,13 +32464,6 @@ snapshots: neo-async@2.6.2: {} - next-axiom@1.5.0(next@14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0): - dependencies: - next: 14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - react: 18.2.0 - use-deep-compare: 1.3.0(react@18.2.0) - whatwg-fetch: 3.6.20 - next-themes@0.2.1(next@14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0): dependencies: next: 14.2.11(@babel/core@7.24.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.0)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -35804,13 +35455,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - tsx@4.7.1: - dependencies: - esbuild: 0.19.12 - get-tsconfig: 4.7.3 - optionalDependencies: - fsevents: 2.3.3 - tunnel-agent@0.6.0: dependencies: safe-buffer: 5.2.1 @@ -36194,11 +35838,6 @@ snapshots: optionalDependencies: '@types/react': 18.2.14 - use-deep-compare@1.3.0(react@18.2.0): - dependencies: - dequal: 2.0.3 - react: 18.2.0 - use-resize-observer@9.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0): dependencies: '@juggle/resize-observer': 3.4.0 @@ -36605,10 +36244,10 @@ snapshots: - utf-8-validate - zod - wagmi@2.12.10(@tanstack/query-core@5.51.16)(@tanstack/react-query@5.51.16(react@18.2.0))(@types/react@18.2.14)(bufferutil@4.0.8)(encoding@0.1.13)(immer@9.0.21)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8): + wagmi@2.12.10(@tanstack/query-core@5.51.16)(@tanstack/react-query@5.51.16(react@18.2.0))(@types/react@18.2.14)(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8): dependencies: '@tanstack/react-query': 5.51.16(react@18.2.0) - '@wagmi/connectors': 5.1.10(@types/react@18.2.14)(@wagmi/core@2.13.5(@tanstack/query-core@5.51.16)(@types/react@18.2.14)(immer@9.0.21)(react@18.2.0)(typescript@5.5.4)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8)))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8) + '@wagmi/connectors': 5.1.10(@types/react@18.2.14)(@wagmi/core@2.13.5(@tanstack/query-core@5.51.16)(@types/react@18.2.14)(react@18.2.0)(typescript@5.5.4)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8)))(bufferutil@4.0.8)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(rollup@4.21.2)(typescript@5.5.4)(utf-8-validate@5.0.10)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8) '@wagmi/core': 2.13.5(@tanstack/query-core@5.51.16)(@types/react@18.2.14)(immer@9.0.21)(react@18.2.0)(typescript@5.5.4)(viem@2.21.4(bufferutil@4.0.8)(typescript@5.5.4)(utf-8-validate@5.0.10)(zod@3.23.8)) react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 4d804026ac..9bb591c53a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,6 +2,4 @@ packages: - 'apis/*' - 'apps/*' - 'config/*' - - 'packages/**' - - 'protocols/*' - - 'sandboxes/*' \ No newline at end of file + - 'packages/*' \ No newline at end of file diff --git a/turbo.json b/turbo.json index 0d6521f45b..c1e3977694 100644 --- a/turbo.json +++ b/turbo.json @@ -1,15 +1,10 @@ { "$schema": "https://turbo.build/schema.json", "globalEnv": ["NODE_ENV"], - "globalPassThroughEnv": ["DISPLAY", "NODE_OPTIONS"], + "globalPassThroughEnv": ["DISPLAY", "NODE_OPTIONS", "CI"], "globalDependencies": [".npmrc", ".nvmrc", "tsconfig.json"], "ui": "stream", "tasks": { - "anvil": { - "cache": false, - "env": ["ANVIL_BLOCK_NUMBER", "ANVIL_FORK_URL", "ANVIL_PORT"], - "persistent": true - }, "build": { "dependsOn": ["^build", "generate"], "inputs": [ @@ -51,12 +46,7 @@ ] }, "generate": { - "outputs": [ - ".mesh/**/*", - ".graphclient/**/*", - "src/generated.ts", - "typechain" - ], + "outputs": ["src/generated.ts"], "cache": false }, "lint": { @@ -72,16 +62,11 @@ "start": { "dependsOn": ["^build", "generate"], "env": [ - "ALCHEMY_ID", "API_BASE_URL", "APP_ENV", - "DATABASE_URL", "DRPC_ID", "EDGE_CONFIG", "RSK_ID", - "REDIS_URL", - "TOKENS_API_V0_BASE_URL", - "STRAPI_API_URL", "VERCEL_ENV", "SENTRY_DSN", "SENTRY_ENVIRONMENT",