chore: review updates

canerakdas · canerakdas · commit bdd871ec81fc · 2025-08-26T19:59:28.000+03:00
diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -97,7 +97,7 @@ jobs:
             ${{ needs.get-vercel-preview.outputs.url }}/en/about
             ${{ needs.get-vercel-preview.outputs.url }}/en/about/previous-releases
             ${{ needs.get-vercel-preview.outputs.url }}/en/download
-            ${{ needs.get-vercel-preview.outputs.url }}/en/download/archive
+            ${{ needs.get-vercel-preview.outputs.url }}/en/download/archive/current
             ${{ needs.get-vercel-preview.outputs.url }}/en/blog
           uploadArtifacts: true # save results as a action artifacts
           temporaryPublicStorage: true # upload lighthouse report to the temporary storage
diff --git a/apps/site/app/[locale]/[...path]/page.tsx b/apps/site/app/[locale]/[...path]/page.tsx
@@ -15,9 +15,9 @@ import { ENABLE_STATIC_EXPORT_LOCALE } from '#site/next.constants.mjs';
 import { dynamicRouter } from '#site/next.dynamic.mjs';
 import * as basePage from '#site/next.dynamic.page.mjs';
 import { availableLocaleCodes, defaultLocale } from '#site/next.locales.mjs';
+import type { DynamicParams } from '#site/types';
 
-type DynamicStaticPaths = { path: Array<string>; locale: string };
-type DynamicParams = { params: Promise<DynamicStaticPaths> };
+type PageParams = DynamicParams<{ path: Array<string> }>;
 
 // This is the default Viewport Metadata
 // @see https://nextjs.org/docs/app/api-reference/functions/generate-viewport#generateviewport-function
