resolve merge conflicts

Author: kumaryash90

.changeset/funny-dragons-thank.md

@@ -6,8 +6,6 @@ To get started, read the [How this repo works](#how-this-repo-works) section bel
 
 From there, you can take a look at our [Good First Issues](https://github.com/thirdweb-dev/js/labels/good%20first%20issue) board and find an issue that interests you!
 
-If you have any questions about the issue, feel free to ask on our [Discord server](https://discord.gg/thirdweb) in the `#contributors` channel; where you'll be able to get help from our team and other contributors.
-
 <br />
 
 ## How this repo works
@@ -85,7 +83,10 @@ If your test depends on a downstream network call, you must mock the call using
 import { setupServer } from "msw/node";
 import { downloadMock, uploadMock } from "../../../test/src/mocks/storage.js";
 
-const server = setupServer(uploadMock("HASH"), downloadMock({ name: "Test NFT" }));
+const server = setupServer(
+  uploadMock("HASH"),
+  downloadMock({ name: "Test NFT" })
+);
 
 beforeAll(() => server.listen());
 afterEach(() => server.resetHandlers());

.github/contributing.md

@@ -20,7 +20,7 @@ env:
 
 jobs:
   optimize_ci:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8
     outputs:
       skip: ${{ steps.check_skip.outputs.skip }}
     steps:
@@ -34,7 +34,7 @@ jobs:
   build:
     needs: optimize_ci
     if: needs.optimize_ci.outputs.skip == 'false'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8
     name: Build Packages
     steps:
       - name: Check out the code
@@ -51,7 +51,7 @@ jobs:
     if: needs.optimize_ci.outputs.skip == 'false'
     timeout-minutes: 15
     name: Lint Packages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8
     steps:
       - name: Check out the code
         uses: actions/checkout@v4
@@ -71,7 +71,7 @@ jobs:
     if: needs.optimize_ci.outputs.skip == 'false'
     timeout-minutes: 15
     name: Unit Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8
     steps:
       - name: Check out the code
         uses: actions/checkout@v4
@@ -99,7 +99,7 @@ jobs:
     if: needs.optimize_ci.outputs.skip == 'false'
     timeout-minutes: 15
     name: E2E Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8
     strategy:
       matrix:
         package_manager: [npm, yarn, pnpm, bun]
@@ -169,7 +169,7 @@ jobs:
     if:  github.event_name == 'pull_request' && needs.optimize_ci.outputs.skip == 'false'
     timeout-minutes: 15
     name: "Size"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8
     steps:
       - name: Check out the code
         uses: actions/checkout@v4

.github/workflows/CI.yml

@@ -11,9 +11,6 @@
     <a href="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml">
         <img alt="Build Status" src="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml/badge.svg"/>
     </a>
-    <a href="https://discord.gg/thirdweb">
-        <img alt="Join our Discord!" src="https://img.shields.io/discord/834227967404146718.svg?color=7289da&label=discord&logo=discord&style=flat"/>
-    </a>
 </p>
 
 <p align="center"><strong>All-in-one web3 SDK for Browser, Node and Mobile apps</strong></p>

.github/workflows/issue.yml

@@ -6,10 +6,14 @@
 # not required to build, defaults to prod
 NEXT_PUBLIC_THIRDWEB_DOMAIN="localhost:3000"
 
-# API host. For local development, please use "https://api.thirdweb-preview.com"
+# API host. For local development, please use "https://api.thirdweb-dev.com"
 # otherwise: "https://api.thirdweb.com"
 NEXT_PUBLIC_THIRDWEB_API_HOST="https://api.thirdweb-dev.com"
 
+# Bridge API. For local development, please use "https://bridge.thirdweb-dev.com"
+# otherwise: "https://bridge.thirdweb.com"
+NEXT_PUBLIC_THIRDWEB_BRIDGE_HOST="https://bridge.thirdweb-dev.com"
+
 # Paper API host
 NEXT_PUBLIC_THIRDWEB_EWS_API_HOST="https://ews.thirdweb-dev.com"
 
@@ -97,4 +101,4 @@ REDIS_URL=""
 ANALYTICS_SERVICE_URL=""
 
 # Required for Nebula Chat
-NEXT_PUBLIC_NEBULA_URL=""
+NEXT_PUBLIC_NEBULA_URL=""

README.md

@@ -11,6 +11,10 @@ module.exports = [
   "/connect/sign-in",
   "/connect/account-abstraction",
   "/connect/universal-bridge",
+  "/connect/auth",
+  "/connect/in-app-wallets",
+  // -- storage
+  "/storage",
   // -- nebula
   "/nebula",
   // --insight
@@ -43,4 +47,12 @@ module.exports = [
   // -- templates --
   "/templates",
   "/templates/:template_slug",
+  // -- learn --
+  "/learn",
+  "/learn/tutorials",
+  "/learn/tutorials/:tutorial_slug",
+  "/learn/guides",
+  "/learn/guides/:guide_slug",
+  "/learn/courses",
+  "/learn/glossary",
 ];

apps/dashboard/.env.example

@@ -9,5 +9,9 @@
   ],
   "project": ["src/**"],
   "ignoreBinaries": ["only-allow", "biome"],
-  "ignoreDependencies": ["@storybook/blocks", "@thirdweb-dev/service-utils"]
+  "ignoreDependencies": [
+    "@storybook/blocks",
+    "@thirdweb-dev/service-utils",
+    "@types/color"
+  ]
 }

apps/dashboard/framer-rewrites.js

@@ -12,7 +12,7 @@ const ContentSecurityPolicy = `
   style-src 'self' 'unsafe-inline' vercel.live;
   font-src 'self' vercel.live assets.vercel.com framerusercontent.com fonts.gstatic.com;
   frame-src * data:;
-  script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' 'inline-speculation-rules' *.thirdweb.com *.thirdweb-dev.com vercel.live js.stripe.com framerusercontent.com events.framer.com challenges.cloudflare.com;
+  script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' 'inline-speculation-rules' *.thirdweb.com *.thirdweb-dev.com vercel.live js.stripe.com framerusercontent.com events.framer.com challenges.cloudflare.com static.reo.dev;
   connect-src * data: blob:;
   worker-src 'self' blob:;
   block-all-mixed-content;
@@ -101,9 +101,6 @@ const SENTRY_OPTIONS: SentryBuildOptions = {
   // Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load)
   tunnelRoute: "/err",
 
-  // Hides source maps from generated client bundles
-  hideSourceMaps: true,
-
   // Automatically tree-shake Sentry logger statements to reduce bundle size
   disableLogger: true,
 
@@ -156,7 +153,7 @@ const baseNextConfig: NextConfig = {
       // re-write /home to / (this is so that logged in users will be able to go to /home and NOT be redirected to the logged in app)
       {
         source: "/home",
-        destination: "/",
+        destination: "https://landing.thirdweb.com",
       },
       ...FRAMER_PATHS.map((path) => ({
         source: path,

apps/dashboard/knip.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "dev": "next dev --turbo",
+    "dev": "next dev --turbopack",
     "build": "NODE_OPTIONS=--max-old-space-size=6144 next build",
     "start": "next start",
     "format": "biome format ./src --write",
@@ -29,49 +29,50 @@
     "@emotion/styled": "11.14.0",
     "@hookform/resolvers": "^3.9.1",
     "@marsidev/react-turnstile": "^1.1.0",
-    "@n8tb1t/use-scroll-position": "^2.0.3",
-    "@radix-ui/react-accordion": "^1.2.2",
-    "@radix-ui/react-alert-dialog": "^1.1.5",
-    "@radix-ui/react-avatar": "^1.1.2",
-    "@radix-ui/react-checkbox": "^1.1.3",
-    "@radix-ui/react-dialog": "1.1.5",
-    "@radix-ui/react-dropdown-menu": "^2.1.5",
-    "@radix-ui/react-hover-card": "^1.1.5",
-    "@radix-ui/react-label": "^2.1.1",
-    "@radix-ui/react-popover": "^1.1.5",
-    "@radix-ui/react-progress": "^1.1.1",
-    "@radix-ui/react-radio-group": "^1.2.2",
-    "@radix-ui/react-select": "^2.1.5",
-    "@radix-ui/react-separator": "^1.1.1",
-    "@radix-ui/react-slot": "^1.1.1",
-    "@radix-ui/react-switch": "^1.1.2",
-    "@radix-ui/react-tooltip": "1.1.7",
-    "@sentry/nextjs": "8.53.0",
+    "@radix-ui/react-accordion": "^1.2.3",
+    "@radix-ui/react-alert-dialog": "^1.1.6",
+    "@radix-ui/react-avatar": "^1.1.3",
+    "@radix-ui/react-checkbox": "^1.1.4",
+    "@radix-ui/react-dialog": "1.1.6",
+    "@radix-ui/react-dropdown-menu": "^2.1.6",
+    "@radix-ui/react-hover-card": "^1.1.6",
+    "@radix-ui/react-label": "^2.1.2",
+    "@radix-ui/react-popover": "^1.1.6",
+    "@radix-ui/react-progress": "^1.1.2",
+    "@radix-ui/react-radio-group": "^1.2.3",
+    "@radix-ui/react-select": "^2.1.6",
+    "@radix-ui/react-separator": "^1.1.2",
+    "@radix-ui/react-slot": "^1.1.2",
+    "@radix-ui/react-switch": "^1.1.3",
+    "@radix-ui/react-tooltip": "1.1.8",
+    "@sentry/nextjs": "9.2.0",
     "@shazow/whatsabi": "^0.19.0",
-    "@tanstack/react-query": "5.66.0",
-    "@tanstack/react-table": "^8.20.6",
+    "@tanstack/react-query": "5.66.9",
+    "@tanstack/react-table": "^8.21.2",
     "@thirdweb-dev/service-utils": "workspace:*",
-    "@vercel/functions": "^1.6.0",
+    "@vercel/functions": "2.0.0",
     "@vercel/og": "^0.6.5",
     "abitype": "1.0.8",
     "chakra-react-select": "^4.7.6",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "color": "^4.2.3",
+    "color": "5.0.0",
     "compare-versions": "^6.1.0",
     "date-fns": "4.1.0",
     "fetch-event-stream": "0.1.5",
     "flat": "^6.0.1",
-    "framer-motion": "12.0.6",
-    "fuse.js": "7.0.0",
+    "framer-motion": "12.4.7",
+    "fuse.js": "7.1.0",
+    "idb-keyval": "^6.2.1",
     "input-otp": "^1.4.1",
-    "ioredis": "^5.4.1",
+    "ioredis": "^5.5.0",
     "ipaddr.js": "^2.2.0",
-    "lucide-react": "0.474.0",
-    "next": "15.1.6",
+    "lucide-react": "0.476.0",
+    "next": "15.2.0",
     "next-plausible": "^3.12.4",
     "next-themes": "^0.4.4",
     "nextjs-toploader": "^1.6.12",
+    "nuqs": "^2.4.0",
     "p-limit": "^6.2.0",
     "papaparse": "^5.5.2",
     "pluralize": "^8.0.0",
@@ -81,48 +82,48 @@
     "react-children-utilities": "^2.10.0",
     "react-day-picker": "^8.10.1",
     "react-dom": "19.0.0",
-    "react-dropzone": "^14.3.5",
+    "react-dropzone": "^14.3.8",
     "react-error-boundary": "^5.0.0",
     "react-hook-form": "7.54.2",
     "react-markdown": "^9.0.1",
     "react-table": "^7.8.0",
     "recharts": "2.15.1",
-    "remark-gfm": "^4.0.0",
+    "remark-gfm": "4.0.1",
     "responsive-rsc": "0.0.7",
     "server-only": "^0.0.1",
     "shiki": "1.27.0",
-    "sonner": "^1.7.4",
+    "sonner": "2.0.1",
     "spdx-correct": "^3.2.0",
-    "swagger-ui-react": "^5.18.3",
+    "swagger-ui-react": "^5.19.0",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "thirdweb": "workspace:*",
     "tiny-invariant": "^1.3.3",
     "use-debounce": "^10.0.4",
-    "zod": "3.24.1"
+    "zod": "3.24.2"
   },
   "devDependencies": {
     "@chakra-ui/cli": "^2.4.1",
     "@chromatic-com/storybook": "3.2.4",
-    "@next/bundle-analyzer": "15.1.6",
-    "@next/eslint-plugin-next": "15.1.6",
+    "@next/bundle-analyzer": "15.2.0",
+    "@next/eslint-plugin-next": "15.2.0",
     "@playwright/test": "1.50.1",
-    "@storybook/addon-essentials": "8.5.2",
-    "@storybook/addon-interactions": "8.5.2",
-    "@storybook/addon-links": "8.5.2",
-    "@storybook/addon-onboarding": "8.5.2",
-    "@storybook/addon-viewport": "8.5.2",
-    "@storybook/blocks": "8.5.2",
-    "@storybook/nextjs": "8.5.2",
-    "@storybook/react": "8.5.2",
-    "@storybook/test": "8.5.2",
+    "@storybook/addon-essentials": "8.6.0",
+    "@storybook/addon-interactions": "8.6.0",
+    "@storybook/addon-links": "8.6.0",
+    "@storybook/addon-onboarding": "8.6.0",
+    "@storybook/addon-viewport": "8.6.0",
+    "@storybook/blocks": "8.6.0",
+    "@storybook/nextjs": "8.6.0",
+    "@storybook/react": "8.6.0",
+    "@storybook/test": "8.6.0",
     "@types/color": "4.2.0",
-    "@types/node": "22.13.0",
+    "@types/node": "22.13.5",
     "@types/papaparse": "^5.3.15",
     "@types/pluralize": "^0.0.33",
     "@types/qrcode": "^1.5.5",
-    "@types/react": "19.0.8",
-    "@types/react-dom": "19.0.3",
+    "@types/react": "19.0.10",
+    "@types/react-dom": "19.0.4",
     "@types/react-table": "^7.7.20",
     "@types/spdx-correct": "^3.1.3",
     "@types/swagger-ui-react": "^4.19.0",
@@ -132,12 +133,12 @@
     "checkly": "^4.19.1",
     "eslint": "8.57.0",
     "eslint-config-biome": "1.9.4",
-    "eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
-    "eslint-plugin-storybook": "^0.11.1",
-    "knip": "5.43.6",
+    "eslint-plugin-react-compiler": "19.0.0-beta-e1e972c-20250221",
+    "eslint-plugin-storybook": "0.11.3",
+    "knip": "5.45.0",
     "next-sitemap": "^4.2.3",
-    "postcss": "8.5.1",
-    "storybook": "8.5.2",
+    "postcss": "8.5.3",
+    "storybook": "8.6.0",
     "tailwindcss": "3.4.17",
     "typescript": "5.7.3"
   }