From 25fb828b75eaa79f16c94b6b97ea79f7f2948e36 Mon Sep 17 00:00:00 2001 From: Charles de Dreuille Date: Tue, 9 Jul 2024 18:54:45 +0100 Subject: [PATCH] Revert "Add redirects for tags" --- apps/frontpage/middleware.ts | 16 ++++++++++++++-- apps/frontpage/redirects/redirects.ts | 16 ---------------- apps/frontpage/redirects/redirects_tags.ts | 9 --------- 3 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 apps/frontpage/redirects/redirects.ts delete mode 100644 apps/frontpage/redirects/redirects_tags.ts diff --git a/apps/frontpage/middleware.ts b/apps/frontpage/middleware.ts index ff259451..250ad2c2 100644 --- a/apps/frontpage/middleware.ts +++ b/apps/frontpage/middleware.ts @@ -1,13 +1,25 @@ import { NextResponse } from 'next/server'; import type { NextRequest } from 'next/server'; import { cookieRenderId } from './constants'; -import { listOfRedirects } from './redirects/redirects'; +import { docsVersionsRedirects } from './redirects/docs-versions-redirects'; +import { RedirectData } from './redirects/types'; +import { docsRenderersRedirects } from './redirects/docs-renderers-redirects'; +import { docsCommonRedirects } from './redirects/docs-common-redirects'; export async function middleware(request: NextRequest) { let searchParam = request.nextUrl.searchParams.get('renderer'); const pathname: string = request.nextUrl.pathname; - for (const redirectData of listOfRedirects) { + // Merge all redirects into a single list + // The order of the list is important + // The first matching redirect will be used + const redirectList: RedirectData[] = [ + ...docsVersionsRedirects, + ...docsRenderersRedirects, + ...docsCommonRedirects, + ]; + + for (const redirectData of redirectList) { let sourcePattern = redirectData.source; let destinationURL = redirectData.destination; diff --git a/apps/frontpage/redirects/redirects.ts b/apps/frontpage/redirects/redirects.ts deleted file mode 100644 index 2b98fcef..00000000 --- a/apps/frontpage/redirects/redirects.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { docsCommonRedirects } from './docs-common-redirects'; -import { docsRenderersRedirects } from './docs-renderers-redirects'; -import { docsVersionsRedirects } from './docs-versions-redirects'; -import { redirectsTags } from './redirects_tags'; -import { RedirectData } from './types'; - -// Merge all redirects into a single list -// The order of the list is important -// The first matching redirect will be used - -export const listOfRedirects: RedirectData[] = [ - ...docsVersionsRedirects, - ...docsRenderersRedirects, - ...docsCommonRedirects, - ...redirectsTags, -]; diff --git a/apps/frontpage/redirects/redirects_tags.ts b/apps/frontpage/redirects/redirects_tags.ts deleted file mode 100644 index 786fc35c..00000000 --- a/apps/frontpage/redirects/redirects_tags.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { RedirectData } from './types'; - -export const redirectsTags: RedirectData[] = [ - { - source: '/tag/:path', - destination: '/addons/tag/:path', - permanent: true, - }, -];