Skip to content

refactor: replace cn util with dep#3256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afonsojramos merged 1 commit into from
Sep 3, 2026
Merged

refactor: replace cn util with dep #3256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
"test:visual:update": "scripts/visual.sh --update"
},
"dependencies": {
"cn": "0.2.4",
"electron-log": "5.4.4",
"electron-menubar": "10.2.1",
"electron-updater": "6.8.9",
Expand DownExpand Up@@ -111,7 +112,6 @@
"@vitejs/plugin-react": "6.1.1",
"@vitest/browser-playwright": "4.1.11",
"@vitest/coverage-v8": "4.1.11",
"clsx": "2.1.1",
"concurrently": "10.0.5",
"date-fns": "4.4.0",
"dotenv": "17.4.2",
Expand All@@ -125,7 +125,6 @@
"react-devtools": "7.0.1",
"rimraf": "6.1.3",
"semver": "7.8.5",
"tailwind-merge": "3.6.0",
"tailwindcss": "4.3.3",
"typescript": "7.0.2",
"vite": "8.2.2",
Expand Down
21 changes: 10 additions & 11 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/renderer/components/fields/Checkbox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ import type { FC, ReactNode } from 'react';

import { Stack } from '@primer/react';

import { cn } from 'cn';

import { CustomCounter } from '../primitives/CustomCounter';

import { cn } from '../../utils/ui/cn';
import { Tooltip } from './Tooltip';

export interface CheckboxProps {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/fields/Tooltip.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { type FC, type ReactNode, useEffect, useRef, useState } from 'react';
import { QuestionIcon } from '@primer/octicons-react';
import { AnchoredOverlay } from '@primer/react';

import { cn } from '../../utils/ui/cn';
import { cn } from 'cn';

export interface TooltipProps {
name: string;
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/filters/SearchFilter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@ import {
} from '@primer/octicons-react';
import { Stack, Text } from '@primer/react';

import { cn } from 'cn';

import { useFiltersStore, useSettingsStore } from '../../stores';

import { Title } from '../primitives/Title';
Expand All@@ -20,7 +22,6 @@ import {
hasExcludeSearchFilters,
hasIncludeSearchFilters,
} from '../../utils/notifications/filters/search';
import { cn } from '../../utils/ui/cn';
import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
import { TokenSearchInput } from './TokenSearchInput';

Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/filters/SearchFilterSuggestions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ import type { FC } from 'react';

import { Popover, Stack, Text } from '@primer/react';

import { cn } from 'cn';

import { useSettingsStore } from '../../stores';

import { Opacity } from '../../types';
Expand All@@ -11,7 +13,6 @@ import {
BASE_SEARCH_QUALIFIERS,
SEARCH_DELIMITER,
} from '../../utils/notifications/filters/search';
import { cn } from '../../utils/ui/cn';

interface SearchFilterSuggestionsProps {
open: boolean;
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/icons/LogoIcon.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import type { FC } from 'react';

import { cn } from 'cn';

import { APPLICATION } from '../../../shared/constants';

import { Size } from '../../types';

import { cn } from '../../utils/ui/cn';

interface LogoIconProps {
isDark?: boolean;
onClick?: () => void;
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/layout/Contents.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { FC, ReactNode } from 'react';

import { cn } from '../../utils/ui/cn';
import { cn } from 'cn';

interface IContents {
children: ReactNode;
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/notifications/AccountNotifications.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { type FC, type MouseEvent, useMemo, useState } from 'react';
import { GitPullRequestIcon, IssueOpenedIcon } from '@primer/octicons-react';
import { Button, Stack } from '@primer/react';

import { cn } from 'cn';

import { useAccountsStore } from '../../stores';

import { HoverButton } from '../primitives/HoverButton';
Expand All@@ -16,7 +18,6 @@ import {
isGroupByRepository,
} from '../../utils/notifications/group';
import { openAccountProfile, openHostIssues, openHostPulls } from '../../utils/system/links';
import { cn } from '../../utils/ui/cn';
import { getChevronDetails } from '../../utils/ui/display';
import { AllRead } from '../AllRead';
import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/notifications/NotificationFooter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,12 @@ import type { FC, MouseEvent } from 'react';

import { RelativeTime, Stack, Text } from '@primer/react';

import { cn } from 'cn';

import { type GitifyNotification, Opacity, Size } from '../../types';

import { getAdapter } from '../../utils/forges/registry';
import { openUserProfile } from '../../utils/system/links';
import { cn } from '../../utils/ui/cn';
import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
import { MetricGroup } from '../metrics/MetricGroup';

Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/notifications/NotificationHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,14 @@ import type { FC, MouseEvent } from 'react';

import { Stack } from '@primer/react';

import { cn } from 'cn';

import { useSettingsStore } from '../../stores';

import { type GitifyNotification, Opacity, Size } from '../../types';

import { isGroupByDate } from '../../utils/notifications/group';
import { openRepository } from '../../utils/system/links';
import { cn } from '../../utils/ui/cn';
import { AvatarWithFallback } from '../avatars/AvatarWithFallback';

export interface NotificationHeaderProps {
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/notifications/NotificationRow.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { type CSSProperties, type FC, useState } from 'react';
import { BellSlashIcon, CheckIcon, ReadIcon } from '@primer/octicons-react';
import { Stack, Text, Tooltip } from '@primer/react';

import { cn } from 'cn';

import { useNotifications } from '../../hooks/useNotifications';
import {
getNotificationFailureKey,
Expand All@@ -22,7 +24,6 @@ import {
import { isGroupByDate } from '../../utils/notifications/group';
import { shouldRemoveNotificationsFromState } from '../../utils/notifications/remove';
import { openNotification } from '../../utils/system/links';
import { cn } from '../../utils/ui/cn';
import { NotificationFooter } from './NotificationFooter';
import { NotificationHeader } from './NotificationHeader';
import { NotificationTitle } from './NotificationTitle';
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/notifications/NotificationTitle.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,10 @@ import type { FC } from 'react';

import { Text } from '@primer/react';

import { cn } from 'cn';

import { useSettingsStore } from '../../stores';

import { cn } from '../../utils/ui/cn';
import { parseInlineCode } from '../../utils/ui/display';

interface NotificationTitleProps {
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/components/notifications/RepositoryNotifications.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { type FC, type MouseEvent, useState } from 'react';
import { CheckIcon, ReadIcon } from '@primer/octicons-react';
import { Button, Stack } from '@primer/react';

import { cn } from 'cn';

import { useNotifications } from '../../hooks/useNotifications';
import { getNotificationFailureKey, useNotificationActionFailuresStore } from '../../stores';

Expand All@@ -14,7 +16,6 @@ import { type GitifyNotification, Opacity, Size } from '../../types';
import { isMarkAsDoneFeatureSupported } from '../../utils/api/features';
import { shouldRemoveNotificationsFromState } from '../../utils/notifications/remove';
import { openRepository } from '../../utils/system/links';
import { cn } from '../../utils/ui/cn';
import { getChevronDetails } from '../../utils/ui/display';
import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
import { NotificationRow } from './NotificationRow';
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/primitives/CustomCounter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { FC } from 'react';

import { Text } from '@primer/react';

import { cn } from '../../utils/ui/cn';
import { cn } from 'cn';

type CounterScheme = 'primary' | 'secondary' | 'empty';

Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/primitives/HoverGroup.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import type { FC, ReactNode } from 'react';

import { Stack } from '@primer/react';

import { cn } from '../../utils/ui/cn';
import { cn } from 'cn';

interface HoverGroupProps {
children: ReactNode;
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/routes/Login.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ import { useNavigate } from 'react-router-dom';

import { Button, Heading, Stack, Text } from '@primer/react';

import { cn } from 'cn';

import { useAccountsStore } from '../stores';

import { LogoIcon } from '../components/icons/LogoIcon';
Expand All@@ -13,7 +15,6 @@ import type { ForgeAdapter, LoginMethodDescriptor } from '../utils/forges/types'

import { listAdapters } from '../utils/forges/registry';
import { showWindow } from '../utils/system/comms';
import { cn } from '../utils/ui/cn';

/**
* Pick the method that should drive the dominant CTA for a forge.
Expand Down
8 changes: 0 additions & 8 deletions src/renderer/utils/ui/cn.test.ts
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/renderer/utils/ui/cn.ts
View file
Open in desktop

This file was deleted.

Loading