chore: resolve conflict

Author: canerakdas

apps/site/app/[locale]/next-data/api-data/route.ts

@@ -48,7 +48,7 @@ export const GET = async () => {
         const deflatedSource = deflateSync(cleanedContent).toString('base64');
 
         return {
-          filename,
+          filename: filename,
           pathname: getPathnameForApiFile(name, versionWithPrefix),
           content: deflatedSource,
         };

apps/site/app/[locale]/next-data/page-data/route.ts

@@ -35,15 +35,15 @@ export const GET = async () => {
       const cleanedContent = parseRichTextIntoPlainText(matter(source).content);
 
       // Deflates a String into a base64 string-encoded (zlib compressed)
-      const deflatedSource = deflateSync(cleanedContent).toString('base64');
+      const content = deflateSync(cleanedContent).toString('base64');
 
       // Returns metadata of each page available on the Website
       return {
         filename,
         pathname,
         title,
         description,
-        content: deflatedSource,
+        content,
       };
     });
 

apps/site/app/[locale]/page.tsx

@@ -134,11 +134,11 @@ const getPage: FC<DynamicParams> = async props => {
 
     // Metadata and shared Context to be available through the lifecycle of the page
     const sharedContext = {
-      frontmatter,
-      headings,
+      frontmatter: frontmatter,
+      headings: headings,
       pathname: `/${pathname}`,
-      readingTime,
-      filename,
+      readingTime: readingTime,
+      filename: filename,
     };
 
     // Defines a shared Server Context for the Client-Side

apps/site/components/Common/CodeBox.tsx

@@ -3,11 +3,12 @@
 import { CodeBracketIcon } from '@heroicons/react/24/outline';
 import BaseCodeBox from '@node-core/ui-components/Common/BaseCodeBox';
 import styles from '@node-core/ui-components/Common/BaseCodeBox/index.module.css';
+import { useNotification } from '@node-core/ui-components/Providers/NotificationProvider';
 import { useTranslations } from 'next-intl';
 import type { FC, PropsWithChildren } from 'react';
 
 import Link from '#site/components/Link';
-import { useCopyToClipboard, useNotification } from '#site/hooks';
+import { useCopyToClipboard } from '#site/hooks';
 
 type CodeBoxProps = {
   language: string;

apps/site/components/Downloads/DownloadReleasesTable/index.tsx

@@ -7,6 +7,22 @@ import DetailsButton from '#site/components/Downloads/DownloadReleasesTable/Deta
 import Link from '#site/components/Link';
 import getReleaseData from '#site/next-data/releaseData';
 
+const BADGE_KIND_MAP = {
+  'End-of-life': 'warning',
+  Maintenance: 'neutral',
+  LTS: 'info',
+  Current: 'default',
+  Pending: 'default',
+} as const;
+
+const BADGE_TEXT_MAP = {
+  'End-of-life': 'End-of-Life (EOL)',
+  Maintenance: 'Maintenance LTS',
+  LTS: 'Active LTS',
+  Current: 'Current',
+  Pending: 'Pending',
+} as const;
+
 const DownloadReleasesTable: FC = async () => {
   const releaseData = await getReleaseData();
 
@@ -40,11 +56,8 @@ const DownloadReleasesTable: FC = async () => {
               <FormattedTime date={release.releaseDate} />
             </td>
             <td data-label="Status">
-              <Badge
-                kind={release.status === 'End-of-life' ? 'warning' : 'default'}
-                size="small"
-              >
-                {release.status}
+              <Badge kind={BADGE_KIND_MAP[release.status]} size="small">
+                {BADGE_TEXT_MAP[release.status]}
               </Badge>
             </td>
             <td className="download-table-last">

apps/site/components/Downloads/Release/ReleaseCodeBox.tsx

@@ -116,10 +116,7 @@ const ReleaseCodeBox: FC = () => {
         </AlertBox>
       </noscript>
 
-      <WithReleaseAlertBox
-        status={release.status}
-        link="/about/previous-releases"
-      />
+      <WithReleaseAlertBox status={release.status} />
 
       {release.status === 'LTS' && (
         <AlertBox

apps/site/components/Downloads/Release/VersionDropdown.tsx

@@ -38,12 +38,12 @@ const VersionDropdown: FC = () => {
     );
 
     if (release?.status === 'LTS' && pathname.includes('current')) {
-      redirect({ href: '/download', locale });
+      redirect({ href: '/download', locale: locale });
       return;
     }
 
     if (release?.status === 'Current' && !pathname.includes('current')) {
-      redirect({ href: '/download/current', locale });
+      redirect({ href: '/download/current', locale: locale });
       return;
     }
 

apps/site/components/Downloads/ReleaseModal/index.tsx

@@ -43,8 +43,6 @@ const ReleaseModal: FC<ReleaseModalProps> = ({
           </LinkWithArrow>
         )}
 
-        <h5>{t('components.releaseModal.overview')}</h5>
-
         <ReleaseOverview release={release} />
 
         <h5>{t('components.releaseModal.minorVersions')}</h5>

apps/site/components/withAvatarGroup.tsx

@@ -21,9 +21,9 @@ const WithAvatarGroup: FC<WithAvatarGroupProps> = ({
 }) => (
   <AvatarGroup
     avatars={getAuthors({
-      usernames: usernames,
-      names: names,
-      clickable: clickable,
+      usernames,
+      names,
+      clickable,
     })}
     as={Link}
     {...props}

apps/site/components/withBreadcrumbs.tsx

@@ -57,7 +57,9 @@ const WithBreadcrumbs: FC<WithBreadcrumbsProps> = ({ navKeys = [] }) => {
         // Goes deeper on the tree of items if there are any.
         currentNode = items;
 
-        return label ? [...breadcrumbs, { label, href: link }] : breadcrumbs;
+        return label
+          ? [...breadcrumbs, { label: label, href: link }]
+          : breadcrumbs;
       }
 
       return breadcrumbs;