Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

remove barrel imports

Steven Tey1d39fc92b622
diff --git a/apps/web/app/(ee)/api/track/open/route.ts b/apps/web/app/(ee)/api/track/open/route.ts
index e47e38e2f1..dbb654b369 100644
--- a/apps/web/app/(ee)/api/track/open/route.ts
+++ b/apps/web/app/(ee)/api/track/open/route.ts
@@ -4,8 +4,8 @@ import { linkCache } from "@/lib/api/links/cache";
import { recordClickCache } from "@/lib/api/links/record-click-cache";
import { parseRequestBody } from "@/lib/api/utils";
import { withAxiom } from "@/lib/axiom/server";
-import { getIdentityHash } from "@/lib/middleware/utils";
import { DeepLinkClickData } from "@/lib/middleware/utils/cache-deeplink-click-data";
+import { getIdentityHash } from "@/lib/middleware/utils/get-identity-hash";
import { getLinkViaEdge } from "@/lib/planetscale";
import { recordClick } from "@/lib/tinybird";
import { RedisLinkProps } from "@/lib/types";
diff --git a/apps/web/app/(ee)/api/track/visit/route.ts b/apps/web/app/(ee)/api/track/visit/route.ts
index 7947d9e5bd..51f721f871 100644
--- a/apps/web/app/(ee)/api/track/visit/route.ts
+++ b/apps/web/app/(ee)/api/track/visit/route.ts
@@ -5,7 +5,7 @@ import { linkCache } from "@/lib/api/links/cache";
import { recordClickCache } from "@/lib/api/links/record-click-cache";
import { parseRequestBody } from "@/lib/api/utils";
import { withAxiom } from "@/lib/axiom/server";
-import { getIdentityHash } from "@/lib/middleware/utils";
+import { getIdentityHash } from "@/lib/middleware/utils/get-identity-hash";
import { getLinkViaEdge, getWorkspaceViaEdge } from "@/lib/planetscale";
import { recordClick } from "@/lib/tinybird";
import { RedisLinkProps } from "@/lib/types";
diff --git a/apps/web/lib/middleware/admin.ts b/apps/web/lib/middleware/admin.ts
index 019e047a34..90a4c82eea 100644
--- a/apps/web/lib/middleware/admin.ts
+++ b/apps/web/lib/middleware/admin.ts
@@ -1,8 +1,8 @@
-import { parse } from "@/lib/middleware/utils";
import { prismaEdge } from "@dub/prisma/edge";
import { DUB_WORKSPACE_ID } from "@dub/utils";
import { NextRequest, NextResponse } from "next/server";
import { getUserViaToken } from "./utils/get-user-via-token";
+import { parse } from "./utils/parse";
export async function AdminMiddleware(req: NextRequest) {
const { path } = parse(req);
diff --git a/apps/web/lib/middleware/api.ts b/apps/web/lib/middleware/api.ts
index 11a8881e92..da53ff0933 100644
--- a/apps/web/lib/middleware/api.ts
+++ b/apps/web/lib/middleware/api.ts
@@ -1,5 +1,5 @@
-import { parse } from "@/lib/middleware/utils";
import { NextRequest, NextResponse } from "next/server";
+import { parse } from "./utils/parse";
export function ApiMiddleware(req: NextRequest) {
const { fullPath } = parse(req);
diff --git a/apps/web/lib/middleware/app.ts b/apps/web/lib/middleware/app.ts
index 4819ab79f7..a1eef9a571 100644
--- a/apps/web/lib/middleware/app.ts
+++ b/apps/web/lib/middleware/app.ts
@@ -1,4 +1,3 @@
-import { parse } from "@/lib/middleware/utils";
import { NextRequest, NextResponse } from "next/server";
import {
ONBOARDING_WINDOW_SECONDS,
@@ -10,6 +9,7 @@ import { appRedirect } from "./utils/app-redirect";
import { getDefaultWorkspace } from "./utils/get-default-workspace";
import { getUserViaToken } from "./utils/get-user-via-token";
import { isTopLevelSettingsRedirect } from "./utils/is-top-level-settings-redirect";
+import { parse } from "./utils/parse";
import { WorkspacesMiddleware } from "./workspaces";
export async function AppMiddleware(req: NextRequest) {
diff --git a/apps/web/lib/middleware/create-link.ts b/apps/web/lib/middleware/create-link.ts
index 72c0ad9632..abbeccdd4b 100644
--- a/apps/web/lib/middleware/create-link.ts
+++ b/apps/web/lib/middleware/create-link.ts
@@ -1,6 +1,6 @@
-import { parse } from "@/lib/middleware/utils";
import { APP_DOMAIN, getUrlFromString } from "@dub/utils";
import { NextRequest, NextResponse } from "next/server";
+import { parse } from "./utils/parse";
export function CreateLinkMiddleware(req: NextRequest) {
const { domain, fullPath } = parse(req);
diff --git a/apps/web/lib/middleware/embed.ts b/apps/web/lib/middleware/embed.ts
index 98e187f4cd..965ece1aa2 100644
--- a/apps/web/lib/middleware/embed.ts
+++ b/apps/web/lib/middleware/embed.ts
@@ -1,5 +1,5 @@
import { NextRequest, NextResponse } from "next/server";
-import { parse } from "./utils";
+import { parse } from "./utils/parse";
export function EmbedMiddleware(req: NextRequest) {
const { searchParamsObj, fullPath } = parse(req);
diff --git a/apps/web/lib/middleware/index.ts b/apps/web/lib/middleware/index.ts
deleted file mode 100644
index 53bd1240da..0000000000
--- a/apps/web/lib/middleware/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { AdminMiddleware } from "./admin";
-export { ApiMiddleware } from "./api";
-export { AppMiddleware } from "./app";
-export { CreateLinkMiddleware } from "./create-link";
-export { LinkMiddleware } from "./link";
diff --git a/apps/web/lib/middleware/link.ts b/apps/web/lib/middleware/link.ts
index dd6ee17995..648f7d1e0e 100644
--- a/apps/web/lib/middleware/link.ts
+++ b/apps/web/lib/middleware/link.ts
@@ -1,11 +1,3 @@
-import {
- createResponseWithCookies,
- detectBot,
- getFinalUrl,
- getIdentityHash,
- isSupportedCustomURIScheme,
- parse,
-} from "@/lib/middleware/utils";
import { recordClick } from "@/lib/tinybird";
import { formatRedisLink } from "@/lib/upstash";
import {
@@ -33,9 +25,15 @@ import { getLinkViaEdge } from "../planetscale";
import { getPartnerEnrollmentInfo } from "../planetscale/get-partner-enrollment-info";
import { cacheDeepLinkClickData } from "./utils/cache-deeplink-click-data";
import { crawlBitly } from "./utils/crawl-bitly";
+import { createResponseWithCookies } from "./utils/create-response-with-cookies";
+import { detectBot } from "./utils/detect-bot";
+import { getFinalUrl } from "./utils/get-final-url";
+import { getIdentityHash } from "./utils/get-identity-hash";
import { handleNotFoundLink } from "./utils/handle-not-found-link";
import { isIosAppStoreUrl } from "./utils/is-ios-app-store-url";
import { isSingularTrackingUrl } from "./utils/is-singular-tracking-url";
+import { isSupportedCustomURIScheme } from "./utils/is-supported-custom-uri-scheme";
+import { parse } from "./utils/parse";
import { resolveABTestURL } from "./utils/resolve-ab-test-url";
export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
diff --git a/apps/web/lib/middleware/new-link.ts b/apps/web/lib/middleware/new-link.ts
index 0239cad972..275454a437 100644
--- a/apps/web/lib/middleware/new-link.ts
+++ b/apps/web/lib/middleware/new-link.ts
@@ -1,8 +1,8 @@
import { APP_DOMAIN } from "@dub/utils";
import { NextRequest, NextResponse } from "next/server";
import { UserProps } from "../types";
-import { parse } from "./utils";
import { getDefaultWorkspace } from "./utils/get-default-workspace";
+import { parse } from "./utils/parse";
export async function NewLinkMiddleware(req: NextRequest, user: UserProps) {
const { fullPath } = parse(req);
diff --git a/apps/web/lib/middleware/partners.ts b/apps/web/lib/middleware/partners.ts
index 14107ca2c7..ee7d50ad85 100644
--- a/apps/web/lib/middleware/partners.ts
+++ b/apps/web/lib/middleware/partners.ts
@@ -1,7 +1,8 @@
-import { isValidInternalRedirect, parse } from "@/lib/middleware/utils";
import { NextRequest, NextResponse } from "next/server";
import { getDefaultPartnerId } from "./utils/get-default-partner";
import { getUserViaToken } from "./utils/get-user-via-token";
+import { isValidInternalRedirect } from "./utils/is-valid-internal-redirect";
+import { parse } from "./utils/parse";
import { partnersRedirect } from "./utils/partners-redirect";
const AUTHENTICATED_PATHS = [
diff --git a/apps/web/lib/middleware/utils/index.ts b/apps/web/lib/middleware/utils/index.ts
deleted file mode 100644
index ea11bdd477..0000000000
--- a/apps/web/lib/middleware/utils/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from "./create-response-with-cookies";
-export * from "./detect-bot";
-export * from "./detect-qr";
-export * from "./get-final-url";
-export * from "./get-identity-hash";
-export * from "./is-supported-custom-uri-scheme";
-export * from "./is-valid-internal-redirect";
-export * from "./parse";
diff --git a/apps/web/lib/middleware/workspaces.ts b/apps/web/lib/middleware/workspaces.ts
index 293a08ed3a..d699139189 100644
--- a/apps/web/lib/middleware/workspaces.ts
+++ b/apps/web/lib/middleware/workspaces.ts
@@ -1,9 +1,10 @@
import { UserProps } from "@/lib/types";
import { NextRequest, NextResponse } from "next/server";
-import { isValidInternalRedirect, parse } from "./utils";
import { getDefaultWorkspace } from "./utils/get-default-workspace";
import { getWorkspaceProduct } from "./utils/get-workspace-product";
import { isTopLevelSettingsRedirect } from "./utils/is-top-level-settings-redirect";
+import { isValidInternalRedirect } from "./utils/is-valid-internal-redirect";
+import { parse } from "./utils/parse";
export async function WorkspacesMiddleware(req: NextRequest, user: UserProps) {
const { path, searchParamsObj, searchParamsString } = parse(req);
diff --git a/apps/web/lib/tinybird/record-click.ts b/apps/web/lib/tinybird/record-click.ts
index e0ad68c03e..12b6a6f93e 100644
--- a/apps/web/lib/tinybird/record-click.ts
+++ b/apps/web/lib/tinybird/record-click.ts
@@ -10,7 +10,9 @@ import { geolocation, ipAddress, waitUntil } from "@vercel/functions";
import { userAgent } from "next/server";
import { recordClickCache } from "../api/links/record-click-cache";
import { ExpandedLink, transformLink } from "../api/links/utils/transform-link";
-import { detectBot, detectQr, getIdentityHash } from "../middleware/utils";
+import { detectBot } from "../middleware/utils/detect-bot";
+import { detectQr } from "../middleware/utils/detect-qr";
+import { getIdentityHash } from "../middleware/utils/get-identity-hash";
import { conn } from "../planetscale";
import { WorkspaceProps } from "../types";
import { redis } from "../upstash";
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index a8ba6101d8..2657336396 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -1,12 +1,4 @@
import { logger } from "@/lib/axiom/server";
-import {
- AdminMiddleware,
- ApiMiddleware,
- AppMiddleware,
- CreateLinkMiddleware,
- LinkMiddleware,
-} from "@/lib/middleware";
-import { parse } from "@/lib/middleware/utils";
import { transformMiddlewareRequest } from "@axiomhq/nextjs";
import {
ADMIN_HOSTNAMES,
@@ -17,7 +9,13 @@ import {
} from "@dub/utils";
import { PARTNERS_HOSTNAMES } from "@dub/utils/src/constants";
import { NextFetchEvent, NextRequest, NextResponse } from "next/server";
+import { AdminMiddleware } from "./lib/middleware/admin";
+import { ApiMiddleware } from "./lib/middleware/api";
+import { AppMiddleware } from "./lib/middleware/app";
+import { CreateLinkMiddleware } from "./lib/middleware/create-link";
+import { LinkMiddleware } from "./lib/middleware/link";
import { PartnersMiddleware } from "./lib/middleware/partners";
+import { parse } from "./lib/middleware/utils/parse";
import { supportedWellKnownFiles } from "./lib/well-known";
export const config = {
@@ -70,7 +68,6 @@ export default async function middleware(req: NextRequest, ev: NextFetchEvent) {
return NextResponse.redirect(DEFAULT_REDIRECTS[key]);
}
- // for Admin
if (ADMIN_HOSTNAMES.has(domain)) {
return AdminMiddleware(req);
}