@@ -59,7 +59,7 @@ export const generateStaticParams = async () => {
 // then it proceeds to retrieve the Markdown file and parse the MDX Content into a React Component
 // finally it returns (if the locale and route are valid) the React Component with the relevant context
 // and attached context providers for rendering the current page
-const getPage: FC<DynamicParams> = async props => {
+const getPage: FC<PageParams> = async props => {
   const { path, locale: routeLocale } = await props.params;
 
   // Gets the current full pathname for a given path
diff --git a/apps/site/app/[locale]/blog/[...path]/page.tsx b/apps/site/app/[locale]/blog/[...path]/page.tsx
@@ -5,9 +5,9 @@ import { ENABLE_STATIC_EXPORT } from '#site/next.constants.mjs';
 import { BLOG_DYNAMIC_ROUTES } from '#site/next.dynamic.constants.mjs';
 import * as basePage from '#site/next.dynamic.page.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
+import type { DynamicParams } from '#site/types';
 
-type DynamicStaticPaths = { path: Array<string>; locale: string };
-type DynamicParams = { params: Promise<DynamicStaticPaths> };
+type PageParams = DynamicParams<{ path: Array<string> }>;
 
 // This is the default Viewport Metadata
 // @see https://nextjs.org/docs/app/api-reference/functions/generate-viewport#generateviewport-function
@@ -38,7 +38,7 @@ export const generateStaticParams = async () => {
 // then it proceeds to retrieve the Markdown file and parse the MDX Content into a React Component
 // finally it returns (if the locale and route are valid) the React Component with the relevant context
 // and attached context providers for rendering the current page
-const getPage: FC<DynamicParams> = async props => {
+const getPage: FC<PageParams> = async props => {
   const { path, locale: routeLocale } = await props.params;
 
   // Gets the current full pathname for a given path
diff --git a/apps/site/app/[locale]/download/archive/[version]/page.tsx b/apps/site/app/[locale]/download/archive/[version]/page.tsx
@@ -1,13 +1,14 @@
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import type { FC } from 'react';
 
+import provideReleaseData from '#site/next-data/providers/releaseData';
 import { ENABLE_STATIC_EXPORT } from '#site/next.constants.mjs';
 import { ARCHIVE_DYNAMIC_ROUTES } from '#site/next.dynamic.constants.mjs';
 import * as basePage from '#site/next.dynamic.page.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
+import type { DynamicParams } from '#site/types';
 
-type DynamicStaticPaths = { version: string; locale: string };
-type DynamicParams = { params: Promise<DynamicStaticPaths> };
+type PageParams = DynamicParams<{ version: string }>;
 
 // This is the default Viewport Metadata
 // @see https://nextjs.org/docs/app/api-reference/functions/generate-viewport#generateviewport-function
@@ -38,12 +39,20 @@ export const generateStaticParams = async () => {
 // then it proceeds to retrieve the Markdown file and parse the MDX Content into a React Component
 // finally it returns (if the locale and route are valid) the React Component with the relevant context
 // and attached context providers for rendering the current page
-const getPage: FC<DynamicParams> = async props => {
+const getPage: FC<PageParams> = async props => {
   const { version, locale: routeLocale } = await props.params;
 
   // Gets the current full pathname for a given path
   const [locale, pathname] = basePage.getLocaleAndPath(version, routeLocale);
 
+  if (version === 'current') {
+    const releaseData = provideReleaseData();
+
+    const release = releaseData.find(release => release.status === 'Current');
+
+    redirect(`/${locale}/download/archive/${release?.versionWithPrefix}`);
+  }
+
   // Verifies if the current route is a dynamic route
   const isDynamicRoute = ARCHIVE_DYNAMIC_ROUTES.some(r => r.includes(pathname));
 
diff --git a/apps/site/app/[locale]/page.tsx b/apps/site/app/[locale]/page.tsx
@@ -6,9 +6,9 @@ import { ENABLE_STATIC_EXPORT_LOCALE } from '#site/next.constants.mjs';
 import * as basePage from '#site/next.dynamic.page.mjs';
 import { availableLocaleCodes } from '#site/next.locales.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
+import type { DynamicParams } from '#site/types';
 
-type DynamicStaticPaths = { path: Array<string>; locale: string };
-type DynamicParams = { params: Promise<DynamicStaticPaths> };
+type PageParams = DynamicParams<{ path: Array<string> }>;
 
 // This is the default Viewport Metadata
 // @see https://nextjs.org/docs/app/api-reference/functions/generate-viewport#generateviewport-function
@@ -49,7 +49,7 @@ export const generateStaticParams = async () => {
 // then it proceeds to retrieve the Markdown file and parse the MDX Content into a React Component
 // finally it returns (if the locale and route are valid) the React Component with the relevant context
 // and attached context providers for rendering the current page
-const getPage: FC<DynamicParams> = async props => {
+const getPage: FC<PageParams> = async props => {
   const { path, locale: routeLocale } = await props.params;
 
   // Gets the current full pathname for a given path
diff --git a/apps/site/components/Downloads/Release/ReleaseCodeBox.tsx b/apps/site/components/Downloads/Release/ReleaseCodeBox.tsx
@@ -108,7 +108,7 @@ const ReleaseCodeBox: FC = () => {
         >
           {t.rich('layouts.download.codeBox.noScriptDetected', {
             link: text => (
-              <Link href="/download/archive">
+              <Link href="/download/archive/current">
                 <b>{text}</b>
               </Link>
             ),
diff --git a/apps/site/components/withDownloadArchive.tsx b/apps/site/components/withDownloadArchive.tsx
@@ -1,12 +1,12 @@
 import { notFound } from 'next/navigation';
 import type { FC } from 'react';
+import semVer from 'semver';
 
 import { getClientContext } from '#site/client-context';
 import provideReleaseData from '#site/next-data/providers/releaseData';
 import {
   buildReleaseArtifacts,
   extractVersionFromPath,
-  findReleaseByVersion,
 } from '#site/util/download/archive';
 
 type DownloadArchive = ReturnType<typeof buildReleaseArtifacts>;
@@ -33,7 +33,9 @@ const WithDownloadArchive: FC<WithDownloadArchiveProps> = async ({
 
   // Find the release data for the given version
   const releaseData = provideReleaseData();
-  const release = findReleaseByVersion(releaseData, version);
+  const release = releaseData.find(
+    release => semVer.major(version) === release.major
+  )!;
 
   const releaseArtifacts = buildReleaseArtifacts(
     release,
diff --git a/apps/site/pages/en/download/current.mdx b/apps/site/pages/en/download/current.mdx
@@ -30,7 +30,7 @@ Learn how to <LinkWithArrow href="https://github.com/nodejs/node#verifying-binar
 Looking for Node.js source? Download a signed <Release.DownloadLink kind="source">Node.js source</Release.DownloadLink> tarball.
 
 Check out our <LinkWithArrow href="https://nodejs.org/download/nightly/">nightly</LinkWithArrow> binaries or
-all <Link href="/download/archive">previous releases</Link>
+all <Link href="/download/archive/current">previous releases</Link>
 or the <LinkWithArrow href="https://unofficial-builds.nodejs.org/download/">unofficial</LinkWithArrow> binaries for other platforms.
 
 </section>
diff --git a/apps/site/pages/en/download/index.mdx b/apps/site/pages/en/download/index.mdx
@@ -30,7 +30,7 @@ Learn how to <LinkWithArrow href="https://github.com/nodejs/node#verifying-binar
 Looking for Node.js source? Download a signed <Release.DownloadLink kind="source">Node.js source</Release.DownloadLink> tarball.
 
 Check out our <LinkWithArrow href="https://nodejs.org/download/nightly/">nightly</LinkWithArrow> binaries or
-all <Link href="/download/archive">previous releases</Link>
+all <Link href="/download/archive/current">previous releases</Link>
 or the <LinkWithArrow href="https://unofficial-builds.nodejs.org/download/">unofficial</LinkWithArrow> binaries for other platforms.
 
 </section>
diff --git a/apps/site/types/download.ts b/apps/site/types/download.ts
@@ -39,3 +39,15 @@ export type DownloadArtifact = {
   url: string;
   version: string;
 };
+
+export type CompatibleArtifactOptions = {
+  platforms?: Record<OperatingSystem, Array<DownloadDropdownItem<Platform>>>;
+  exclude?: Array<string>;
+  versionWithPrefix: string;
+  kind?: DownloadKind;
+};
+
+export type CompatiblePlatforms = Array<{
+  os: OperatingSystem;
+  platform: DownloadDropdownItem<Platform>;
+}>;
diff --git a/apps/site/types/index.ts b/apps/site/types/index.ts
@@ -14,3 +14,4 @@ export * from './author';
 export * from './download';
 export * from './userAgent';
 export * from './vulnerabilities';
+export * from './page';
diff --git a/apps/site/types/page.ts b/apps/site/types/page.ts
@@ -0,0 +1,9 @@
+type RouteParams = Record<string, string | Array<string>>;
+
+export type DynamicStaticPaths<T extends RouteParams = RouteParams> = T & {
+  locale: string;
+};
+
+export type DynamicParams<T extends RouteParams = RouteParams> = {
+  params: Promise<DynamicStaticPaths<T>>;
+};
diff --git a/apps/site/util/download/archive.tsx b/apps/site/util/download/archive.tsx
@@ -6,20 +6,15 @@ import type {
   DownloadArtifact,
   OperatingSystem,
   Platform,
+  CompatiblePlatforms,
+  CompatibleArtifactOptions,
 } from '#site/types';
 import type { NodeRelease } from '#site/types/releases';
 import { OS_NOT_SUPPORTING_INSTALLERS, PLATFORMS } from '#site/util/download';
 import { getNodeDownloadUrl } from '#site/util/url';
 
 import { DIST_URL } from '#site/next.constants';
 
-type CompatibleArtifactOptions = {
-  platforms?: Record<OperatingSystem, Array<DownloadDropdownItem<Platform>>>;
-  exclude?: Array<string>;
-  versionWithPrefix: string;
-  kind?: DownloadKind;
-};
-
 /**
  * Creates a download artifact from platform data
  */
@@ -46,19 +41,14 @@ const createDownloadArtifact = (
   };
 };
 
-type CompatiblePlatforms = Array<{
-  os: OperatingSystem;
-  platform: DownloadDropdownItem<Platform>;
-}>;
-
 /**
  * Filters platforms by compatibility and exclusions
  */
 const getCompatiblePlatforms = (
   platforms: Record<OperatingSystem, Array<DownloadDropdownItem<Platform>>>,
   exclude: Array<string>,
   versionWithPrefix: string
-): CompatiblePlatforms => {
+) => {
   return Object.entries(platforms).flatMap(([os, items]) => {
     if (exclude.includes(os)) {
       return [];
@@ -78,9 +68,9 @@ const getCompatiblePlatforms = (
         );
       })
       .map(platform => ({
-        os: os as OperatingSystem,
-        platform: platform,
-      }));
+        os,
+        platform,
+      })) as CompatiblePlatforms;
   });
 };
 
@@ -148,7 +138,7 @@ export const buildReleaseArtifacts = (
 
 /**
  * Extracts the version from the pathname.
- * It expects the version to be in the format 'v22.0.4' or 'archive'.
+ * It expects the version to be in the format like 'v22.0.4'.
  */
 export const extractVersionFromPath = (pathname: string | undefined) => {
   if (!pathname) {
@@ -159,25 +149,10 @@ export const extractVersionFromPath = (pathname: string | undefined) => {
   const version = segments.pop();
 
   // Checks the version prefix + digits + optional dot-separated digits
-  //  (v22, v22.0.4) OR literal "archive"
-  if (!version || !version.match(/^v\d+(\.\d+)*|archive$/)) {
+  //  (v22, v22.0.4)
+  if (!version || !version.match(/^v\d+(\.\d+)*$/)) {
     return null;
   }
 
   return version;
 };
-
-/**
- * Finds the appropriate release based on version, if 'archive' is passed,
- * it returns the latest LTS release.
- */
-export const findReleaseByVersion = (
-  releaseData: Array<NodeRelease>,
-  version: string | 'archive'
-) => {
-  if (version === 'archive') {
-    return releaseData.find(release => release.status === 'Current')!;
-  }
-
-  return releaseData.find(release => semVer.major(version) === release.major)!;
-};

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ const ReleaseCodeBox: FC = () => {`
`108`	`108`	`>`
`109`	`109`	`{t.rich('layouts.download.codeBox.noScriptDetected', {`
`110`	`110`	`link: text => (`
`111`		`- <Link href="/download/archive">`
	`111`	`+ <Link href="/download/archive/current">`
`112`	`112`	`<b>{text}</b>`
`113`	`113`	`</Link>`
`114`	`114`	`),`