Merge branch 'main' into ipfs-exponential-backoff

usecannon · Aug 18, 2024 · 10eae3d · 10eae3d
2 parents db80776 + c5845d4
commit 10eae3d
Show file tree

Hide file tree

Showing 24 changed files with 407 additions and 167 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/website/.gitignore b/packages/website/.gitignore
@@ -3,6 +3,7 @@
 !.env.*.example
 local.graphql
 
+tsconfig.tsbuildinfo
 
 # next.js build output
 .next/

diff --git a/packages/website/next.config.js b/packages/website/next.config.js
@@ -1,4 +1,9 @@
 /** @type {import('next').NextConfig} */
+
+const withBundleAnalyzer = require('@next/bundle-analyzer')({
+  enabled: process.env.ANALYZE === 'true',
+});
+
 const nextConfig = {
   output: 'export',
   reactStrictMode: true,
@@ -22,37 +27,39 @@ module.exports = nextConfig;
 
 const { withSentryConfig } = require('@sentry/nextjs');
 
-module.exports = withSentryConfig(module.exports, {
-  // For all available options, see:
-  // https://github.com/getsentry/sentry-webpack-plugin#options
+module.exports = withBundleAnalyzer(
+  withSentryConfig(module.exports, {
+    // For all available options, see:
+    // https://github.com/getsentry/sentry-webpack-plugin#options
 
-  org: 'cannon-ct',
-  project: 'cannon',
+    org: 'cannon-ct',
+    project: 'cannon',
 
-  // Only print logs for uploading source maps in CI
-  silent: !process.env.CI,
+    // Only print logs for uploading source maps in CI
+    silent: !process.env.CI,
 
-  // For all available options, see:
-  // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
+    // 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,
+    // Upload a larger set of source maps for prettier stack traces (increases build time)
+    widenClientFileUpload: 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-
-  // side errors will fail.
-  tunnelRoute: '/monitoring',
+    // 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-
+    // side errors will fail.
+    tunnelRoute: '/monitoring',
 
-  // Hides source maps from generated client bundles
-  hideSourceMaps: true,
+    // Hides source maps from generated client bundles
+    hideSourceMaps: true,
 
-  // Automatically tree-shake Sentry logger statements to reduce bundle size
-  disableLogger: true,
+    // Automatically tree-shake Sentry logger statements to reduce bundle size
+    disableLogger: true,
 
-  // Enables automatic instrumentation of Vercel Cron Monitors. (Does not yet work with App Router route handlers.)
-  // See the following for more information:
-  // https://docs.sentry.io/product/crons/
-  // https://vercel.com/docs/cron-jobs
-  automaticVercelMonitors: true,
-});
+    // Enables automatic instrumentation of Vercel Cron Monitors. (Does not yet work with App Router route handlers.)
+    // See the following for more information:
+    // https://docs.sentry.io/product/crons/
+    // https://vercel.com/docs/cron-jobs
+    automaticVercelMonitors: true,
+  })
+);
diff --git a/packages/website/package.json b/packages/website/package.json
@@ -5,6 +5,8 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
+    "analyze": "ANALYZE=true npm run build",
+    "tsc:build": "tsc",
     "start": "next start",
     "lint": "next lint --fix",
     "e2e": "NEXT_PUBLIC_E2E_TESTING_MODE=true start-server-and-test dev http://localhost:3000 \"cypress open --e2e\"",
@@ -23,6 +25,7 @@
     "@iarna/toml": "^3.0.0",
     "@isomorphic-git/lightning-fs": "^4.6.0",
     "@monaco-editor/react": "^4.6.0",
+    "@next/bundle-analyzer": "^14.2.5",
     "@next/third-parties": "^14.2.3",
     "@rainbow-me/rainbowkit": "^2.1.2",
     "@safe-global/api-kit": "^2.2.0",
@@ -71,7 +74,6 @@
     "remark-gfm": "^3.0.1",
     "simple-url": "^1.1.8",
     "styled-components": "^6.0.7",
-    "typescript": "^5.3.3",
     "viem": "2.16.5",
     "wagmi": "^2.5.13",
     "zod": "^3.23.8",
@@ -97,7 +99,8 @@
     "cypress-xpath": "^2.0.1",
     "eslint-plugin-cypress": "^3.2.0",
     "sass": "^1.63.6",
-    "start-server-and-test": "^2.0.3"
+    "start-server-and-test": "^2.0.3",
+    "typescript": "^5.3.3"
   },
   "optionalDependencies": {
     "@nx/nx-darwin-arm64": "18.0.4",

diff --git a/packages/website/src/components/Alert.tsx b/packages/website/src/components/Alert.tsx
@@ -1,24 +1,26 @@
 import { ReactNode } from 'react';
 import {
   Alert as ChakraAlert,
+  AlertProps as ChakraAlertProps,
   AlertDescription,
   AlertIcon,
   AlertTitle,
 } from '@chakra-ui/react';
 
-interface Props {
+type Props = {
   status?: 'info' | 'success' | 'error' | 'warning';
   title?: string;
   children: ReactNode;
-}
+} & ChakraAlertProps;
 
-export function Alert({ status = 'info', title, children }: Props) {
+export function Alert({ status = 'info', title, children, ...rest }: Props) {
   return (
     <ChakraAlert
       status={status}
       bg="gray.800"
       border="1px solid"
       borderColor="gray.700"
+      {...rest}
     >
       <AlertIcon />
       {title && <AlertTitle>{title}</AlertTitle>}

diff --git a/packages/website/src/constants/externalLinks.ts b/packages/website/src/constants/externalLinks.ts
@@ -13,4 +13,5 @@ export const externalLinks = {
   HARDHAT_EXAMPLE: github + 'usecannon/cannon/tree/main/examples/sample-hardhat-project',
   ETHERSCAN: 'https://www.etherscan.io/',
   IPFS_CLUSTER: 'https://cluster.ipfs.io/',
+  IPFS_CANNON: 'https://repo.usecannon.com/',
 };