Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/app/(ee)/api/track/open/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/(ee)/api/track/visit/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/admin.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/api.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/app.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { parse } from "@/lib/middleware/utils";
import { NextRequest, NextResponse } from "next/server";
import {
ONBOARDING_WINDOW_SECONDS,
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/create-link.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/embed.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
5 changes: 0 additions & 5 deletions apps/web/lib/middleware/index.ts

This file was deleted.

14 changes: 6 additions & 8 deletions apps/web/lib/middleware/link.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/middleware/new-link.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion apps/web/lib/middleware/partners.ts
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
8 changes: 0 additions & 8 deletions apps/web/lib/middleware/utils/index.ts

This file was deleted.

3 changes: 2 additions & 1 deletion apps/web/lib/middleware/workspaces.ts
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 3 additions & 1 deletion apps/web/lib/tinybird/record-click.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
15 changes: 6 additions & 9 deletions apps/web/middleware.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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 = {
Expand Down Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"minimatch": "^10.1.1",
"motion": "^12.23.22",
"nanoid": "^5.0.1",
"next": "15.5.4",
"next": "15.5.7",
"next-auth": "4.24.11",
"next-plausible": "^3.12.0",
"next-safe-action": "7.10.1",
Expand All @@ -105,9 +105,9 @@
"openapi3-ts": "^4.2.1",
"openid-client": "^6.8.0",
"posthog-js": "^1.164.1",
"react": "19.1.1",
"react": "19.1.2",
"react-colorful": "^5.6.1",
"react-dom": "19.1.1",
"react-dom": "19.1.2",
"react-highlight-words": "^0.20.0",
"react-hook-form": "^7.52.1",
"react-markdown": "^9.0.3",
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
"@types/react": "^19.1.14",
"@types/react-dom": "^19.1.9",
"autoprefixer": "^10.4.16",
"next": "15.5.4",
"next": "15.5.7",
"postcss": "^8.4.31",
"react": "^19.1.1",
"react": "^19.1.2",
"react-dom": "^19.1.2",
"tailwindcss": "^3.4.4",
"tsconfig": "workspace:*",
"tsup": "^6.1.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@
"check-types": "tsc --noEmit"
},
"peerDependencies": {
"next": "15.5.4",
"react": "^19.1.1"
"next": "15.5.7",
"react": "^19.1.2",
"react-dom": "^19.1.2"
},
"devDependencies": {
"@types/ms": "^0.7.31",
"@types/node": "18.11.9",
"@types/punycode": "^2.1.4",
"@types/react": "^19.1.15",
"next": "15.5.4",
"react": "^19.1.1",
"next": "15.5.7",
"react": "^19.1.2",
"tsconfig": "workspace:*",
"tsup": "^6.1.3",
"typescript": "^5.1.6"
Expand All @@ -37,7 +38,6 @@
"ms": "^2.1.3",
"nanoid": "^5.0.1",
"punycode": "^2.3.0",
"react-dom": "^19.1.1",
"tailwind-merge": "^2.4.0"
},
"author": "Steven Tey <[email protected]>",
Expand Down
Loading