Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix lint warnings

Blue Mouse0836b9486e56
diff --git a/web/app/components/marketing/ConveyorBelt.tsx b/web/app/components/marketing/ConveyorBelt.tsx
index 3b89cac6d..456d15533 100644
--- a/web/app/components/marketing/ConveyorBelt.tsx
+++ b/web/app/components/marketing/ConveyorBelt.tsx
@@ -1,9 +1,9 @@
-import clsx from 'clsx'
+import { cn } from '~/utils/generic'
const Logo = ({ label, className }: { label: string; className: string }) => {
return (
<div
- className={clsx(
+ className={cn(
className,
'absolute top-[calc(50%-1rem)] flex items-center gap-2 px-3 py-1 whitespace-nowrap',
'bg-gray-700 bg-gradient-to-t from-50% ring-1 ring-white/10 ring-inset',
diff --git a/web/app/components/marketing/LogoTimeline.tsx b/web/app/components/marketing/LogoTimeline.tsx
index 3e191cf77..685f6ebad 100644
--- a/web/app/components/marketing/LogoTimeline.tsx
+++ b/web/app/components/marketing/LogoTimeline.tsx
@@ -12,9 +12,10 @@ import {
SiWix,
SiWordpress,
} from '@icons-pack/react-simple-icons'
-import clsx from 'clsx'
import React from 'react'
+import { cn } from '~/utils/generic'
+
const Row = ({ children }: { children: React.ReactNode }) => {
return (
<div className='group relative'>
@@ -28,7 +29,7 @@ const Row = ({ children }: { children: React.ReactNode }) => {
const Logo = ({ label, icon, className }: { label: string; icon: React.ReactNode; className: string }) => {
return (
<div
- className={clsx(
+ className={cn(
className,
'absolute top-2 flex items-center gap-2 px-3 py-1 whitespace-nowrap',
'rounded-full bg-gradient-to-t from-gray-800 from-50% to-gray-700 ring-1 ring-white/10 ring-inset',
diff --git a/web/app/pages/Auth/Signin/Signin.tsx b/web/app/pages/Auth/Signin/Signin.tsx
index 5ea51d04c..f31a29fb8 100644
--- a/web/app/pages/Auth/Signin/Signin.tsx
+++ b/web/app/pages/Auth/Signin/Signin.tsx
@@ -1,4 +1,3 @@
-import clsx from 'clsx'
import _isEmpty from 'lodash/isEmpty'
import _isString from 'lodash/isString'
import _keys from 'lodash/keys'
@@ -21,7 +20,7 @@ import Checkbox from '~/ui/Checkbox'
import Input from '~/ui/Input'
import { setAccessToken, removeAccessToken } from '~/utils/accessToken'
import { deleteCookie, getCookie } from '~/utils/cookie'
-import { delay, openBrowserWindow } from '~/utils/generic'
+import { cn, delay, openBrowserWindow } from '~/utils/generic'
import { setRefreshToken, removeRefreshToken } from '~/utils/refreshToken'
import routes from '~/utils/routes'
import { isValidEmail, isValidPassword, MIN_PASSWORD_CHARS } from '~/utils/validator'
@@ -357,7 +356,7 @@ const Signin = () => {
</span>
</div>
</div>
- <div className={clsx('mt-6 grid gap-4', isSelfhosted ? 'grid-cols-1' : 'grid-cols-2')}>
+ <div className={cn('mt-6 grid gap-4', isSelfhosted ? 'grid-cols-1' : 'grid-cols-2')}>
{isSelfhosted ? (
<OIDCAuth onClick={() => onSsoLogin('openid-connect')} disabled={isLoading} className='w-full' />
) : (
diff --git a/web/app/routes/_index.tsx b/web/app/routes/_index.tsx
index cfaa7d914..c915d0e77 100644
--- a/web/app/routes/_index.tsx
+++ b/web/app/routes/_index.tsx
@@ -2,7 +2,6 @@ import { ArrowRightIcon } from '@heroicons/react/20/solid'
import { CheckIcon, GlobeAltIcon } from '@heroicons/react/24/outline'
import { StarIcon } from '@heroicons/react/24/solid'
import { UAParser } from '@ua-parser-js/pro-business'
-import clsx from 'clsx'
import { motion } from 'framer-motion'
import _map from 'lodash/map'
import { Cookie, FileTextIcon, MousePointerClickIcon } from 'lucide-react'
@@ -36,7 +35,7 @@ import CCRow from '~/pages/Project/View/components/CCRow'
import { MetricCard, MetricCardSelect } from '~/pages/Project/View/components/MetricCards'
import { useAuth } from '~/providers/AuthProvider'
import { useTheme } from '~/providers/ThemeProvider'
-import { getStringFromTime, getTimeFromSeconds } from '~/utils/generic'
+import { cn, getStringFromTime, getTimeFromSeconds } from '~/utils/generic'
import routesPath from '~/utils/routes'
export const sitemap: SitemapFunction = () => ({
@@ -430,7 +429,7 @@ const FeatureBlock = ({ heading, description, children, className, dark }: Featu
whileHover='active'
variants={{ idle: {}, active: {} }}
data-dark={dark ? 'true' : undefined}
- className={clsx(
+ className={cn(
'group relative flex flex-col overflow-hidden rounded-lg bg-white ring-1 ring-black/5 data-[dark]:bg-slate-800 data-[dark]:ring-white/15',
className,
)}
diff --git a/web/app/utils/generic.ts b/web/app/utils/generic.ts
index 75e33c835..d1bfbaf16 100644
--- a/web/app/utils/generic.ts
+++ b/web/app/utils/generic.ts
@@ -1,4 +1,4 @@
-import clsx, { type ClassValue } from 'clsx'
+import { clsx, type ClassValue } from 'clsx'
import _find from 'lodash/find'
import _map from 'lodash/map'
import _reduce from 'lodash/reduce'