Modify page to no longer do any redirection

Author: oBusk

src/app/diff/[a]/[b]/page.tsx

@@ -1,13 +1,8 @@
-import { redirect } from "next/navigation";
 import { Suspense } from "react";
 import { ViewType } from "react-diff-view";
 import { DEFAULT_DIFF_FILES_GLOB } from "^/lib/default-diff-files";
-import destination from "^/lib/destination";
 import { parseQuery, QueryParams } from "^/lib/query";
 import { createSimplePackageSpec } from "^/lib/SimplePackageSpec";
-import decodeParts from "^/lib/utils/decodeParts";
-import specsToDiff from "^/lib/utils/specsToDiff";
-import splitParts from "^/lib/utils/splitParts";
 import BundlephobiaDiff, {
     BundlephobiaDiffSkeleton,
 } from "./_page/BundlephobiaDiff";
@@ -20,16 +15,18 @@ import PackagephobiaDiff, {
 import { DIFF_TYPE_PARAM_NAME } from "./_page/paramNames";
 
 export interface DiffPageProps {
-    params: { a: string; b: string };
-    searchParams: QueryParams & { [DIFF_TYPE_PARAM_NAME]: ViewType };
+    params: {
+        a: string;
+        b: string;
+    };
+    searchParams: QueryParams & {
+        [DIFF_TYPE_PARAM_NAME]: ViewType;
+    };
 }
 
 export function generateMetadata({ params: { a: _a, b: _b } }: DiffPageProps) {
-    _a = decodeURIComponent(_a);
-    _b = decodeURIComponent(_b);
-
-    const a = createSimplePackageSpec(_a);
-    const b = createSimplePackageSpec(_b);
+    const a = createSimplePackageSpec(decodeURIComponent(_a));
+    const b = createSimplePackageSpec(decodeURIComponent(_b));
 
     return {
         title: `Comparing ${a.name}@${a.version}...${b.name}@${b.version}`,
@@ -50,72 +47,43 @@ const DiffPage = async ({
 }: DiffPageProps): Promise<JSX.Element> => {
     const { diffFiles, ...optionsQuery } = searchParams;
 
-    const specsOrVersions: [string, string] = [
-        decodeURIComponent(_a),
-        decodeURIComponent(_b),
-    ];
-    const { redirect: redirectTarget, canonicalSpecs } = await destination(
-        specsOrVersions,
-    );
-
-    if (redirectTarget !== false) {
-        const specsStr = specsToDiff(canonicalSpecs);
-        const searchStr = Object.entries(searchParams)
-            .map(([key, value]) => `${key}=${value}`)
-            .join("&");
+    const options = parseQuery({
+        // If no diffFiles is passed, use the default.
+        // This is done here, since we don't want a fall back in the API
+        diffFiles: diffFiles ?? DEFAULT_DIFF_FILES_GLOB,
+        ...optionsQuery,
+    });
 
-        redirect(
-            `/${specsStr}` + (searchStr?.length > 0 ? `?${searchStr}` : ""),
-        );
-    } else {
-        const options = parseQuery({
-            // If no diffFiles is passed, use the default.
-            // This is done here, since we don't want a fall back in the API
-            diffFiles: diffFiles ?? DEFAULT_DIFF_FILES_GLOB,
-            ...optionsQuery,
-        });
+    _a = decodeURIComponent(_a);
+    _b = decodeURIComponent(_b);
 
-        const [a, b] = canonicalSpecs.map((spec) =>
-            createSimplePackageSpec(spec),
-        );
+    const specs = [_a, _b] as [string, string];
+    const a = createSimplePackageSpec(_a);
+    const b = createSimplePackageSpec(_b);
 
-        return (
-            <>
-                <DiffIntro
-                    alignSelf="stretch"
-                    a={a}
-                    b={b}
-                    services={
-                        <>
-                            <Suspense fallback={<BundlephobiaDiffSkeleton />}>
-                                <BundlephobiaDiff
-                                    a={a}
-                                    b={b}
-                                    specs={canonicalSpecs}
-                                />
-                            </Suspense>
-                            <Suspense fallback={<PackagephobiaDiffSkeleton />}>
-                                <PackagephobiaDiff
-                                    a={a}
-                                    b={b}
-                                    specs={canonicalSpecs}
-                                />
-                            </Suspense>
-                        </>
-                    }
-                    options={options}
-                />
-                <Suspense fallback={<NpmDiffSkeleton flex="1" />}>
-                    <NpmDiff
-                        a={a}
-                        b={b}
-                        specs={canonicalSpecs}
-                        options={options}
-                    />
-                </Suspense>
-            </>
-        );
-    }
+    return (
+        <>
+            <DiffIntro
+                alignSelf="stretch"
+                a={a}
+                b={b}
+                services={
+                    <>
+                        <Suspense fallback={<BundlephobiaDiffSkeleton />}>
+                            <BundlephobiaDiff a={a} b={b} specs={specs} />
+                        </Suspense>
+                        <Suspense fallback={<PackagephobiaDiffSkeleton />}>
+                            <PackagephobiaDiff a={a} b={b} specs={specs} />
+                        </Suspense>
+                    </>
+                }
+                options={options}
+            />
+            <Suspense fallback={<NpmDiffSkeleton flex="1" />}>
+                <NpmDiff a={a} b={b} specs={specs} options={options} />
+            </Suspense>
+        </>
+    );
 };
 
 export default DiffPage;