From 006badc3b55870dc221cb611bc63b4ead26680d5 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Fri, 26 Aug 2022 19:07:44 +0100
Subject: [PATCH] Backported 973e0a3..6ad0e23 (#3943)

---
 apps/web/middleware.ts               | 4 ++--
 apps/web/pages/api/collect-events.ts | 4 ++--
 packages/prisma/seed.ts              | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 09ed4c0183..e3dcc4ad23 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -34,9 +34,9 @@ const middleware: NextMiddleware = async (req) => {
   if (req.cookies.has("calcom-v2-early-access") && V2_WHITELIST.some((p) => url.pathname.startsWith(p))) {
     // rewrite to the current subdomain under the pages/sites folder
     url.pathname = `/v2${url.pathname}`;
+    return NextResponse.rewrite(url);
   }
-
-  return NextResponse.rewrite(url);
+  return NextResponse.next();
 };
 
 export default collectEvents({
diff --git a/apps/web/pages/api/collect-events.ts b/apps/web/pages/api/collect-events.ts
index 79ae3b5455..a98ce285fd 100644
--- a/apps/web/pages/api/collect-events.ts
+++ b/apps/web/pages/api/collect-events.ts
@@ -1,8 +1,8 @@
-import { nextEventsCollectApi } from "next-collect/server";
+import { collectApiHandler } from "next-collect/server";
 
 import { extendEventData, nextCollectBasicSettings } from "@calcom/lib/telemetry";
 
-export default nextEventsCollectApi({
+export default collectApiHandler({
   ...nextCollectBasicSettings,
   cookieName: "__clnds",
   extend: extendEventData,
diff --git a/packages/prisma/seed.ts b/packages/prisma/seed.ts
index 4808d08a36..7f7ab54d67 100644
--- a/packages/prisma/seed.ts
+++ b/packages/prisma/seed.ts
@@ -11,6 +11,7 @@ import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/avail
 import prisma from ".";
 import mainAppStore from "./seed-app-store";
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 require("dotenv").config({ path: "../../.env" });
 async function createUserAndEventType(opts: {
   user: {