Merge branch 'main' into 11-26-update_metadata_for_explore_page

jnsdls · web-flow · commit 03d567666094 · 2024-11-26T14:11:11.000-08:00
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20
+22
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
@@ -48,14 +48,14 @@
     "@radix-ui/react-tooltip": "1.1.4",
     "@sentry/nextjs": "8.40.0",
     "@shazow/whatsabi": "^0.17.0",
-    "@tanstack/react-query": "5.61.3",
+    "@tanstack/react-query": "5.61.4",
     "@tanstack/react-table": "^8.17.3",
     "@thirdweb-dev/service-utils": "workspace:*",
     "@vercel/functions": "^1.4.2",
     "@vercel/og": "^0.6.4",
     "abitype": "1.0.6",
     "chakra-react-select": "^4.7.6",
-    "class-variance-authority": "^0.7.0",
+    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "color": "^4.2.3",
     "compare-versions": "^6.1.0",
@@ -66,7 +66,6 @@
     "input-otp": "^1.4.1",
     "ioredis": "^5.4.1",
     "ipaddr.js": "^2.2.0",
-    "lottie-react": "^2.4.0",
     "lucide-react": "0.461.0",
     "next": "15.0.3",
     "next-plausible": "^3.12.4",
@@ -117,7 +116,7 @@
     "@storybook/react": "8.4.5",
     "@storybook/test": "8.4.5",
     "@types/color": "4.2.0",
-    "@types/node": "20.14.9",
+    "@types/node": "22.10.0",
     "@types/papaparse": "^5.3.15",
     "@types/pluralize": "^0.0.33",
     "@types/qrcode": "^1.5.5",
@@ -134,7 +133,7 @@
     "eslint-config-biome": "1.9.3",
     "eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
     "eslint-plugin-storybook": "^0.11.1",
-    "knip": "5.37.2",
+    "knip": "5.38.0",
     "next-sitemap": "^4.2.3",
     "postcss": "8.4.49",
     "storybook": "8.4.5",
diff --git a/apps/dashboard/public/assets/product-pages/connect/connect-lottie.json b/apps/dashboard/public/assets/product-pages/connect/connect-lottie.json
diff --git a/apps/dashboard/public/assets/product-pages/engine/lottie.json b/apps/dashboard/public/assets/product-pages/engine/lottie.json
diff --git a/apps/dashboard/public/assets/product-pages/engine/lottie2.json b/apps/dashboard/public/assets/product-pages/engine/lottie2.json
diff --git a/apps/dashboard/src/@/actions/billing.ts b/apps/dashboard/src/@/actions/billing.ts
@@ -1,15 +1,15 @@
 "use server";
 
 import "server-only";
