Skip to content

Commit 83a187b

Browse files
zomarszomars
committed
Revert "fix: temp renamed app dir to prevent OOM"
This reverts commit 0d3baee. Revert "fix: temp renamed app dir to prevent OOM" This reverts commit 0d3baee. Revert "fix: temp renamed app dir to prevent OOM" This reverts commit 0d3baee. Revert "fix: temp renamed app dir to prevent OOM" This reverts commit 0d3baee.
1 parent 200ce69 commit 83a187b

File tree

41 files changed

+28
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+28
-28
lines changed

‎apps/web/_app/_trpc/HydrateClient.tsx ‎apps/web/app/_trpc/HydrateClient.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use client";
22

3-
import { createHydrateClient } from "_app/_trpc/createHydrateClient";
3+
import { createHydrateClient } from "app/_trpc/createHydrateClient";
44
import superjson from "superjson";
55

66
export const HydrateClient = createHydrateClient({

‎apps/web/_app/_trpc/client.ts ‎apps/web/app/_trpc/client.ts

File renamed without changes.

‎apps/web/_app/_trpc/createHydrateClient.tsx ‎apps/web/app/_trpc/createHydrateClient.tsx

File renamed without changes.

‎apps/web/_app/_trpc/createTRPCNextLayout.ts ‎apps/web/app/_trpc/createTRPCNextLayout.ts

File renamed without changes.

‎apps/web/_app/_trpc/serverClient.ts ‎apps/web/app/_trpc/serverClient.ts

File renamed without changes.

‎apps/web/_app/_trpc/ssgInit.ts ‎apps/web/app/_trpc/ssgInit.ts

File renamed without changes.

‎apps/web/_app/_trpc/ssrInit.ts ‎apps/web/app/_trpc/ssrInit.ts

File renamed without changes.

‎apps/web/_app/_trpc/trpc-provider.tsx ‎apps/web/app/_trpc/trpc-provider.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { type DehydratedState, QueryClient, QueryClientProvider } from "@tanstack/react-query";
2-
import { HydrateClient } from "_app/_trpc/HydrateClient";
3-
import { trpc } from "_app/_trpc/client";
2+
import { HydrateClient } from "app/_trpc/HydrateClient";
3+
import { trpc } from "app/_trpc/client";
44
import { useState } from "react";
55
import superjson from "superjson";
66

‎apps/web/_app/_types.ts ‎apps/web/app/_types.ts

File renamed without changes.

‎apps/web/_app/_utils.tsx ‎apps/web/app/_utils.tsx

File renamed without changes.

‎apps/web/_app/error.tsx ‎apps/web/app/error.tsx

File renamed without changes.

‎apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/layout.tsx ‎apps/web/app/future/(individual-page-wrapper)/apps/[slug]/layout.tsx

File renamed without changes.

‎apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx ‎apps/web/app/future/(individual-page-wrapper)/apps/[slug]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import AppPage from "@pages/apps/[slug]/index";
22
import { Prisma } from "@prisma/client";
3-
import { _generateMetadata } from "_app/_utils";
3+
import { _generateMetadata } from "app/_utils";
44
import fs from "fs";
55
import matter from "gray-matter";
66
import { notFound } from "next/navigation";

‎apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx ‎apps/web/app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import SetupPage from "@pages/apps/[slug]/setup";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33
import type { GetServerSidePropsContext } from "next";
44
import { cookies, headers } from "next/headers";
55
import { notFound, redirect } from "next/navigation";

‎apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx ‎apps/web/app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import CategoryPage from "@pages/apps/categories/[category]";
22
import { Prisma } from "@prisma/client";
3-
import { _generateMetadata } from "_app/_utils";
3+
import { _generateMetadata } from "app/_utils";
44
import { notFound } from "next/navigation";
55
import z from "zod";
66

‎apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx ‎apps/web/app/future/(individual-page-wrapper)/apps/categories/page.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import LegacyPage from "@pages/apps/categories/index";
2-
import { ssrInit } from "_app/_trpc/ssrInit";
3-
import { _generateMetadata } from "_app/_utils";
2+
import { ssrInit } from "app/_trpc/ssrInit";
3+
import { _generateMetadata } from "app/_utils";
44
import { cookies, headers } from "next/headers";
55

66
import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";

‎apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/layout.tsx ‎apps/web/app/future/(individual-page-wrapper)/apps/installed/[category]/layout.tsx

File renamed without changes.

‎apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx ‎apps/web/app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import LegacyPage from "@pages/apps/installed/[category]";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33
import { notFound } from "next/navigation";
44
import { z } from "zod";
55

‎apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/layout.tsx ‎apps/web/app/future/(shared-page-wrapper)/(admin-layout)/layout.tsx

File renamed without changes.

‎apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Page from "@pages/settings/admin/apps/[category]";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Page from "@pages/settings/admin/apps/index";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Page from "@pages/settings/admin/flags";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Page from "@pages/settings/admin/impersonation";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Page from "@pages/settings/admin/oAuth/index";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Page from "@pages/settings/admin/index";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import EventTypes from "@pages/event-types";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(layout)/layout.tsx ‎apps/web/app/future/(shared-page-wrapper)/(layout)/layout.tsx

File renamed without changes.

‎apps/web/_app/future/(shared-page-wrapper)/(no-layout)/layout.tsx ‎apps/web/app/future/(shared-page-wrapper)/(no-layout)/layout.tsx

File renamed without changes.

‎apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Page from "@pages/settings/admin/oAuth/oAuthView";
2-
import { _generateMetadata } from "_app/_utils";
2+
import { _generateMetadata } from "app/_utils";
33

44
export const generateMetadata = async () =>
55
await _generateMetadata(

‎apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/layout.tsx ‎apps/web/app/future/(shared-page-wrapper)/(settings-layout)/layout.tsx

File renamed without changes.

‎apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { _generateMetadata } from "_app/_utils";
1+
import { _generateMetadata } from "app/_utils";
22

33
import Page from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
44

‎apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { getServerCaller } from "_app/_trpc/serverClient";
2-
import { type Params } from "_app/_types";
3-
import { _generateMetadata } from "_app/_utils";
1+
import { getServerCaller } from "app/_trpc/serverClient";
2+
import { type Params } from "app/_types";
3+
import { _generateMetadata } from "app/_utils";
44
import { cookies, headers } from "next/headers";
55
import { z } from "zod";
66

‎apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { _generateMetadata } from "_app/_utils";
1+
import { _generateMetadata } from "app/_utils";
22

33
import Page from "@calcom/features/ee/users/pages/users-add-view";
44

‎apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx ‎apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { _generateMetadata } from "_app/_utils";
1+
import { _generateMetadata } from "app/_utils";
22

33
import Page from "@calcom/features/ee/users/pages/users-listing-view";
44

‎apps/web/_app/global-error.tsx ‎apps/web/app/global-error.tsx

File renamed without changes.

‎apps/web/_app/layout.tsx ‎apps/web/app/layout.tsx

File renamed without changes.

‎apps/web/lib/app-providers-app-dir.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { TooltipProvider } from "@radix-ui/react-tooltip";
2-
import { TrpcProvider } from "_app/_trpc/trpc-provider";
2+
import { TrpcProvider } from "app/_trpc/trpc-provider";
33
import { dir } from "i18next";
44
import type { Session } from "next-auth";
55
import { SessionProvider, useSession } from "next-auth/react";

‎apps/web/playwright/ab-tests-redirect.e2e.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { test } from "./lib/fixtures";
44

55
test.describe.configure({ mode: "parallel" });
66

7-
test.describe.skip("apps/ A/B tests", () => {
7+
test.describe("apps/ A/B tests", () => {
88
test("should point to the /future/apps/installed/[category]", async ({ page, users, context }) => {
99
await context.addCookies([
1010
{

‎apps/web/playwright/event-types.e2e.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { bookTimeSlot, createNewEventType, selectFirstAvailableTimeSlotNextMonth
1111
test.describe.configure({ mode: "parallel" });
1212

1313
test.describe("Event Types A/B tests", () => {
14-
test.skip("should point to the /future/event-types page", async ({ page, users, context }) => {
14+
test("should point to the /future/event-types page", async ({ page, users, context }) => {
1515
await context.addCookies([
1616
{
1717
name: "x-calcom-future-routes-override",

‎apps/web/playwright/lib/future-legacy-routes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { test } from "./fixtures";
22

33
export type RouteVariant = "future" | "legacy";
44

5-
const routeVariants = [/*"future",*/ "legacy"];
5+
const routeVariants = ["future", "legacy"];
66

77
/**
88
* Small wrapper around test.describe().

‎apps/web/playwright/settings-admin.e2e.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { test } from "./lib/fixtures";
55
test.describe.configure({ mode: "parallel" });
66

77
test.describe("Settings/admin A/B tests", () => {
8-
test.skip("should point to the /future/settings/admin page", async ({ page, users, context }) => {
8+
test("should point to the /future/settings/admin page", async ({ page, users, context }) => {
99
await context.addCookies([
1010
{
1111
name: "x-calcom-future-routes-override",

0 commit comments

Comments
 (0)