chore(site): rename and merge utilities (#7853)

* chore(site): rename and merge utilities

* ua -> userAgent

* fixup! ua -> userAgent

* code review

* fixup! code review

* code review

Author: avivkeller

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

@@ -4,8 +4,8 @@ import provideReleaseData from '#site/next-data/providers/releaseData';
 import { GITHUB_API_KEY } from '#site/next.constants.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
 import type { GitHubApiFile } from '#site/types';
-import { getGitHubApiDocsUrl } from '#site/util/gitHubUtils';
-import { parseRichTextIntoPlainText } from '#site/util/stringUtils';
+import { getGitHubApiDocsUrl } from '#site/util/github';
+import { parseRichTextIntoPlainText } from '#site/util/string';
 
 // Defines if we should use the GitHub API Key for the request
 // based on the environment variable `GITHUB_API_KEY`

apps/site/app/[locale]/next-data/og/[category]/[title]/route.tsx

@@ -4,19 +4,21 @@ import { ImageResponse } from 'next/og';
 
 import { DEFAULT_CATEGORY_OG_TYPE } from '#site/next.constants.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
-import { hexToRGBA } from '#site/util/hexToRGBA';
 
 // TODO: use CSS variables instead of absolute values
 const CATEGORY_TO_THEME_COLOUR_MAP = {
-  announcement: '#1a3f1d',
-  release: '#0c7bb3',
-  vulnerability: '#ae5f00',
+  announcement: 'rgb(26, 63, 29)',
+  release: 'rgb(12, 123, 179)',
+  vulnerability: 'rgb(174, 95, 0)',
 };
 
-type Category = keyof typeof CATEGORY_TO_THEME_COLOUR_MAP;
-
-type DynamicStaticPaths = { locale: string; category: Category; title: string };
-type StaticParams = { params: Promise<DynamicStaticPaths> };
+type StaticParams = {
+  params: Promise<{
+    locale: string;
+    category: keyof typeof CATEGORY_TO_THEME_COLOUR_MAP;
+    title: string;
+  }>;
+};
 
 // This is the Route Handler for the `GET` method which handles the request
 // for generating OpenGraph images for Blog Posts and Pages
@@ -29,7 +31,7 @@ export const GET = async (_: Request, props: StaticParams) => {
       ? CATEGORY_TO_THEME_COLOUR_MAP[params.category]
       : CATEGORY_TO_THEME_COLOUR_MAP[DEFAULT_CATEGORY_OG_TYPE];
 
-  const gridBackground = `radial-gradient(circle, ${hexToRGBA(categoryColour)}, transparent)`;
+  const gridBackground = `radial-gradient(circle, ${categoryColour}, transparent)`;
 
   return new ImageResponse(
     (

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

@@ -4,7 +4,7 @@ import matter from 'gray-matter';
 
 import { dynamicRouter } from '#site/next.dynamic.mjs';
 import { defaultLocale } from '#site/next.locales.mjs';
-import { parseRichTextIntoPlainText } from '#site/util/stringUtils';
+import { parseRichTextIntoPlainText } from '#site/util/string';
 
 // This is the Route Handler for the `GET` method which handles the request
 // for a digest and metadata of all existing pages on Node.js Website

apps/site/client-context.ts

@@ -1,7 +1,7 @@
 import { cache } from 'react';
 
 import type { ClientSharedServerContext } from '#site/types';
-import { assignClientContext } from '#site/util/assignClientContext';
+import { assignClientContext } from '#site/util/context';
 
 // This allows us to have Server-Side Context's of the shared "contextual" data
 // which includes the frontmatter, the current pathname from the dynamic segments

apps/site/components/Blog/BlogPostCard/index.tsx

@@ -6,7 +6,7 @@ import FormattedTime from '#site/components/Common/FormattedTime';
 import Link from '#site/components/Link';
 import WithAvatarGroup from '#site/components/withAvatarGroup';
 import type { BlogCategory } from '#site/types';
-import { mapBlogCategoryToPreviewType } from '#site/util/blogUtils';
+import { mapBlogCategoryToPreviewType } from '#site/util/blog';
 
 import styles from './index.module.css';
 

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

@@ -7,8 +7,8 @@ import type { FC, PropsWithChildren } from 'react';
 import Button from '#site/components/Common/Button';
 import { useClientContext } from '#site/hooks';
 import type { NodeRelease } from '#site/types';
-import { getNodeDownloadUrl } from '#site/util/getNodeDownloadUrl';
-import { getUserPlatform } from '#site/util/getUserPlatform';
+import { getNodeDownloadUrl } from '#site/util/url';
+import { getUserPlatform } from '#site/util/userAgent';
 
 import styles from './index.module.css';
 

apps/site/components/Downloads/DownloadLink.tsx

@@ -4,10 +4,9 @@ import type { FC, PropsWithChildren } from 'react';
 
 import LinkWithArrow from '#site/components/LinkWithArrow';
 import { useClientContext } from '#site/hooks';
-import type { NodeRelease } from '#site/types';
-import type { DownloadKind } from '#site/util/getNodeDownloadUrl';
-import { getNodeDownloadUrl } from '#site/util/getNodeDownloadUrl';
-import { getUserPlatform } from '#site/util/getUserPlatform';
+import type { DownloadKind, NodeRelease } from '#site/types';
+import { getNodeDownloadUrl } from '#site/util/url';
+import { getUserPlatform } from '#site/util/userAgent';
 
 type DownloadLinkProps = { release: NodeRelease; kind?: DownloadKind };
 

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

@@ -7,7 +7,7 @@ import type { FC } from 'react';
 import Link from '#site/components/Link';
 import { BASE_CHANGELOG_URL } from '#site/next.constants.mjs';
 import type { MinorVersion } from '#site/types';
-import { getNodeApiLink } from '#site/util/getNodeApiLink';
+import { getNodeApiUrl } from '#site/util/url';
 
 import styles from './index.module.css';
 
@@ -50,7 +50,7 @@ export const MinorReleasesTable: FC<MinorReleasesTableProps> = ({
                 <Separator orientation="vertical" />
                 <Link
                   kind="neutral"
-                  href={getNodeApiLink(`v${release.version}`)}
+                  href={getNodeApiUrl(`v${release.version}`)}
                 >
                   {t('actions.docs')}
                 </Link>

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

@@ -5,7 +5,7 @@ import { useContext } from 'react';
 
 import DownloadLinkBase from '#site/components/Downloads/DownloadLink';
 import { ReleaseContext } from '#site/providers/releaseProvider';
-import type { DownloadKind } from '#site/util/getNodeDownloadUrl';
+import type { DownloadKind } from '#site/types/download';
 
 type DownloadLinkProps = { kind?: DownloadKind };
 

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

@@ -7,11 +7,7 @@ import type { FC } from 'react';
 
 import { ReleaseContext } from '#site/providers/releaseProvider';
 import type { InstallationMethod } from '#site/types/release';
-import {
-  nextItem,
-  INSTALL_METHODS,
-  parseCompat,
-} from '#site/util/downloadUtils';
+import { nextItem, INSTALL_METHODS, parseCompat } from '#site/util/download';
 
 const InstallationMethodDropdown: FC = () => {
   const release = useContext(ReleaseContext);