Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 2 additions & 19 deletions apps/site/components/Common/CodeBox.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
'use client';

import {
DocumentDuplicateIcon,
CodeBracketIcon,
} from '@heroicons/react/24/outline';
import BaseCodeBox from '@node-core/ui-components/Common/BaseCodeBox';
import { useTranslations } from 'next-intl';

import Link from '#site/components/Link';
import { useCopyToClipboard } from '#site/hooks';

import type { FC, PropsWithChildren } from 'react';

Expand All @@ -18,25 +13,13 @@ type CodeBoxProps = {
};

const CodeBox: FC<PropsWithChildren<CodeBoxProps>> = props => {
const [copied, copyToClipboard] = useCopyToClipboard();
const t = useTranslations();

const ButtonIcon = copied ? DocumentDuplicateIcon : CodeBracketIcon;

return (
<BaseCodeBox
as={Link}
onCopy={copyToClipboard}
buttonContent={
<>
<ButtonIcon className="size-4" />
{t(
copied
? 'components.common.codebox.copied'
: 'components.common.codebox.copy'
)}
</>
}
copyButtonLabel={t('components.common.codebox.copy')}
copiedButtonLabel={t('components.common.codebox.copied')}
{...props}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Select from '@node-core/ui-components/Common/Select';
import { useTranslations } from 'next-intl';
import { useContext, useEffect, useMemo } from 'react';

import { useClientContext } from '#site/hooks';
import { useClientContext } from '#site/hooks/client';
import { ReleaseContext } from '#site/providers/releaseProvider';
import { nextItem, OPERATING_SYSTEMS, parseCompat } from '#site/util/download';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Select from '@node-core/ui-components/Common/Select';
import { useTranslations } from 'next-intl';
import { useEffect, useContext, useMemo } from 'react';

import { useClientContext } from '#site/hooks';
import { useClientContext } from '#site/hooks/client';
import { ReleaseContext } from '#site/providers/releaseProvider';
import { PLATFORMS, nextItem, parseCompat } from '#site/util/download';
import { getUserPlatform } from '#site/util/userAgent';
Expand Down
3 changes: 1 addition & 2 deletions apps/site/components/EOL/EOLReleaseTable/TableBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ import LinkWithArrow from '#site/components/Common/LinkWithArrow';
import EOLModal from '#site/components/EOL/EOLModal';
import VulnerabilityChips from '#site/components/EOL/VulnerabilityChips';

import type { NodeRelease } from '#site/types/releases.js';
import type { GroupedVulnerabilities } from '#site/types/vulnerabilities.js';
import type { GroupedVulnerabilities, NodeRelease } from '#site/types';
import type { FC } from 'react';

type EOLReleaseTableBodyProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import FormattedTime from '#site/components/Common/FormattedTime';
import LinkWithArrow from '#site/components/Common/LinkWithArrow';
import Link from '#site/components/Link';

import type { NodeRelease } from '#site/types/releases.js';
import type { NodeRelease } from '#site/types';
import type { FC } from 'react';

import ReleaseModal from '../ReleaseModal';
Expand Down
7 changes: 2 additions & 5 deletions apps/site/components/withBreadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ import Breadcrumbs from '@node-core/ui-components/Common/Breadcrumbs';
import { useTranslations } from 'next-intl';

import Link from '#site/components/Link';
import {
useClientContext,
useMediaQuery,
useSiteNavigation,
} from '#site/hooks';
import { useClientContext, useMediaQuery } from '#site/hooks/client';
import { useSiteNavigation } from '#site/hooks/generic';
import { dashToCamelCase } from '#site/util/string';

import type { NavigationKeys } from '#site/types';
Expand Down
3 changes: 1 addition & 2 deletions apps/site/components/withMetaBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import { useFormatter, useLocale, useTranslations } from 'next-intl';

import Link from '#site/components/Link';
import WithAvatarGroup from '#site/components/withAvatarGroup';
import { useClientContext } from '#site/hooks/react-client';
import useMediaQuery from '#site/hooks/react-client/useMediaQuery';
import { useClientContext, useMediaQuery } from '#site/hooks/client';
import { DEFAULT_DATE_FORMAT } from '#site/next.calendar.constants.mjs';
import { TRANSLATION_URL } from '#site/next.constants.mjs';
import { getGitHubBlobUrl } from '#site/util/github';
Expand Down
2 changes: 1 addition & 1 deletion apps/site/components/withNavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import SearchButton from '#site/components/Common/Searchbox';
import Link from '#site/components/Link';
import WithBanner from '#site/components/withBanner';
import WithNodejsLogo from '#site/components/withNodejsLogo';
import { useSiteNavigation } from '#site/hooks';
import { useSiteNavigation } from '#site/hooks/generic';
import { useRouter, usePathname } from '#site/navigation.mjs';

import type { SimpleLocaleConfig } from '@node-core/ui-components/types';
Expand Down
4 changes: 2 additions & 2 deletions apps/site/components/withSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { usePathname } from 'next/navigation';
import { useLocale, useTranslations } from 'next-intl';

import Link from '#site/components/Link';
import { useClientContext } from '#site/hooks';
import { useSiteNavigation } from '#site/hooks/server';
import { useClientContext } from '#site/hooks/client';
import { useSiteNavigation } from '#site/hooks/generic';
import { useRouter } from '#site/navigation.mjs';

import type { NavigationKeys } from '#site/types';
Expand Down
3 changes: 2 additions & 1 deletion apps/site/components/withSidebarCrossLinks.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import CrossLink from '#site/components/Common/CrossLink';
import { useClientContext, useSiteNavigation } from '#site/hooks/server';
import { useSiteNavigation } from '#site/hooks/generic';
import { useClientContext } from '#site/hooks/server';

import type { NavigationKeys } from '#site/types';
import type { FC } from 'react';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { renderHook } from '@testing-library/react';
import { describe, it } from 'node:test';
import assert from 'node:assert/strict';

import useClientContext from '#site/hooks/react-client/useClientContext';
import useClientContext from '#site/hooks/client/useClientContext';
import { MatterContext } from '#site/providers/matterProvider';

describe('useClientContext', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { describe, it, afterEach } from 'node:test';

import { renderHook, waitFor } from '@testing-library/react';

import useDetectOS from '#site/hooks/react-client/useDetectOS';
import useDetectOS from '#site/hooks/client/useDetectOS';

const windowsUserAgent =
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { describe, it } from 'node:test';

import { renderHook } from '@testing-library/react';

import useMediaQuery from '#site/hooks/react-client/useMediaQuery';
import useMediaQuery from '#site/hooks/client/useMediaQuery';

const noop = () => {};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export { default as useCopyToClipboard } from './useCopyToClipboard';
export { default as useDetectOS } from './useDetectOS';
export { default as useMediaQuery } from './useMediaQuery';
export { default as useClientContext } from './useClientContext';
9 changes: 9 additions & 0 deletions apps/site/hooks/client/useClientContext.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use client';

import { useContext } from 'react';

import { MatterContext } from '#site/providers/matterProvider';

import type { ClientSharedServerContext } from '#site/types';

export default () => useContext(MatterContext) as ClientSharedServerContext;
2 changes: 0 additions & 2 deletions apps/site/hooks/index.ts

This file was deleted.

5 changes: 0 additions & 5 deletions apps/site/hooks/react-client/index.ts

This file was deleted.

33 changes: 0 additions & 33 deletions apps/site/hooks/react-client/useClientContext.ts

This file was deleted.

35 changes: 0 additions & 35 deletions apps/site/hooks/react-client/useCopyToClipboard.ts

This file was deleted.

42 changes: 0 additions & 42 deletions apps/site/hooks/react-client/useNavigationState.ts

This file was deleted.

5 changes: 0 additions & 5 deletions apps/site/hooks/react-server/useCopyToClipboard.ts

This file was deleted.

5 changes: 0 additions & 5 deletions apps/site/hooks/react-server/useDetectOS.ts

This file was deleted.

5 changes: 0 additions & 5 deletions apps/site/hooks/react-server/useMediaQuery.ts

This file was deleted.

2 changes: 0 additions & 2 deletions apps/site/hooks/server.ts

This file was deleted.

1 change: 1 addition & 0 deletions apps/site/hooks/server/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as useClientContext } from './useClientContext';
2 changes: 1 addition & 1 deletion apps/site/layouts/Post.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import WithBlogCrossLinks from '#site/components/withBlogCrossLinks';
import WithFooter from '#site/components/withFooter';
import WithMetaBar from '#site/components/withMetaBar';
import WithNavBar from '#site/components/withNavBar';
import { useClientContext } from '#site/hooks/react-server';
import { useClientContext } from '#site/hooks/server';
import { mapAuthorToCardAuthors } from '#site/util/author';
import { mapBlogCategoryToPreviewType } from '#site/util/blog';

Expand Down
2 changes: 1 addition & 1 deletion apps/site/providers/matterProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { createContext } from 'react';

import { useDetectOS } from '#site/hooks';
import { useDetectOS } from '#site/hooks/client';
import { assignClientContext } from '#site/util/context';

import type { ClientSharedServerContext } from '#site/types';
Expand Down
2 changes: 1 addition & 1 deletion apps/site/types/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { useDetectOS } from '#site/hooks';
import type { useDetectOS } from '#site/hooks/client';
import type { Frontmatter } from '#site/types/frontmatter';
import type { Heading } from '@vcarl/remark-headings';
import type { ReadTimeResults } from 'reading-time';
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@node-core/ui-components",
"version": "1.5.0",
"version": "1.5.1",
"type": "module",
"exports": {
"./*": [
Expand Down
Loading
Loading