From 6f05f97ae9f0a1ab876e9db3dae5628de259246e Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 09:36:13 +0700 Subject: [PATCH 01/13] chore: update sentry latest and config --- .github/workflows/dev.yml | 26 ++ .github/workflows/integrationTests.yml | 9 +- .github/workflows/main.yml | 23 + .gitignore | 4 +- next.config.js | 61 ++- package.json | 2 +- ...lient.config.js => sentry.client.config.ts | 43 +- sentry.edge.config.ts | 16 + sentry.server.config.js | 19 - sentry.server.config.ts | 15 + src/utils/sentry.ts | 2 +- yarn.lock | 427 ++++++++---------- 12 files changed, 343 insertions(+), 304 deletions(-) create mode 100644 .github/workflows/dev.yml create mode 100644 .github/workflows/main.yml rename sentry.client.config.js => sentry.client.config.ts (51%) create mode 100644 sentry.edge.config.ts delete mode 100644 sentry.server.config.js create mode 100644 sentry.server.config.ts diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml new file mode 100644 index 0000000..b9543bc --- /dev/null +++ b/.github/workflows/dev.yml @@ -0,0 +1,26 @@ +name: UAT deployment +on: + push: + branches: ['dev'] + +jobs: + build-and-deploy: + uses: AstraProtocol/github-actions-workflows/.github/workflows/stella-deployment.yml@main + with: + ingressEnabled: "yes" + ingressHost: "defi.dev.astranet.services" + replicas: "1" + servicePort: "3000" + buildArgs: |- + NEXT_PUBLIC_CHAIN_ID=11115 + NEXT_PUBLIC_NODE_1=https://rpc.astranaut.dev + NEXT_PUBLIC_NODE_2=https://rpc.astranaut.dev + NEXT_PUBLIC_NODE_3=https://rpc.astranaut.dev + NEXT_PUBLIC_NODE_PRODUCTION=https://rpc.astranaut.dev + NEXT_PUBLIC_HOST=https://defi.astranaut.dev + NEXT_PUBLIC_EXPLORER=http://explorer.astranaut.dev + NEXT_PUBLIC_GTAG='' + NEXT_PUBLIC_FEE=20 + NEXT_PUBLIC_TITLE=SolarSwap + NEXT_PUBLIC_WALLET_CONNECT_RELAY=wc-relay.astranaut.dev + NEXT_PUBLIC_SENTRY_DSN=https://204e8402a7684195a50ee186a5fec8d8@sentry.astranet.live/6 diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index f2f2ba0..5c5debc 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -24,7 +24,8 @@ jobs: node-version: 16.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.PAT_ASTRAPROTOCOL }} + token: ${{ secrets.GITHUB_TOKEN }} + # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -38,12 +39,14 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Cypress install run: yarn install --frozen-lockfile env: - NODE_AUTH_TOKEN: ${{ secrets.PAT_ASTRAPROTOCOL }} + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # NODE_AUTH_TOKEN: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: make env uses: canastro/copy-file-action@master with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..e3a9e2e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,23 @@ +name: Production deployment +on: + push: + branches: ['main'] + +jobs: + build-and-deploy: + uses: AstraProtocol/github-actions-workflows/.github/workflows/stella-deployment.yml@main + with: + ingressEnabled: "yes" + ingressHost: "defi.prod.astranet.services" + replicas: "1" + servicePort: "3000" + buildArgs: |- + ENV=prod + API=https://reward-api.astranaut.io + RPC=https://rpc.astranaut.io + EXPLORER=https://explorer.astranaut.io + CHAIN_ID=0x2B66 + WEB3_CLIENT_ID=BE3UNkct8a0zPojRdlR_AxHd-Ag922XH9qaljgz5NoyWNJVBR49uy4pa6hrxWPLGwDIncdVG9vLmYAqxBj0XxEg + WEB3_AUTH_NETWORK=testnet + OPERATING_FEE_PERCENT=10 + MAX_NUMBER=100000000 diff --git a/.gitignore b/.gitignore index 59bf20a..9df3ba1 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,6 @@ types astraprotocol-astra-ui-*.tgz package-lock.json package -.next \ No newline at end of file +.next +# Sentry Auth Token +.sentryclirc diff --git a/next.config.js b/next.config.js index 34bd7b9..53dc050 100644 --- a/next.config.js +++ b/next.config.js @@ -6,25 +6,28 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({ const sentryWebpackPluginOptions = process.env.VERCEL_ENV === 'production' ? { - // Additional config options for the Sentry Webpack plugin. Keep in mind that - // the following options are set automatically, and overriding them is not - // recommended: - // release, url, org, project, authToken, configFile, stripPrefix, - // urlPrefix, include, ignore - silent: false, // Logging when deploying to check if there is any problem - validate: true, - dryRun: !process.env.SENTRY_AUTH_TOKEN, - // Set to env false will skip deploying release on Sentry except Production - // https://github.com/getsentry/sentry-webpack-plugin/blob/master/src/index.js#L522 - deploy: { - env: process.env.VERCEL_ENV, - }, - // For all available options, see: - // https://github.com/getsentry/sentry-webpack-plugin#options. + // Additional config options for the Sentry Webpack plugin. Keep in mind that + // the following options are set automatically, and overriding them is not + // recommended: + // release, url, org, project, authToken, configFile, stripPrefix, + // urlPrefix, include, ignore + silent: false, // Logging when deploying to check if there is any problem + // Suppresses source map uploading logs during build + org: "stella", + project: "solarswap-fe", + validate: true, + dryRun: !process.env.SENTRY_AUTH_TOKEN, + // Set to env false will skip deploying release on Sentry except Production + // https://github.com/getsentry/sentry-webpack-plugin/blob/master/src/index.js#L522 + deploy: { + env: process.env.VERCEL_ENV, + }, + // For all available options, see: + // https://github.com/getsentry/sentry-webpack-plugin#options. } : { - silent: true, // Suppresses all logs - dryRun: !process.env.SENTRY_AUTH_TOKEN, + silent: true, // Suppresses all logs + dryRun: !process.env.SENTRY_AUTH_TOKEN, } /** @type {import('next').NextConfig} */ @@ -112,4 +115,26 @@ const config = { }, } -module.exports = withBundleAnalyzer(withSentryConfig(config, sentryWebpackPluginOptions)) +module.exports = withBundleAnalyzer(withSentryConfig(config, sentryWebpackPluginOptions, { + // For all available options, see: + // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/ + + // Upload a larger set of source maps for prettier stack traces (increases build time) + widenClientFileUpload: true, + + // Transpiles SDK to be compatible with IE11 (increases bundle size) + transpileClientSDK: true, + + // Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load) + tunnelRoute: "/monitoring", + + // Hides source maps from generated client bundles + hideSourceMaps: true, + + // Automatically tree-shake Sentry logger statements to reduce bundle size + disableLogger: true, + })) + + + + diff --git a/package.json b/package.json index dd9128a..1196d77 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@gelatonetwork/limit-orders-lib": "^4.1.0", "@next/bundle-analyzer": "^12.0.7", "@reduxjs/toolkit": "^1.5.0", - "@sentry/nextjs": "^6.17.9", + "@sentry/nextjs": "^7.56.0", "@solarswap/sdk": "^1.0.7", "@uniswap/token-lists": "^1.0.0-beta.19", "@walletconnect/sign-client": "^2.1.4", diff --git a/sentry.client.config.js b/sentry.client.config.ts similarity index 51% rename from sentry.client.config.js rename to sentry.client.config.ts index a3b274b..c26c616 100644 --- a/sentry.client.config.js +++ b/sentry.client.config.ts @@ -1,5 +1,5 @@ -// This file configures the initialization of Sentry on the browser. -// The config you add here will be used whenever a page is visited. +// This file configures the initialization of Sentry on the client. +// The config you add here will be used whenever a users loads a page in their browser. // https://docs.sentry.io/platforms/javascript/guides/nextjs/ import * as Sentry from '@sentry/nextjs' @@ -11,26 +11,21 @@ const isUserRejected = err => { return typeof err === 'object' && 'code' in err && err.code === 4001 } -const ENV = process.env.VERCEL_ENV || process.env.NODE_ENV - Sentry.init({ dsn: SENTRY_DSN, - integrations: [ - new Sentry.Integrations.Breadcrumbs({ - console: ENV === 'production', - }), - new Sentry.Integrations.GlobalHandlers({ - onerror: false, - onunhandledrejection: false, - }), - ], - environment: ENV === 'production' ? 'production' : 'development', + // Adjust this value in production, or use tracesSampler for greater control - tracesSampleRate: 0, - // ... - // Note: if you want to override the automatic release value, do not set a - // `release` value here - use the environment variable `SENTRY_RELEASE`, so - // that it will also get attached to your source maps + 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, + beforeSend(event, hint) { const error = hint?.originalException if (error && isUserRejected(error)) { @@ -38,6 +33,16 @@ Sentry.init({ } return event }, + + // You can remove this option if you're not planning to use the Sentry Session Replay feature: + integrations: [ + new Sentry.Replay({ + // Additional Replay configuration goes in here, for example: + maskAllText: true, + blockAllMedia: true, + }), + ], + ignoreErrors: [ 'User denied transaction signature', 'Non-Error promise rejection captured', diff --git a/sentry.edge.config.ts b/sentry.edge.config.ts new file mode 100644 index 0000000..7f17dd7 --- /dev/null +++ b/sentry.edge.config.ts @@ -0,0 +1,16 @@ +// This file configures the initialization of Sentry for edge features (middleware, edge routes, and so on). +// The config you add here will be used whenever one of the edge features is loaded. +// Note that this config is unrelated to the Vercel Edge Runtime and is also required when running locally. +// https://docs.sentry.io/platforms/javascript/guides/nextjs/ + +import * as Sentry from "@sentry/nextjs"; + +Sentry.init({ + dsn: "https://3440367258bb4aa39f6798ce548c98c8@sentry.astranet.live/5", + + // 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, +}); diff --git a/sentry.server.config.js b/sentry.server.config.js deleted file mode 100644 index 00e743e..0000000 --- a/sentry.server.config.js +++ /dev/null @@ -1,19 +0,0 @@ -// This file configures the initialization of Sentry on the server. -// The config you add here will be used whenever the server handles a request. -// https://docs.sentry.io/platforms/javascript/guides/nextjs/ - -import * as Sentry from '@sentry/nextjs' - -const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN -const ENV = process.env.VERCEL_ENV || process.env.NODE_ENV - -Sentry.init({ - dsn: SENTRY_DSN, - environment: ENV === 'production' ? 'production' : 'development', - // Adjust this value in production, or use tracesSampler for greater control - tracesSampleRate: 0, - // ... - // Note: if you want to override the automatic release value, do not set a - // `release` value here - use the environment variable `SENTRY_RELEASE`, so - // that it will also get attached to your source maps -}) diff --git a/sentry.server.config.ts b/sentry.server.config.ts new file mode 100644 index 0000000..30ba873 --- /dev/null +++ b/sentry.server.config.ts @@ -0,0 +1,15 @@ +// This file configures the initialization of Sentry on the server. +// The config you add here will be used whenever the server handles a request. +// https://docs.sentry.io/platforms/javascript/guides/nextjs/ + +import * as Sentry from "@sentry/nextjs"; + +Sentry.init({ + dsn: "https://3440367258bb4aa39f6798ce548c98c8@sentry.astranet.live/5", + + // 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, +}); diff --git a/src/utils/sentry.ts b/src/utils/sentry.ts index 13b5f68..9f2eb8f 100644 --- a/src/utils/sentry.ts +++ b/src/utils/sentry.ts @@ -22,7 +22,7 @@ export const isUserRejected = err => { return typeof err === 'object' && 'code' in err && (err.code === 4001 || err.code === 'ACTION_REJECTED') } -const ENABLED_LOG = false +const ENABLED_LOG = true export const logError = (error: Error | unknown) => { if (ENABLED_LOG) { diff --git a/yarn.lock b/yarn.lock index 5905377..a56c5c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1797,6 +1797,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.13": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" @@ -1968,6 +1973,18 @@ "@babel/helper-module-imports" "^7.18.6" "@rollup/pluginutils" "^5.0.1" +"@rollup/plugin-commonjs@24.0.0": + version "24.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-24.0.0.tgz#fb7cf4a6029f07ec42b25daa535c75b05a43f75c" + integrity sha512-0w0wyykzdyRRPHOb0cQt14mIBLujfAv6GgP6g8nvg/iBxEm112t3YPPq+Buqe2+imvElTka+bjNlJ/gB56TD8g== + dependencies: + "@rollup/pluginutils" "^5.0.1" + commondir "^1.0.1" + estree-walker "^2.0.2" + glob "^8.0.3" + is-reference "1.2.1" + magic-string "^0.27.0" + "@rollup/pluginutils@^5.0.1": version "5.0.2" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33" @@ -1982,139 +1999,131 @@ resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728" integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg== -"@sentry/browser@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.19.7.tgz#a40b6b72d911b5f1ed70ed3b4e7d4d4e625c0b5f" - integrity sha512-oDbklp4O3MtAM4mtuwyZLrgO1qDVYIujzNJQzXmi9YzymJCuzMLSRDvhY83NNDCRxf0pds4DShgYeZdbSyKraA== +"@sentry-internal/tracing@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.56.0.tgz#ba709258f2f0f3d8a36f9740403088b39212b843" + integrity sha512-OKI4Pz/O13gng8hT9rNc+gRV3+P7nnk1HnHlV8fgaQydS6DsRxoDL1sHa42tZGbh7K9jqNAP3TC6VjBOsr2tXA== + dependencies: + "@sentry/core" "7.56.0" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" + tslib "^1.9.3" + +"@sentry/browser@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.56.0.tgz#6bf3ff21bc2e9b66a72ea0c7dcc3572fdeb3bd8f" + integrity sha512-qpyyw+NM/psbNAYMlTCCdWwxHHcogppEQ+Q40jGE4sKP2VRIjjyteJkUcaEMoGpbJXx9puzTWbpzqlQ8r15Now== dependencies: - "@sentry/core" "6.19.7" - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" + "@sentry-internal/tracing" "7.56.0" + "@sentry/core" "7.56.0" + "@sentry/replay" "7.56.0" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" tslib "^1.9.3" -"@sentry/cli@^1.73.0": - version "1.74.6" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.74.6.tgz#c4f276e52c6f5e8c8d692845a965988068ebc6f5" - integrity sha512-pJ7JJgozyjKZSTjOGi86chIngZMLUlYt2HOog+OJn+WGvqEkVymu8m462j1DiXAnex9NspB4zLLNuZ/R6rTQHg== +"@sentry/cli@^1.74.6": + version "1.75.2" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.75.2.tgz#2c38647b38300e52c9839612d42b7c23f8d6455b" + integrity sha512-CG0CKH4VCKWzEaegouWfCLQt9SFN+AieFESCatJ7zSuJmzF05ywpMusjxqRul6lMwfUhRKjGKOzcRJ1jLsfTBw== dependencies: https-proxy-agent "^5.0.0" mkdirp "^0.5.5" node-fetch "^2.6.7" - npmlog "^4.1.2" progress "^2.0.3" proxy-from-env "^1.1.0" which "^2.0.2" -"@sentry/core@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.7.tgz#156aaa56dd7fad8c89c145be6ad7a4f7209f9785" - integrity sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw== - dependencies: - "@sentry/hub" "6.19.7" - "@sentry/minimal" "6.19.7" - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" - tslib "^1.9.3" - -"@sentry/hub@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.7.tgz#58ad7776bbd31e9596a8ec46365b45cd8b9cfd11" - integrity sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA== +"@sentry/core@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.56.0.tgz#f4253e0d61f55444180a63e5278b62e57303f7cf" + integrity sha512-Nuyyfh09Yz27kPo74fXHlrdmZeK6zrlJVtxQ6LkwuoaTBcNcesNXVaOtr6gjvUGUmsfriVPP3Jero5LXufV7GQ== dependencies: - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" tslib "^1.9.3" -"@sentry/integrations@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.19.7.tgz#e6e126b692077c8731644224c754012bed65b425" - integrity sha512-yNeeFyuygJaV7Mdc5qWuDa13xVj5mVdECaaw2Xs4pfeHaXmRfRzZY17N8ypWFegKWxKBHynyQRMD10W5pBwJvA== +"@sentry/integrations@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.56.0.tgz#6fe812454fbccf00810f65667eb393b3bf298b92" + integrity sha512-0d/E/R3MW+5bQ9wcHPD0h/B2KFOpUt+wQgN1kNk7atY12auDzHKuGCjPP87D/xVyRoma3ErFqZCRqwtvCj1cfQ== dependencies: - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" localforage "^1.8.1" tslib "^1.9.3" -"@sentry/minimal@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.7.tgz#b3ee46d6abef9ef3dd4837ebcb6bdfd01b9aa7b4" - integrity sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ== - dependencies: - "@sentry/hub" "6.19.7" - "@sentry/types" "6.19.7" - tslib "^1.9.3" - -"@sentry/nextjs@^6.17.9": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/nextjs/-/nextjs-6.19.7.tgz#2c40692d89a99ec1382189f11702b1498c91fb77" - integrity sha512-029gpqhR6gHF7zfE9oxFOf3Zm68CShDu8/6azC8mwfIfJtyLC9dqztJJi48j0Uxs+sR1TEkN5Dw3wZbfWtFd8g== - dependencies: - "@sentry/core" "6.19.7" - "@sentry/hub" "6.19.7" - "@sentry/integrations" "6.19.7" - "@sentry/node" "6.19.7" - "@sentry/react" "6.19.7" - "@sentry/tracing" "6.19.7" - "@sentry/utils" "6.19.7" - "@sentry/webpack-plugin" "1.18.8" +"@sentry/nextjs@^7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/nextjs/-/nextjs-7.56.0.tgz#75467c6d5efe35a18d014966bff935c2ac3e0f36" + integrity sha512-s/HX6e3r8dS/683mbKfJymKg2DSqfQBeMRMxfp34Lg7Pzed/VLE9JLPkZq7BcS7leD0XQEflyxGYBKEq8iqeKA== + dependencies: + "@rollup/plugin-commonjs" "24.0.0" + "@sentry/core" "7.56.0" + "@sentry/integrations" "7.56.0" + "@sentry/node" "7.56.0" + "@sentry/react" "7.56.0" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" + "@sentry/webpack-plugin" "1.20.0" + chalk "3.0.0" + rollup "2.78.0" + stacktrace-parser "^0.1.10" tslib "^1.9.3" -"@sentry/node@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.19.7.tgz#32963b36b48daebbd559e6f13b1deb2415448592" - integrity sha512-gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg== +"@sentry/node@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.56.0.tgz#ddeb34a848c8a544d0dbb5f2c3031615be040d2b" + integrity sha512-QXbWy/ypRxfFd8iP6zLvHInYZyjGKPrkVNYt43mhKAZHm764NxX/29vDfj1FztgG9Z6lVLIG2eyqTvLruYmsWw== dependencies: - "@sentry/core" "6.19.7" - "@sentry/hub" "6.19.7" - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" + "@sentry-internal/tracing" "7.56.0" + "@sentry/core" "7.56.0" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/react@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.19.7.tgz#58cc2d6da20f7d3b0df40638dfbbbc86c9c85caf" - integrity sha512-VzJeBg/v41jfxUYPkH2WYrKjWc4YiMLzDX0f4Zf6WkJ4v3IlDDSkX6DfmWekjTKBho6wiMkSNy2hJ1dHfGZ9jA== +"@sentry/react@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.56.0.tgz#7e2e9363a76c7d67854bdb179142a2f7f910d476" + integrity sha512-dRnkZwspef5aEHV/eiLS/mhomFCXItylU8s78fzAn5QMTDGHmu5Pnhl5dxh/zbPUcdXqFA6GwJVucV4gzsNEJw== dependencies: - "@sentry/browser" "6.19.7" - "@sentry/minimal" "6.19.7" - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" + "@sentry/browser" "7.56.0" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" hoist-non-react-statics "^3.3.2" tslib "^1.9.3" -"@sentry/tracing@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.19.7.tgz#54bb99ed5705931cd33caf71da347af769f02a4c" - integrity sha512-ol4TupNnv9Zd+bZei7B6Ygnr9N3Gp1PUrNI761QSlHtPC25xXC5ssSD3GMhBgyQrcvpuRcCFHVNNM97tN5cZiA== +"@sentry/replay@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.56.0.tgz#8a49dcb45e9ea83bf905cec0d9b42fed4b8085bd" + integrity sha512-bvjiJK1+SM/paLapuL+nEJ8CIF1bJqi0nnFyxUIi2L5L6yb2uMwfyT3IQ+kz0cXJsLdb3HN4WMphVjyiU9pFdg== dependencies: - "@sentry/hub" "6.19.7" - "@sentry/minimal" "6.19.7" - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" - tslib "^1.9.3" + "@sentry/core" "7.56.0" + "@sentry/types" "7.56.0" + "@sentry/utils" "7.56.0" -"@sentry/types@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7" - integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg== +"@sentry/types@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.56.0.tgz#9042a099cf9e8816d081886d24b88082a5d9f87a" + integrity sha512-5WjhVOQm75ItOytOx2jTx+5yw8/qJ316+g1Di8dS9+kgIi1zniqdMcX00C2yYe3FMUgFB49PegCUYulm9Evapw== -"@sentry/utils@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79" - integrity sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA== +"@sentry/utils@7.56.0": + version "7.56.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.56.0.tgz#e60e4935d17b2197584abf6ce61b522ad055352c" + integrity sha512-wgeX7bufxc//TjjSIE+gCMm8hVId7Jzvc+f441bYrWnNZBuzPIDW2BummCcPrKzSYe5GeYZDTZGV8YZGMLGBjw== dependencies: - "@sentry/types" "6.19.7" + "@sentry/types" "7.56.0" tslib "^1.9.3" -"@sentry/webpack-plugin@1.18.8": - version "1.18.8" - resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.18.8.tgz#247a73a0aa9e28099a736bbe89ca0d35cbac7636" - integrity sha512-PtKr0NL62b5L3kPFGjwSNbIUwwcW5E5G6bQxAYZGpkgL1MFPnS4ND0SAsySuX0byQJRFFium5A19LpzyvQZSlQ== +"@sentry/webpack-plugin@1.20.0": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.20.0.tgz#e7add76122708fb6b4ee7951294b521019720e58" + integrity sha512-Ssj1mJVFsfU6vMCOM2d+h+KQR7QHSfeIP16t4l20Uq/neqWXZUQ2yvQfe4S3BjdbJXz/X4Rw8Hfy1Sd0ocunYw== dependencies: - "@sentry/cli" "^1.73.0" + "@sentry/cli" "^1.74.6" + webpack-sources "^2.0.0 || ^3.0.0" "@sideway/address@^4.1.3": version "4.1.4" @@ -2503,6 +2512,11 @@ dependencies: "@types/node" "*" +"@types/estree@*": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== + "@types/estree@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" @@ -3618,24 +3632,11 @@ app-path@^3.2.0: dependencies: execa "^1.0.0" -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== -are-we-there-yet@~1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -4269,6 +4270,14 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@3.0.0, chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -4280,14 +4289,6 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -4464,11 +4465,6 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -4581,6 +4577,11 @@ common-tags@^1.8.0: resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== + compare-func@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" @@ -4594,11 +4595,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - conventional-changelog-angular@^5.0.11: version "5.0.13" resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c" @@ -4662,11 +4658,6 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - cosmiconfig-typescript-loader@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.2.0.tgz#a3cfd0dd9dac86be7dbe5f53eb46ad03abdf417b" @@ -5080,11 +5071,6 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - detect-browser@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97" @@ -6393,20 +6379,6 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg== - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -6529,6 +6501,17 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.3: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-dirs@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -6693,11 +6676,6 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -6889,7 +6867,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4: +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -7032,13 +7010,6 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -7148,6 +7119,13 @@ is-promise@^2.2.2: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== +is-reference@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" + integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== + dependencies: + "@types/estree" "*" + is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -7252,11 +7230,6 @@ isarray@^2.0.1, isarray@^2.0.5: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -8361,6 +8334,13 @@ lz-string@^1.4.4: resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== +magic-string@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.13" + make-dir@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -8841,21 +8821,6 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== - numeral@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506" @@ -8866,7 +8831,7 @@ nwsapi@^2.2.0: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== -object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -9451,11 +9416,6 @@ pretty-format@^29.0.0, pretty-format@^29.3.1: ansi-styles "^5.0.0" react-is "^18.0.0" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - process-warning@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616" @@ -9868,19 +9828,6 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stre string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^2.0.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -10125,6 +10072,13 @@ rlp@^2.0.0, rlp@^2.2.3: dependencies: bn.js "^5.2.0" +rollup@2.78.0: + version "2.78.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.0.tgz#00995deae70c0f712ea79ad904d5f6b033209d9e" + integrity sha512-4+YfbQC9QEVvKTanHhIAFVUFSRsezvQF8vFOJwtGfb9Bb+r014S+qryr9PSmw8x6sMnPkmFBGAvIFVQxvJxjtg== + optionalDependencies: + fsevents "~2.3.2" + rpc-websockets@^7.5.0: version "7.5.0" resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.5.0.tgz#bbeb87572e66703ff151e50af1658f98098e2748" @@ -10178,11 +10132,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - safe-event-emitter@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/safe-event-emitter/-/safe-event-emitter-1.0.1.tgz#5b692ef22329ed8f69fdce607e50ca734f6f20af" @@ -10275,7 +10224,7 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve dependencies: lru-cache "^6.0.0" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== @@ -10564,6 +10513,13 @@ stack-utils@^2.0.3: dependencies: escape-string-regexp "^2.0.0" +stacktrace-parser@^0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a" + integrity sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg== + dependencies: + type-fest "^0.7.1" + start-server-and-test@^1.15.3: version "1.15.3" resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.15.3.tgz#33bb6465ff4d5e3a476337512a7e0d737a5ef026" @@ -10621,16 +10577,16 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10639,15 +10595,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string-width@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" @@ -10696,14 +10643,7 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== @@ -11362,6 +11302,11 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== +type-fest@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" + integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -11580,7 +11525,7 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "^4.3.0" -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== @@ -11743,6 +11688,11 @@ webpack-bundle-analyzer@4.3.0: sirv "^1.0.7" ws "^7.3.1" +"webpack-sources@^2.0.0 || ^3.0.0": + version "3.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== + whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" @@ -11833,13 +11783,6 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" From af6ee4f6ce651e3535bae7fffe6c61e928b86c40 Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 09:55:06 +0700 Subject: [PATCH 02/13] chore: use Sentry DSN env + config build prod on tag release --- .github/workflows/dev.yml | 1 + .github/workflows/main.yml | 25 +++++++++++++++---------- sentry.client.config.ts | 2 ++ sentry.edge.config.ts | 14 ++++++++------ sentry.properties | 3 --- sentry.server.config.ts | 13 +++++++------ 6 files changed, 33 insertions(+), 25 deletions(-) delete mode 100644 sentry.properties diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index b9543bc..cb87a08 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -24,3 +24,4 @@ jobs: NEXT_PUBLIC_TITLE=SolarSwap NEXT_PUBLIC_WALLET_CONNECT_RELAY=wc-relay.astranaut.dev NEXT_PUBLIC_SENTRY_DSN=https://204e8402a7684195a50ee186a5fec8d8@sentry.astranet.live/6 + NEXT_PUBLIC_SENTRY_ENVIRONMENT=testnet diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3a9e2e..ded210b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,8 @@ name: Production deployment on: push: - branches: ['main'] + tags: + - '**' # jobs: build-and-deploy: @@ -12,12 +13,16 @@ jobs: replicas: "1" servicePort: "3000" buildArgs: |- - ENV=prod - API=https://reward-api.astranaut.io - RPC=https://rpc.astranaut.io - EXPLORER=https://explorer.astranaut.io - CHAIN_ID=0x2B66 - WEB3_CLIENT_ID=BE3UNkct8a0zPojRdlR_AxHd-Ag922XH9qaljgz5NoyWNJVBR49uy4pa6hrxWPLGwDIncdVG9vLmYAqxBj0XxEg - WEB3_AUTH_NETWORK=testnet - OPERATING_FEE_PERCENT=10 - MAX_NUMBER=100000000 + NEXT_PUBLIC_CHAIN_ID=11110 + NEXT_PUBLIC_NODE_1=https://rpc.astranaut.io + NEXT_PUBLIC_NODE_2=https://rpc.astranaut.io + NEXT_PUBLIC_NODE_3=https://rpc.astranaut.io + NEXT_PUBLIC_NODE_PRODUCTION=https://rpc.astranaut.io + NEXT_PUBLIC_HOST=https://solarswap.io + NEXT_PUBLIC_EXPLORER=http://explorer.astranaut.io + NEXT_PUBLIC_GTAG='G-MK9VVY7GT5' + NEXT_PUBLIC_FEE=20 + NEXT_PUBLIC_TITLE=SolarSwap + NEXT_PUBLIC_WALLET_CONNECT_RELAY=wc-relay.astranaut.io + NEXT_PUBLIC_SENTRY_DSN=https://204e8402a7684195a50ee186a5fec8d8@sentry.astranet.live/6 + NEXT_PUBLIC_SENTRY_ENVIRONMENT=mainnet diff --git a/sentry.client.config.ts b/sentry.client.config.ts index c26c616..b593387 100644 --- a/sentry.client.config.ts +++ b/sentry.client.config.ts @@ -14,6 +14,8 @@ const isUserRejected = err => { Sentry.init({ dsn: SENTRY_DSN, + environment: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT, + // Adjust this value in production, or use tracesSampler for greater control tracesSampleRate: 1, diff --git a/sentry.edge.config.ts b/sentry.edge.config.ts index 7f17dd7..45d8319 100644 --- a/sentry.edge.config.ts +++ b/sentry.edge.config.ts @@ -5,12 +5,14 @@ import * as Sentry from "@sentry/nextjs"; +const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN + Sentry.init({ - dsn: "https://3440367258bb4aa39f6798ce548c98c8@sentry.astranet.live/5", + dsn: SENTRY_DSN, - // Adjust this value in production, or use tracesSampler for greater control - tracesSampleRate: 1, + // 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, -}); + // Setting this option to true will print useful information to the console while you're setting up Sentry. + debug: false, +}) diff --git a/sentry.properties b/sentry.properties deleted file mode 100644 index b695bee..0000000 --- a/sentry.properties +++ /dev/null @@ -1,3 +0,0 @@ -defaults.url=https://sentry.tiki.com.vn -defaults.org=solarswap -defaults.project=solarswap \ No newline at end of file diff --git a/sentry.server.config.ts b/sentry.server.config.ts index 30ba873..ece1650 100644 --- a/sentry.server.config.ts +++ b/sentry.server.config.ts @@ -3,13 +3,14 @@ // https://docs.sentry.io/platforms/javascript/guides/nextjs/ import * as Sentry from "@sentry/nextjs"; +const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN Sentry.init({ - dsn: "https://3440367258bb4aa39f6798ce548c98c8@sentry.astranet.live/5", + dsn: SENTRY_DSN, - // Adjust this value in production, or use tracesSampler for greater control - tracesSampleRate: 1, + // 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, -}); + // Setting this option to true will print useful information to the console while you're setting up Sentry. + debug: false, +}) From 7513291ed2863da2b8d9da820ddf86e5adc4ccd6 Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 10:16:39 +0700 Subject: [PATCH 03/13] chore: update secret token --- .github/workflows/dev.yml | 1 + .github/workflows/lint.yml | 6 ++++-- .github/workflows/main.yml | 1 + .github/workflows/unitTests.yml | 6 ++++-- Dockerfile | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index cb87a08..3def3aa 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -25,3 +25,4 @@ jobs: NEXT_PUBLIC_WALLET_CONNECT_RELAY=wc-relay.astranaut.dev NEXT_PUBLIC_SENTRY_DSN=https://204e8402a7684195a50ee186a5fec8d8@sentry.astranet.live/6 NEXT_PUBLIC_SENTRY_ENVIRONMENT=testnet + SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1e846e0..6912dfd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,8 @@ jobs: node-version: 16.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.PAT_ASTRAPROTOCOL }} + token: ${{ secrets.GITHUB_TOKEN }} + # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -42,7 +43,8 @@ jobs: ${{ runner.os }}-yarn- - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Install dependencies run: yarn install --frozen-lockfile diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ded210b..16bd209 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,3 +26,4 @@ jobs: NEXT_PUBLIC_WALLET_CONNECT_RELAY=wc-relay.astranaut.io NEXT_PUBLIC_SENTRY_DSN=https://204e8402a7684195a50ee186a5fec8d8@sentry.astranet.live/6 NEXT_PUBLIC_SENTRY_ENVIRONMENT=mainnet + SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} diff --git a/.github/workflows/unitTests.yml b/.github/workflows/unitTests.yml index 06256be..b357c40 100644 --- a/.github/workflows/unitTests.yml +++ b/.github/workflows/unitTests.yml @@ -27,7 +27,8 @@ jobs: node-version: 16.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.PAT_ASTRAPROTOCOL }} + token: ${{ secrets.GITHUB_TOKEN }} + # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -42,7 +43,8 @@ jobs: ${{ runner.os }}-yarn- - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Install dependencies run: yarn install --frozen-lockfile diff --git a/Dockerfile b/Dockerfile index b44e2e6..8de1383 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN GITHUB_PACKAGE_TOKEN=${GITHUB_TOKEN} yarn --frozen-lockfile FROM node:18-alpine AS builder WORKDIR /app -ARG ASTRA_SENTRY_AUTH_TOKEN +ARG SENTRY_AUTH_TOKEN ARG NEXT_PUBLIC_CHAIN_ID ARG NEXT_PUBLIC_NODE_1 ARG NEXT_PUBLIC_NODE_2 @@ -37,7 +37,7 @@ ARG NEXT_PUBLIC_SENTRY_DSN COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/src ./src COPY . . -RUN ASTRA_SENTRY_AUTH_TOKEN=${ASTRA_SENTRY_AUTH_TOKEN} \ +RUN SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN} \ NEXT_PUBLIC_CHAIN_ID=${NEXT_PUBLIC_CHAIN_ID} \ NEXT_PUBLIC_NODE_1=${NEXT_PUBLIC_NODE_1} \ NEXT_PUBLIC_NODE_2=${NEXT_PUBLIC_NODE_2} \ From b2c14b1117651015600dad7511e8571c400be34a Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 10:23:36 +0700 Subject: [PATCH 04/13] chore: update CI --- .github/workflows/integrationTests.yml | 5 +---- .github/workflows/lint.yml | 4 ++-- .github/workflows/testConfig.yml | 10 ++++++---- package.json | 2 +- yarn.lock | 8 ++++---- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index 5c5debc..0c3d43b 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -2,9 +2,6 @@ name: Integration Tests on: pull_request: - branches: - - dev - - main push: branches: - dev @@ -21,7 +18,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6912dfd..42b2e42 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: true matrix: - node: [14] + node: [18] name: Lint @@ -24,7 +24,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/testConfig.yml b/.github/workflows/testConfig.yml index 7d7c295..e29e922 100644 --- a/.github/workflows/testConfig.yml +++ b/.github/workflows/testConfig.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: true matrix: - node: [14] + node: [18] name: Config (Jest) @@ -26,10 +26,11 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.PAT_ASTRAPROTOCOL }} + token: ${{ secrets.GITHUB_TOKEN }} + # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -43,7 +44,8 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Install dependencies run: yarn install --frozen-lockfile diff --git a/package.json b/package.json index 1196d77..7cdfea6 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@astra-sdk/connector": "^1.1.5", "@astra-sdk/wallet-connect": "^1.0.4", "@astra-sdk/walletconnect-connector": "^1.0.3", - "@astraprotocol/astra-ui": "^1.0.30", + "@astraprotocol/astra-ui": "^1.0.39", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", diff --git a/yarn.lock b/yarn.lock index a56c5c0..90d6131 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,10 +36,10 @@ resolved "https://registry.yarnpkg.com/@astra-sdk/walletconnect-connector/-/walletconnect-connector-1.0.3.tgz#24381d75124889dd4aef7c5667004da802c48734" integrity sha512-Azq0Yqged21YVt9gznIhNURsSy0uws3o50x/adBn45eUwrVyNZwcNBZ9kEoXL3y3dRN5jYGiECL1XM+oAEB1Kw== -"@astraprotocol/astra-ui@^1.0.30": - version "1.0.30" - resolved "https://npm.pkg.github.com/download/@astraprotocol/astra-ui/1.0.30/4f575e3bd0238e23506158ea894611a0b1b228f1#4f575e3bd0238e23506158ea894611a0b1b228f1" - integrity sha512-7CAlhY+wdWCdHf1nsSjpQNjRi+rydkPQdYdP/hbJ70UdkBL4LM9txdUJCu+69vkQzrS+TgeeCVQSjUhqEUlB9Q== +"@astraprotocol/astra-ui@^1.0.39": + version "1.0.39" + resolved "https://npm.pkg.github.com/download/@astraprotocol/astra-ui/1.0.39/69c8c0faae5160a10d3fd72ff9691b2d7ce82f12#69c8c0faae5160a10d3fd72ff9691b2d7ce82f12" + integrity sha512-Zze/t21N7GAInwSzwLDhk5QgtLMX/+zfv5JTrdrKNaDHHHpTlnlA8BXfOfV+qUV7s+W1DqCwUuJ5YeFS4bxjIg== dependencies: "@types/numeral" "^2.0.2" "@types/react-copy-to-clipboard" "^5.0.4" From 51975486f565a37e708b3c7b1d7dd57d499a94a9 Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 10:32:10 +0700 Subject: [PATCH 05/13] ci: test config ci --- .github/workflows/lint.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 42b2e42..ffbe518 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ jobs: node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.GITHUB_TOKEN }} + # token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path @@ -42,8 +42,8 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + # - name: Setup npm token + # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Install dependencies From 5b368ec671e1ecf826b97aa97e0f88b8043cba88 Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 10:44:19 +0700 Subject: [PATCH 06/13] ci: test another gh token --- .github/workflows/lint.yml | 6 +++--- .github/workflows/unitTests.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ffbe518..67707b8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ jobs: node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - # token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_AUTH_TOKEN }} # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path @@ -42,8 +42,8 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - # - name: Setup npm token - # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + - name: Setup npm token + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}" # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Install dependencies diff --git a/.github/workflows/unitTests.yml b/.github/workflows/unitTests.yml index b357c40..3bb47a6 100644 --- a/.github/workflows/unitTests.yml +++ b/.github/workflows/unitTests.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: true matrix: - node: [14] + node: [18] name: Unit tests (Jest) @@ -24,7 +24,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: 16.x + node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' token: ${{ secrets.GITHUB_TOKEN }} From d1da8cc0cbbb4798b193ca77d7eb586d94c467de Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 10:52:26 +0700 Subject: [PATCH 07/13] ci: update gh token --- .github/workflows/dev.yml | 1 + .github/workflows/integrationTests.yml | 8 ++++---- .github/workflows/main.yml | 1 + .github/workflows/testConfig.yml | 4 ++-- .github/workflows/unitTests.yml | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 3def3aa..a8dfa1f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -26,3 +26,4 @@ jobs: NEXT_PUBLIC_SENTRY_DSN=https://204e8402a7684195a50ee186a5fec8d8@sentry.astranet.live/6 NEXT_PUBLIC_SENTRY_ENVIRONMENT=testnet SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} + GITHUB_TOKEN=${{ secrets.GH_AUTH_TOKEN }} diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index 0c3d43b..9a1b4cb 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -21,7 +21,7 @@ jobs: node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_AUTH_TOKEN }} # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path @@ -36,13 +36,13 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}" # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Cypress install run: yarn install --frozen-lockfile env: - NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.GH_AUTH_TOKEN }} # NODE_AUTH_TOKEN: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: make env uses: canastro/copy-file-action@master @@ -60,4 +60,4 @@ jobs: CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} # Recommended: pass the GitHub token lets this action correctly # determine the unique run id necessary to re-run the checks - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GH_AUTH_TOKEN }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16bd209..56f1f4d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,3 +27,4 @@ jobs: NEXT_PUBLIC_SENTRY_DSN=https://204e8402a7684195a50ee186a5fec8d8@sentry.astranet.live/6 NEXT_PUBLIC_SENTRY_ENVIRONMENT=mainnet SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} + GITHUB_TOKEN=${{ secrets.GH_AUTH_TOKEN }} diff --git a/.github/workflows/testConfig.yml b/.github/workflows/testConfig.yml index e29e922..4c76507 100644 --- a/.github/workflows/testConfig.yml +++ b/.github/workflows/testConfig.yml @@ -29,7 +29,7 @@ jobs: node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_AUTH_TOKEN }} # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path @@ -44,7 +44,7 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}" # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Install dependencies diff --git a/.github/workflows/unitTests.yml b/.github/workflows/unitTests.yml index 3bb47a6..57e3e5c 100644 --- a/.github/workflows/unitTests.yml +++ b/.github/workflows/unitTests.yml @@ -27,7 +27,7 @@ jobs: node-version: 18.x registry-url: 'https://npm.pkg.github.com' scope: '@astraprotocol' - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_AUTH_TOKEN }} # token: ${{ secrets.PAT_ASTRAPROTOCOL }} - name: Get yarn cache directory path @@ -43,7 +43,7 @@ jobs: ${{ runner.os }}-yarn- - name: Setup npm token - run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}" + run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}" # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}" - name: Install dependencies From 44177bdc7a87f0d3b96f0be5be07ba977547a3a6 Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 11:04:40 +0700 Subject: [PATCH 08/13] fix: bug Sentry severity level --- src/components/ErrorBoundary/ErrorBoundary.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ErrorBoundary/ErrorBoundary.tsx b/src/components/ErrorBoundary/ErrorBoundary.tsx index e3e6339..ad6055c 100644 --- a/src/components/ErrorBoundary/ErrorBoundary.tsx +++ b/src/components/ErrorBoundary/ErrorBoundary.tsx @@ -1,5 +1,5 @@ import { Logo } from '@astraprotocol/astra-ui' -import { ErrorBoundary as SentryErrorBoundary, Severity } from '@sentry/nextjs' +import { ErrorBoundary as SentryErrorBoundary, SeverityLevel } from '@sentry/nextjs' import Page from 'components/Layout/Page' import { useTranslation } from 'contexts/Localization' import { useTheme } from 'next-themes' @@ -13,7 +13,7 @@ export default function ErrorBoundary({ children }) { return ( { - scope.setLevel(Severity.Fatal) + scope.setLevel('error' as SeverityLevel) }} fallback={({ eventId }) => { return ( From a0ab276f7343ee16d75a0e4cada3f17f7d1d0680 Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 11:25:22 +0700 Subject: [PATCH 09/13] ci: disable record cypress --- .github/workflows/integrationTests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index 9a1b4cb..aeb59a1 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -54,7 +54,7 @@ jobs: with: build: npm run build start: npm start - record: true + record: false env: # pass the Cypress Cloud record key as an environment variable CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} From 9a4103ee2f8f0af25b0598ed3320a67c8efe88cc Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 11:41:52 +0700 Subject: [PATCH 10/13] ci: update ci cypress --- .github/workflows/integrationTests.yml | 2 +- package.json | 5 +++-- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index aeb59a1..b54ae6d 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -53,7 +53,7 @@ jobs: - uses: cypress-io/github-action@v5.0.7 # use the explicit version number with: build: npm run build - start: npm start + start: npm run start record: false env: # pass the Cypress Cloud record key as an environment variable diff --git a/package.json b/package.json index 7cdfea6..94a89d9 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "test": "jest", "test:watch": "jest --watch", "test:config": "jest src/config/__tests__/ --testPathIgnorePatterns", - "integration-test": "start-server-and-test start http://localhost:3000 'cypress run --reporter json'", + "e2e": "cypress run --reporter json", + "integration-test": "start-server-and-test start http://localhost:3000 e2e", "lint": "eslint 'src/**/*.{js,jsx,ts,tsx}'", "lint:style": "npx stylelint '**/*.{ts,tsx}'", "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx}\"", @@ -135,7 +136,7 @@ "prettier": "^2.8.0", "sass": "^1.56.1", "source-map-explorer": "^2.5.2", - "start-server-and-test": "^1.15.3", + "start-server-and-test": "^2.0.0", "stylelint": "^14.5.3", "stylelint-config-prettier": "^9.0.3", "stylelint-config-recommended": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 90d6131..65514af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10520,10 +10520,10 @@ stacktrace-parser@^0.1.10: dependencies: type-fest "^0.7.1" -start-server-and-test@^1.15.3: - version "1.15.3" - resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.15.3.tgz#33bb6465ff4d5e3a476337512a7e0d737a5ef026" - integrity sha512-4GqkqghvUR9cJ8buvtgkyT0AHgVwCJ5EN8eDEhe9grTChGwWUxGm2nqfSeE9+0PZkLRdFqcwTwxVHe1y3ViutQ== +start-server-and-test@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-2.0.0.tgz#0644809d63036a8a001efb70582f3e37ebfdd33d" + integrity sha512-UqKLw0mJbfrsG1jcRLTUlvuRi9sjNuUiDOLI42r7R5fA9dsFoywAy9DoLXNYys9B886E4RCKb+qM1Gzu96h7DQ== dependencies: arg "^5.0.2" bluebird "3.7.2" From 431dd096edf20b85a6099528768514885fcebf5f Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 11:50:18 +0700 Subject: [PATCH 11/13] ci: add wait for server start before run cypress --- src/views/Swap/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Swap/index.tsx b/src/views/Swap/index.tsx index 3e91dbc..706c4ff 100644 --- a/src/views/Swap/index.tsx +++ b/src/views/Swap/index.tsx @@ -322,7 +322,7 @@ export default function Swap() { ) const swapIsUnsupported = useIsTransactionUnsupported(currencies?.INPUT, currencies?.OUTPUT) - + console.log('swapIsUnsupported', swapIsUnsupported, 'showWrap', showWrap) const [onPresentImportTokenWarningModal] = useModal( router.push('/swap')} />, ) From 4cb3db790a91ab1189592f64c9cfab438565a10e Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 11:50:58 +0700 Subject: [PATCH 12/13] ci: add wait for server start before run cypress --- .github/workflows/integrationTests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integrationTests.yml b/.github/workflows/integrationTests.yml index b54ae6d..ccf500c 100644 --- a/.github/workflows/integrationTests.yml +++ b/.github/workflows/integrationTests.yml @@ -55,6 +55,7 @@ jobs: build: npm run build start: npm run start record: false + wait-on: 'http://localhost:3000' env: # pass the Cypress Cloud record key as an environment variable CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} From bdf7c3123fba9342d20e75c50e6a6bd36788c86a Mon Sep 17 00:00:00 2001 From: tiendn Date: Tue, 27 Jun 2023 11:51:47 +0700 Subject: [PATCH 13/13] chore: remove log --- src/views/Swap/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Swap/index.tsx b/src/views/Swap/index.tsx index 706c4ff..3e91dbc 100644 --- a/src/views/Swap/index.tsx +++ b/src/views/Swap/index.tsx @@ -322,7 +322,7 @@ export default function Swap() { ) const swapIsUnsupported = useIsTransactionUnsupported(currencies?.INPUT, currencies?.OUTPUT) - console.log('swapIsUnsupported', swapIsUnsupported, 'showWrap', showWrap) + const [onPresentImportTokenWarningModal] = useModal( router.push('/swap')} />, )