chore: resolve conflict

Author: canerakdas

.github/CODEOWNERS

@@ -4,7 +4,9 @@
 # Infrastructure
 .github @nodejs/web-infra
 .husky @nodejs/web-infra
+.nvmrc @nodejs/web-infra
 codecov.yml @nodejs/web-infra
+packages/ui-components/scripts/publish.mjs @nodejs/web-infra
 
 # Dependencies
 pnpm-workspace.yaml @nodejs/nodejs-website @nodejs/web-infra

.github/workflows/publish-packages.yml

@@ -74,13 +74,25 @@ jobs:
             # If a specific package is requested via workflow_dispatch, just publish that one
             echo "matrix={\"package\":[\"$PACKAGE\"]}" >> $GITHUB_OUTPUT
           else
-            # Otherwise, identify all packages with changes since the last commit
             CHANGED_PACKAGES=()
             for pkg in $(ls -d packages/*); do
               PKG_NAME=$(basename "$pkg")
-              # For manual runs, include all packages. For automatic runs, only include packages with changes
+              PKG_JSON="$pkg/package.json"
+
+              # Determine if the package has changed (or include all on manual trigger)
               if [ "$EVENT_NAME" == "workflow_dispatch" ] || ! git diff --quiet $COMMIT_SHA~1 $COMMIT_SHA -- "$pkg/"; then
-                CHANGED_PACKAGES+=("$PKG_NAME")
+                HAS_VERSION=$(jq 'has("version")' "$PKG_JSON")
+                if [ "$HAS_VERSION" == "false" ]; then
+                  # Include packages without version field
+                  CHANGED_PACKAGES+=("$PKG_NAME")
+                else
+                  # For packages with version field, include only if version changed
+                  OLD_VERSION=$(git show $COMMIT_SHA~1:$PKG_JSON | jq -r '.version')
+                  NEW_VERSION=$(jq -r '.version' "$PKG_JSON")
+                  if [ "$OLD_VERSION" != "$NEW_VERSION" ]; then
+                    CHANGED_PACKAGES+=("$PKG_NAME")
+                  fi
+                fi
               fi
             done
 
@@ -115,13 +127,22 @@ jobs:
           node-version-file: '.nvmrc'
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Re-install npm
+        # TODO: OIDC requires npm >=11.5.1.
+        # Until Node.js v24 is LTS (with npm 11 as the default), we need to bump.
+        run: npm install -g npm@11
+
       - name: Publish
         working-directory: packages/${{ matrix.package }}
         run: |
           # Install deps
           pnpm install --frozen-lockfile
-          # Create a unique version using the commit SHA as a prerelease identifier
-          npm version --no-git-tag-version 1.0.1-$COMMIT_SHA
+
+          HAS_VERSION=$(jq 'has("version")' package.json)
+          if [ "$HAS_VERSION" == "false" ]; then
+            # Only bump version if package has no version field
+            npm version --no-git-tag-version 1.0.1-$COMMIT_SHA
+          fi
 
           # Check if a custom publish script exists in package.json
           if jq -e '.scripts.publish' package.json > /dev/null; then

apps/site/.remarkrc.json

@@ -1,21 +1,3 @@
 {
-  "settings": {
-    "bullet": "-",
-    "resourceLink": true
-  },
-  "plugins": [
-    "remark-frontmatter",
-    "remark-preset-lint-node",
-    ["remark-gfm", false],
-    ["remark-lint-fenced-code-flag", false],
-    ["remark-lint-first-heading-level", false],
-    ["remark-lint-maximum-line-length", false],
-    ["remark-lint-no-file-name-articles", false],
-    ["remark-lint-no-literal-urls", false],
-    ["remark-lint-no-unused-definitions", false],
-    ["remark-lint-no-undefined-references", false],
-    ["remark-lint-prohibited-strings", false],
-    ["remark-lint-unordered-list-marker-style", "-"],
-    ["remark-preset-lint-node/remark-lint-nodejs-links.js", false]
-  ]
+  "plugins": ["remark-frontmatter", "@node-core/remark-lint"]
 }

apps/site/components/Common/LinkWithArrow/index.module.css

@@ -0,0 +1,16 @@
+@reference "../../../styles/index.css";
+
+.icon {
+  @apply ml-1
+    inline
+    w-3
+    fill-neutral-600
+    dark:fill-white;
+}
+
+.button {
+  @apply text-green-600
+    hover:text-green-900
+    dark:text-green-400
+    dark:hover:text-green-200;
+}

apps/site/components/Common/LinkWithArrow/index.tsx

@@ -0,0 +1,38 @@
+import { ArrowUpRightIcon } from '@heroicons/react/24/solid';
+import classNames from 'classnames';
+import type {
+  ButtonHTMLAttributes,
+  ComponentProps,
+  FC,
+  PropsWithChildren,
+} from 'react';
+
+import Link from '#site/components/Link';
+
+import styles from './index.module.css';
+
+type LinkWithArrowProps =
+  | ComponentProps<typeof Link>
+  | ButtonHTMLAttributes<HTMLButtonElement>;
+
+const LinkWithArrow: FC<PropsWithChildren<LinkWithArrowProps>> = ({
+  children,
+  className,
+  ...props
+}) =>
+  'href' in props ? (
+    <Link {...props} className={className}>
+      {children}
+      <ArrowUpRightIcon className={styles.icon} />
+    </Link>
+  ) : (
+    <button
+      className={classNames(className, styles.button)}
+      {...(props as ButtonHTMLAttributes<HTMLButtonElement>)}
+    >
+      {children}
+      <ArrowUpRightIcon className={styles.icon} />
+    </button>
+  );
+
+export default LinkWithArrow;

apps/site/components/Downloads/DownloadLink.tsx

@@ -2,7 +2,7 @@
 
 import type { FC, PropsWithChildren } from 'react';
 
-import LinkWithArrow from '#site/components/LinkWithArrow';
+import LinkWithArrow from '#site/components/Common/LinkWithArrow';
 import { useClientContext } from '#site/hooks';
 import type { DownloadKind, NodeRelease } from '#site/types';
 import { getNodeDownloadUrl } from '#site/util/url';

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

@@ -3,17 +3,16 @@
 import type { FC, PropsWithChildren } from 'react';
 import { useContext } from 'react';
 
-import Link from '#site/components/Link';
-import LinkWithArrow from '#site/components/LinkWithArrow';
+import LinkWithArrow from '#site/components/Common/LinkWithArrow';
 import { BASE_CHANGELOG_URL } from '#site/next.constants.mjs';
 import { ReleaseContext } from '#site/providers/releaseProvider';
 
 const ChangelogLink: FC<PropsWithChildren> = ({ children }) => {
   const { release } = useContext(ReleaseContext);
 
   return (
-    <LinkWithArrow asChild>
-      <Link href={`${BASE_CHANGELOG_URL}${release.version}`}>{children}</Link>
+    <LinkWithArrow href={`${BASE_CHANGELOG_URL}${release.version}`}>
+      {children}
     </LinkWithArrow>
   );
 };

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

@@ -8,8 +8,8 @@ import type { FC } from 'react';
 import { useContext, useMemo } from 'react';
 
 import CodeBox from '#site/components/Common/CodeBox';
+import LinkWithArrow from '#site/components/Common/LinkWithArrow';
 import Link from '#site/components/Link';
-import LinkWithArrow from '#site/components/LinkWithArrow';
 import WithReleaseAlertBox from '#site/components/withReleaseAlertBox';
 import { createSval } from '#site/next.jsx.compiler.mjs';
 import {

apps/site/components/EOL/EOLReleaseTable.tsx

@@ -5,9 +5,9 @@ import { Fragment, useState } from 'react';
 import type { FC } from 'react';
 
 import FormattedTime from '#site/components/Common/FormattedTime';
+import LinkWithArrow from '#site/components/Common/LinkWithArrow';
 import EOLModal from '#site/components/EOL/EOLModal';
 import VulnerabilityChips from '#site/components/EOL/VulnerabilityChips';
-import LinkWithArrow from '#site/components/LinkWithArrow';
 import provideReleaseData from '#site/next-data/providers/releaseData';
 import provideVulnerabilities from '#site/next-data/providers/vulnerabilities';
 import { EOL_VERSION_IDENTIFIER } from '#site/next.constants.mjs';

apps/site/components/EOL/VulnerabilitiesTable.tsx

@@ -2,8 +2,8 @@ import classNames from 'classnames';
 import { useTranslations } from 'next-intl';
 import type { FC } from 'react';
 
+import LinkWithArrow from '#site/components/Common/LinkWithArrow';
 import VulnerabilityChip from '#site/components/EOL/VulnerabilityChips/VulnerabilityChip';
-import LinkWithArrow from '#site/components/LinkWithArrow';
 import type { Vulnerability } from '#site/types/vulnerabilities';
 
 const VulnerabilitiesTable: FC<{