diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 94992862..61707399 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -367,44 +367,7 @@ importers: specifier: ^5.9.2 version: 5.9.2 - dist: - dependencies: - chart.js: - specifier: ^4.5.0 - version: 4.5.0 - chartjs-adapter-date-fns: - specifier: ^3.0.0 - version: 3.0.0(chart.js@4.5.0)(date-fns@2.30.0) - colord: - specifier: ^2.9.2 - version: 2.9.3 - jsonwebtoken: - specifier: ^9.0.2 - version: 9.0.2 - lucide-react: - specifier: ^0.542.0 - version: 0.542.0(react@19.1.1) - pure-rand: - specifier: ^7.0.1 - version: 7.0.1 - react-simple-maps: - specifier: ^2.3.0 - version: 2.3.0(prop-types@15.8.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - react-use-measure: - specifier: ^2.0.4 - version: 2.1.7(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - react-window: - specifier: ^1.8.6 - version: 1.8.11(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - serialize-error: - specifier: ^12.0.0 - version: 12.0.0 - thenby: - specifier: ^1.3.4 - version: 1.3.4 - uuid: - specifier: ^11.1.0 - version: 11.1.0 + dist: {} packages: @@ -5283,11 +5246,6 @@ packages: peerDependencies: react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 - lucide-react@0.542.0: - resolution: {integrity: sha512-w3hD8/SQB7+lzU2r4VdFyzzOzKnUjTZIF/MQJGSSvni7Llewni4vuViRppfRAa2guOsY5k4jZyxw/i9DQHv+dw==} - peerDependencies: - react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 - lucide-react@0.543.0: resolution: {integrity: sha512-fpVfuOQO0V3HBaOA1stIiP/A2fPCXHIleRZL16Mx3HmjTYwNSbimhnFBygs2CAfU1geexMX5ItUcWBGUaqw5CA==} peerDependencies: @@ -13418,10 +13376,6 @@ snapshots: dependencies: react: 19.1.1 - lucide-react@0.542.0(react@19.1.1): - dependencies: - react: 19.1.1 - lucide-react@0.543.0(react@19.1.1): dependencies: react: 19.1.1 diff --git a/src/app/(main)/boards/BoardAddForm.tsx b/src/app/(main)/boards/BoardAddForm.tsx index e0467082..8e7b764c 100644 --- a/src/app/(main)/boards/BoardAddForm.tsx +++ b/src/app/(main)/boards/BoardAddForm.tsx @@ -1,7 +1,6 @@ import { Form, FormField, FormSubmitButton, Row, TextField, Button } from '@umami/react-zen'; -import { useUpdateQuery } from '@/components/hooks'; +import { useUpdateQuery, useMessages } from '@/components/hooks'; import { DOMAIN_REGEX } from '@/lib/constants'; -import { useMessages } from '@/components/hooks'; export function BoardAddForm({ teamId, diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx index b3fa289c..558a9cd3 100644 --- a/src/app/(main)/layout.tsx +++ b/src/app/(main)/layout.tsx @@ -1,8 +1,13 @@ +import { Suspense } from 'react'; import { Metadata } from 'next'; import { App } from './App'; export default function ({ children }) { - return {children}; + return ( + + {children} + + ); } export const metadata: Metadata = { diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx index cbd9b894..5e266dd6 100644 --- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx +++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx @@ -5,8 +5,8 @@ import { File, User } from '@/components/icons'; import { Lightning } from '@/components/svg'; import { formatLongNumber } from '@/lib/format'; import { ReportEditButton } from '@/components/input/ReportEditButton'; -import { FunnelEditForm } from './FunnelEditForm'; import { ChangeLabel } from '@/components/metrics/ChangeLabel'; +import { FunnelEditForm } from './FunnelEditForm'; type FunnelResult = { type: string; diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx index 9ef5840c..dead3cab 100644 --- a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx +++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx @@ -1,7 +1,8 @@ import { Grid, Row, Column, Text, Icon, ProgressBar, Dialog } from '@umami/react-zen'; import { ReportEditButton } from '@/components/input/ReportEditButton'; import { useMessages, useResultQuery } from '@/components/hooks'; -import { File, Lightning, User } from '@/components/icons'; +import { File, User } from '@/components/icons'; +import { Lightning } from '@/components/svg'; import { LoadingPanel } from '@/components/common/LoadingPanel'; import { formatLongNumber } from '@/lib/format'; import { GoalEditForm } from './GoalEditForm'; diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx index 965e7a31..d897a76a 100644 --- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx +++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx @@ -3,7 +3,8 @@ import { TooltipTrigger, Tooltip, Focusable, Icon, Text, Row, Column } from '@um import { firstBy } from 'thenby'; import classNames from 'classnames'; import { useEscapeKey, useMessages, useResultQuery } from '@/components/hooks'; -import { File, Lightning } from '@/components/icons'; +import { File } from '@/components/icons'; +import { Lightning } from '@/components/svg'; import { objectToArray } from '@/lib/data'; import { formatLongNumber } from '@/lib/format'; import { LoadingPanel } from '@/components/common/LoadingPanel'; diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx index e69b80df..04db76f1 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx @@ -1,6 +1,7 @@ import { Tabs, TabList, Tab, Icon, Text, Row } from '@umami/react-zen'; import { useMessages, useNavigation, useWebsite } from '@/components/hooks'; -import { Clock, Eye, Lightning, User, ChartPie } from '@/components/icons'; +import { Clock, Eye, User, ChartPie } from '@/components/icons'; +import { Lightning } from '@/components/svg'; export function WebsiteTabs() { const website = useWebsite(); diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx index 07690ff1..8cd31016 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx @@ -8,7 +8,8 @@ import { useTimezone, useWebsite, } from '@/components/hooks'; -import { Eye, User, Lightning } from '@/components/icons'; +import { Eye, User } from '@/components/icons'; +import { Lightning } from '@/components/svg'; import { BROWSERS, OS_NAMES } from '@/lib/constants'; import { stringToColor } from '@/lib/format'; import { useMemo, useState } from 'react'; diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx index 7cc931e9..4ed55427 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx @@ -12,7 +12,8 @@ import { Dialog, } from '@umami/react-zen'; import { LoadingPanel } from '@/components/common/LoadingPanel'; -import { Lightning, Eye, FileText } from '@/components/icons'; +import { Eye, FileText } from '@/components/icons'; +import { Lightning } from '@/components/svg'; import { useMessages, useSessionActivityQuery, useTimezone } from '@/components/hooks'; import { EventData } from '@/components/metrics/EventData'; diff --git a/src/app/api/send/route.ts b/src/app/api/send/route.ts index 9fe03ff4..37824e46 100644 --- a/src/app/api/send/route.ts +++ b/src/app/api/send/route.ts @@ -196,10 +196,7 @@ export async function POST(request: Request) { referrerPath = referrerUrl.pathname; referrerQuery = referrerUrl.search.substring(1); - - if (referrerUrl.hostname !== 'localhost') { - referrerDomain = referrerUrl.hostname.replace(/^www\./, ''); - } + referrerDomain = referrerUrl.hostname.replace(/^www\./, ''); } const eventType = linkId diff --git a/src/app/layout.tsx b/src/app/layout.tsx index b2430cc2..745f6461 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,3 +1,4 @@ +import { Suspense } from 'react'; import { Metadata } from 'next'; import { Providers } from './Providers'; import '@fontsource/inter/300.css'; @@ -32,7 +33,9 @@ export default function ({ children }) { - {children} + + {children} + );