maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backported 973e0a3..6ad0e23 (#3943)

This commit is contained in:
Alex van Andel 2022-08-26 19:07:44 +01:00 committed by GitHub
parent 19e9e0083e
commit 006badc3b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/middleware.ts
View File

@ -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({

4
apps/web/pages/api/collect-events.ts
View File

@ -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,

1
packages/prisma/seed.ts
View File

@ -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: {