Updated redirect config.

fix(hash): improve URL normalization and handling in tracking functions

next.config.ts

@@ -117,22 +117,22 @@ const redirects = [
   {
     source: '/settings',
     destination: '/settings/preferences',
-    permanent: true,
+    permanent: false,
   },
   {
     source: '/teams/:id',
     destination: '/teams/:id/websites',
-    permanent: true,
+    permanent: false,
   },
   {
     source: '/teams/:id/settings',
     destination: '/teams/:id/settings/preferences',
-    permanent: true,
+    permanent: false,
   },
   {
     source: '/admin',
     destination: '/admin/users',
-    permanent: true,
+    permanent: false,
   },
 ];
 

package.components.json

@@ -1,6 +1,6 @@
 {
   "name": "@umami/components",
-  "version": "0.123.0",
+  "version": "0.125.0",
   "description": "Umami React components.",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",

src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx

@@ -25,7 +25,7 @@ export function WebsiteMenu({ websiteId }: { websiteId: string }) {
     if (id === 'compare') {
       router.push(updateParams({ compare: 'prev' }));
     } else if (id === 'edit') {
-      router.push(renderUrl(`/settings/websites/${websiteId}`));
+      router.push(renderUrl(`/websites/${websiteId}`));
     }
   };
 

src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsx

@@ -39,7 +39,7 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
   const handleSave = () => {
     touch('websites');
     onSave?.();
-    router.push(renderUrl(`/settings/websites`));
+    router.push(renderUrl(`/websites`));
   };
 
   const handleReset = async () => {

src/components/common/ActionForm.tsx

@@ -2,12 +2,12 @@ import { Row, Column, Text } from '@umami/react-zen';
 
 export function ActionForm({ label, description, children }) {
   return (
-    <Row padding="6" border borderRadius="3" justifyContent="space-between" shadow="2">
+    <Row alignItems="center" justifyContent="space-between" gap>
-      <Column gap>
+      <Column gap="2">
         <Text weight="bold">{label}</Text>
-        <Text>{description}</Text>
+        <Text color="muted">{description}</Text>
       </Column>
-      <Row gap="3" alignItems="center">
+      <Row alignItems="center" gap>
         {children}
       </Row>
     </Row>

src/components/hooks/queries/useUserTeamsQuery.ts

@@ -8,7 +8,7 @@ export function useUserTeamsQuery(userId: string) {
   return useQuery({
     queryKey: ['teams', { userId, modified }],
     queryFn: () => {
-      return get(`/users/${userId}/teams`, { userId });
+      return get(`/users/${userId}/teams`);
     },
     enabled: !!userId,
   });

src/components/input/SettingsButton.tsx

@@ -24,7 +24,7 @@ export function SettingsButton() {
   const handleAction = (id: Key) => {
     if (id === 'settings') {
       if (cloudMode) {
-        window.location.href = `${cloudUrl}/dashboard`;
+        window.location.href = `${cloudUrl}/settings`;
         return;
       }
     }

src/index.ts

@@ -1,3 +1,8 @@
+export * from '@/app/(main)/settings/preferences/LanguageSetting';
+export * from '@/app/(main)/settings/preferences/PreferenceSettings';
+export * from '@/app/(main)/settings/preferences/PreferencesPage';
+export * from '@/app/(main)/settings/preferences/ThemeSetting';
+
 export * from '@/app/(main)/teams/[teamId]/TeamMemberEditButton';
 export * from '@/app/(main)/teams/[teamId]/TeamMemberEditForm';
 export * from '@/app/(main)/teams/[teamId]/TeamMemberRemoveButton';

src/tracker/index.js

@@ -38,6 +38,18 @@
 
   /* Helper functions */
 
+  const normalize = raw => {
+    if (!raw) return raw;
+    try {
+      const u = new URL(raw, location.href);
+      if (excludeSearch) u.search = '';
+      if (excludeHash) u.hash = '';
+      return u.toString();
+    } catch (e) {
+      return raw;
+    }
+  };
+
   const getPayload = () => ({
     website,
     screen,
@@ -61,11 +73,7 @@
     if (!url) return;
 
     currentRef = currentUrl;
-    currentUrl = new URL(url, location.href);
+    currentUrl = normalize(new URL(url, location.href).toString());
-
-    if (excludeSearch) currentUrl.search = '';
-    if (excludeHash) currentUrl.hash = '';
-    currentUrl = currentUrl.toString();
 
     if (currentUrl !== currentRef) {
       setTimeout(track, delayDuration);
@@ -211,8 +219,9 @@
     };
   }
 
-  let currentUrl = href;
+  let currentUrl = normalize(href);
-  let currentRef = referrer.startsWith(origin) ? '' : referrer;
+  let currentRef = normalize(referrer.startsWith(origin) ? '' : referrer);
+
   let initialized = false;
   let disabled = false;
   let cache;