-import { API_SERVER_URL, getAbsoluteUrlFromPath } from "@/constants/env";
+import { API_SERVER_URL } from "@/constants/env";
 import { redirect } from "next/navigation";
 import { getAuthToken } from "../../app/api/lib/getAuthToken";
 import type { ProductSKU } from "../lib/billing";
 
 export type RedirectCheckoutOptions = {
   teamSlug: string;
   sku: ProductSKU;
-  redirectPath?: string;
+  redirectUrl: string;
   metadata?: Record<string, string>;
 };
 export async function redirectToCheckout(
@@ -34,10 +34,7 @@ export async function redirectToCheckout(
       method: "POST",
       body: JSON.stringify({
         sku: options.sku,
-        redirectTo: getAbsoluteUrlFromPath(
-          options.redirectPath ||
-            `/team/${options.teamSlug}/~/settings/billing`,
-        ).toString(),
+        redirectTo: options.redirectUrl,
         metadata: options.metadata || {},
       }),
       headers: {
@@ -64,7 +61,7 @@ export async function redirectToCheckout(
 
 export type BillingPortalOptions = {
   teamSlug: string | undefined;
-  redirectPath?: string;
+  redirectUrl: string;
 };
 export async function redirectToBillingPortal(
   options: BillingPortalOptions,
@@ -86,10 +83,7 @@ export async function redirectToBillingPortal(
     {
       method: "POST",
       body: JSON.stringify({
-        redirectTo: getAbsoluteUrlFromPath(
-          options.redirectPath ||
-            `/team/${options.teamSlug}/~/settings/billing`,
-        ).toString(),
+        redirectTo: options.redirectUrl,
       }),
       headers: {
         "Content-Type": "application/json",
diff --git a/apps/dashboard/src/@/components/billing.tsx b/apps/dashboard/src/@/components/billing.tsx
@@ -8,7 +8,11 @@ import {
 } from "../actions/billing";
 import { Button, type ButtonProps } from "./ui/button";
 
-type CheckoutButtonProps = RedirectCheckoutOptions & ButtonProps;
+type CheckoutButtonProps = Omit<RedirectCheckoutOptions, "redirectUrl"> &
+  ButtonProps & {
+    redirectPath: string;
+  };
+
 export function CheckoutButton({
   onClick,
   teamSlug,
@@ -27,7 +31,7 @@ export function CheckoutButton({
           teamSlug,
           sku,
           metadata,
-          redirectPath,
+          redirectUrl: getRedirectUrl(redirectPath),
         });
       }}
     >
@@ -36,7 +40,10 @@ export function CheckoutButton({
   );
 }
 
-type BillingPortalButtonProps = BillingPortalOptions & ButtonProps;
+type BillingPortalButtonProps = Omit<BillingPortalOptions, "redirectUrl"> &
+  ButtonProps & {
+    redirectPath: string;
+  };
 export function BillingPortalButton({
   onClick,
   teamSlug,
@@ -51,11 +58,17 @@ export function BillingPortalButton({
         onClick?.(e);
         await redirectToBillingPortal({
           teamSlug,
-          redirectPath,
+          redirectUrl: getRedirectUrl(redirectPath),
         });
       }}
     >
       {children}
     </Button>
   );
 }
+
+function getRedirectUrl(path: string) {
+  const url = new URL(window.location.origin);
+  url.pathname = path;
+  return url.toString();
+}
diff --git a/apps/dashboard/src/@/constants/env.ts b/apps/dashboard/src/@/constants/env.ts
@@ -39,10 +39,3 @@ export const BASE_URL = isProd
   : (process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL
       ? `https://${process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL}`
       : "http://localhost:3000") || "https://thirdweb-dev.com";
-
-export function getAbsoluteUrlFromPath(path: string) {
-  const url = new URL(BASE_URL);
-
-  url.pathname = path;
-  return url;
-}
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/overview/components/backend-wallets-table.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/overview/components/backend-wallets-table.tsx
@@ -371,6 +371,7 @@ const ReceiveFundsModal = ({
               address={backendWallet.address}
               shortenAddress={false}
             />
+            {/* eslint-disable-next-line @next/next/no-img-element */}
             <img
               src={qrCodeBase64Query.data}
               alt="QR code for receiving funds"
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/settings/billing/components/PlanInfoCard.tsx
@@ -49,7 +49,11 @@ export function PlanInfoCard(props: {
 
         <div className="flex flex-row gap-2">
           {/* manage team billing */}
-          <BillingPortalButton teamSlug={team.slug} variant="outline">
+          <BillingPortalButton
+            teamSlug={team.slug}
+            variant="outline"
+            redirectPath={`/team/${team.slug}/~/settings/billing`}
+          >
             Manage Billing
           </BillingPortalButton>
 
diff --git a/apps/dashboard/src/components/landing-pages/desktop-mobile-image.tsx b/apps/dashboard/src/components/landing-pages/desktop-mobile-image.tsx
@@ -1,11 +1,9 @@
-import { Box } from "@chakra-ui/react";
 import { ChakraNextImage } from "components/Image";
-import Lottie from "lottie-react";
 import type { LandingDesktopMobileImageProps } from "./types";
 
 export const LandingDesktopMobileImage: React.FC<
   LandingDesktopMobileImageProps
-> = ({ lottie, image, mobileImage, ...props }) => {
+> = ({ image, mobileImage, ...props }) => {
   return (
     <>
       {mobileImage && (
@@ -16,27 +14,14 @@ export const LandingDesktopMobileImage: React.FC<
           alt=""
         />
       )}
-      {!lottie && image && (
+      {image && (
         <ChakraNextImage
           {...props}
           src={image}
           alt=""
           display={{ base: mobileImage ? "none" : "block", md: "block" }}
         />
       )}
-      {lottie && (
-        <Box
-          w="100%"
-          h="100%"
-          display={{ base: mobileImage ? "none" : "block", md: "block" }}
-        >
-          <Lottie
-            animationData={lottie}
-            style={{ height: "100%" }}
-            loop={true}
-          />
-        </Box>
-      )}
     </>
   );
 };
diff --git a/apps/dashboard/src/components/landing-pages/hero-with-side-image.tsx b/apps/dashboard/src/components/landing-pages/hero-with-side-image.tsx
@@ -20,8 +20,6 @@ interface LandingHeroWithSideImageProps {
   gradient: string;
   image?: StaticImageData;
   mobileImage?: StaticImageData;
-  // biome-ignore lint/complexity/noBannedTypes: FIXME
-  lottie?: {};
   miniImage?: StaticImageData;
   mt?: BoxProps["mt"];
   contactUsBg?: TrackedLinkProps["bg"];
@@ -44,7 +42,7 @@ export const LandingHeroWithSideImage: React.FC<
   gradient,
   image,
   mobileImage,
-  lottie,
+
   miniImage,
   mt,
   contactUsBg,
@@ -93,11 +91,7 @@ export const LandingHeroWithSideImage: React.FC<
         />
       </Flex>
       <Flex maxH="500px">
-        <LandingDesktopMobileImage
-          lottie={lottie}
-          image={image}
-          mobileImage={mobileImage}
-        />
+        <LandingDesktopMobileImage image={image} mobileImage={mobileImage} />
       </Flex>
     </SimpleGrid>
   );
diff --git a/apps/dashboard/src/components/landing-pages/types.tsx b/apps/dashboard/src/components/landing-pages/types.tsx
@@ -5,8 +5,6 @@ import type { HeadingSizes } from "theme/typography";
 export type LandingDesktopMobileImageProps = ChakraNextImageProps & {
   image?: StaticImageData;
   mobileImage?: StaticImageData;
-  // biome-ignore lint/complexity/noBannedTypes: FIXME
-  lottie?: {};
 };
 
 export interface LandingSectionHeadingProps {
diff --git a/apps/dashboard/src/components/pay/PayConfig.tsx b/apps/dashboard/src/components/pay/PayConfig.tsx
@@ -119,7 +119,7 @@ export const PayConfig: React.FC<PayConfigProps> = ({ apiKey }) => {
             </h3>
             <p className="mt-1.5 mb-4 text-foreground text-sm">
               thirdweb collects a 1% fee per end user transaction through{" "}
-              <strong>Buy With Crypto</strong>. We share 30% of this fee with
+              <strong>Buy With Crypto</strong>. We share 70% of this fee with
               you.{" "}
               <Link
                 href="https://portal.thirdweb.com/connect/pay/fee-sharing"
diff --git a/apps/dashboard/src/pages/connect.tsx b/apps/dashboard/src/pages/connect.tsx
@@ -16,7 +16,6 @@ import Head from "next/head";
 import { PageId } from "page-id";
 import { Heading, Text } from "tw-components";
 import type { ThirdwebNextPage } from "utils/types";
-import connectLottie from "../../public/assets/product-pages/connect/connect-lottie.json";
 
 const TRACKING_CATEGORY = "connect-wallet-landing";
 
@@ -175,7 +174,6 @@ const ConnectLanding: ThirdwebNextPage = () => {
             ctaLink="https://playground.thirdweb.com/connect/sign-in/button"
             contactUsTitle="Book Demo"
             gradient="linear(to-r, #4490FF, #4490FF)"
-            lottie={connectLottie}
             image={require("../../public/assets/product-pages/hero/desktop-hero-connect-wallet.png")}
             mobileImage={require("../../public/assets/product-pages/hero/mobile-hero-connect-wallet.png")}
             contactUsBg="#0E0E0E"
diff --git a/apps/playground-web/package.json b/apps/playground-web/package.json
@@ -27,13 +27,13 @@
     "@radix-ui/react-switch": "^1.1.1",
     "@radix-ui/react-tabs": "^1.1.1",
     "@radix-ui/react-tooltip": "1.1.4",
-    "@tanstack/react-query": "5.61.3",
-    "class-variance-authority": "^0.7.0",
+    "@tanstack/react-query": "5.61.4",
+    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "0.461.0",
     "next": "15.0.3",
     "next-themes": "^0.4.3",
-    "prettier": "^3.3.2",
+    "prettier": "3.3.3",
     "react": "19.0.0-rc-69d4b800-20241021",
     "react-dom": "19.0.0-rc-69d4b800-20241021",
     "react-pick-color": "^2.0.0",
@@ -44,7 +44,7 @@
     "use-debounce": "^10.0.4"
   },
   "devDependencies": {
-    "@types/node": "20.14.9",
+    "@types/node": "22.10.0",
     "@types/react": "npm:types-react@19.0.0-rc.1",
     "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
     "eslint": "8.57.0",
diff --git a/apps/portal/package.json b/apps/portal/package.json
@@ -24,9 +24,9 @@
     "@radix-ui/react-dropdown-menu": "^2.1.2",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-tabs": "^1.1.1",
-    "@tanstack/react-query": "5.61.3",
+    "@tanstack/react-query": "5.61.4",
     "@tryghost/content-api": "^1.11.21",
-    "class-variance-authority": "^0.7.0",
+    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "date-fns": "4.1.0",
     "escape-string-regexp": "^5.0.0",
@@ -37,7 +37,7 @@
     "nextjs-toploader": "^1.6.12",
     "node-html-parser": "^6.1.13",
     "posthog-js": "1.67.1",
-    "prettier": "^3.3.2",
+    "prettier": "3.3.3",
     "react": "19.0.0-rc-69d4b800-20241021",
     "react-dom": "19.0.0-rc-69d4b800-20241021",
     "react-html-parser": "2.0.2",
@@ -54,7 +54,7 @@
   "devDependencies": {
     "@types/flexsearch": "^0.7.6",
     "@types/mdx": "^2.0.13",
-    "@types/node": "20.14.9",
+    "@types/node": "22.10.0",
     "@types/react": "npm:types-react@19.0.0-rc.1",
     "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
     "@types/react-html-parser": "^2.0.6",
diff --git a/apps/wallet-ui/package.json b/apps/wallet-ui/package.json
@@ -16,8 +16,8 @@
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.2",
     "@radix-ui/react-slot": "^1.1.0",
-    "@tanstack/react-query": "5.61.3",
-    "class-variance-authority": "^0.7.0",
+    "@tanstack/react-query": "5.61.4",
+    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",
     "lucide-react": "0.461.0",
@@ -36,15 +36,15 @@
   },
   "devDependencies": {
     "@next/eslint-plugin-next": "15.0.3",
-    "@types/node": "20.14.9",
+    "@types/node": "22.10.0",
     "@types/react": "npm:types-react@19.0.0-rc.1",
     "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
     "@typescript-eslint/eslint-plugin": "7.14.1",
     "@typescript-eslint/parser": "7.14.1",
     "eslint": "8.57.0",
     "eslint-config-biome": "1.9.3",
     "eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
-    "knip": "5.37.2",
+    "knip": "5.38.0",
     "postcss": "8.4.49",
     "postcss-load-config": "^6.0.1",
     "tailwindcss": "3.4.15",
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "private": true,
   "engines": {
-    "node": ">=18",
+    "node": ">=20",
     "pnpm": ">=9"
   },
   "scripts": {
@@ -44,7 +44,7 @@
     "@changesets/changelog-github": "0.5.0",
     "@changesets/cli": "2.27.10",
     "@manypkg/get-packages": "2.2.2",
-    "@types/node": "20.14.9",
+    "@types/node": "22.10.0",
     "turbo": "2.3.2",
     "typescript": "5.7.2"
   },
diff --git a/packages/service-utils/package.json b/packages/service-utils/package.json
diff --git a/packages/thirdweb/package.json b/packages/thirdweb/package.json
diff --git a/packages/thirdweb/src/utils/bytecode/detectExtension.ts b/packages/thirdweb/src/utils/bytecode/detectExtension.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/turbo.json b/turbo.json
