Skip to content
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
02db91b
feat: add eol page
bmuenzenmeyer Jul 16, 2025
113334f
Update Modal.tsx
ovflowd Jul 21, 2025
6bc1393
expand and do not reuse i18n keys
bmuenzenmeyer Jul 22, 2025
967676d
add one more i18n key
bmuenzenmeyer Jul 22, 2025
5cd1b33
add footer to article layout
bmuenzenmeyer Jul 22, 2025
d2b7826
Update apps/site/components/EOL/Table.tsx
bmuenzenmeyer Jul 22, 2025
b294b44
cleanup unused classnames
bmuenzenmeyer Jul 22, 2025
4204159
simplify Table
bmuenzenmeyer Jul 22, 2025
2cadb0c
normalize endOfLife vs eol
bmuenzenmeyer Jul 22, 2025
55abd69
Apply suggestions from code review
bmuenzenmeyer Jul 22, 2025
1a4a53a
add back in the release schedule link
bmuenzenmeyer Jul 22, 2025
51c5fb0
small grammar / tense / capitalization changes
bmuenzenmeyer Jul 22, 2025
ea43096
Update apps/site/pages/en/eol.mdx
ovflowd Jul 23, 2025
d94d5ce
increase gap between vulnerability chips
bmuenzenmeyer Jul 24, 2025
1dccbd5
Merge branch 'main' into eol
ovflowd Jul 25, 2025
21014bd
make all translation strings long-form
bmuenzenmeyer Jul 28, 2025
ff6ddec
document translation key retrieval
bmuenzenmeyer Jul 28, 2025
9c68dd0
rename variable
bmuenzenmeyer Jul 28, 2025
f8cab5e
move CTAs up
bmuenzenmeyer Jul 28, 2025
2fbd30a
Merge branch 'main' into eol
ovflowd Jul 28, 2025
7babcc8
chore: button variants, and updated eol page; removed translated prev…
ovflowd Jul 28, 2025
07befbb
rename EOLModal/index per standard
bmuenzenmeyer Jul 29, 2025
594531f
rename components per docs and patterns
bmuenzenmeyer Jul 29, 2025
c4abb0e
chore: design improvements
ovflowd Jul 29, 2025
e471cb0
chore: tiny mobile improvement
ovflowd Jul 29, 2025
6b7bde7
chore: apply suggestions
ovflowd Jul 29, 2025
2a748fd
chore: apply text suggestions
ovflowd Jul 29, 2025
e0f7c44
chore: balance the buttons
ovflowd Jul 29, 2025
5ab2cbb
fix a11y issue on mdx rendering
bmuenzenmeyer Jul 29, 2025
26f5b81
chore: make it rain tm
ovflowd Jul 29, 2025
16f5992
Update vulnerabilities.mjs
avivkeller Jul 29, 2025
ccbba0f
apply aviv"s suggestions - manually added as the redirect also needed…
bmuenzenmeyer Jul 30, 2025
40df1ab
types and constants cleanup
bmuenzenmeyer Jul 30, 2025
f424d53
fix import
bmuenzenmeyer Jul 30, 2025
7724afb
more types cleanup
bmuenzenmeyer Jul 30, 2025
669d21d
one final type lint
bmuenzenmeyer Jul 30, 2025
04e4f5c
Merge branch 'main' into eol
bmuenzenmeyer Aug 1, 2025
89e5c92
move link below buttons
bmuenzenmeyer Aug 1, 2025
748e116
move URL to constants
bmuenzenmeyer Aug 2, 2025
9fe21cc
rename variable
bmuenzenmeyer Aug 2, 2025
4836bef
tighten up UnknownSeverity types
bmuenzenmeyer Aug 2, 2025
c147efc
format after refactor
bmuenzenmeyer Aug 2, 2025
847897b
memoize calls
bmuenzenmeyer Aug 2, 2025
d61bd30
simplify translation call
bmuenzenmeyer Aug 2, 2025
1a522c8
apply suggestion
bmuenzenmeyer Aug 2, 2025
dd10604
apply linter
bmuenzenmeyer Aug 2, 2025
fb31b90
refator vulnerability grouping, add unit tests
bmuenzenmeyer Aug 5, 2025
6957f21
avoid passing modal via frontmatter
avivkeller Aug 8, 2025
1c499dd
generify modal props
avivkeller Aug 9, 2025
1a7a80a
move checks into children components
avivkeller Aug 9, 2025
029ee7d
pass all vulns to children
avivkeller Aug 9, 2025
54fe024
fixup!
avivkeller Aug 9, 2025
9a8c6c7
no modal provider
avivkeller Aug 10, 2025
92cdd9a
rename ref to url
avivkeller Aug 10, 2025
f579c6f
fix type
avivkeller Aug 10, 2025
f376739
use proper import specifier
bmuenzenmeyer Aug 14, 2025
37df55b
tweak memo per review
bmuenzenmeyer Aug 14, 2025
ef51f5c
destructure and cleanup.
bmuenzenmeyer Aug 14, 2025
ec44c25
Merge branch 'main' into eol
bmuenzenmeyer Aug 14, 2025
cfc2828
move key after fragment introduced
bmuenzenmeyer Aug 14, 2025
f63e6b6
change herodevs link to be a direct anchor, with no event listener fr…
bmuenzenmeyer Aug 14, 2025
947ea35
use rich translation for EOLAlertBox
bmuenzenmeyer Aug 14, 2025
3a1ae8f
chore: recommendation under
ovflowd Aug 14, 2025
784e7e1
Update apps/site/components/EOL/VulnerabilityChips/Chip/index.tsx
bmuenzenmeyer Aug 15, 2025
5167bf1
use filtered vulnerabilities
bmuenzenmeyer Aug 15, 2025
c4e0b56
add space
bmuenzenmeyer Aug 15, 2025
60ff118
use consistent modern looping
bmuenzenmeyer Aug 15, 2025
dca3e9c
chore: cleanup, refactor + fixes
ovflowd Aug 15, 2025
97ac623
fix: tests
ovflowd Aug 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apps/site/components/Common/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import BaseButton, {
type ButtonProps,
} from '@node-core/ui-components/Common/BaseButton';
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 Link from '#site/components/Link';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,20 @@ import type { FC } from 'react';
import { use } from 'react';

