Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Update API version to 3.3.1 and replace classnames with cn

Mike Cao9c7813167154
diff --git a/package.json b/package.json
index 357656312..29741be8a 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,6 @@
"chalk": "^5.6.2",
"chart.js": "^4.5.1",
"chartjs-adapter-date-fns": "^3.0.0",
- "classnames": "^2.3.1",
"colord": "^2.10.0",
"date-fns": "^4.4.0",
"date-fns-tz": "^3.2.0",
diff --git a/packages/api-client/src/generated/operations.ts b/packages/api-client/src/generated/operations.ts
index 36821e308..f40d8b687 100644
--- a/packages/api-client/src/generated/operations.ts
+++ b/packages/api-client/src/generated/operations.ts
@@ -4,7 +4,7 @@
import type { RequestOptions } from '../types';
import type { components, operations as OperationTypes } from './types';
-export const API_VERSION = '3.3.0';
+export const API_VERSION = '3.3.1';
export type HttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d15636235..ab5ce3055 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,9 +56,6 @@ importers:
chartjs-adapter-date-fns:
specifier: ^3.0.0
- classnames:
- specifier: ^2.3.1
- version: 2.5.1
colord:
specifier: ^2.10.0
version: 2.10.0
diff --git a/public/openapi.json b/public/openapi.json
index d3a09e9bd..f57a3f22c 100644
--- a/public/openapi.json
+++ b/public/openapi.json
@@ -1614,7 +1614,7 @@
"name": "MIT"
},
"title": "Umami API",
- "version": "3.3.0"
+ "version": "3.3.1"
},
"openapi": "3.1.0",
"paths": {
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx
index 45fc58c0b..700f51ac2 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx
@@ -1,5 +1,4 @@
-import { Column, Icon, Row, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';
-import classNames from 'classnames';
+import { Column, cn, Icon, Row, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';
import { useMemo, useState } from 'react';
import { firstBy } from 'thenby';
import { LoadingPanel } from '@/components/common/LoadingPanel';
@@ -169,7 +168,7 @@ export function Journey({ websiteId, steps, startStep, endStep, view }: JourneyP
return (
<div
key={columnIndex}
- className={classNames(styles.column, {
+ className={cn(styles.column, {
[styles.selected]: selectedNode,
[styles.active]: activeNode,
})}
@@ -217,7 +216,7 @@ export function Journey({ websiteId, steps, startStep, endStep, view }: JourneyP
onMouseLeave={() => selected && setActiveNode(null)}
>
<div
- className={classNames(styles.node, {
+ className={cn(styles.node, {
[styles.selected]: selected,
[styles.active]: active,
})}
@@ -260,7 +259,7 @@ export function Journey({ websiteId, steps, startStep, endStep, view }: JourneyP
return (
<div
key={`${fromIndex}${nodeIndex}${i}`}
- className={classNames(styles.line, {
+ className={cn(styles.line, {
[styles.active]:
active &&
activeNode?.paths.find(
@@ -274,14 +273,14 @@ export function Journey({ websiteId, steps, startStep, endStep, view }: JourneyP
})}
style={{ height }}
>
- <div className={classNames(styles.segment, styles.start)} />
+ <div className={cn(styles.segment, styles.start)} />
<div
- className={classNames(styles.segment, styles.mid)}
+ className={cn(styles.segment, styles.mid)}
style={{
height: midHeight,
}}
/>
- <div className={classNames(styles.segment, styles.end)} />
+ <div className={cn(styles.segment, styles.end)} />
</div>
);
})}