The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
fix merge conflicts, charge-succeeded cron
Steven Teycc3e9c5f90da
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.tsindex 805e9e9a11..3c4c62f84e 100644--- a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.ts+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/resolve-webhook-workspace.ts@@ -1,5 +1,5 @@+import { prisma } from "@/lib/prisma";import { StripeMode } from "@/lib/types";-import { prisma } from "@dub/prisma";export async function resolveWebhookWorkspace({stripeAccountId,diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/types.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/types.tsindex 0bcd0a92df..4aaa092601 100644--- a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/types.ts+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/types.ts@@ -1,5 +1,5 @@import { StripeMode } from "@/lib/types";-import { Project } from "@dub/prisma/client";+import { Project } from "@prisma/client";export type StripeWebhookInput = {mode: StripeMode;diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsxindex 8458b205f7..72e8d0a343 100644--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx@@ -6,7 +6,7 @@ import { ApplicationAnalytics } from "@/ui/application-analytics";import { ApplicationFormHero } from "@/ui/partners/groups/design/application-form/application-hero-preview";import { ProgramApplicationForm } from "@/ui/partners/groups/design/application-form/program-application-form";import { LanderRewards } from "@/ui/partners/lander/lander-rewards";-import { WorkspaceEnvironment } from "@dub/prisma/client";+import { WorkspaceEnvironment } from "@prisma/client";import { notFound, redirect } from "next/navigation";import { CSSProperties } from "react";import { ApplyHeader } from "../header";diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsxindex d23519ce64..c8e3592443 100644--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx@@ -6,7 +6,7 @@ import { ApplicationAnalytics } from "@/ui/application-analytics";import { BLOCK_COMPONENTS } from "@/ui/partners/lander/blocks";import { LanderHero } from "@/ui/partners/lander/lander-hero";import { LanderRewards } from "@/ui/partners/lander/lander-rewards";-import { WorkspaceEnvironment } from "@dub/prisma/client";+import { WorkspaceEnvironment } from "@prisma/client";import { notFound, redirect } from "next/navigation";import { CSSProperties } from "react";import { ApplyButton } from "./apply-button";diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.tsindex 1fe27c908a..efd92ae263 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts@@ -8,9 +8,9 @@ import {} from "@/lib/constants/payouts";import { SANDBOX_PAYMENT_METHOD } from "@/lib/sandbox/mock-payment-provider";import { stripe } from "@/lib/stripe";-import { WorkspaceEnvironment } from "@dub/prisma/client";import { APP_DOMAIN } from "@dub/utils";import { capitalize } from "@dub/utils/src";+import { WorkspaceEnvironment } from "@prisma/client";import { NextResponse } from "next/server";import Stripe from "stripe";import * as z from "zod/v4";diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsxindex 6e9f54ecd7..79a5fb0a8e 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx@@ -7,9 +7,9 @@ import type { DiscountProps, GroupProps } from "@/lib/types";import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";import { useDiscountSheet } from "@/ui/partners/discounts/add-edit-discount-sheet";import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";-import { WorkspaceEnvironment } from "@dub/prisma/client";import { Button, useRouterStuff } from "@dub/ui";import { cn, isClickOnInteractiveChild } from "@dub/utils";+import { WorkspaceEnvironment } from "@prisma/client";import { BadgePercent } from "lucide-react";import Link from "next/link";import { useParams } from "next/navigation";diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsxindex 0f088553ee..72bdd16a7c 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page-client.tsx@@ -15,7 +15,6 @@ import { useRemoveWorkspaceUserModal } from "@/ui/modals/remove-workspace-user-mimport { useWorkspaceUserRoleModal } from "@/ui/modals/update-workspace-user-role";import { SearchBoxPersisted } from "@/ui/shared/search-box";import { UserAvatar } from "@/ui/users/user-avatar";-import { WorkspaceEnvironment, WorkspaceRole } from "@dub/prisma/client";import {Button,Filter,@@ -36,6 +35,7 @@ import {UserCheck,} from "@dub/ui/icons";import { cn, fetcher, timeAgo } from "@dub/utils";+import { WorkspaceEnvironment, WorkspaceRole } from "@prisma/client";import { ColumnDef, Row } from "@tanstack/react-table";import { Command } from "cmdk";import { UserMinus } from "lucide-react";diff --git a/apps/web/lib/hooks/use-dashboard-banner-visible.ts b/apps/web/lib/hooks/use-dashboard-banner-visible.tsindex c7d26b8a47..99feef7906 100644--- a/apps/web/lib/hooks/use-dashboard-banner-visible.ts+++ b/apps/web/lib/hooks/use-dashboard-banner-visible.ts@@ -1,7 +1,7 @@"use client";import useWorkspace from "@/lib/swr/use-workspace";-import { WorkspaceEnvironment } from "@dub/prisma/client";+import { WorkspaceEnvironment } from "@prisma/client";export function useDashboardBannerVisible() {const {diff --git a/apps/web/lib/sandbox/components/program-environment-banner.tsx b/apps/web/lib/sandbox/components/program-environment-banner.tsxindex 2c9a48a7ba..fea430e21c 100644--- a/apps/web/lib/sandbox/components/program-environment-banner.tsx+++ b/apps/web/lib/sandbox/components/program-environment-banner.tsx@@ -1,6 +1,6 @@-import { WorkspaceEnvironment } from "@dub/prisma/client";import { IsolatedCube } from "@dub/ui/icons";import { capitalize, cn } from "@dub/utils";+import { WorkspaceEnvironment } from "@prisma/client";export function ProgramEnvironmentBanner({environment,diff --git a/apps/web/lib/sandbox/components/workspace-environment-banner.tsx b/apps/web/lib/sandbox/components/workspace-environment-banner.tsxindex 958908ac37..e5177e3cc9 100644--- a/apps/web/lib/sandbox/components/workspace-environment-banner.tsx+++ b/apps/web/lib/sandbox/components/workspace-environment-banner.tsx@@ -3,10 +3,10 @@import { useDashboardBannerVisible } from "@/lib/hooks/use-dashboard-banner-visible";import useWorkspace from "@/lib/swr/use-workspace";import useWorkspaces from "@/lib/swr/use-workspaces";-import { WorkspaceEnvironment } from "@dub/prisma/client";import { IsolatedCube } from "@dub/ui";import { cn } from "@dub/utils";import { capitalize } from "@dub/utils/src";+import { WorkspaceEnvironment } from "@prisma/client";import { motion } from "motion/react";import Link from "next/link";import { usePathname } from "next/navigation";diff --git a/apps/web/lib/sandbox/components/workspace-environment-switcher.tsx b/apps/web/lib/sandbox/components/workspace-environment-switcher.tsxindex f5ce8b1345..a608466b1a 100644--- a/apps/web/lib/sandbox/components/workspace-environment-switcher.tsx+++ b/apps/web/lib/sandbox/components/workspace-environment-switcher.tsx@@ -1,8 +1,8 @@"use client";import { WorkspaceProps } from "@/lib/types";-import { WorkspaceEnvironment } from "@dub/prisma/client";import { IsolatedCube } from "@dub/ui/icons";+import { WorkspaceEnvironment } from "@prisma/client";import Link from "next/link";const buttonClassName =diff --git a/apps/web/lib/sandbox/copy-discount-to-live.ts b/apps/web/lib/sandbox/copy-discount-to-live.tsindex b91aaf6a17..971016a059 100644--- a/apps/web/lib/sandbox/copy-discount-to-live.ts+++ b/apps/web/lib/sandbox/copy-discount-to-live.ts@@ -1,8 +1,8 @@"use server";-import { prisma } from "@dub/prisma";-import { WorkspaceEnvironment } from "@dub/prisma/client";+import { prisma } from "@/lib/prisma";import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";+import { WorkspaceEnvironment } from "@prisma/client";import { waitUntil } from "@vercel/functions";import { authActionClient } from "../actions/safe-action";import { throwIfNoPermission } from "../actions/throw-if-no-permission";diff --git a/apps/web/lib/sandbox/copy-reward-to-live.ts b/apps/web/lib/sandbox/copy-reward-to-live.tsindex 9d9cdfdfc2..a6c3b31df1 100644--- a/apps/web/lib/sandbox/copy-reward-to-live.ts+++ b/apps/web/lib/sandbox/copy-reward-to-live.ts@@ -1,7 +1,7 @@"use server";-import { prisma } from "@dub/prisma";-import { WorkspaceEnvironment } from "@dub/prisma/client";+import { prisma } from "@/lib/prisma";+import { WorkspaceEnvironment } from "@prisma/client";import { waitUntil } from "@vercel/functions";import { authActionClient } from "../actions/safe-action";import { throwIfNoPermission } from "../actions/throw-if-no-permission";diff --git a/apps/web/lib/sandbox/create-sandbox-workspace.ts b/apps/web/lib/sandbox/create-sandbox-workspace.tsindex e2bfc30315..3da35dc850 100644--- a/apps/web/lib/sandbox/create-sandbox-workspace.ts+++ b/apps/web/lib/sandbox/create-sandbox-workspace.ts@@ -1,7 +1,7 @@+import { prisma } from "@/lib/prisma";import { PlanProps } from "@/lib/types";-import { prisma } from "@dub/prisma";-import { User, WorkspaceEnvironment, WorkspaceRole } from "@dub/prisma/client";import { nanoid, TRIAL_LIMITS } from "@dub/utils";+import { User, WorkspaceEnvironment, WorkspaceRole } from "@prisma/client";import { generateRandomString } from "../api/utils/generate-random-string";import { createWorkspaceId } from "../api/workspaces/create-workspace-id";diff --git a/apps/web/lib/sandbox/create-staging-program.ts b/apps/web/lib/sandbox/create-staging-program.tsindex ed3102dceb..0f10114df4 100644--- a/apps/web/lib/sandbox/create-staging-program.ts+++ b/apps/web/lib/sandbox/create-staging-program.ts@@ -1,5 +1,5 @@-import { prisma } from "@dub/prisma";-import { Prisma } from "@dub/prisma/client";+import { prisma } from "@/lib/prisma";+import { Prisma } from "@prisma/client";import { createId } from "../api/create-id";import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";diff --git a/apps/web/lib/sandbox/create-staging-workspace.ts b/apps/web/lib/sandbox/create-staging-workspace.tsindex acf45eb127..442c40cf08 100644--- a/apps/web/lib/sandbox/create-staging-workspace.ts+++ b/apps/web/lib/sandbox/create-staging-workspace.ts@@ -1,7 +1,7 @@import { getPlanCapabilities } from "@/lib/plan-capabilities";-import { prisma } from "@dub/prisma";-import { WorkspaceEnvironment } from "@dub/prisma/client";+import { prisma } from "@/lib/prisma";import { TRIAL_LIMITS } from "@dub/utils";+import { WorkspaceEnvironment } from "@prisma/client";import { generateRandomString } from "../api/utils/generate-random-string";import { createWorkspaceId } from "../api/workspaces/create-workspace-id";diff --git a/apps/web/lib/sandbox/mock-payout-completion.ts b/apps/web/lib/sandbox/mock-payout-completion.tsindex ebd2efcd89..53a604c25e 100644--- a/apps/web/lib/sandbox/mock-payout-completion.ts+++ b/apps/web/lib/sandbox/mock-payout-completion.ts@@ -1,8 +1,8 @@+import { prisma } from "@/lib/prisma";import { sendBatchEmail } from "@dub/email";import PartnerPayoutProcessed from "@dub/email/templates/partner-payout-processed";-import { prisma } from "@dub/prisma";-import { Invoice, Project, WorkspaceEnvironment } from "@dub/prisma/client";import { currencyFormatter } from "@dub/utils";+import { Invoice, Project, WorkspaceEnvironment } from "@prisma/client";import { trackCommissionStatusUpdatesByProgram } from "../api/commissions/track-commission-update-activity-log";interface MockPayoutCompletionParams {diff --git a/apps/web/lib/sandbox/sync-workspace.ts b/apps/web/lib/sandbox/sync-workspace.tsindex 482b0d774e..ebe6e542cb 100644--- a/apps/web/lib/sandbox/sync-workspace.ts+++ b/apps/web/lib/sandbox/sync-workspace.ts@@ -1,5 +1,5 @@-import { prisma } from "@dub/prisma";-import { Project, WorkspaceRole } from "@dub/prisma/client";+import { prisma } from "@/lib/prisma";+import { Project, WorkspaceRole } from "@prisma/client";// We don't sync the machine user from the production workspace to the staging workspacediff --git a/apps/web/lib/sandbox/throw-if-staging-workspace.ts b/apps/web/lib/sandbox/throw-if-staging-workspace.tsindex 9a698cadde..52f7606a7b 100644--- a/apps/web/lib/sandbox/throw-if-staging-workspace.ts+++ b/apps/web/lib/sandbox/throw-if-staging-workspace.ts@@ -1,5 +1,5 @@import { DubApiError } from "@/lib/api/errors";-import { Project, WorkspaceEnvironment } from "@dub/prisma/client";+import { Project, WorkspaceEnvironment } from "@prisma/client";export function throwIfStagingWorkspace(workspace: Pick<Project, "environment">,diff --git a/apps/web/scripts/dev/seed-installation.ts b/apps/web/scripts/dev/seed-installation.tsindex 87b53cf7d9..61067fbda0 100644--- a/apps/web/scripts/dev/seed-installation.ts+++ b/apps/web/scripts/dev/seed-installation.ts@@ -1,6 +1,6 @@import "dotenv-flow/config";-import { prisma } from "@dub/prisma";+import { prisma } from "@/lib/prisma";import { STRIPE_INTEGRATION_ID } from "@dub/utils";async function main() {diff --git a/apps/web/scripts/migrations/backfill-staging-workspaces.ts b/apps/web/scripts/migrations/backfill-staging-workspaces.tsindex 7ed093ec3b..831b906e92 100644--- a/apps/web/scripts/migrations/backfill-staging-workspaces.ts+++ b/apps/web/scripts/migrations/backfill-staging-workspaces.ts@@ -1,6 +1,6 @@+import { prisma } from "@/lib/prisma";import { createStagingWorkspace } from "@/lib/sandbox/create-staging-workspace";-import { prisma } from "@dub/prisma";-import { WorkspaceEnvironment } from "@dub/prisma/client";+import { WorkspaceEnvironment } from "@prisma/client";import "dotenv-flow/config";const BATCH_SIZE = 50;diff --git a/apps/web/ui/account/update-default-workspace.tsx b/apps/web/ui/account/update-default-workspace.tsxindex 7b2338ccac..69ffd4becd 100644--- a/apps/web/ui/account/update-default-workspace.tsx+++ b/apps/web/ui/account/update-default-workspace.tsx@@ -1,8 +1,8 @@"use client";import { WorkspaceSelector } from "@/ui/workspaces/workspace-selector";-import { WorkspaceEnvironment } from "@dub/prisma/client";import { Button } from "@dub/ui";+import { WorkspaceEnvironment } from "@prisma/client";import { useSession } from "next-auth/react";import { useEffect, useState } from "react";import { toast } from "sonner";diff --git a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx b/apps/web/ui/layout/sidebar/workspace-dropdown.tsxindex 89db794d07..1f557c6c85 100644--- a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx+++ b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx@@ -6,10 +6,10 @@ import useWorkspaces from "@/lib/swr/use-workspaces";import { PlanProps, WorkspaceProps } from "@/lib/types";import { ModalContext } from "@/ui/modals/modal-provider";import { getUserAvatarUrl } from "@/ui/users/user-avatar";-import { WorkspaceEnvironment } from "@dub/prisma/client";import { BlurImage, Popover, useScrollProgress } from "@dub/ui";import { Check2, Gear, Plus, UserPlus } from "@dub/ui/icons";import { cn, isLegacyBusinessPlan, pluralize } from "@dub/utils";+import { WorkspaceEnvironment } from "@prisma/client";import { useSession } from "next-auth/react";import Link from "next/link";import { useParams, usePathname } from "next/navigation";diff --git a/apps/web/ui/workspaces/workspace-selector.tsx b/apps/web/ui/workspaces/workspace-selector.tsxindex 8661d61ba2..9347a1f9dc 100644--- a/apps/web/ui/workspaces/workspace-selector.tsx+++ b/apps/web/ui/workspaces/workspace-selector.tsx@@ -1,7 +1,7 @@import useWorkspaces from "@/lib/swr/use-workspaces";-import { WorkspaceEnvironment } from "@dub/prisma/client";import { Button, Combobox } from "@dub/ui";import { OG_AVATAR_URL, cn } from "@dub/utils";+import { WorkspaceEnvironment } from "@prisma/client";import { useMemo, useState } from "react";import { useAddWorkspaceModal } from "../modals/add-workspace-modal";