import LinkWithArrow from '#site/components/LinkWithArrow';
import { ReleaseModalContext } from '#site/providers/releaseModalProvider';
import type { NodeRelease } from '#site/types';
import { ModalContext } from '#site/providers/modalProvider';

type DetailsButtonProps = {
versionData: NodeRelease;
data: unknown;
};

const DetailsButton: FC<DetailsButtonProps> = ({ versionData }) => {
const t = useTranslations('components.downloadReleasesTable');
const DetailsButton: FC<DetailsButtonProps> = ({ data }) => {
const t = useTranslations();

const { openModal } = use(ReleaseModalContext);
const { openModal } = use(ModalContext);

return (
<LinkWithArrow
className="cursor-pointer"
onClick={() => openModal(versionData)}
>
{t('details')}
<LinkWithArrow className="cursor-pointer" onClick={() => openModal(data)}>
{t('components.downloadReleasesTable.details')}
</LinkWithArrow>
);
};
Expand Down
75 changes: 41 additions & 34 deletions apps/site/components/Downloads/DownloadReleasesTable/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
'use client';

import Badge from '@node-core/ui-components/Common/Badge';
import { useTranslations } from 'next-intl';
import type { FC } from 'react';

import FormattedTime from '#site/components/Common/FormattedTime';
import DetailsButton from '#site/components/Downloads/DownloadReleasesTable/DetailsButton';
import provideReleaseData from '#site/next-data/providers/releaseData';
import { ModalProvider } from '#site/providers/modalProvider';

import ReleaseModal from '../ReleaseModal';

const BADGE_KIND_MAP = {
'End-of-life': 'warning',
Expand All @@ -19,41 +24,43 @@ const DownloadReleasesTable: FC = () => {
const t = useTranslations();

return (
<table id="tbVersions" className="download-table full-width">
<thead>
<tr>
<th>{t('components.downloadReleasesTable.version')}</th>
<th>{t('components.downloadReleasesTable.codename')}</th>
<th>{t('components.downloadReleasesTable.firstReleased')}</th>
<th>{t('components.downloadReleasesTable.lastUpdated')}</th>
<th>{t('components.downloadReleasesTable.status')}</th>
<th></th>
</tr>
</thead>
<tbody>
{releaseData.map(release => (
<tr key={release.major}>
<td data-label="Version">v{release.major}</td>
<td data-label="LTS">{release.codename || '-'}</td>
<td data-label="Date">
<FormattedTime date={release.currentStart} />
</td>
<td data-label="Date">
<FormattedTime date={release.releaseDate} />
</td>
<td data-label="Status">
<Badge kind={BADGE_KIND_MAP[release.status]} size="small">
{release.status}
{release.status === 'End-of-life' ? ' (EoL)' : ''}
</Badge>
</td>
<td className="download-table-last">
<DetailsButton versionData={release} />
</td>
<ModalProvider Component={ReleaseModal}>
<table id="tbVersions">
<thead>
<tr>
<th>{t('components.downloadReleasesTable.version')}</th>
<th>{t('components.downloadReleasesTable.codename')}</th>
<th>{t('components.downloadReleasesTable.firstReleased')}</th>
<th>{t('components.downloadReleasesTable.lastUpdated')}</th>
<th>{t('components.downloadReleasesTable.status')}</th>
<th></th>
</tr>
))}
</tbody>
</table>
</thead>
<tbody>
{releaseData.map(release => (
<tr key={release.major}>
<td data-label="Version">v{release.major}</td>
<td data-label="LTS">{release.codename || '-'}</td>
<td data-label="Date">
<FormattedTime date={release.currentStart} />
</td>
<td data-label="Date">
<FormattedTime date={release.releaseDate} />
</td>
<td data-label="Status">
<Badge kind={BADGE_KIND_MAP[release.status]} size="small">
{release.status}
{release.status === 'End-of-life' ? ' (EoL)' : ''}
</Badge>
</td>
<td>
<DetailsButton data={release} />
</td>
</tr>
))}
</tbody>
</table>
</ModalProvider>
);
};

Expand Down
12 changes: 6 additions & 6 deletions apps/site/components/Downloads/MinorReleasesTable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ type MinorReleasesTableProps = {
export const MinorReleasesTable: FC<MinorReleasesTableProps> = ({
releases,
}) => {
const t = useTranslations('components.minorReleasesTable');
const t = useTranslations();

return (
<table>
<thead>
<tr>
<th>{t('version')}</th>
<th>{t('links')}</th>
<th>{t('components.minorReleasesTable.version')}</th>
<th>{t('components.minorReleasesTable.links')}</th>
</tr>
</thead>
<tbody>
Expand All @@ -38,21 +38,21 @@ export const MinorReleasesTable: FC<MinorReleasesTableProps> = ({
kind="neutral"
href={`https://nodejs.org/download/release/v${release.version}/`}
>
{t('actions.release')}
{t('components.minorReleasesTable.actions.release')}
</Link>
<Separator orientation="vertical" />
<Link
kind="neutral"
href={`${BASE_CHANGELOG_URL}${release.version}`}
>
{t('actions.changelog')}
{t('components.minorReleasesTable.actions.changelog')}
</Link>
<Separator orientation="vertical" />
<Link
kind="neutral"
href={getNodeApiUrl(`v${release.version}`)}
>
{t('actions.docs')}
{t('components.minorReleasesTable.actions.docs')}
</Link>
</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const ReleaseCodeBox: FC = () => {
size="small"
>
{t.rich('layouts.download.codeBox.unsupportedVersionWarning', {
link: text => <Link href="/about/previous-releases/">{text}</Link>,
link: text => <Link href="/eol">{text}</Link>,
})}
</AlertBox>
)}
Expand Down
35 changes: 13 additions & 22 deletions apps/site/components/Downloads/ReleaseModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,27 @@ import type { FC } from 'react';
import { MinorReleasesTable } from '#site/components/Downloads/MinorReleasesTable';
import { ReleaseOverview } from '#site/components/Downloads/ReleaseOverview';
import Link from '#site/components/Link';
import type { NodeRelease } from '#site/types';
import type { ModalProps, NodeRelease } from '#site/types';

type ReleaseModalProps = {
isOpen: boolean;
closeModal: () => void;
release: NodeRelease;
};

const ReleaseModal: FC<ReleaseModalProps> = ({
isOpen,
const ReleaseModal: FC<ModalProps<NodeRelease>> = ({
open,
closeModal,
release,
data,
}) => {
const t = useTranslations();

const modalHeadingKey = release.codename
const modalHeadingKey = data.codename
? 'components.releaseModal.title'
: 'components.releaseModal.titleWithoutCodename';

const modalHeading = t(modalHeadingKey, {
version: release.major,
codename: release.codename ?? '',
version: data.major,
codename: data.codename ?? '',
});

return (
<Modal open={isOpen} onOpenChange={closeModal}>
{release.status === 'End-of-life' && (
<Modal open={open} onOpenChange={closeModal}>
{data.status === 'End-of-life' && (
<div className="mb-4">
<AlertBox
title={t('components.common.alertBox.warning')}
Expand All @@ -41,10 +35,7 @@ const ReleaseModal: FC<ReleaseModalProps> = ({
>
{t.rich('components.releaseModal.unsupportedVersionWarning', {
link: text => (
<Link
onClick={closeModal}
href="/about/previous-releases#release-schedule"
>
<Link onClick={closeModal} href="/eol">
{text}
</Link>
),
Expand All @@ -53,7 +44,7 @@ const ReleaseModal: FC<ReleaseModalProps> = ({
</div>
)}

{release.isLts && (
{data.isLts && (
<div className="mb-4">
<AlertBox
title={t('components.common.alertBox.info')}
Expand All @@ -70,11 +61,11 @@ const ReleaseModal: FC<ReleaseModalProps> = ({
<Title>{modalHeading}</Title>

<Content>
<ReleaseOverview release={release} />
<ReleaseOverview release={data} />

<h5>{t('components.releaseModal.minorVersions')}</h5>

<MinorReleasesTable releases={release.minorVersions} />
<MinorReleasesTable releases={data.minorVersions} />
</Content>
</Modal>
);
Expand Down
19 changes: 19 additions & 0 deletions apps/site/components/EOL/EOLAlert/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import AlertBox from '@node-core/ui-components/Common/AlertBox';
import { useTranslations } from 'next-intl';

import Link from '#site/components/Link';

const EOLAlert = () => {
const t = useTranslations();
return (
<AlertBox level="warning">
{t('components.eolAlert.intro')}{' '}
<Link href="/eol">
OpenJS Ecosystem Sustainability Program{' '}
{t('components.eolAlert.partner')} HeroDevs
</Link>
</AlertBox>
);
};

export default EOLAlert;
65 changes: 65 additions & 0 deletions apps/site/components/EOL/EOLModal/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { Modal, Title, Content } from '@node-core/ui-components/Common/Modal';
import { useTranslations } from 'next-intl';
import { useMemo, type FC } from 'react';

import UnknownSeveritySection from '#site/components/EOL/UnknownSeveritySection';
import VulnerabilitiesTable from '#site/components/EOL/VulnerabilitiesTable';
import { SEVERITY_ORDER } from '#site/next.constants.mjs';
import type { ModalProps } from '#site/types';
import type { EOLModalData } from '#site/types/vulnerabilities';

const EOLModal: FC<ModalProps<EOLModalData>> = ({
open,
closeModal,
data: { release, vulnerabilities },
}) => {
const t = useTranslations();

const modalHeading = release.codename
? t('components.eolModal.title', {
version: release.major,
codename: release.codename,
})
: t('components.eolModal.titleWithoutCodename', { version: release.major });

useMemo(
() =>
vulnerabilities.sort(
(a, b) =>
SEVERITY_ORDER.indexOf(a.severity) -
SEVERITY_ORDER.indexOf(b.severity)
),
[vulnerabilities]
);

return (
<Modal open={open} onOpenChange={closeModal}>
<Title>{modalHeading}</Title>
<Content>
{vulnerabilities.length > 0 && (
<p className="m-1">
{t('components.eolModal.vulnerabilitiesMessage', {
count: vulnerabilities.length,
})}
</p>
)}

<VulnerabilitiesTable
vulnerabilities={vulnerabilities.filter(
vuln => vuln.severity !== 'unknown'
)}
/>

<UnknownSeveritySection vulnerabilities={vulnerabilities} />

{!vulnerabilities.length && (
<p className="m-1">
{t('components.eolModal.noVulnerabilitiesMessage')}
</p>
)}
</Content>
</Modal>
);
};

export default EOLModal;
Loading
Loading