chore: resolve conflict

Author: canerakdas

.github/workflows/publish-packages.yml

@@ -17,6 +17,8 @@ on:
 
 permissions:
   contents: read
+  # For npm OIDC (https://docs.npmjs.com/trusted-publishers)
+  id-token: write
 
 env:
   COMMIT_SHA: ${{ github.sha }}
@@ -115,8 +117,6 @@ jobs:
 
       - name: Publish
         working-directory: packages/${{ matrix.package }}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           # Install deps
           pnpm install --frozen-lockfile

apps/site/components/Common/Button.tsx

@@ -1,11 +1,9 @@
 import BaseButton from '@node-core/ui-components/Common/BaseButton';
 import type { ButtonProps } from '@node-core/ui-components/Common/BaseButton';
-import type { FC, ComponentProps } from 'react';
+import type { FC } from 'react';
 
 import Link from '#site/components/Link';
 
-const Button: FC<
-  Omit<ButtonProps, 'as'> & Omit<ComponentProps<typeof Link>, 'as' | 'size'>
-> = props => <BaseButton as={Link} {...props} />;
+const Button: FC<ButtonProps> = props => <BaseButton as={Link} {...props} />;
 
 export default Button;

apps/site/components/Link.tsx

@@ -1,25 +1,17 @@
-import type { FC, HTMLProps } from 'react';
+import type { FC, AnchorHTMLAttributes, ComponentProps } from 'react';
 
 import { Link as LocalizedLink } from '#site/navigation.mjs';
 
-const Link: FC<HTMLProps<HTMLAnchorElement>> = ({
-  children,
-  href,
-  ...props
-}) => {
-  if (!href || /^https?:/.test(href.toString())) {
-    return (
-      <a href={href} {...props}>
-        {children}
-      </a>
-    );
+export type LinkProps =
+  | ComponentProps<typeof LocalizedLink>
+  | AnchorHTMLAttributes<HTMLAnchorElement>;
+
+const Link: FC<LinkProps> = ({ href, ...props }) => {
+  if (!href || /^https?:/.test(href as string)) {
+    return <a href={href as string} {...props} />;
   }
 
-  return (
-    <LocalizedLink href={href?.toString()} {...props}>
-      {children}
-    </LocalizedLink>
-  );
+  return <LocalizedLink href={href} {...props} />;
 };
 
 export default Link;

apps/site/components/LinkWithArrow.tsx

@@ -1,12 +1,13 @@
 import { ArrowUpRightIcon } from '@heroicons/react/24/solid';
 import type { SlotProps } from '@radix-ui/react-slot';
 import { Slot } from '@radix-ui/react-slot';
-import type { ComponentProps, FC, PropsWithChildren } from 'react';
+import type { FC, PropsWithChildren } from 'react';
 
 import Link from '#site/components/Link';
+import type { LinkProps } from '#site/components/Link';
 
 type LinkWithArrowProps =
-  | ({ asChild?: false } & ComponentProps<typeof Link>)
+  | ({ asChild?: false } & LinkProps)
   | ({ asChild: true } & SlotProps);
 
 const LinkWithArrow: FC<PropsWithChildren<LinkWithArrowProps>> = ({
@@ -17,7 +18,7 @@ const LinkWithArrow: FC<PropsWithChildren<LinkWithArrowProps>> = ({
   const Comp = asChild ? Slot : Link;
 
   return (
-    <Comp {...props}>
+    <Comp {...(props as SlotProps)}>
       <span>
         {children}
         <ArrowUpRightIcon className="ml-1 inline w-3 fill-neutral-600 dark:fill-white" />

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

@@ -34,10 +34,7 @@ const MinorReleasesTable: FC<MinorReleasesTableProps> = ({ releases }) => {
           {releases.map(release => (
             <tr key={release.version}>
               <td>
-                <Link
-                  kind="neutral"
-                  href={`/download/archive/v${release.version}`}
-                >
+                <Link href={`/download/archive/v${release.version}`}>
                   v{release.version}
                 </Link>
               </td>
@@ -72,15 +69,11 @@ const MinorReleasesTable: FC<MinorReleasesTableProps> = ({ releases }) => {
               </td>
               <td>
                 <div className={styles.additionalLinks}>
-                  <Link
-                    kind="neutral"
-                    href={getNodeApiUrl(`v${release.version}`)}
-                  >
+                  <Link href={getNodeApiUrl(`v${release.version}`)}>
                     {t('components.minorReleasesTable.actions.docs')}
                   </Link>
                   <Separator orientation="vertical" />
                   <LinkWithArrow
-                    kind="neutral"
                     href={`${BASE_CHANGELOG_URL}${release.version}`}
                   >
                     {t('components.minorReleasesTable.actions.changelog')}

apps/site/next.constants.mjs

@@ -173,7 +173,7 @@ export const GITHUB_API_KEY = process.env.NEXT_GITHUB_API_KEY || '';
  * The resource we point people to when discussing internationalization efforts.
  */
 export const TRANSLATION_URL =
-  'https://github.com/nodejs/nodejs.org/blob/main/TRANSLATION.md#how-to-translate';
+  'https://github.com/nodejs/nodejs.org/blob/main/docs/translation.md#how-to-translate';
 
 /**
  * Define the order in which vulnerabilities should be sorted