From 30acf6b19622b211bb105b84d71d950535da5a8a Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Mon, 9 Dec 2024 04:48:22 -0500 Subject: [PATCH] chore: use app router - /apps main page (#16980) * chore: apps main page remove pages router * revert unneeded changes --- .env.example | 1 - apps/web/abTest/middlewareFactory.ts | 1 - apps/web/app/{future => }/apps/page.tsx | 0 apps/web/middleware.ts | 1 - apps/web/pages/apps/index.tsx | 14 -------------- apps/web/scripts/vercel-app-router-deploy.sh | 1 - turbo.json | 1 - 7 files changed, 19 deletions(-) rename apps/web/app/{future => }/apps/page.tsx (100%) delete mode 100644 apps/web/pages/apps/index.tsx diff --git a/.env.example b/.env.example index 8c8990c58a..beea9239e9 100644 --- a/.env.example +++ b/.env.example @@ -358,7 +358,6 @@ APP_ROUTER_BOOKING_ENABLED=0 APP_ROUTER_BOOKINGS_STATUS_ENABLED=0 APP_ROUTER_WORKFLOWS_ENABLED=0 APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0 -APP_ROUTER_APPS_ENABLED=0 APP_ROUTER_VIDEO_ENABLED=0 APP_ROUTER_TEAM_ENABLED=0 APP_ROUTER_TEAMS_ENABLED=0 diff --git a/apps/web/abTest/middlewareFactory.ts b/apps/web/abTest/middlewareFactory.ts index 8a01e79422..6903552b80 100644 --- a/apps/web/abTest/middlewareFactory.ts +++ b/apps/web/abTest/middlewareFactory.ts @@ -22,7 +22,6 @@ const ROUTES: [URLPattern, boolean][] = [ ["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const, ["/workflows/:path*", process.env.APP_ROUTER_WORKFLOWS_ENABLED === "1"] as const, ["/getting-started/:step", process.env.APP_ROUTER_GETTING_STARTED_STEP_ENABLED === "1"] as const, - ["/apps", process.env.APP_ROUTER_APPS_ENABLED === "1"] as const, ["/bookings/:status", process.env.APP_ROUTER_BOOKINGS_STATUS_ENABLED === "1"] as const, ["/booking/:path*", process.env.APP_ROUTER_BOOKING_ENABLED === "1"] as const, ["/video/:path*", process.env.APP_ROUTER_VIDEO_ENABLED === "1"] as const, diff --git a/apps/web/app/future/apps/page.tsx b/apps/web/app/apps/page.tsx similarity index 100% rename from apps/web/app/future/apps/page.tsx rename to apps/web/app/apps/page.tsx diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts index cd5d528119..e33de4893d 100644 --- a/apps/web/middleware.ts +++ b/apps/web/middleware.ts @@ -183,7 +183,6 @@ export const config = { "/getting-started/:step/", "/future/getting-started/:step/", "/apps", - "/future/apps", "/bookings/:status/", "/future/bookings/:status/", "/video/:path*", diff --git a/apps/web/pages/apps/index.tsx b/apps/web/pages/apps/index.tsx deleted file mode 100644 index 37a72233bc..0000000000 --- a/apps/web/pages/apps/index.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { getServerSideProps } from "@lib/apps/getServerSideProps"; - -import PageWrapper from "@components/PageWrapper"; - -import type { PageProps } from "~/apps/apps-view"; -import Apps from "~/apps/apps-view"; - -const Page = (props: PageProps) => ; - -Page.PageWrapper = PageWrapper; - -export { getServerSideProps }; - -export default Page; diff --git a/apps/web/scripts/vercel-app-router-deploy.sh b/apps/web/scripts/vercel-app-router-deploy.sh index 70ea9c351f..72ad7d3f19 100755 --- a/apps/web/scripts/vercel-app-router-deploy.sh +++ b/apps/web/scripts/vercel-app-router-deploy.sh @@ -23,7 +23,6 @@ checkRoute "$APP_ROUTER_AUTH_PLATFORM_ENABLED" app/future/auth/platform checkRoute "$APP_ROUTER_AUTH_OAUTH2_ENABLED" app/future/auth/oauth2 checkRoute "$APP_ROUTER_WORKFLOWS_ENABLED" app/future/workflows checkRoute "$APP_ROUTER_GETTING_STARTED_STEP_ENABLED" app/future/getting-started -checkRoute "$APP_ROUTER_APPS_ENABLED" app/future/apps checkRoute "$APP_ROUTER_BOOKINGS_STATUS_ENABLED" app/future/bookings checkRoute "$APP_ROUTER_BOOKING_ENABLED" app/future/booking checkRoute "$APP_ROUTER_VIDEO_ENABLED" app/future/video diff --git a/turbo.json b/turbo.json index 86d271ced3..40b5c45e18 100644 --- a/turbo.json +++ b/turbo.json @@ -234,7 +234,6 @@ "API_KEY_PREFIX", "APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED", "APP_ROUTER_APPS_CATEGORIES_ENABLED", - "APP_ROUTER_APPS_ENABLED", "APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED", "APP_ROUTER_APPS_SLUG_ENABLED", "APP_ROUTER_APPS_SLUG_SETUP_ENABLED",