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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Reformatted files with biome.
Mike Caofa8d8055df3f
diff --git a/biome.json b/biome.jsonindex 847b1dc0b..0dec793be 100644--- a/biome.json+++ b/biome.json@@ -26,8 +26,13 @@"style": {"noDescendingSpecificity": "off"},+ "complexity": {+ "noImportantStyles": "off"+ },"suspicious": {- "noExplicitAny": "off"+ "noArrayIndexKey": "off",+ "noExplicitAny": "off",+ "noImplicitAnyLet": "off"},"performance": {"noImgElement": "off"diff --git a/docker/middleware.ts b/docker/middleware.tsindex 3fd7f20e3..4b189df89 100644--- a/docker/middleware.ts+++ b/docker/middleware.ts@@ -1,4 +1,4 @@-import { NextRequest, NextResponse } from 'next/server';+import { type NextRequest, NextResponse } from 'next/server';export const config = {matcher: '/:path*',diff --git a/package.json b/package.jsonindex d8ca9cfd3..306e10f37 100644--- a/package.json+++ b/package.json@@ -49,11 +49,11 @@"cypress-run": "cypress run cypress run","lint": "biome lint .","format": "biome format --write .",- "check": "biome check --apply"+ "check": "biome check --write"},"lint-staged": {"**/*.{js,jsx,ts,tsx,json,css}": [- "npm run format"+ "biome check --write --no-errors-on-unmatched --files-ignore-unknown=true"]},"cacheDirectories": [@@ -89,7 +89,6 @@"detect-browser": "^5.2.0","dotenv": "^17.2.3","esbuild": "^0.25.11",- "eslint-plugin-promise": "^6.1.1","fs-extra": "^11.3.2","immer": "^10.2.0","ipaddr.js": "^2.0.1",@@ -141,8 +140,6 @@"@types/react": "^19.2.2","@types/react-dom": "^19.2.2","@types/react-window": "^1.8.8",- "@typescript-eslint/eslint-plugin": "^8.46.2",- "@typescript-eslint/parser": "^8.46.2","babel-plugin-react-compiler": "19.1.0-rc.2","cross-env": "^10.1.0","cypress": "^13.6.6",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 92a8bd32e..5db0535d2 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -10,7 +10,7 @@ importers:dependencies:'@clickhouse/client':specifier: ^1.12.0- version: 1.12.1+ version: 1.14.0'@date-fns/utc':specifier: ^1.2.0version: 1.2.0@@ -25,16 +25,16 @@ importers:version: 5.2.8'@hello-pangea/dnd':specifier: ^17.0.0- version: 17.0.0(@types/[email protected])([email protected]([email protected]))([email protected])+ version: 17.0.0(@types/[email protected])([email protected]([email protected]))([email protected])'@prisma/adapter-pg':specifier: ^7.0.0version: 7.0.0'@prisma/client':specifier: ^7.0.0- version: 7.0.0([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])+ version: 7.0.0([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])'@prisma/extension-read-replicas':specifier: ^0.4.1- version: 0.4.1(@prisma/[email protected]([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected]))+ version: 0.4.1(@prisma/[email protected]([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected]))'@react-spring/web':specifier: ^10.0.3@@ -43,16 +43,16 @@ importers:version: 8.1.0([email protected])'@tanstack/react-query':specifier: ^5.90.5- version: 5.90.5([email protected])+ version: 5.90.10([email protected])'@umami/react-zen':specifier: ^0.210.0- version: 0.210.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))+ version: 0.210.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))'@umami/redis-client':specifier: ^0.29.0version: 0.29.0bcryptjs:specifier: ^3.0.2- version: 3.0.2+ version: 3.0.3chalk:specifier: ^5.6.2version: 5.6.2@@ -94,10 +94,7 @@ importers:version: 17.2.3esbuild:specifier: ^0.25.11- version: 0.25.11- eslint-plugin-promise:- specifier: ^6.1.1- version: 6.6.0([email protected])+ version: 0.25.12fs-extra:specifier: ^11.3.2version: 11.3.2@@ -118,7 +115,7 @@ importers:version: 2.0.0isbot:specifier: ^5.1.31- version: 5.1.31+ version: 5.1.32jsonwebtoken:specifier: ^9.0.2version: 9.0.2@@ -133,7 +130,7 @@ importers:version: 0.543.0([email protected])maxmind:specifier: ^5.0.0- version: 5.0.0+ version: 5.0.1next:specifier: 15.5.3version: 15.5.3(@babel/[email protected])([email protected])([email protected]([email protected]))([email protected])@@ -151,7 +148,7 @@ importers:version: 8.16.3prisma:specifier: ^7.0.0- version: 7.0.0(@types/[email protected])([email protected]([email protected]))([email protected])([email protected])+ version: 7.0.0(@types/[email protected])([email protected]([email protected]))([email protected])([email protected])pure-rand:specifier: ^7.0.1version: 7.0.1@@ -199,59 +196,53 @@ importers:version: 4.1.12zustand:specifier: ^5.0.8- version: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))+ version: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))devDependencies:'@biomejs/biome':specifier: ^2.3.6- version: 2.3.6+ version: 2.3.7'@formatjs/cli':specifier: ^4.2.29- version: 4.8.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ version: 4.8.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))'@netlify/plugin-nextjs':specifier: ^5.14.4- version: 5.14.4+ version: 5.14.7'@rollup/plugin-alias':specifier: ^5.0.0- version: 5.1.1([email protected])+ version: 5.1.1([email protected])'@rollup/plugin-commonjs':specifier: ^25.0.4- version: 25.0.8([email protected])+ version: 25.0.8([email protected])'@rollup/plugin-json':specifier: ^6.0.0- version: 6.1.0([email protected])+ version: 6.1.0([email protected])'@rollup/plugin-node-resolve':specifier: ^15.2.0- version: 15.3.1([email protected])+ version: 15.3.1([email protected])'@rollup/plugin-replace':specifier: ^5.0.2- version: 5.0.7([email protected])+ version: 5.0.7([email protected])'@rollup/plugin-terser':specifier: ^0.4.4- version: 0.4.4([email protected])+ version: 0.4.4([email protected])'@rollup/plugin-typescript':specifier: ^12.3.0'@types/jest':specifier: ^30.0.0version: 30.0.0'@types/node':specifier: ^24.9.2- version: 24.9.2+ version: 24.10.1'@types/react':specifier: ^19.2.2- version: 19.2.2+ version: 19.2.6'@types/react-dom':specifier: ^19.2.2- version: 19.2.2(@types/[email protected])+ version: 19.2.3(@types/[email protected])'@types/react-window':specifier: ^1.8.8version: 1.8.8- '@typescript-eslint/eslint-plugin':- specifier: ^8.46.2- version: 8.46.2(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])- '@typescript-eslint/parser':- specifier: ^8.46.2- version: 8.46.2([email protected])([email protected])babel-plugin-react-compiler:specifier: 19.1.0-rc.2version: 19.1.0-rc.2@@ -263,16 +254,16 @@ importers:version: 13.17.0extract-react-intl-messages:specifier: ^4.1.1- version: 4.1.1([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ version: 4.1.1([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))husky:specifier: ^9.1.7version: 9.1.7jest:specifier: ^29.7.0- version: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ version: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))lint-staged:specifier: ^16.2.6- version: 16.2.6+ version: 16.2.7postcss:specifier: ^8.5.6version: 8.5.6@@ -290,25 +281,25 @@ importers:version: 2.4.2rollup:specifier: ^4.52.5- version: 4.52.5+ version: 4.53.3rollup-plugin-copy:specifier: ^3.4.0version: 3.5.0rollup-plugin-delete:specifier: ^3.0.1- version: 3.0.1([email protected])+ version: 3.0.1([email protected])rollup-plugin-dts:specifier: ^6.2.3- version: 6.2.3([email protected])([email protected])+ version: 6.2.3([email protected])([email protected])rollup-plugin-node-externals:specifier: ^8.1.1- version: 8.1.1([email protected])+ version: 8.1.2([email protected])rollup-plugin-peer-deps-external:specifier: ^2.2.4- version: 2.2.4([email protected])+ version: 2.2.4([email protected])rollup-plugin-postcss:specifier: ^4.0.2stylelint:specifier: ^15.10.1version: 15.11.0([email protected])@@ -326,13 +317,13 @@ importers:version: 6.2.1ts-jest:specifier: ^29.4.5- version: 29.4.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])+ version: 29.4.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])ts-node:specifier: ^10.9.1- version: 10.9.2(@types/[email protected])([email protected])+ version: 10.9.2(@types/[email protected])([email protected])tsup:specifier: ^8.5.0typescript:specifier: ^5.9.3version: 5.9.3@@ -514,55 +505,55 @@ packages:'@bcoe/[email protected]':resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}- '@biomejs/[email protected]':- resolution: {integrity: sha512-oqUhWyU6tae0MFsr/7iLe++QWRg+6jtUhlx9/0GmCWDYFFrK366sBLamNM7D9Y+c7YSynUFKr8lpEp1r6Sk7eA==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-CTbAS/jNAiUc6rcq94BrTB8z83O9+BsgWj2sBCQg9rD6Wkh2gjfR87usjx0Ncx0zGXP1NKgT7JNglay5Zfs9jw==}engines: {node: '>=14.21.3'}hasBin: true- '@biomejs/[email protected]':- resolution: {integrity: sha512-P4JWE5d8UayBxYe197QJwyW4ZHp0B+zvRIGCusOm1WbxmlhpAQA1zEqQuunHgSIzvyEEp4TVxiKGXNFZPg7r9Q==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-LirkamEwzIUULhXcf2D5b+NatXKeqhOwilM+5eRkbrnr6daKz9rsBL0kNZ16Hcy4b8RFq22SG4tcLwM+yx/wFA==}engines: {node: '>=14.21.3'}cpu: [arm64]os: [darwin]- '@biomejs/[email protected]':- resolution: {integrity: sha512-I4rTebj+F/L9K93IU7yTFs8nQ6EhaCOivxduRha4w4WEZK80yoZ8OAdR1F33m4yJ/NfUuTUbP/Wjs+vKjlCoWA==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-Q4TO633kvrMQkKIV7wmf8HXwF0dhdTD9S458LGE24TYgBjSRbuhvio4D5eOQzirEYg6eqxfs53ga/rbdd8nBKg==}engines: {node: '>=14.21.3'}cpu: [x64]os: [darwin]- '@biomejs/[email protected]':- resolution: {integrity: sha512-oK1NpIXIixbJ/4Tcx40cwiieqah6rRUtMGOHDeK2ToT7yUFVEvXUGRKqH0O4hqZ9tW8TcXNZKfgRH6xrsjVtGg==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-/afy8lto4CB8scWfMdt+NoCZtatBUF62Tk3ilWH2w8ENd5spLhM77zKlFZEvsKJv9AFNHknMl03zO67CiklL2Q==}engines: {node: '>=14.21.3'}cpu: [arm64]os: [linux]- '@biomejs/[email protected]':- resolution: {integrity: sha512-JjYy83eVBnvuINZiqyFO7xx72v8Srh4hsgaacSBCjC22DwM6+ZvnX1/fj8/SBiLuUOfZ8YhU2pfq2Dzakeyg1A==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-inHOTdlstUBzgjDcx0ge71U4SVTbwAljmkfi3MC5WzsYCRhancqfeL+sa4Ke6v2ND53WIwCFD5hGsYExoI3EZQ==}engines: {node: '>=14.21.3'}cpu: [arm64]os: [linux]- '@biomejs/[email protected]':- resolution: {integrity: sha512-QvxB8GHQeaO4FCtwJpJjCgJkbHBbWxRHUxQlod+xeaYE6gtJdSkYkuxdKAQUZEOIsec+PeaDAhW9xjzYbwmOFA==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-CQUtgH1tIN6e5wiYSJqzSwJumHYolNtaj1dwZGCnZXm2PZU1jOJof9TsyiP3bXNDb+VOR7oo7ZvY01If0W3iFQ==}engines: {node: '>=14.21.3'}cpu: [x64]os: [linux]- '@biomejs/[email protected]':- resolution: {integrity: sha512-ZjPXzy5yN9wusIoX+8Zp4p6cL8r0NzJCXg/4r1KLVveIPXd2jKVlqZ6ZyzEq385WwU3OX5KOwQYLQsOc788waQ==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-fJMc3ZEuo/NaMYo5rvoWjdSS5/uVSW+HPRQujucpZqm2ZCq71b8MKJ9U4th9yrv2L5+5NjPF0nqqILCl8HY/fg==}engines: {node: '>=14.21.3'}cpu: [x64]os: [linux]- '@biomejs/[email protected]':- resolution: {integrity: sha512-YM7hLHpwjdt8R7+O2zS1Vo2cKgqEeptiXB1tWW1rgjN5LlpZovBVKtg7zfwfRrFx3i08aNZThYpTcowpTlczug==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-aJAE8eCNyRpcfx2JJAtsPtISnELJ0H4xVVSwnxm13bzI8RwbXMyVtxy2r5DV1xT3WiSP+7LxORcApWw0LM8HiA==}engines: {node: '>=14.21.3'}cpu: [arm64]os: [win32]- '@biomejs/[email protected]':- resolution: {integrity: sha512-psgNEYgMAobY5h+QHRBVR9xvg2KocFuBKm6axZWB/aD12NWhQjiVFQUjV6wMXhlH4iT0Q9c3yK5JFRiDC/rzHA==}+ '@biomejs/[email protected]':+ resolution: {integrity: sha512-pulzUshqv9Ed//MiE8MOUeeEkbkSHVDVY5Cz5wVAnH1DUqliCQG3j6s1POaITTFqFfo7AVIx2sWdKpx/GS+Nqw==}engines: {node: '>=14.21.3'}cpu: [x64]os: [win32]@@ -579,11 +570,11 @@ packages:'@chevrotain/[email protected]':resolution: {integrity: sha512-hBzuU5+JjB2cqNZyszkDHZgOSrUUT8V3dhgRl8Q9Gp6dAj/H5+KILGjbhDpc3Iy9qmqlm/akuOI2ut9VUtzJxQ==}- '@clickhouse/[email protected]':- resolution: {integrity: sha512-ccw1N6hB4+MyaAHIaWBwGZ6O2GgMlO99FlMj0B0UEGfjxM9v5dYVYql6FpP19rMwrVAroYs/IgX2vyZEBvzQLg==}+ '@clickhouse/[email protected]':+ resolution: {integrity: sha512-CyUcv2iCkZ1A++vmOSufYRpHR3aAWVfbrWed7ATzf0yyx/BW/2SEqlL07vBpSRa3BIkQe/DSOHVv8JkWZpUOwQ==}- '@clickhouse/[email protected]':- resolution: {integrity: sha512-7ORY85rphRazqHzImNXMrh4vsaPrpetFoTWpZYueCO2bbO6PXYDXp/GQ4DgxnGIqbWB/Di1Ai+Xuwq2o7DJ36A==}+ '@clickhouse/[email protected]':+ resolution: {integrity: sha512-co2spjR7wZoZ3Ck0H/jv76bpiuO3oJHtOmq9/gxFiod2DcT9NFg01u/hXcG8MJFnEJuMB6e3vGqS6IOnLwHqRw==}engines: {node: '>=16'}'@colors/[email protected]':@@ -930,183 +921,317 @@ packages:'@epic-web/[email protected]':resolution: {integrity: sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==}- '@esbuild/[email protected]':- resolution: {integrity: sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}engines: {node: '>=18'}cpu: [ppc64]os: [aix]- '@esbuild/[email protected]':- resolution: {integrity: sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-KuZrd2hRjz01y5JK9mEBSD3Vj3mbCvemhT466rSuJYeE/hjuBrHfjjcjMdTm/sz7au+++sdbJZJmuBwQLuw68A==}+ engines: {node: '>=18'}+ cpu: [ppc64]+ os: [aix]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==}engines: {node: '>=18'}cpu: [arm64]os: [android]- '@esbuild/[email protected]':- resolution: {integrity: sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-CC3vt4+1xZrs97/PKDkl0yN7w8edvU2vZvAFGD16n9F0Cvniy5qvzRXjfO1l94efczkkQE6g1x0i73Qf5uthOQ==}+ engines: {node: '>=18'}+ cpu: [arm64]+ os: [android]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==}+ engines: {node: '>=18'}+ cpu: [arm]+ os: [android]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-j67aezrPNYWJEOHUNLPj9maeJte7uSMM6gMoxfPC9hOg8N02JuQi/T7ewumf4tNvJadFkvLZMlAq73b9uwdMyQ==}engines: {node: '>=18'}cpu: [arm]os: [android]- '@esbuild/[email protected]':- resolution: {integrity: sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==}engines: {node: '>=18'}cpu: [x64]os: [android]- '@esbuild/[email protected]':- resolution: {integrity: sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-wurMkF1nmQajBO1+0CJmcN17U4BP6GqNSROP8t0X/Jiw2ltYGLHpEksp9MpoBqkrFR3kv2/te6Sha26k3+yZ9Q==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [android]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==}+ engines: {node: '>=18'}+ cpu: [arm64]+ os: [darwin]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-uJOQKYCcHhg07DL7i8MzjvS2LaP7W7Pn/7uA0B5S1EnqAirJtbyw4yC5jQ5qcFjHK9l6o/MX9QisBg12kNkdHg==}engines: {node: '>=18'}cpu: [arm64]os: [darwin]- '@esbuild/[email protected]':- resolution: {integrity: sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [darwin]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-8mG6arH3yB/4ZXiEnXof5MK72dE6zM9cDvUcPtxhUZsDjESl9JipZYW60C3JGreKCEP+p8P/72r69m4AZGJd5g==}engines: {node: '>=18'}cpu: [x64]os: [darwin]- '@esbuild/[email protected]':- resolution: {integrity: sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}engines: {node: '>=18'}cpu: [arm64]os: [freebsd]- '@esbuild/[email protected]':- resolution: {integrity: sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-9FHtyO988CwNMMOE3YIeci+UV+x5Zy8fI2qHNpsEtSF83YPBmE8UWmfYAQg6Ux7Gsmd4FejZqnEUZCMGaNQHQw==}+ engines: {node: '>=18'}+ cpu: [arm64]+ os: [freebsd]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [freebsd]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-zCMeMXI4HS/tXvJz8vWGexpZj2YVtRAihHLk1imZj4efx1BQzN76YFeKqlDr3bUWI26wHwLWPd3rwh6pe4EV7g==}engines: {node: '>=18'}cpu: [x64]os: [freebsd]- '@esbuild/[email protected]':- resolution: {integrity: sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==}+ engines: {node: '>=18'}+ cpu: [arm64]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-AS18v0V+vZiLJyi/4LphvBE+OIX682Pu7ZYNsdUHyUKSoRwdnOsMf6FDekwoAFKej14WAkOef3zAORJgAtXnlQ==}engines: {node: '>=18'}cpu: [arm64]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==}+ engines: {node: '>=18'}+ cpu: [arm]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-t76XLQDpxgmq2cNXKTVEB7O7YMb42atj2Re2Haf45HkaUpjM2J0UuJZDuaGbPbamzZ7bawyGFUkodL+zcE+jvQ==}engines: {node: '>=18'}cpu: [arm]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==}+ engines: {node: '>=18'}+ cpu: [ia32]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-Mz1jxqm/kfgKkc/KLHC5qIujMvnnarD9ra1cEcrs7qshTUSksPihGrWHVG5+osAIQ68577Zpww7SGapmzSt4Nw==}engines: {node: '>=18'}cpu: [ia32]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==}+ engines: {node: '>=18'}+ cpu: [loong64]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-QbEREjdJeIreIAbdG2hLU1yXm1uu+LTdzoq1KCo4G4pFOLlvIspBm36QrQOar9LFduavoWX2msNFAAAY9j4BDg==}engines: {node: '>=18'}cpu: [loong64]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==}engines: {node: '>=18'}cpu: [mips64el]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-sJz3zRNe4tO2wxvDpH/HYJilb6+2YJxo/ZNbVdtFiKDufzWq4JmKAiHy9iGoLjAV7r/W32VgaHGkk35cUXlNOg==}+ engines: {node: '>=18'}+ cpu: [mips64el]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==}+ engines: {node: '>=18'}+ cpu: [ppc64]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-z9N10FBD0DCS2dmSABDBb5TLAyF1/ydVb+N4pi88T45efQ/w4ohr/F/QYCkxDPnkhkp6AIpIcQKQ8F0ANoA2JA==}engines: {node: '>=18'}cpu: [ppc64]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==}+ engines: {node: '>=18'}+ cpu: [riscv64]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-pQdyAIZ0BWIC5GyvVFn5awDiO14TkT/19FTmFcPdDec94KJ1uZcmFs21Fo8auMXzD4Tt+diXu1LW1gHus9fhFQ==}engines: {node: '>=18'}cpu: [riscv64]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==}+ engines: {node: '>=18'}+ cpu: [s390x]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-hPlRWR4eIDDEci953RI1BLZitgi5uqcsjKMxwYfmi4LcwyWo2IcRP+lThVnKjNtk90pLS8nKdroXYOqW+QQH+w==}engines: {node: '>=18'}cpu: [s390x]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [linux]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-1hBWx4OUJE2cab++aVZ7pObD6s+DK4mPGpemtnAORBvb5l/g5xFGk0vc0PjSkrDs0XaXj9yyob3d14XqvnQ4gw==}engines: {node: '>=18'}cpu: [x64]os: [linux]- '@esbuild/[email protected]':- resolution: {integrity: sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}+ engines: {node: '>=18'}+ cpu: [arm64]+ os: [netbsd]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-6m0sfQfxfQfy1qRuecMkJlf1cIzTOgyaeXaiVaaki8/v+WB+U4hc6ik15ZW6TAllRlg/WuQXxWj1jx6C+dfy3w==}engines: {node: '>=18'}cpu: [arm64]os: [netbsd]- '@esbuild/[email protected]':- resolution: {integrity: sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [netbsd]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-xbbOdfn06FtcJ9d0ShxxvSn2iUsGd/lgPIO2V3VZIPDbEaIj1/3nBBe1AwuEZKXVXkMmpr6LUAgMkLD/4D2PPA==}engines: {node: '>=18'}cpu: [x64]os: [netbsd]- '@esbuild/[email protected]':- resolution: {integrity: sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}+ engines: {node: '>=18'}+ cpu: [arm64]+ os: [openbsd]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-fWgqR8uNbCQ/GGv0yhzttj6sU/9Z5/Sv/VGU3F5OuXK6J6SlriONKrQ7tNlwBrJZXRYk5jUhuWvF7GYzGguBZQ==}engines: {node: '>=18'}cpu: [arm64]os: [openbsd]- '@esbuild/[email protected]':- resolution: {integrity: sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [openbsd]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-aCwlRdSNMNxkGGqQajMUza6uXzR/U0dIl1QmLjPtRbLOx3Gy3otfFu/VjATy4yQzo9yFDGTxYDo1FfAD9oRD2A==}engines: {node: '>=18'}cpu: [x64]os: [openbsd]- '@esbuild/[email protected]':- resolution: {integrity: sha512-rOREuNIQgaiR+9QuNkbkxubbp8MSO9rONmwP5nKncnWJ9v5jQ4JxFnLu4zDSRPf3x4u+2VN4pM4RdyIzDty/wQ==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}+ engines: {node: '>=18'}+ cpu: [arm64]+ os: [openharmony]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-nyvsBccxNAsNYz2jVFYwEGuRRomqZ149A39SHWk4hV0jWxKM0hjBPm3AmdxcbHiFLbBSwG6SbpIcUbXjgyECfA==}engines: {node: '>=18'}cpu: [arm64]os: [openharmony]- '@esbuild/[email protected]':- resolution: {integrity: sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [sunos]++ '@esbuild/[email protected]':+ resolution: {integrity: sha512-Q1KY1iJafM+UX6CFEL+F4HRTgygmEW568YMqDA5UV97AuZSm21b7SXIrRJDwXWPzr8MGr75fUZPV67FdtMHlHA==}engines: {node: '>=18'}cpu: [x64]os: [sunos]- '@esbuild/[email protected]':- resolution: {integrity: sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==}engines: {node: '>=18'}cpu: [arm64]os: [win32]- '@esbuild/[email protected]':- resolution: {integrity: sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-W1eyGNi6d+8kOmZIwi/EDjrL9nxQIQ0MiGqe/AWc6+IaHloxHSGoeRgDRKHFISThLmsewZ5nHFvGFWdBYlgKPg==}engines: {node: '>=18'}- cpu: [ia32]+ cpu: [arm64]os: [win32]- '@esbuild/[email protected]':- resolution: {integrity: sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==}engines: {node: '>=18'}- cpu: [x64]+ cpu: [ia32]os: [win32]- '@eslint-community/[email protected]':- resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- peerDependencies:- eslint: ^6.0.0 || ^7.0.0 || >=8.0.0-- '@eslint-community/[email protected]':- resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}- engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}-- '@eslint-community/[email protected]':- resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}- engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-30z1aKL9h22kQhilnYkORFYt+3wp7yZsHWus+wSKAJR8JtdfI76LJ4SBdMsCopTR3z/ORqVu5L1vtnHZWVj4cQ==}+ engines: {node: '>=18'}+ cpu: [ia32]+ os: [win32]- '@eslint/[email protected]':- resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [win32]- '@eslint/[email protected]':- resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}+ '@esbuild/[email protected]':+ resolution: {integrity: sha512-aIitBcjQeyOhMTImhLZmtxfdOcuNRpwlPNmlFKPcHQYPhEssw75Cl1TSXJXpMkzaua9FUetx/4OQKq7eJul5Cg==}+ engines: {node: '>=18'}+ cpu: [x64]+ os: [win32]'@fontsource/[email protected]':resolution: {integrity: sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg==}@@ -1190,19 +1315,6 @@ packages:peerDependencies:hono: ^4- '@humanwhocodes/[email protected]':- resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}- engines: {node: '>=10.10.0'}- deprecated: Use @eslint/config-array instead-- '@humanwhocodes/[email protected]':- resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}- engines: {node: '>=12.22'}-- '@humanwhocodes/[email protected]':- resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}- deprecated: Use @eslint/object-schema instead-'@img/[email protected]':resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}engines: {node: '>=18'}@@ -1610,8 +1722,8 @@ packages:resolution: {integrity: sha512-JwqeCQ1U3fvccttHZq7Tk0m/TMC6WcFAQZdukypW3AzlJYKYTGNVd1ANU2GuhKnv4UQuOFj3oAl0LLG/gxFN1w==}engines: {node: '>=16'}- '@netlify/[email protected]':- resolution: {integrity: sha512-HnMHG0tksVoS2E6ImcX9o/EcVH1dckb8ZL1FyghKRsEPYCo+20hQ6zncd5EEOW7K22UN+n1EprCROWUmsbhYMg==}+ '@netlify/[email protected]':+ resolution: {integrity: sha512-RJRPGIlaY3M4KA6GxpOlynCPUKCVbtkHwg4ccHhoSVrHgysW3nqw1pX+FBvlBexrUl1JO2zuDFh4enRal9BpAw==}engines: {node: '>=18.0.0'}'@next/[email protected]':@@ -2540,113 +2652,113 @@ packages:rollup:optional: true- '@rollup/[email protected]':- resolution: {integrity: sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==}cpu: [arm]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w==}cpu: [arm64]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA==}cpu: [arm64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ==}cpu: [x64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w==}cpu: [arm64]os: [freebsd]- '@rollup/[email protected]':- resolution: {integrity: sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q==}cpu: [x64]os: [freebsd]- '@rollup/[email protected]':- resolution: {integrity: sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw==}cpu: [arm]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg==}cpu: [arm]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w==}cpu: [arm64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A==}cpu: [arm64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g==}cpu: [loong64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw==}cpu: [ppc64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g==}cpu: [riscv64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A==}cpu: [riscv64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg==}cpu: [s390x]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==}cpu: [x64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==}cpu: [x64]os: [linux]- '@rollup/[email protected]':- resolution: {integrity: sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw==}cpu: [arm64]os: [openharmony]- '@rollup/[email protected]':- resolution: {integrity: sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw==}cpu: [arm64]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA==}cpu: [ia32]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg==}cpu: [x64]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ==}cpu: [x64]os: [win32]@@ -2760,11 +2872,11 @@ packages:'@swc/[email protected]':resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==}- '@tanstack/[email protected]':- resolution: {integrity: sha512-wLamYp7FaDq6ZnNehypKI5fNvxHPfTYylE0m/ZpuuzJfJqhR5Pxg9gvGBHZx4n7J+V5Rg5mZxHHTlv25Zt5u+w==}+ '@tanstack/[email protected]':+ resolution: {integrity: sha512-EhZVFu9rl7GfRNuJLJ3Y7wtbTnENsvzp+YpcAV7kCYiXni1v8qZh++lpw4ch4rrwC0u/EZRnBHIehzCGzwXDSQ==}- '@tanstack/[email protected]':- resolution: {integrity: sha512-pN+8UWpxZkEJ/Rnnj2v2Sxpx1WFlaa9L6a4UO89p6tTQbeo+m0MS8oYDjbggrR8QcTyjKoYWKS3xJQGr3ExT8Q==}+ '@tanstack/[email protected]':+ resolution: {integrity: sha512-BKLss9Y8PQ9IUjPYQiv3/Zmlx92uxffUOX8ZZNoQlCIZBJPT5M+GOMQj7xislvVQ6l1BstBjcX0XB/aHfFYVNw==}peerDependencies:react: ^18 || ^19@@ -2848,22 +2960,22 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}- '@types/[email protected]':- resolution: {integrity: sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==}+ '@types/[email protected]':+ resolution: {integrity: sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==}'@types/[email protected]':resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}- '@types/[email protected]':- resolution: {integrity: sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==}+ '@types/[email protected]':+ resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}peerDependencies:'@types/react': ^19.2.0'@types/[email protected]':resolution: {integrity: sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==}- '@types/[email protected]':- resolution: {integrity: sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==}+ '@types/[email protected]':+ resolution: {integrity: sha512-p/jUvulfgU7oKtj6Xpk8cA2Y1xKTtICGpJYeJXz2YVO2UcvjQgeRMLDGfDeqeRW2Ta+0QNFwcc8X3GH8SxZz6w==}'@types/[email protected]':resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}@@ -2893,74 +3005,12 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-ZGBMToy857/NIPaaCucIUQgqueOiq7HeAKkhlvqVV4lm089zUFW6ikRySx2v+cAhKeUCPuWVHeimyk6Dw1iY3w==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- peerDependencies:- '@typescript-eslint/parser': ^8.46.2- eslint: ^8.57.0 || ^9.0.0- typescript: '>=4.8.4 <6.0.0'-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- peerDependencies:- eslint: ^8.57.0 || ^9.0.0- typescript: '>=4.8.4 <6.0.0'-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- peerDependencies:- typescript: '>=4.8.4 <6.0.0'-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- peerDependencies:- typescript: '>=4.8.4 <6.0.0'-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-HbPM4LbaAAt/DjxXaG9yiS9brOOz6fabal4uvUmaUYe6l3K1phQDMQKBRUrr06BQkxkvIZVVHttqiybM9nJsLA==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- peerDependencies:- eslint: ^8.57.0 || ^9.0.0- typescript: '>=4.8.4 <6.0.0'-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- peerDependencies:- typescript: '>=4.8.4 <6.0.0'-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- peerDependencies:- eslint: ^8.57.0 || ^9.0.0- typescript: '>=4.8.4 <6.0.0'-- '@typescript-eslint/[email protected]':- resolution: {integrity: sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}-'@umami/[email protected]':resolution: {integrity: sha512-nQ8EfrSleuXMPBVabr6rDoH2VS0ca41A3V2OCQbG4HqgLJ5+Mj8gHT/aLqUz5EKNBAmMy0/XxPNAgsHwwoxrCQ==}'@umami/[email protected]':resolution: {integrity: sha512-Jaqh++jskqDB7ny75pfC02OvKp1JTS4asGDsFrRL3qy8sxL3PAl9+/mybCJe4/6vWrXDJKqpgkSfUDJq2bFjyw==}- '@ungap/[email protected]':- resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}-'@vue/[email protected]':resolution: {integrity: sha512-3slwjQrrV1TO8MoXgy3aynDQ7lslj5UqDxuHnrzHtpON5CBinhWjJETciPngpin/T3OuW3tXUf86tEurusnztw==}@@ -2990,11 +3040,6 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-cZy8Dq+uuIXbxCZpuLd2GJdeSO/lIzIspC2WtkqIpje5QyFbvLaI5wZtdUjLHjGZrlVX6GilejatWwVYYRc8tA==}- resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}- peerDependencies:- acorn: ^6.0.0 || ^7.0.0 || ^8.0.0-resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}engines: {node: '>=0.4.0'}@@ -3184,8 +3229,8 @@ packages:resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}- resolution: {integrity: sha512-k38b3XOZKv60C4E2hVsXTolJWfkGRMbILBIe2IBITXciy5bOsTKot5kDrf3ZfufQtQOUN5mXceUEpU1rTl9Uog==}+ resolution: {integrity: sha512-GlF5wPWnSa/X5LKM1o0wz0suXIINz1iHRLvTS+sLyi7XPbe5ycmYI3DlZqVGZZtDgl4DmasFg7gOB3JYbphV5g==}hasBin: true@@ -3437,8 +3482,8 @@ packages:resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}engines: {node: '>= 0.8'}- resolution: {integrity: sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==}+ resolution: {integrity: sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==}engines: {node: '>=20'}@@ -3624,8 +3669,8 @@ packages:resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}- resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}+ resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}resolution: {integrity: sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==}@@ -3747,9 +3792,6 @@ packages:babel-plugin-macros:optional: true- resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}-resolution: {integrity: sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==}engines: {node: '>=16.0.0'}@@ -3822,10 +3864,6 @@ packages:resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}engines: {node: '>=8'}- resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}- engines: {node: '>=6.0.0'}-resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}@@ -3941,8 +3979,13 @@ packages:resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==}+ resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==}+ engines: {node: '>=18'}+ hasBin: true++ resolution: {integrity: sha512-jd0f4NHbD6cALCyGElNpGAOtWxSq46l9X/sWB0Nzd5er4Kz2YTm+Vl0qKFT9KUJvD8+fiO8AvoHhFvEatfVixA==}engines: {node: '>=18'}hasBin: true@@ -3958,65 +4001,17 @@ packages:resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}engines: {node: '>=8'}- resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}- engines: {node: '>=10'}-- resolution: {integrity: sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- peerDependencies:- eslint: ^7.0.0 || ^8.0.0 || ^9.0.0-- resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}-- resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}-- resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}-- resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.- hasBin: true-- resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}-resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}engines: {node: '>=4'}hasBin: true- resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}- engines: {node: '>=0.10'}-- resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}- engines: {node: '>=4.0'}-- resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}- engines: {node: '>=4.0'}-resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}- resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}- engines: {node: '>=0.10.0'}-resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}@@ -4084,9 +4079,6 @@ packages:resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}- resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}-resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==}@@ -4120,10 +4112,6 @@ packages:resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}engines: {node: '>=8'}- resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}- engines: {node: ^10.12.0 || >=12.0.0}-resolution: {integrity: sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==}engines: {node: '>=12.0.0'}@@ -4277,14 +4265,6 @@ packages:resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}engines: {node: '>= 6'}- resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}- engines: {node: '>=10.13.0'}-- resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}- hasBin: true-resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==}hasBin: true@@ -4310,10 +4290,6 @@ packages:resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}engines: {node: '>=6'}- resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}- engines: {node: '>=8'}-resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}engines: {node: '>= 0.4'}@@ -4343,9 +4319,6 @@ packages:resolution: {integrity: sha512-HNwLkgRg9SqTAd1N3Uh/MnKwTBTzwBxTOPbXQ8pb0tpwydjk90k4zRE8JUn9fMUiRwKtXFZ1TWFmms3dZHN+Fg==}- resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}-resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==}engines: {node: '>=0.4.7'}@@ -4726,8 +4699,8 @@ packages:resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}- resolution: {integrity: sha512-DPgQshehErHAqSCKDb3rNW03pa2wS/v5evvUqtxt6TTnHRqAG8FdzcSSJs9656pK6Y+NT7K9R4acEYXLHYfpUQ==}+ resolution: {integrity: sha512-VNfjM73zz2IBZmdShMfAUg10prm6t7HFUQmNAEOAVS4YH92ZrZcvkMcGX6cIgBJAzWDzPent/EeAtYEHNPNPBQ==}engines: {node: '>=18'}@@ -4935,10 +4908,6 @@ packages:resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}hasBin: true- resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}- hasBin: true-resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}@@ -4965,9 +4934,6 @@ packages:resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}- resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}-resolution: {integrity: sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==}engines: {node: '>= 0.4'}@@ -5035,10 +5001,6 @@ packages:resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}engines: {node: '>=6'}- resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}- engines: {node: '>= 0.8.0'}-resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}@@ -5053,8 +5015,8 @@ packages:resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}- resolution: {integrity: sha512-s1gphtDbV4bmW1eylXpVMk2u7is7YsrLl8hzrtvC70h4ByhcMLZFY01Fx05ZUDNuv1H8HO4E+e2zgejV1jVwNw==}+ resolution: {integrity: sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==}engines: {node: '>=20.17'}hasBin: true@@ -5132,9 +5094,6 @@ packages:resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}deprecated: This package is deprecated. Use destructuring assignment syntax instead.- resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}-resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}@@ -5233,8 +5192,8 @@ packages:resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}- resolution: {integrity: sha512-ndhnbeQWKuiBU17BJ6cybUnvcyvNXaK+1VM5n9/I7+TIqAYFLDvX1DSoVfE1hgvZfudvAU9Ts1CW5sxYq/M8dA==}+ resolution: {integrity: sha512-hYxQxvHkBUlyF34f7IlQOb60rytezCi2oZ8H/BtZpcoodXTlcK1eLgf7kY2TofHqBC3o+Hqtvde9kS72gFQSDw==}engines: {node: '>=12', npm: '>=6'}@@ -5512,10 +5471,6 @@ packages:resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}engines: {node: '>=18'}- resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}- engines: {node: '>= 0.8.0'}-resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}@@ -6172,10 +6127,6 @@ packages:resolution: {integrity: sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==}engines: {node: '>=12'}- resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}- engines: {node: '>= 0.8.0'}-resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}engines: {node: '>=10.13.0'}@@ -6497,8 +6448,8 @@ packages:rollup: ^3.29.4 || ^4typescript: ^4.5 || ^5.0- resolution: {integrity: sha512-MEWJmXMGjo5E7o9hgAmma6XLCdU9gTVRcaaCubugTJdoJD3A91qxtxiukT9k2PeUdogtCaNehV3pvJUWrRNtwg==}+ resolution: {integrity: sha512-EuB6/lolkMLK16gvibUjikERq5fCRVIGwD2xue/CrM8D0pz5GXD2V6N8IrgxegwbcUoKkUFI8VYCEEv8MMvgpA==}engines: {node: '>= 21 || ^20.6.0 || ^18.19.0'}peerDependencies:rollup: ^4.0.0@@ -6517,8 +6468,8 @@ packages:resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==}- resolution: {integrity: sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==}+ resolution: {integrity: sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==}engines: {node: '>=18.0.0', npm: '>=8.0.0'}hasBin: true@@ -6698,10 +6649,9 @@ packages:resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}- engines: {node: '>= 8'}- deprecated: The work that was done in this beta branch won't be included in future versions+ resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}+ engines: {node: '>= 12'}resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}@@ -6936,9 +6886,6 @@ packages:resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}engines: {node: '>=8'}- resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}-resolution: {integrity: sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==}@@ -6958,8 +6905,8 @@ packages:resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}- resolution: {integrity: sha512-UxWEfRKpFCabAf6fkTNdlfSw/RDUJ/4C6i1aLZaDnGF82PERHyYhz5CMCVYXtLt34LbqgfpJ2bjmgGKgxuF/6A==}+ resolution: {integrity: sha512-hkcz3FjNJfKXjV4mjQ1OrXSLAehg8Hw+cEZclOVT+5c/cWQWImQ9wolzTjth+dmmDe++p3bme3fTxz6Q4Etsqw==}engines: {node: '>=12'}@@ -6999,9 +6946,6 @@ packages:resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}engines: {node: '>=16'}- resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}-resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}hasBin: true@@ -7014,12 +6958,6 @@ packages:resolution: {integrity: sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==}engines: {node: '>=12'}- resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==}- engines: {node: '>=18.12'}- peerDependencies:- typescript: '>=4.8.4'-resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}@@ -7067,8 +7005,8 @@ packages:resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}- resolution: {integrity: sha512-VmBp77lWNQq6PfuMqCHD3xWl22vEoWsKajkF8t+yMBawlUS8JzEI+vOVMeuNZIuMML8qXRizFKi9oD5glKQVcQ==}+ resolution: {integrity: sha512-xtgkqwdhpKWr3tKPmCkvYmS9xnQK3m3XgxZHwSUjvfTjp7YfXe5tT3GgWi0F2N+ZSMsOeWeZFh7ZZFg5iPhing==}engines: {node: '>=18'}hasBin: truepeerDependencies:@@ -7092,10 +7030,6 @@ packages:resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}- resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}- engines: {node: '>= 0.8.0'}-resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}engines: {node: '>=4'}@@ -7104,10 +7038,6 @@ packages:resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}engines: {node: '>=10'}- resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}- engines: {node: '>=10'}-resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}engines: {node: '>=10'}@@ -7271,12 +7201,6 @@ packages:resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}engines: {node: '>= 8'}- resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}-- resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}-resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}engines: {node: '>= 0.4'}@@ -7302,10 +7226,6 @@ packages:engines: {node: '>= 8'}hasBin: true- resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}- engines: {node: '>=0.10.0'}-resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}@@ -7615,39 +7535,39 @@ snapshots:'@bcoe/[email protected]': {}- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optionalDependencies:- '@biomejs/cli-darwin-arm64': 2.3.6- '@biomejs/cli-darwin-x64': 2.3.6- '@biomejs/cli-linux-arm64': 2.3.6- '@biomejs/cli-linux-arm64-musl': 2.3.6- '@biomejs/cli-linux-x64': 2.3.6- '@biomejs/cli-linux-x64-musl': 2.3.6- '@biomejs/cli-win32-arm64': 2.3.6- '@biomejs/cli-win32-x64': 2.3.6+ '@biomejs/cli-darwin-arm64': 2.3.7+ '@biomejs/cli-darwin-x64': 2.3.7+ '@biomejs/cli-linux-arm64': 2.3.7+ '@biomejs/cli-linux-arm64-musl': 2.3.7+ '@biomejs/cli-linux-x64': 2.3.7+ '@biomejs/cli-linux-x64-musl': 2.3.7+ '@biomejs/cli-win32-arm64': 2.3.7+ '@biomejs/cli-win32-x64': 2.3.7- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true- '@biomejs/[email protected]':+ '@biomejs/[email protected]':optional: true'@chevrotain/[email protected]':@@ -7665,11 +7585,11 @@ snapshots:'@chevrotain/[email protected]': {}- '@clickhouse/[email protected]': {}+ '@clickhouse/[email protected]': {}- '@clickhouse/[email protected]':+ '@clickhouse/[email protected]':dependencies:- '@clickhouse/client-common': 1.12.1+ '@clickhouse/client-common': 1.14.0'@colors/[email protected]':optional: true@@ -7981,117 +7901,170 @@ snapshots:'@epic-web/[email protected]': {}- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@esbuild/[email protected]':+ '@esbuild/[email protected]':optional: true- '@eslint-community/[email protected]([email protected])':- dependencies:- eslint: 8.57.1- eslint-visitor-keys: 3.4.3+ '@esbuild/[email protected]':+ optional: true- '@eslint-community/[email protected]': {}+ '@esbuild/[email protected]':+ optional: true- '@eslint-community/[email protected]': {}+ '@esbuild/[email protected]':+ optional: true- '@eslint/[email protected]':- dependencies:- ajv: 6.12.6- debug: 4.4.3([email protected])- espree: 9.6.1- globals: 13.24.0- ignore: 5.3.2- import-fresh: 3.3.1- js-yaml: 4.1.1- minimatch: 3.1.2- strip-json-comments: 3.1.1- transitivePeerDependencies:- - supports-color+ '@esbuild/[email protected]':+ optional: true- '@eslint/[email protected]': {}+ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true++ '@esbuild/[email protected]':+ optional: true'@fontsource/[email protected]': {}'@fontsource/[email protected]': {}- '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':+ '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:'@formatjs/icu-messageformat-parser': 2.1.0- '@formatjs/ts-transformer': 3.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ '@formatjs/ts-transformer': 3.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))'@types/estree': 0.0.50'@types/fs-extra': 9.0.13'@types/json-stable-stringify': 1.2.0@@ -8178,15 +8151,15 @@ snapshots:optionalDependencies:typescript: 5.9.3- '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':+ '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:intl-messageformat-parser: 6.1.2tslib: 2.8.1typescript: 4.9.5optionalDependencies:- ts-jest: 29.4.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])+ ts-jest: 29.4.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])- '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':+ '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:'@formatjs/icu-messageformat-parser': 2.1.0'@types/node': 14.18.63@@ -8194,9 +8167,9 @@ snapshots:tslib: 2.8.1typescript: 4.9.5optionalDependencies:- ts-jest: 29.4.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])+ ts-jest: 29.4.5(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])- '@hello-pangea/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@hello-pangea/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@babel/runtime': 7.28.3css-box-model: 1.2.1@@ -8204,7 +8177,7 @@ snapshots:raf-schd: 4.0.3react: 19.2.0react-dom: 19.2.0([email protected])redux: 5.0.1use-memo-one: 1.1.3([email protected])transitivePeerDependencies:@@ -8214,18 +8187,6 @@ snapshots:dependencies:hono: 4.7.10- '@humanwhocodes/[email protected]':- dependencies:- '@humanwhocodes/object-schema': 2.0.3- debug: 4.4.3([email protected])- minimatch: 3.1.2- transitivePeerDependencies:- - supports-color-- '@humanwhocodes/[email protected]': {}-- '@humanwhocodes/[email protected]': {}-'@img/[email protected]':optional: true@@ -8454,27 +8415,27 @@ snapshots:'@jest/[email protected]':dependencies:'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1chalk: 4.1.2jest-message-util: 29.7.0jest-util: 29.7.0slash: 3.0.0dependencies:'@jest/console': 29.7.0'@jest/reporters': 29.7.0'@jest/test-result': 29.7.0'@jest/transform': 29.7.0'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1ansi-escapes: 4.3.2chalk: 4.1.2ci-info: 3.9.0exit: 0.1.2graceful-fs: 4.2.11jest-changed-files: 29.7.0- jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))jest-haste-map: 29.7.0jest-message-util: 29.7.0jest-regex-util: 29.6.3@@ -8501,7 +8462,7 @@ snapshots:dependencies:'@jest/fake-timers': 29.7.0'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1jest-mock: 29.7.0'@jest/[email protected]':@@ -8523,7 +8484,7 @@ snapshots:dependencies:'@jest/types': 29.6.3'@sinonjs/fake-timers': 10.3.0- '@types/node': 24.9.2+ '@types/node': 24.10.1jest-message-util: 29.7.0jest-mock: 29.7.0jest-util: 29.7.0@@ -8541,7 +8502,7 @@ snapshots:'@jest/[email protected]':dependencies:- '@types/node': 24.9.2+ '@types/node': 24.10.1jest-regex-util: 30.0.1'@jest/[email protected]':@@ -8552,7 +8513,7 @@ snapshots:'@jest/transform': 29.7.0'@jest/types': 29.6.3'@jridgewell/trace-mapping': 0.3.30- '@types/node': 24.9.2+ '@types/node': 24.10.1chalk: 4.1.2collect-v8-coverage: 1.0.2exit: 0.1.2@@ -8626,7 +8587,7 @@ snapshots:'@jest/schemas': 29.6.3'@types/istanbul-lib-coverage': 2.0.6'@types/istanbul-reports': 3.0.4- '@types/node': 24.9.2+ '@types/node': 24.10.1'@types/yargs': 17.0.33chalk: 4.1.2@@ -8636,7 +8597,7 @@ snapshots:'@jest/schemas': 30.0.5'@types/istanbul-lib-coverage': 2.0.6'@types/istanbul-reports': 3.0.4- '@types/node': 24.9.2+ '@types/node': 24.10.1'@types/yargs': 17.0.33chalk: 4.1.2@@ -8671,7 +8632,7 @@ snapshots:chevrotain: 10.5.0lilconfig: 2.1.0- '@netlify/[email protected]': {}+ '@netlify/[email protected]': {}'@next/[email protected]': {}@@ -8750,11 +8711,11 @@ snapshots:'@prisma/[email protected]': {}- '@prisma/[email protected]([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])':+ '@prisma/[email protected]([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])':dependencies:'@prisma/client-runtime-utils': 7.0.0optionalDependencies:- prisma: 7.0.0(@types/[email protected])([email protected]([email protected]))([email protected])([email protected])+ prisma: 7.0.0(@types/[email protected])([email protected]([email protected]))([email protected])([email protected])typescript: 5.9.3'@prisma/[email protected]':@@ -8805,9 +8766,9 @@ snapshots:'@prisma/fetch-engine': 7.0.0'@prisma/get-platform': 7.0.0- '@prisma/[email protected](@prisma/[email protected]([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected]))':+ '@prisma/[email protected](@prisma/[email protected]([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected]))':dependencies:- '@prisma/client': 7.0.0([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])+ '@prisma/client': 7.0.0([email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]))([email protected])'@prisma/[email protected]':dependencies:@@ -8825,9 +8786,9 @@ snapshots:'@prisma/[email protected]': {}- '@prisma/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@prisma/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:- '@types/react': 19.2.2+ '@types/react': 19.2.6react: 19.2.0react-dom: 19.2.0([email protected])@@ -9962,133 +9923,133 @@ snapshots:dependencies:'@redis/client': 1.6.1- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:- '@rollup/pluginutils': 5.2.0([email protected])+ '@rollup/pluginutils': 5.2.0([email protected])commondir: 1.0.1estree-walker: 2.0.2glob: 8.1.0is-reference: 1.2.1magic-string: 0.30.17optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:- '@rollup/pluginutils': 5.2.0([email protected])+ '@rollup/pluginutils': 5.2.0([email protected])optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:- '@rollup/pluginutils': 5.2.0([email protected])+ '@rollup/pluginutils': 5.2.0([email protected])'@types/resolve': 1.20.2deepmerge: 4.3.1is-module: 1.0.0resolve: 1.22.10optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:- '@rollup/pluginutils': 5.2.0([email protected])+ '@rollup/pluginutils': 5.2.0([email protected])magic-string: 0.30.17optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:serialize-javascript: 6.0.2smob: 1.5.0terser: 5.43.1optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3dependencies:- '@rollup/pluginutils': 5.2.0([email protected])+ '@rollup/pluginutils': 5.2.0([email protected])resolve: 1.22.10typescript: 5.9.3optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3tslib: 2.8.1- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:'@types/estree': 1.0.8estree-walker: 2.0.2picomatch: 4.0.3optionalDependencies:- rollup: 4.52.5+ rollup: 4.53.3- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true'@sinclair/[email protected]': {}@@ -10216,11 +10177,11 @@ snapshots:dependencies:tslib: 2.8.1- '@tanstack/[email protected]': {}+ '@tanstack/[email protected]': {}- '@tanstack/[email protected]([email protected])':+ '@tanstack/[email protected]([email protected])':dependencies:- '@tanstack/query-core': 5.90.5+ '@tanstack/query-core': 5.90.10react: 19.2.0'@trysound/[email protected]': {}@@ -10260,24 +10221,24 @@ snapshots:'@types/[email protected]':dependencies:- '@types/node': 24.9.2+ '@types/node': 24.10.1'@types/[email protected]':dependencies:- '@types/node': 24.9.2+ '@types/node': 24.10.1'@types/[email protected]':dependencies:'@types/minimatch': 6.0.0- '@types/node': 24.9.2+ '@types/node': 24.10.1'@types/[email protected]':dependencies:- '@types/node': 24.9.2+ '@types/node': 24.10.1- '@types/[email protected](@types/[email protected])':+ '@types/[email protected](@types/[email protected])':dependencies:- '@types/react': 19.2.2+ '@types/react': 19.2.6hoist-non-react-statics: 3.3.2'@types/[email protected]': {}@@ -10309,23 +10270,23 @@ snapshots:'@types/[email protected]': {}- '@types/[email protected]':+ '@types/[email protected]':dependencies:undici-types: 7.16.0'@types/[email protected]': {}- '@types/[email protected](@types/[email protected])':+ '@types/[email protected](@types/[email protected])':dependencies:- '@types/react': 19.2.2+ '@types/react': 19.2.6'@types/[email protected]':dependencies:- '@types/react': 19.2.2+ '@types/react': 19.2.6- '@types/[email protected]':+ '@types/[email protected]':dependencies:- csstype: 3.1.3+ csstype: 3.2.3'@types/[email protected]': {}@@ -10349,103 +10310,10 @@ snapshots:'@types/[email protected]':dependencies:- '@types/node': 24.9.2+ '@types/node': 24.10.1optional: true- '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])':- dependencies:- '@eslint-community/regexpp': 4.12.1- '@typescript-eslint/parser': 8.46.2([email protected])([email protected])- '@typescript-eslint/scope-manager': 8.46.2- '@typescript-eslint/type-utils': 8.46.2([email protected])([email protected])- '@typescript-eslint/utils': 8.46.2([email protected])([email protected])- '@typescript-eslint/visitor-keys': 8.46.2- eslint: 8.57.1- graphemer: 1.4.0- ignore: 7.0.5- natural-compare: 1.4.0- ts-api-utils: 2.1.0([email protected])- typescript: 5.9.3- transitivePeerDependencies:- - supports-color-- dependencies:- '@typescript-eslint/scope-manager': 8.46.2- '@typescript-eslint/types': 8.46.2- '@typescript-eslint/typescript-estree': 8.46.2([email protected])- '@typescript-eslint/visitor-keys': 8.46.2- debug: 4.4.3([email protected])- eslint: 8.57.1- typescript: 5.9.3- transitivePeerDependencies:- - supports-color-- '@typescript-eslint/[email protected]([email protected])':- dependencies:- '@typescript-eslint/tsconfig-utils': 8.46.2([email protected])- '@typescript-eslint/types': 8.46.2- debug: 4.4.3([email protected])- typescript: 5.9.3- transitivePeerDependencies:- - supports-color-- '@typescript-eslint/[email protected]':- dependencies:- '@typescript-eslint/types': 8.46.2- '@typescript-eslint/visitor-keys': 8.46.2-- '@typescript-eslint/[email protected]([email protected])':- dependencies:- typescript: 5.9.3-- dependencies:- '@typescript-eslint/types': 8.46.2- '@typescript-eslint/typescript-estree': 8.46.2([email protected])- '@typescript-eslint/utils': 8.46.2([email protected])([email protected])- debug: 4.4.3([email protected])- eslint: 8.57.1- ts-api-utils: 2.1.0([email protected])- typescript: 5.9.3- transitivePeerDependencies:- - supports-color-- '@typescript-eslint/[email protected]': {}-- '@typescript-eslint/[email protected]([email protected])':- dependencies:- '@typescript-eslint/project-service': 8.46.2([email protected])- '@typescript-eslint/tsconfig-utils': 8.46.2([email protected])- '@typescript-eslint/types': 8.46.2- '@typescript-eslint/visitor-keys': 8.46.2- debug: 4.4.3([email protected])- fast-glob: 3.3.3- is-glob: 4.0.3- minimatch: 9.0.5- semver: 7.7.3- ts-api-utils: 2.1.0([email protected])- typescript: 5.9.3- transitivePeerDependencies:- - supports-color-- dependencies:- '@eslint-community/eslint-utils': 4.9.0([email protected])- '@typescript-eslint/scope-manager': 8.46.2- '@typescript-eslint/types': 8.46.2- '@typescript-eslint/typescript-estree': 8.46.2([email protected])- eslint: 8.57.1- typescript: 5.9.3- transitivePeerDependencies:- - supports-color-- '@typescript-eslint/[email protected]':- dependencies:- '@typescript-eslint/types': 8.46.2- eslint-visitor-keys: 4.2.1-- '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))':+ '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))':dependencies:'@fontsource/jetbrains-mono': 5.2.8'@internationalized/date': 3.10.0@@ -10462,7 +10330,7 @@ snapshots:react-hook-form: 7.66.1([email protected])react-icons: 5.5.0([email protected])thenby: 1.3.4- zustand: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))+ zustand: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))transitivePeerDependencies:- '@babel/core'- '@opentelemetry/api'@@ -10481,8 +10349,6 @@ snapshots:transitivePeerDependencies:- supports-color- '@ungap/[email protected]': {}-'@vue/[email protected]':dependencies:'@babel/parser': 7.28.3@@ -10527,7 +10393,7 @@ snapshots:'@vue/reactivity': 3.5.18'@vue/runtime-core': 3.5.18'@vue/shared': 3.5.18- csstype: 3.1.3+ csstype: 3.2.3dependencies:@@ -10537,10 +10403,6 @@ snapshots:'@vue/[email protected]': {}- dependencies:- acorn: 8.15.0-dependencies:acorn: 8.15.0@@ -10704,12 +10566,12 @@ snapshots:dependencies:'@babel/types': 7.28.2- [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):+ [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):dependencies:'@babel/core': 7.28.3'@babel/helper-plugin-utils': 7.27.1'@babel/types': 7.28.2- '@formatjs/ts-transformer': 2.13.0([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ '@formatjs/ts-transformer': 2.13.0([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))'@types/babel__core': 7.20.5'@types/fs-extra': 9.0.13'@types/schema-utils': 2.4.0@@ -10755,7 +10617,7 @@ snapshots:dependencies:tweetnacl: 0.14.5- [email protected]: {}+ [email protected]: {}@@ -10802,9 +10664,9 @@ snapshots:base64-js: 1.5.1ieee754: 1.2.1dependencies:- esbuild: 0.25.11+ esbuild: 0.27.0load-tsconfig: 0.2.5@@ -11006,7 +10868,7 @@ snapshots:dependencies:delayed-stream: 1.0.0- [email protected]: {}+ [email protected]: {}@@ -11056,13 +10918,13 @@ snapshots:optionalDependencies:typescript: 5.9.3- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@jest/types': 29.6.3chalk: 4.1.2exit: 0.1.2graceful-fs: 4.2.11- jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))jest-util: 29.7.0prompts: 2.4.2transitivePeerDependencies:@@ -11211,7 +11073,7 @@ snapshots:dependencies:css-tree: 2.2.1- [email protected]: {}+ [email protected]: {}dependencies:@@ -11368,8 +11230,6 @@ snapshots:- [email protected]: {}-@@ -11436,10 +11296,6 @@ snapshots:dependencies:path-type: 4.0.0- dependencies:- esutils: 2.0.3-dependencies:domelementtype: 2.3.0@@ -11614,34 +11470,63 @@ snapshots:is-date-object: 1.1.0is-symbol: 1.1.1+ optionalDependencies:+ '@esbuild/aix-ppc64': 0.25.12+ '@esbuild/android-arm': 0.25.12+ '@esbuild/android-arm64': 0.25.12+ '@esbuild/android-x64': 0.25.12+ '@esbuild/darwin-arm64': 0.25.12+ '@esbuild/darwin-x64': 0.25.12+ '@esbuild/freebsd-arm64': 0.25.12+ '@esbuild/freebsd-x64': 0.25.12+ '@esbuild/linux-arm': 0.25.12+ '@esbuild/linux-arm64': 0.25.12+ '@esbuild/linux-ia32': 0.25.12+ '@esbuild/linux-loong64': 0.25.12+ '@esbuild/linux-mips64el': 0.25.12+ '@esbuild/linux-ppc64': 0.25.12+ '@esbuild/linux-riscv64': 0.25.12+ '@esbuild/linux-s390x': 0.25.12+ '@esbuild/linux-x64': 0.25.12+ '@esbuild/netbsd-arm64': 0.25.12+ '@esbuild/netbsd-x64': 0.25.12+ '@esbuild/openbsd-arm64': 0.25.12+ '@esbuild/openbsd-x64': 0.25.12+ '@esbuild/openharmony-arm64': 0.25.12+ '@esbuild/sunos-x64': 0.25.12+ '@esbuild/win32-arm64': 0.25.12+ '@esbuild/win32-ia32': 0.25.12+ '@esbuild/win32-x64': 0.25.12+optionalDependencies:- '@esbuild/aix-ppc64': 0.25.11- '@esbuild/android-arm': 0.25.11- '@esbuild/android-arm64': 0.25.11- '@esbuild/android-x64': 0.25.11- '@esbuild/darwin-arm64': 0.25.11- '@esbuild/darwin-x64': 0.25.11- '@esbuild/freebsd-arm64': 0.25.11- '@esbuild/freebsd-x64': 0.25.11- '@esbuild/linux-arm': 0.25.11- '@esbuild/linux-arm64': 0.25.11- '@esbuild/linux-ia32': 0.25.11- '@esbuild/linux-loong64': 0.25.11- '@esbuild/linux-mips64el': 0.25.11- '@esbuild/linux-ppc64': 0.25.11- '@esbuild/linux-riscv64': 0.25.11- '@esbuild/linux-s390x': 0.25.11- '@esbuild/linux-x64': 0.25.11- '@esbuild/netbsd-arm64': 0.25.11- '@esbuild/netbsd-x64': 0.25.11- '@esbuild/openbsd-arm64': 0.25.11- '@esbuild/openbsd-x64': 0.25.11- '@esbuild/openharmony-arm64': 0.25.11- '@esbuild/sunos-x64': 0.25.11- '@esbuild/win32-arm64': 0.25.11- '@esbuild/win32-ia32': 0.25.11- '@esbuild/win32-x64': 0.25.11+ '@esbuild/aix-ppc64': 0.27.0+ '@esbuild/android-arm': 0.27.0+ '@esbuild/android-arm64': 0.27.0+ '@esbuild/android-x64': 0.27.0+ '@esbuild/darwin-arm64': 0.27.0+ '@esbuild/darwin-x64': 0.27.0+ '@esbuild/freebsd-arm64': 0.27.0+ '@esbuild/freebsd-x64': 0.27.0+ '@esbuild/linux-arm': 0.27.0+ '@esbuild/linux-arm64': 0.27.0+ '@esbuild/linux-ia32': 0.27.0+ '@esbuild/linux-loong64': 0.27.0+ '@esbuild/linux-mips64el': 0.27.0+ '@esbuild/linux-ppc64': 0.27.0+ '@esbuild/linux-riscv64': 0.27.0+ '@esbuild/linux-s390x': 0.27.0+ '@esbuild/linux-x64': 0.27.0+ '@esbuild/netbsd-arm64': 0.27.0+ '@esbuild/netbsd-x64': 0.27.0+ '@esbuild/openbsd-arm64': 0.27.0+ '@esbuild/openbsd-x64': 0.27.0+ '@esbuild/openharmony-arm64': 0.27.0+ '@esbuild/sunos-x64': 0.27.0+ '@esbuild/win32-arm64': 0.27.0+ '@esbuild/win32-ia32': 0.27.0+ '@esbuild/win32-x64': 0.27.0@@ -11649,88 +11534,12 @@ snapshots:- [email protected]: {}-- dependencies:- eslint: 8.57.1-- dependencies:- esrecurse: 4.3.0- estraverse: 5.3.0-- [email protected]: {}-- [email protected]: {}-- dependencies:- '@eslint-community/eslint-utils': 4.9.0([email protected])- '@eslint-community/regexpp': 4.12.2- '@eslint/eslintrc': 2.1.4- '@eslint/js': 8.57.1- '@humanwhocodes/config-array': 0.13.0- '@humanwhocodes/module-importer': 1.0.1- '@nodelib/fs.walk': 1.2.8- '@ungap/structured-clone': 1.3.0- ajv: 6.12.6- chalk: 4.1.2- cross-spawn: 7.0.6- debug: 4.4.3([email protected])- doctrine: 3.0.0- escape-string-regexp: 4.0.0- eslint-scope: 7.2.2- eslint-visitor-keys: 3.4.3- espree: 9.6.1- esquery: 1.6.0- esutils: 2.0.3- fast-deep-equal: 3.1.3- file-entry-cache: 6.0.1- find-up: 5.0.0- glob-parent: 6.0.2- globals: 13.24.0- graphemer: 1.4.0- ignore: 5.3.2- imurmurhash: 0.1.4- is-glob: 4.0.3- is-path-inside: 3.0.3- js-yaml: 4.1.1- json-stable-stringify-without-jsonify: 1.0.1- levn: 0.4.1- lodash.merge: 4.6.2- minimatch: 3.1.2- natural-compare: 1.4.0- optionator: 0.9.4- strip-ansi: 6.0.1- text-table: 0.2.0- transitivePeerDependencies:- - supports-color-- dependencies:- acorn: 8.15.0- acorn-jsx: 5.3.2([email protected])- eslint-visitor-keys: 3.4.3-- dependencies:- estraverse: 5.3.0-- dependencies:- estraverse: 5.3.0-- [email protected]: {}-- [email protected]: {}-@@ -11788,10 +11597,10 @@ snapshots:- [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):+ [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):dependencies:'@babel/core': 7.28.3- babel-plugin-react-intl: 7.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ babel-plugin-react-intl: 7.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))flat: 5.0.2glob: 7.2.3js-yaml: 3.14.1@@ -11837,8 +11646,6 @@ snapshots:- [email protected]: {}-@@ -11868,10 +11675,6 @@ snapshots:dependencies:escape-string-regexp: 1.0.5- dependencies:- flat-cache: 3.2.0-dependencies:flat-cache: 3.2.0@@ -11894,7 +11697,7 @@ snapshots:dependencies:magic-string: 0.30.18mlly: 1.8.0- rollup: 4.52.5+ rollup: 4.53.3dependencies:@@ -12049,19 +11852,6 @@ snapshots:dependencies:is-glob: 4.0.3- dependencies:- is-glob: 4.0.3-- dependencies:- foreground-child: 3.3.1- jackspeak: 3.4.3- minimatch: 9.0.5- minipass: 7.1.2- package-json-from-dist: 1.0.1- path-scurry: 1.11.1-dependencies:foreground-child: 3.3.1@@ -12102,10 +11892,6 @@ snapshots:kind-of: 6.0.3which: 1.3.1- dependencies:- type-fest: 0.20.2-dependencies:define-properties: 1.2.1@@ -12148,8 +11934,6 @@ snapshots:- [email protected]: {}-dependencies:minimist: 1.2.8@@ -12469,7 +12253,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}@@ -12534,7 +12318,7 @@ snapshots:'@jest/expect': 29.7.0'@jest/test-result': 29.7.0'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1chalk: 4.1.2co: 4.6.0dedent: 1.6.0@@ -12554,16 +12338,16 @@ snapshots:- babel-plugin-macros- supports-color- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@jest/test-result': 29.7.0'@jest/types': 29.6.3chalk: 4.1.2- create-jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ create-jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))exit: 0.1.2import-local: 3.2.0- jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))jest-util: 29.7.0jest-validate: 29.7.0yargs: 17.7.2@@ -12573,7 +12357,7 @@ snapshots:- supports-color- ts-node- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@babel/core': 7.28.3'@jest/test-sequencer': 29.7.0@@ -12598,8 +12382,8 @@ snapshots:slash: 3.0.0strip-json-comments: 3.1.1optionalDependencies:- '@types/node': 24.9.2- ts-node: 10.9.2(@types/[email protected])([email protected])+ '@types/node': 24.10.1+ ts-node: 10.9.2(@types/[email protected])([email protected])transitivePeerDependencies:- babel-plugin-macros- supports-color@@ -12635,7 +12419,7 @@ snapshots:'@jest/environment': 29.7.0'@jest/fake-timers': 29.7.0'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1jest-mock: 29.7.0jest-util: 29.7.0@@ -12645,7 +12429,7 @@ snapshots:dependencies:'@jest/types': 29.6.3'@types/graceful-fs': 4.1.9- '@types/node': 24.9.2+ '@types/node': 24.10.1anymatch: 3.1.3fb-watchman: 2.0.2graceful-fs: 4.2.11@@ -12703,13 +12487,13 @@ snapshots:dependencies:'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1jest-util: 29.7.0dependencies:'@jest/types': 30.0.5- '@types/node': 24.9.2+ '@types/node': 24.10.1jest-util: 30.0.5@@ -12746,7 +12530,7 @@ snapshots:'@jest/test-result': 29.7.0'@jest/transform': 29.7.0'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1chalk: 4.1.2emittery: 0.13.1graceful-fs: 4.2.11@@ -12774,7 +12558,7 @@ snapshots:'@jest/test-result': 29.7.0'@jest/transform': 29.7.0'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1chalk: 4.1.2cjs-module-lexer: 1.4.3collect-v8-coverage: 1.0.2@@ -12820,7 +12604,7 @@ snapshots:dependencies:'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1chalk: 4.1.2ci-info: 3.9.0graceful-fs: 4.2.11@@ -12829,7 +12613,7 @@ snapshots:dependencies:'@jest/types': 30.0.5- '@types/node': 24.9.2+ '@types/node': 24.10.1chalk: 4.1.2ci-info: 4.3.0graceful-fs: 4.2.11@@ -12848,7 +12632,7 @@ snapshots:dependencies:'@jest/test-result': 29.7.0'@jest/types': 29.6.3- '@types/node': 24.9.2+ '@types/node': 24.10.1ansi-escapes: 4.3.2chalk: 4.1.2emittery: 0.13.1@@ -12857,17 +12641,17 @@ snapshots:dependencies:- '@types/node': 24.9.2+ '@types/node': 24.10.1jest-util: 29.7.0merge-stream: 2.0.0supports-color: 8.1.1- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@jest/types': 29.6.3import-local: 3.2.0- jest-cli: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-cli: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))transitivePeerDependencies:- '@types/node'- babel-plugin-macros@@ -12889,10 +12673,6 @@ snapshots:dependencies:argparse: 2.0.1- dependencies:- argparse: 2.0.1-@@ -12909,8 +12689,6 @@ snapshots:- [email protected]: {}-dependencies:call-bind: 1.0.8@@ -12992,11 +12770,6 @@ snapshots:- dependencies:- prelude-ls: 1.2.1- type-check: 0.4.0-dependencies:immediate: 3.0.6@@ -13007,9 +12780,9 @@ snapshots:dependencies:- commander: 14.0.1+ commander: 14.0.2listr2: 9.0.5micromatch: 4.0.8nano-spawn: 2.0.0@@ -13089,8 +12862,6 @@ snapshots:- [email protected]: {}-@@ -13184,10 +12955,10 @@ snapshots:dependencies:mmdb-lib: 3.0.1- tiny-lru: 11.3.4+ tiny-lru: 11.4.5@@ -13483,15 +13254,6 @@ snapshots:dependencies:mimic-function: 5.0.1- dependencies:- deep-is: 0.1.4- fast-levenshtein: 2.0.6- levn: 0.4.1- prelude-ls: 1.2.1- type-check: 0.4.0- word-wrap: 1.2.5-@@ -13795,13 +13557,13 @@ snapshots:postcss: 8.5.6postcss-value-parser: 4.2.0- [email protected]([email protected])([email protected](@types/[email protected])([email protected])):+ [email protected]([email protected])([email protected](@types/[email protected])([email protected])):dependencies:lilconfig: 2.1.0yaml: 1.10.2optionalDependencies:postcss: 8.5.6- ts-node: 10.9.2(@types/[email protected])([email protected])+ ts-node: 10.9.2(@types/[email protected])([email protected])dependencies:@@ -14102,8 +13864,6 @@ snapshots:- [email protected]: {}-@@ -14120,12 +13880,12 @@ snapshots:ansi-styles: 5.2.0react-is: 18.3.1- [email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]):+ [email protected](@types/[email protected])([email protected]([email protected]))([email protected])([email protected]):dependencies:'@prisma/config': 7.0.0'@prisma/dev': 0.13.0([email protected])'@prisma/engines': 7.0.0- '@prisma/studio-core-licensed': 0.8.0(@types/[email protected])([email protected]([email protected]))([email protected])+ '@prisma/studio-core-licensed': 0.8.0(@types/[email protected])([email protected]([email protected]))([email protected])mysql2: 3.15.3postgres: 3.4.7optionalDependencies:@@ -14297,8 +14057,8 @@ snapshots:'@formatjs/ecma402-abstract': 2.3.6'@formatjs/icu-messageformat-parser': 2.11.4'@formatjs/intl': 3.1.8([email protected])- '@types/hoist-non-react-statics': 3.3.7(@types/[email protected])- '@types/react': 19.2.2+ '@types/hoist-non-react-statics': 3.3.7(@types/[email protected])+ '@types/react': 19.2.6hoist-non-react-statics: 3.3.2intl-messageformat: 10.7.18react: 19.2.0@@ -14310,13 +14070,13 @@ snapshots:dependencies:'@types/use-sync-external-store': 0.0.6react: 19.2.0use-sync-external-store: 1.5.0([email protected])optionalDependencies:- '@types/react': 19.2.2+ '@types/react': 19.2.6redux: 5.0.1@@ -14528,28 +14288,28 @@ snapshots:globby: 10.0.1is-plain-object: 3.0.1dependencies:del: 8.0.0- rollup: 4.52.5+ rollup: 4.53.3dependencies:magic-string: 0.30.18- rollup: 4.52.5+ rollup: 4.53.3typescript: 5.9.3optionalDependencies:'@babel/code-frame': 7.27.1dependencies:- rollup: 4.52.5+ rollup: 4.53.3dependencies:- rollup: 4.52.5+ rollup: 4.53.3- [email protected]([email protected])([email protected](@types/[email protected])([email protected])):+ [email protected]([email protected])([email protected](@types/[email protected])([email protected])):dependencies:chalk: 4.1.2concat-with-sourcemaps: 1.1.0@@ -14558,7 +14318,7 @@ snapshots:p-queue: 6.6.2pify: 5.0.0postcss: 8.5.6- postcss-load-config: 3.1.4([email protected])([email protected](@types/[email protected])([email protected]))+ postcss-load-config: 3.1.4([email protected])([email protected](@types/[email protected])([email protected]))postcss-modules: 4.3.1([email protected])promise.series: 0.2.0resolve: 1.22.10@@ -14572,32 +14332,32 @@ snapshots:dependencies:estree-walker: 0.6.1dependencies:'@types/estree': 1.0.8optionalDependencies:- '@rollup/rollup-android-arm-eabi': 4.52.5- '@rollup/rollup-android-arm64': 4.52.5- '@rollup/rollup-darwin-arm64': 4.52.5- '@rollup/rollup-darwin-x64': 4.52.5- '@rollup/rollup-freebsd-arm64': 4.52.5- '@rollup/rollup-freebsd-x64': 4.52.5- '@rollup/rollup-linux-arm-gnueabihf': 4.52.5- '@rollup/rollup-linux-arm-musleabihf': 4.52.5- '@rollup/rollup-linux-arm64-gnu': 4.52.5- '@rollup/rollup-linux-arm64-musl': 4.52.5- '@rollup/rollup-linux-loong64-gnu': 4.52.5- '@rollup/rollup-linux-ppc64-gnu': 4.52.5- '@rollup/rollup-linux-riscv64-gnu': 4.52.5- '@rollup/rollup-linux-riscv64-musl': 4.52.5- '@rollup/rollup-linux-s390x-gnu': 4.52.5- '@rollup/rollup-linux-x64-gnu': 4.52.5- '@rollup/rollup-linux-x64-musl': 4.52.5- '@rollup/rollup-openharmony-arm64': 4.52.5- '@rollup/rollup-win32-arm64-msvc': 4.52.5- '@rollup/rollup-win32-ia32-msvc': 4.52.5- '@rollup/rollup-win32-x64-gnu': 4.52.5- '@rollup/rollup-win32-x64-msvc': 4.52.5+ '@rollup/rollup-android-arm-eabi': 4.53.3+ '@rollup/rollup-android-arm64': 4.53.3+ '@rollup/rollup-darwin-arm64': 4.53.3+ '@rollup/rollup-darwin-x64': 4.53.3+ '@rollup/rollup-freebsd-arm64': 4.53.3+ '@rollup/rollup-freebsd-x64': 4.53.3+ '@rollup/rollup-linux-arm-gnueabihf': 4.53.3+ '@rollup/rollup-linux-arm-musleabihf': 4.53.3+ '@rollup/rollup-linux-arm64-gnu': 4.53.3+ '@rollup/rollup-linux-arm64-musl': 4.53.3+ '@rollup/rollup-linux-loong64-gnu': 4.53.3+ '@rollup/rollup-linux-ppc64-gnu': 4.53.3+ '@rollup/rollup-linux-riscv64-gnu': 4.53.3+ '@rollup/rollup-linux-riscv64-musl': 4.53.3+ '@rollup/rollup-linux-s390x-gnu': 4.53.3+ '@rollup/rollup-linux-x64-gnu': 4.53.3+ '@rollup/rollup-linux-x64-musl': 4.53.3+ '@rollup/rollup-openharmony-arm64': 4.53.3+ '@rollup/rollup-win32-arm64-msvc': 4.53.3+ '@rollup/rollup-win32-ia32-msvc': 4.53.3+ '@rollup/rollup-win32-x64-gnu': 4.53.3+ '@rollup/rollup-win32-x64-msvc': 4.53.3fsevents: 2.3.3@@ -14844,9 +14604,7 @@ snapshots:- dependencies:- whatwg-url: 7.1.0+ [email protected]: {}dependencies:@@ -15077,7 +14835,7 @@ snapshots:dependencies:'@jridgewell/gen-mapping': 0.3.13commander: 4.1.1- glob: 10.4.5+ glob: 10.5.0lines-and-columns: 1.2.4mz: 2.7.0pirates: 4.0.7@@ -15156,8 +14914,6 @@ snapshots:glob: 7.2.3minimatch: 3.1.2- [email protected]: {}-@@ -15174,7 +14930,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}@@ -15207,28 +14963,20 @@ snapshots:dependencies:tldts: 6.1.86- dependencies:- punycode: 2.3.1-- dependencies:- typescript: 5.9.3-- [email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]):+ [email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]):dependencies:bs-logger: 0.2.6fast-json-stable-stringify: 2.1.0handlebars: 4.7.8- jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))json5: 2.2.3lodash.memoize: 4.1.2make-error: 1.3.6@@ -15241,17 +14989,17 @@ snapshots:'@jest/transform': 29.7.0'@jest/types': 30.0.5babel-jest: 29.7.0(@babel/[email protected])- esbuild: 0.25.11+ esbuild: 0.25.12jest-util: 30.0.5dependencies:'@cspotcode/source-map-support': 0.8.1'@tsconfig/node10': 1.0.11'@tsconfig/node12': 1.0.11'@tsconfig/node14': 1.0.3'@tsconfig/node16': 1.0.4- '@types/node': 24.9.2+ '@types/node': 24.10.1acorn: 8.15.0acorn-walk: 8.3.4arg: 4.1.3@@ -15264,21 +15012,21 @@ snapshots:dependencies:- bundle-require: 5.1.0([email protected])+ bundle-require: 5.1.0([email protected])cac: 6.7.14chokidar: 4.0.3consola: 3.4.2debug: 4.4.3([email protected])- esbuild: 0.25.11+ esbuild: 0.27.0fix-dts-default-cjs-exports: 1.0.1joycon: 3.1.1picocolors: 1.1.1resolve-from: 5.0.0- rollup: 4.52.5- source-map: 0.8.0-beta.0+ rollup: 4.53.3+ source-map: 0.7.6sucrase: 3.35.0tinyexec: 0.3.2tinyglobby: 0.2.14@@ -15298,16 +15046,10 @@ snapshots:- dependencies:- prelude-ls: 1.2.1-- [email protected]: {}-@@ -15458,14 +15200,6 @@ snapshots:- [email protected]: {}-- dependencies:- lodash.sortby: 4.7.0- tr46: 1.0.1- webidl-conversions: 4.0.2-dependencies:is-bigint: 1.1.0@@ -15515,8 +15249,6 @@ snapshots:dependencies:isexe: 2.0.0- [email protected]: {}-@@ -15617,9 +15349,9 @@ snapshots:- [email protected](@types/[email protected])([email protected])([email protected])([email protected]([email protected])):+ [email protected](@types/[email protected])([email protected])([email protected])([email protected]([email protected])):optionalDependencies:- '@types/react': 19.2.2+ '@types/react': 19.2.6immer: 10.2.0react: 19.2.0use-sync-external-store: 1.6.0([email protected])diff --git a/scripts/build-geo.js b/scripts/build-geo.jsindex 749025114..a83caa6c0 100644--- a/scripts/build-geo.js+++ b/scripts/build-geo.js@@ -3,8 +3,8 @@ import 'dotenv/config';import fs from 'node:fs';import path from 'node:path';import https from 'https';-import zlib from 'zlib';import tar from 'tar';+import zlib from 'zlib';if (process.env.VERCEL && !process.env.BUILD_GEO) {console.log('Vercel environment detected. Skipping geo setup.');diff --git a/scripts/check-db.js b/scripts/check-db.jsindex 09577699d..68374f6f5 100644--- a/scripts/check-db.js+++ b/scripts/check-db.js@@ -1,10 +1,10 @@/* eslint-disable no-console */import 'dotenv/config';import { execSync } from 'node:child_process';+import { PrismaPg } from '@prisma/adapter-pg';import chalk from 'chalk';import semver from 'semver';import { PrismaClient } from '../generated/prisma/client.js';-import { PrismaPg } from '@prisma/adapter-pg';const MIN_VERSION = '9.4.0';diff --git a/scripts/download-country-names.js b/scripts/download-country-names.jsindex 2bc91c763..937fb22f0 100644--- a/scripts/download-country-names.js+++ b/scripts/download-country-names.js@@ -1,8 +1,9 @@/* eslint-disable no-console */-import fs from 'fs-extra';+import path from 'node:path';-import https from 'https';import chalk from 'chalk';+import fs from 'fs-extra';+import https from 'https';const src = path.resolve(process.cwd(), 'src/lang');const dest = path.resolve(process.cwd(), 'public/intl/country');diff --git a/scripts/download-language-names.js b/scripts/download-language-names.jsindex 4daa7b797..d3db6016b 100644--- a/scripts/download-language-names.js+++ b/scripts/download-language-names.js@@ -1,8 +1,9 @@/* eslint-disable no-console */-import fs from 'fs-extra';+import path from 'node:path';-import https from 'https';import chalk from 'chalk';+import fs from 'fs-extra';+import https from 'https';const src = path.resolve(process.cwd(), 'src/lang');const dest = path.resolve(process.cwd(), 'public/intl/language');diff --git a/scripts/format-lang.js b/scripts/format-lang.jsindex ad18d82d6..95c390eeb 100644--- a/scripts/format-lang.js+++ b/scripts/format-lang.js@@ -1,6 +1,6 @@import path from 'node:path';-import fs from 'fs-extra';import del from 'del';+import fs from 'fs-extra';import { createRequire } from 'module';const require = createRequire(import.meta.url);diff --git a/scripts/merge-messages.js b/scripts/merge-messages.jsindex 9e846af57..29abc539d 100644--- a/scripts/merge-messages.js+++ b/scripts/merge-messages.js@@ -1,8 +1,8 @@/* eslint-disable no-console */import fs from 'node:fs';import path from 'node:path';-import prettier from 'prettier';import { createRequire } from 'module';+import prettier from 'prettier';const require = createRequire(import.meta.url);diff --git a/src/app/(collect)/p/[slug]/route.ts b/src/app/(collect)/p/[slug]/route.tsindex 9959fe855..79d6faa5c 100644--- a/src/app/(collect)/p/[slug]/route.ts+++ b/src/app/(collect)/p/[slug]/route.ts@@ -1,11 +1,11 @@export const dynamic = 'force-dynamic';import { NextResponse } from 'next/server';-import { notFound } from '@/lib/response';+import { POST } from '@/app/api/send/route';+import type { Pixel } from '@/generated/prisma/client';import redis from '@/lib/redis';+import { notFound } from '@/lib/response';import { findPixel } from '@/queries/prisma';-import { Pixel } from '@/generated/prisma/client';-import { POST } from '@/app/api/send/route';const image = Buffer.from('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw', 'base64');diff --git a/src/app/(collect)/q/[slug]/route.ts b/src/app/(collect)/q/[slug]/route.tsindex 80c5bb47a..24089bdb2 100644--- a/src/app/(collect)/q/[slug]/route.ts+++ b/src/app/(collect)/q/[slug]/route.ts@@ -1,11 +1,11 @@export const dynamic = 'force-dynamic';import { NextResponse } from 'next/server';-import { notFound } from '@/lib/response';-import { findLink } from '@/queries/prisma';import { POST } from '@/app/api/send/route';-import { Link } from '@/generated/prisma/client';+import type { Link } from '@/generated/prisma/client';import redis from '@/lib/redis';+import { notFound } from '@/lib/response';+import { findLink } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ slug: string }> }) {const { slug } = await params;diff --git a/src/app/(main)/MobileNav.tsx b/src/app/(main)/MobileNav.tsxindex a19449606..aaa25846c 100644--- a/src/app/(main)/MobileNav.tsx+++ b/src/app/(main)/MobileNav.tsx@@ -1,11 +1,11 @@+import { Grid, IconLabel, NavMenu, NavMenuItem, Row, Text } from '@umami/react-zen';+import Link from 'next/link';import { WebsiteNav } from '@/app/(main)/websites/[websiteId]/WebsiteNav';import { useMessages, useNavigation } from '@/components/hooks';import { Globe, Grid2x2, LinkIcon } from '@/components/icons';import { MobileMenuButton } from '@/components/input/MobileMenuButton';import { NavButton } from '@/components/input/NavButton';import { Logo } from '@/components/svg';-import { Grid, IconLabel, NavMenu, NavMenuItem, Row, Text } from '@umami/react-zen';-import Link from 'next/link';import { AdminNav } from './admin/AdminNav';import { SettingsNav } from './settings/SettingsNav';diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsxindex 32e3e3978..1ecb58dbc 100644--- a/src/app/(main)/SideNav.tsx+++ b/src/app/(main)/SideNav.tsx@@ -1,20 +1,20 @@-import { Key } from 'react';-import Link from 'next/link';import {+ Row,Sidebar,- SidebarSection,- SidebarItem,SidebarHeader,- Row,- SidebarProps,+ SidebarItem,+ type SidebarProps,+ SidebarSection,ThemeButton,} from '@umami/react-zen';-import { Globe, LinkIcon, Grid2x2, PanelLeft } from '@/components/icons';-import { Logo } from '@/components/svg';-import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';+import Link from 'next/link';+import type { Key } from 'react';+import { useGlobalState, useMessages, useNavigation } from '@/components/hooks';+import { Globe, Grid2x2, LinkIcon, PanelLeft } from '@/components/icons';+import { LanguageButton } from '@/components/input/LanguageButton';import { NavButton } from '@/components/input/NavButton';import { PanelButton } from '@/components/input/PanelButton';-import { LanguageButton } from '@/components/input/LanguageButton';+import { Logo } from '@/components/svg';export function SideNav(props: SidebarProps) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/TopNav.tsx b/src/app/(main)/TopNav.tsxindex 71f38d2b8..d410097ae 100644--- a/src/app/(main)/TopNav.tsx+++ b/src/app/(main)/TopNav.tsx@@ -1,4 +1,4 @@-import { ThemeButton, Row } from '@umami/react-zen';+import { Row, ThemeButton } from '@umami/react-zen';import { LanguageButton } from '@/components/input/LanguageButton';import { ProfileButton } from '@/components/input/ProfileButton';diff --git a/src/app/(main)/UpdateNotice.tsx b/src/app/(main)/UpdateNotice.tsxindex 81e2ca3af..ef441d0bb 100644--- a/src/app/(main)/UpdateNotice.tsx+++ b/src/app/(main)/UpdateNotice.tsx@@ -1,10 +1,10 @@-import { useEffect, useCallback, useState } from 'react';-import { Button, AlertBanner, Column, Row } from '@umami/react-zen';-import { setItem } from '@/lib/storage';-import { useVersion, checkVersion } from '@/store/version';-import { REPO_URL, VERSION_CHECK } from '@/lib/constants';-import { useMessages } from '@/components/hooks';+import { AlertBanner, Button, Column, Row } from '@umami/react-zen';import { usePathname } from 'next/navigation';+import { useCallback, useEffect, useState } from 'react';+import { useMessages } from '@/components/hooks';+import { REPO_URL, VERSION_CHECK } from '@/lib/constants';+import { setItem } from '@/lib/storage';+import { checkVersion, useVersion } from '@/store/version';export function UpdateNotice({ user, config }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/admin/AdminLayout.tsx b/src/app/(main)/admin/AdminLayout.tsxindex 3cc5aed39..56561a8e1 100644--- a/src/app/(main)/admin/AdminLayout.tsx+++ b/src/app/(main)/admin/AdminLayout.tsx@@ -1,8 +1,8 @@'use client';+import { Column, Grid } from '@umami/react-zen';+import type { ReactNode } from 'react';import { PageBody } from '@/components/common/PageBody';import { useLoginQuery } from '@/components/hooks';-import { Column, Grid } from '@umami/react-zen';-import { ReactNode } from 'react';import { AdminNav } from './AdminNav';export function AdminLayout({ children }: { children: ReactNode }) {diff --git a/src/app/(main)/admin/layout.tsx b/src/app/(main)/admin/layout.tsxindex 634fc6588..34cdd0b65 100644--- a/src/app/(main)/admin/layout.tsx+++ b/src/app/(main)/admin/layout.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { AdminLayout } from './AdminLayout';export default function ({ children }) {diff --git a/src/app/(main)/admin/teams/AdminTeamsDataTable.tsx b/src/app/(main)/admin/teams/AdminTeamsDataTable.tsxindex 53e182487..7da8531a1 100644--- a/src/app/(main)/admin/teams/AdminTeamsDataTable.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsDataTable.tsx@@ -1,7 +1,7 @@+import type { ReactNode } from 'react';import { DataGrid } from '@/components/common/DataGrid';import { useTeamsQuery } from '@/components/hooks';import { AdminTeamsTable } from './AdminTeamsTable';-import { ReactNode } from 'react';export function AdminTeamsDataTable({showActions,diff --git a/src/app/(main)/admin/teams/AdminTeamsPage.tsx b/src/app/(main)/admin/teams/AdminTeamsPage.tsxindex 736c7b5fe..41e6f4afb 100644--- a/src/app/(main)/admin/teams/AdminTeamsPage.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsPage.tsx@@ -1,9 +1,9 @@'use client';-import { AdminTeamsDataTable } from './AdminTeamsDataTable';import { Column } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';+import { useMessages } from '@/components/hooks';+import { AdminTeamsDataTable } from './AdminTeamsDataTable';export function AdminTeamsPage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/admin/teams/AdminTeamsTable.tsx b/src/app/(main)/admin/teams/AdminTeamsTable.tsxindex e54532583..9f2abd5cd 100644--- a/src/app/(main)/admin/teams/AdminTeamsTable.tsx+++ b/src/app/(main)/admin/teams/AdminTeamsTable.tsx@@ -1,11 +1,11 @@+import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';+import Link from 'next/link';+import { useState } from 'react';import { DateDistance } from '@/components/common/DateDistance';import { useMessages } from '@/components/hooks';import { Edit, Trash } from '@/components/icons';import { MenuButton } from '@/components/input/MenuButton';-import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';import { TeamDeleteForm } from '../../teams/[teamId]/TeamDeleteForm';-import Link from 'next/link';-import { useState } from 'react';export function AdminTeamsTable({data = [],diff --git a/src/app/(main)/admin/teams/[teamId]/page.tsx b/src/app/(main)/admin/teams/[teamId]/page.tsxindex 95a0acb84..104766ad6 100644--- a/src/app/(main)/admin/teams/[teamId]/page.tsx+++ b/src/app/(main)/admin/teams/[teamId]/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { AdminTeamPage } from './AdminTeamPage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ teamId: string }> }) {const { teamId } = await params;diff --git a/src/app/(main)/admin/teams/page.tsx b/src/app/(main)/admin/teams/page.tsxindex fb0fd3428..987f02b36 100644--- a/src/app/(main)/admin/teams/page.tsx+++ b/src/app/(main)/admin/teams/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { AdminTeamsPage } from './AdminTeamsPage';export default function () {diff --git a/src/app/(main)/admin/users/UserAddButton.tsx b/src/app/(main)/admin/users/UserAddButton.tsxindex 80337b197..052508280 100644--- a/src/app/(main)/admin/users/UserAddButton.tsx+++ b/src/app/(main)/admin/users/UserAddButton.tsx@@ -1,7 +1,7 @@-import { Button, Icon, Text, Modal, DialogTrigger, Dialog, useToast } from '@umami/react-zen';-import { UserAddForm } from './UserAddForm';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';import { useMessages, useModified } from '@/components/hooks';import { Plus } from '@/components/icons';+import { UserAddForm } from './UserAddForm';export function UserAddButton({ onSave }: { onSave?: () => void }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/admin/users/UserAddForm.tsx b/src/app/(main)/admin/users/UserAddForm.tsxindex fe7828c60..6c365510c 100644--- a/src/app/(main)/admin/users/UserAddForm.tsx+++ b/src/app/(main)/admin/users/UserAddForm.tsx@@ -1,13 +1,13 @@import {- Select,- ListItem,+ Button,Form,- FormField,FormButtons,+ FormField,FormSubmitButton,- TextField,+ ListItem,PasswordField,- Button,+ Select,+ TextField,} from '@umami/react-zen';import { useMessages, useUpdateQuery } from '@/components/hooks';import { ROLES } from '@/lib/constants';diff --git a/src/app/(main)/admin/users/UserDeleteButton.tsx b/src/app/(main)/admin/users/UserDeleteButton.tsxindex f3789884b..ee8f2c19c 100644--- a/src/app/(main)/admin/users/UserDeleteButton.tsx+++ b/src/app/(main)/admin/users/UserDeleteButton.tsx@@ -1,5 +1,5 @@-import { Button, Icon, Modal, DialogTrigger, Dialog, Text } from '@umami/react-zen';-import { useMessages, useLoginQuery } from '@/components/hooks';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';+import { useLoginQuery, useMessages } from '@/components/hooks';import { Trash } from '@/components/icons';import { UserDeleteForm } from './UserDeleteForm';diff --git a/src/app/(main)/admin/users/UsersDataTable.tsx b/src/app/(main)/admin/users/UsersDataTable.tsxindex ae72cfed6..8467bd238 100644--- a/src/app/(main)/admin/users/UsersDataTable.tsx+++ b/src/app/(main)/admin/users/UsersDataTable.tsx@@ -1,7 +1,7 @@+import type { ReactNode } from 'react';import { DataGrid } from '@/components/common/DataGrid';import { useUsersQuery } from '@/components/hooks';import { UsersTable } from './UsersTable';-import { ReactNode } from 'react';export function UsersDataTable({ showActions }: { showActions?: boolean; children?: ReactNode }) {const queryResult = useUsersQuery();diff --git a/src/app/(main)/admin/users/UsersPage.tsx b/src/app/(main)/admin/users/UsersPage.tsxindex 3e492b345..7e1b0f48b 100644--- a/src/app/(main)/admin/users/UsersPage.tsx+++ b/src/app/(main)/admin/users/UsersPage.tsx@@ -1,10 +1,10 @@'use client';-import { UsersDataTable } from './UsersDataTable';import { Column } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';-import { UserAddButton } from './UserAddButton';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';+import { useMessages } from '@/components/hooks';+import { UserAddButton } from './UserAddButton';+import { UsersDataTable } from './UsersDataTable';export function UsersPage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/admin/users/UsersTable.tsx b/src/app/(main)/admin/users/UsersTable.tsxindex 6b365691c..9c10f3e79 100644--- a/src/app/(main)/admin/users/UsersTable.tsx+++ b/src/app/(main)/admin/users/UsersTable.tsx@@ -1,13 +1,12 @@-import { useState } from 'react';-import { Row, Text, Icon, DataTable, DataColumn, MenuItem, Modal } from '@umami/react-zen';+import { DataColumn, DataTable, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';import Link from 'next/link';-import { ROLES } from '@/lib/constants';-import { Trash } from '@/components/icons';+import { useState } from 'react';+import { DateDistance } from '@/components/common/DateDistance';import { useMessages } from '@/components/hooks';-import { Edit } from '@/components/icons';+import { Edit, Trash } from '@/components/icons';import { MenuButton } from '@/components/input/MenuButton';+import { ROLES } from '@/lib/constants';import { UserDeleteForm } from './UserDeleteForm';-import { DateDistance } from '@/components/common/DateDistance';export function UsersTable({data = [],diff --git a/src/app/(main)/admin/users/[userId]/UserEditForm.tsx b/src/app/(main)/admin/users/[userId]/UserEditForm.tsxindex 142adaa66..30c86862a 100644--- a/src/app/(main)/admin/users/[userId]/UserEditForm.tsx+++ b/src/app/(main)/admin/users/[userId]/UserEditForm.tsx@@ -1,12 +1,12 @@import {- Select,- ListItem,Form,- FormField,FormButtons,- TextField,+ FormField,FormSubmitButton,+ ListItem,PasswordField,+ Select,+ TextField,} from '@umami/react-zen';import { useLoginQuery, useMessages, useUpdateQuery, useUser } from '@/components/hooks';import { ROLES } from '@/lib/constants';@@ -30,7 +30,7 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () =};return (- <Form onSubmit={handleSubmit} error={getMessage(error?.['code'])} values={user}>+ <Form onSubmit={handleSubmit} error={getMessage(error?.code)} values={user}><FormField name="username" label={formatMessage(labels.username)}><TextField data-test="input-username" /></FormField>diff --git a/src/app/(main)/admin/users/[userId]/UserHeader.tsx b/src/app/(main)/admin/users/[userId]/UserHeader.tsxindex aeaca0b23..1f82897e5 100644--- a/src/app/(main)/admin/users/[userId]/UserHeader.tsx+++ b/src/app/(main)/admin/users/[userId]/UserHeader.tsx@@ -1,6 +1,6 @@-import { User } from '@/components/icons';import { PageHeader } from '@/components/common/PageHeader';import { useUser } from '@/components/hooks';+import { User } from '@/components/icons';export function UserHeader() {const user = useUser();diff --git a/src/app/(main)/admin/users/[userId]/UserPage.tsx b/src/app/(main)/admin/users/[userId]/UserPage.tsxindex 0ae658558..5e0f8d109 100644--- a/src/app/(main)/admin/users/[userId]/UserPage.tsx+++ b/src/app/(main)/admin/users/[userId]/UserPage.tsx@@ -1,9 +1,9 @@'use client';import { Column } from '@umami/react-zen';-import { UserSettings } from './UserSettings';-import { UserProvider } from './UserProvider';import { UserHeader } from '@/app/(main)/admin/users/[userId]/UserHeader';import { Panel } from '@/components/common/Panel';+import { UserProvider } from './UserProvider';+import { UserSettings } from './UserSettings';export function UserPage({ userId }: { userId: string }) {return (diff --git a/src/app/(main)/admin/users/[userId]/UserProvider.tsx b/src/app/(main)/admin/users/[userId]/UserProvider.tsxindex 82dba512f..ea01915a7 100644--- a/src/app/(main)/admin/users/[userId]/UserProvider.tsx+++ b/src/app/(main)/admin/users/[userId]/UserProvider.tsx@@ -1,7 +1,7 @@-import { createContext, ReactNode } from 'react';import { Loading } from '@umami/react-zen';-import { User } from '@/generated/prisma/client';+import { createContext, type ReactNode } from 'react';import { useUserQuery } from '@/components/hooks/queries/useUserQuery';+import type { User } from '@/generated/prisma/client';export const UserContext = createContext<User>(null);diff --git a/src/app/(main)/admin/users/[userId]/UserSettings.tsx b/src/app/(main)/admin/users/[userId]/UserSettings.tsxindex 3d699ebe5..3f17f3e16 100644--- a/src/app/(main)/admin/users/[userId]/UserSettings.tsx+++ b/src/app/(main)/admin/users/[userId]/UserSettings.tsx@@ -1,6 +1,6 @@-import { Column, Tabs, Tab, TabList, TabPanel } from '@umami/react-zen';-import { UserEditForm } from './UserEditForm';+import { Column, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';import { useMessages } from '@/components/hooks';+import { UserEditForm } from './UserEditForm';import { UserWebsites } from './UserWebsites';export function UserSettings({ userId }: { userId: string }) {diff --git a/src/app/(main)/admin/users/[userId]/UserWebsites.tsx b/src/app/(main)/admin/users/[userId]/UserWebsites.tsxindex dae83660a..eeb173e75 100644--- a/src/app/(main)/admin/users/[userId]/UserWebsites.tsx+++ b/src/app/(main)/admin/users/[userId]/UserWebsites.tsx@@ -1,6 +1,6 @@+import { WebsitesTable } from '@/app/(main)/websites/WebsitesTable';import { DataGrid } from '@/components/common/DataGrid';import { useUserWebsitesQuery } from '@/components/hooks';-import { WebsitesTable } from '@/app/(main)/websites/WebsitesTable';export function UserWebsites({ userId }) {const queryResult = useUserWebsitesQuery({ userId });diff --git a/src/app/(main)/admin/users/[userId]/page.tsx b/src/app/(main)/admin/users/[userId]/page.tsxindex e573b14e3..16c9f366c 100644--- a/src/app/(main)/admin/users/[userId]/page.tsx+++ b/src/app/(main)/admin/users/[userId]/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { UserPage } from './UserPage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ userId: string }> }) {const { userId } = await params;diff --git a/src/app/(main)/admin/users/page.tsx b/src/app/(main)/admin/users/page.tsxindex 7cfd48879..96e69eb57 100644--- a/src/app/(main)/admin/users/page.tsx+++ b/src/app/(main)/admin/users/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { UsersPage } from './UsersPage';export default function () {diff --git a/src/app/(main)/admin/websites/AdminWebsitesPage.tsx b/src/app/(main)/admin/websites/AdminWebsitesPage.tsxindex f66c5eb71..1c2ac9218 100644--- a/src/app/(main)/admin/websites/AdminWebsitesPage.tsx+++ b/src/app/(main)/admin/websites/AdminWebsitesPage.tsx@@ -1,9 +1,9 @@'use client';-import { AdminWebsitesDataTable } from './AdminWebsitesDataTable';import { Column } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';+import { useMessages } from '@/components/hooks';+import { AdminWebsitesDataTable } from './AdminWebsitesDataTable';export function AdminWebsitesPage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx b/src/app/(main)/admin/websites/AdminWebsitesTable.tsxindex b8d76a9bc..cfda59572 100644--- a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx+++ b/src/app/(main)/admin/websites/AdminWebsitesTable.tsx@@ -1,12 +1,11 @@-import { useState } from 'react';+import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';import Link from 'next/link';-import { Row, Text, Icon, DataTable, DataColumn, MenuItem, Modal, Dialog } from '@umami/react-zen';-import { Trash, Users } from '@/components/icons';+import { useState } from 'react';+import { WebsiteDeleteForm } from '@/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm';+import { DateDistance } from '@/components/common/DateDistance';import { useMessages } from '@/components/hooks';-import { Edit } from '@/components/icons';+import { Edit, Trash, Users } from '@/components/icons';import { MenuButton } from '@/components/input/MenuButton';-import { DateDistance } from '@/components/common/DateDistance';-import { WebsiteDeleteForm } from '@/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm';export function AdminWebsitesTable({ data = [] }: { data: any[] }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/admin/websites/[websiteId]/page.tsx b/src/app/(main)/admin/websites/[websiteId]/page.tsxindex e1c922768..557adbd94 100644--- a/src/app/(main)/admin/websites/[websiteId]/page.tsx+++ b/src/app/(main)/admin/websites/[websiteId]/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { WebsiteSettingsPage } from '@/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/admin/websites/page.tsx b/src/app/(main)/admin/websites/page.tsxindex 85eb029a2..d6da9f637 100644--- a/src/app/(main)/admin/websites/page.tsx+++ b/src/app/(main)/admin/websites/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { AdminWebsitesPage } from './AdminWebsitesPage';export default function () {diff --git a/src/app/(main)/boards/BoardAddButton.tsx b/src/app/(main)/boards/BoardAddButton.tsxindex 7c98ed167..f9f80f4d7 100644--- a/src/app/(main)/boards/BoardAddButton.tsx+++ b/src/app/(main)/boards/BoardAddButton.tsx@@ -1,5 +1,5 @@+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';import { useMessages, useModified, useNavigation } from '@/components/hooks';-import { Button, Icon, Modal, Dialog, DialogTrigger, Text, useToast } from '@umami/react-zen';import { Plus } from '@/components/icons';import { BoardAddForm } from './BoardAddForm';diff --git a/src/app/(main)/boards/BoardAddForm.tsx b/src/app/(main)/boards/BoardAddForm.tsxindex 8e7b764c7..6471b21e4 100644--- a/src/app/(main)/boards/BoardAddForm.tsx+++ b/src/app/(main)/boards/BoardAddForm.tsx@@ -1,5 +1,5 @@-import { Form, FormField, FormSubmitButton, Row, TextField, Button } from '@umami/react-zen';-import { useUpdateQuery, useMessages } from '@/components/hooks';+import { Button, Form, FormField, FormSubmitButton, Row, TextField } from '@umami/react-zen';+import { useMessages, useUpdateQuery } from '@/components/hooks';import { DOMAIN_REGEX } from '@/lib/constants';export function BoardAddForm({diff --git a/src/app/(main)/boards/BoardsPage.tsx b/src/app/(main)/boards/BoardsPage.tsxindex adf0e02bf..fa5eb64a3 100644--- a/src/app/(main)/boards/BoardsPage.tsx+++ b/src/app/(main)/boards/BoardsPage.tsx@@ -1,7 +1,7 @@'use client';import { Column } from '@umami/react-zen';-import { PageHeader } from '@/components/common/PageHeader';import { PageBody } from '@/components/common/PageBody';+import { PageHeader } from '@/components/common/PageHeader';import { BoardAddButton } from './BoardAddButton';export function BoardsPage() {diff --git a/src/app/(main)/boards/[boardId]/page.tsx b/src/app/(main)/boards/[boardId]/page.tsxindex d11f6a2ab..2cb076a5e 100644--- a/src/app/(main)/boards/[boardId]/page.tsx+++ b/src/app/(main)/boards/[boardId]/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { Board } from './Board';export default async function ({ params }: { params: Promise<{ boardId: string }> }) {diff --git a/src/app/(main)/boards/page.tsx b/src/app/(main)/boards/page.tsxindex 5e3c80341..e8ca66244 100644--- a/src/app/(main)/boards/page.tsx+++ b/src/app/(main)/boards/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { BoardsPage } from './BoardsPage';export default function () {diff --git a/src/app/(main)/console/[websiteId]/TestConsolePage.tsx b/src/app/(main)/console/[websiteId]/TestConsolePage.tsxindex e44ea95d6..56cc49523 100644--- a/src/app/(main)/console/[websiteId]/TestConsolePage.tsx+++ b/src/app/(main)/console/[websiteId]/TestConsolePage.tsx@@ -1,25 +1,25 @@'use client';-import { Button, Grid, Column, Heading } from '@umami/react-zen';+import { Button, Column, Grid, Heading } from '@umami/react-zen';import Link from 'next/link';import Script from 'next/script';-import { Panel } from '@/components/common/Panel';-import { PageBody } from '@/components/common/PageBody';-import { EventsChart } from '@/components/metrics/EventsChart';import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';-import { useWebsiteQuery } from '@/components/hooks';+import { PageBody } from '@/components/common/PageBody';import { PageHeader } from '@/components/common/PageHeader';+import { Panel } from '@/components/common/Panel';+import { useWebsiteQuery } from '@/components/hooks';+import { EventsChart } from '@/components/metrics/EventsChart';export function TestConsolePage({ websiteId }: { websiteId: string }) {const { data } = useWebsiteQuery(websiteId);function handleRunScript() {- window['umami'].track(props => ({+ window.umami.track(props => ({...props,url: '/page-view',referrer: 'https://www.google.com',}));- window['umami'].track('track-event-no-data');- window['umami'].track('track-event-with-data', {+ window.umami.track('track-event-no-data');+ window.umami.track('track-event-with-data', {test: 'test-data',boolean: true,booleanError: 'true',@@ -40,32 +40,32 @@ export function TestConsolePage({ websiteId }: { websiteId: string }) {}function handleRunRevenue() {- window['umami'].track(props => ({+ window.umami.track(props => ({...props,url: '/checkout-cart',referrer: 'https://www.google.com',}));- window['umami'].track('checkout-cart', {+ window.umami.track('checkout-cart', {revenue: parseFloat((Math.random() * 1000).toFixed(2)),currency: 'USD',});- window['umami'].track('affiliate-link', {+ window.umami.track('affiliate-link', {revenue: parseFloat((Math.random() * 1000).toFixed(2)),currency: 'USD',});- window['umami'].track('promotion-link', {+ window.umami.track('promotion-link', {revenue: parseFloat((Math.random() * 1000).toFixed(2)),currency: 'USD',});- window['umami'].track('checkout-cart', {+ window.umami.track('checkout-cart', {revenue: parseFloat((Math.random() * 1000).toFixed(2)),currency: 'EUR',});- window['umami'].track('promotion-link', {+ window.umami.track('promotion-link', {revenue: parseFloat((Math.random() * 1000).toFixed(2)),currency: 'EUR',});- window['umami'].track('affiliate-link', {+ window.umami.track('affiliate-link', {item1: {productIdentity: 'ABC424',revenue: parseFloat((Math.random() * 10000).toFixed(2)),@@ -80,7 +80,7 @@ export function TestConsolePage({ websiteId }: { websiteId: string }) {}function handleRunIdentify() {- window['umami'].identify({+ window.umami.identify({userId: 123,name: 'brian',number: Math.random() * 100,diff --git a/src/app/(main)/console/[websiteId]/page.tsx b/src/app/(main)/console/[websiteId]/page.tsxindex 7f507e415..28b816152 100644--- a/src/app/(main)/console/[websiteId]/page.tsx+++ b/src/app/(main)/console/[websiteId]/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { TestConsolePage } from './TestConsolePage';async function getEnabled() {diff --git a/src/app/(main)/dashboard/DashboardPage.tsx b/src/app/(main)/dashboard/DashboardPage.tsxindex c05e411d6..c2c7e75f0 100644--- a/src/app/(main)/dashboard/DashboardPage.tsx+++ b/src/app/(main)/dashboard/DashboardPage.tsx@@ -1,8 +1,8 @@'use client';import { Column } from '@umami/react-zen';+import { PageBody } from '@/components/common/PageBody';import { PageHeader } from '@/components/common/PageHeader';import { useMessages } from '@/components/hooks';-import { PageBody } from '@/components/common/PageBody';export function DashboardPage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsxindex e934e6ada..4b79b598f 100644--- a/src/app/(main)/dashboard/page.tsx+++ b/src/app/(main)/dashboard/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { DashboardPage } from './DashboardPage';export default async function () {diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsxindex 558a9cd3f..98fca4ab4 100644--- a/src/app/(main)/layout.tsx+++ b/src/app/(main)/layout.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { Suspense } from 'react';-import { Metadata } from 'next';import { App } from './App';export default function ({ children }) {diff --git a/src/app/(main)/links/LinkAddButton.tsx b/src/app/(main)/links/LinkAddButton.tsxindex d0c4e3619..4276895d0 100644--- a/src/app/(main)/links/LinkAddButton.tsx+++ b/src/app/(main)/links/LinkAddButton.tsx@@ -1,7 +1,7 @@import { useMessages } from '@/components/hooks';import { Plus } from '@/components/icons';-import { LinkEditForm } from './LinkEditForm';import { DialogButton } from '@/components/input/DialogButton';+import { LinkEditForm } from './LinkEditForm';export function LinkAddButton({ teamId }: { teamId?: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/links/LinkDeleteButton.tsx b/src/app/(main)/links/LinkDeleteButton.tsxindex aa044a363..78f85f891 100644--- a/src/app/(main)/links/LinkDeleteButton.tsx+++ b/src/app/(main)/links/LinkDeleteButton.tsx@@ -1,8 +1,8 @@-import { Trash } from '@/components/icons';import { ConfirmationForm } from '@/components/common/ConfirmationForm';-import { messages } from '@/components/messages';import { useDeleteQuery, useMessages } from '@/components/hooks';+import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { messages } from '@/components/messages';export function LinkDeleteButton({linkId,diff --git a/src/app/(main)/links/LinkEditButton.tsx b/src/app/(main)/links/LinkEditButton.tsxindex a93852b69..4d8587966 100644--- a/src/app/(main)/links/LinkEditButton.tsx+++ b/src/app/(main)/links/LinkEditButton.tsx@@ -1,7 +1,7 @@-import { Edit } from '@/components/icons';-import { LinkEditForm } from './LinkEditForm';import { useMessages } from '@/components/hooks';+import { Edit } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { LinkEditForm } from './LinkEditForm';export function LinkEditButton({ linkId }: { linkId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/links/LinkEditForm.tsx b/src/app/(main)/links/LinkEditForm.tsxindex 36a114552..6c10c7f0a 100644--- a/src/app/(main)/links/LinkEditForm.tsx+++ b/src/app/(main)/links/LinkEditForm.tsx@@ -1,22 +1,21 @@-import { useState, useEffect } from 'react';import {+ Button,+ Column,Form,FormField,FormSubmitButton,- Row,- TextField,- Button,- Label,- Column,Icon,+ Label,Loading,+ Row,+ TextField,} from '@umami/react-zen';-import { useConfig, useLinkQuery } from '@/components/hooks';-import { useMessages } from '@/components/hooks';-import { RefreshCw } from '@/components/icons';-import { getRandomChars } from '@/lib/generate';+import { useEffect, useState } from 'react';+import { useConfig, useLinkQuery, useMessages } from '@/components/hooks';import { useUpdateQuery } from '@/components/hooks/queries/useUpdateQuery';+import { RefreshCw } from '@/components/icons';import { LINKS_URL } from '@/lib/constants';+import { getRandomChars } from '@/lib/generate';import { isValidUrl } from '@/lib/url';const generateId = () => getRandomChars(9);diff --git a/src/app/(main)/links/LinkProvider.tsx b/src/app/(main)/links/LinkProvider.tsxindex de97cdcf5..c29e13cf9 100644--- a/src/app/(main)/links/LinkProvider.tsx+++ b/src/app/(main)/links/LinkProvider.tsx@@ -1,8 +1,8 @@'use client';-import { createContext, ReactNode } from 'react';import { Loading } from '@umami/react-zen';-import { Link } from '@/generated/prisma/client';+import { createContext, type ReactNode } from 'react';import { useLinkQuery } from '@/components/hooks/queries/useLinkQuery';+import type { Link } from '@/generated/prisma/client';export const LinkContext = createContext<Link>(null);diff --git a/src/app/(main)/links/LinksDataTable.tsx b/src/app/(main)/links/LinksDataTable.tsxindex 043cd768e..0b3d660bb 100644--- a/src/app/(main)/links/LinksDataTable.tsx+++ b/src/app/(main)/links/LinksDataTable.tsx@@ -1,6 +1,6 @@+import { DataGrid } from '@/components/common/DataGrid';import { useLinksQuery, useNavigation } from '@/components/hooks';import { LinksTable } from './LinksTable';-import { DataGrid } from '@/components/common/DataGrid';export function LinksDataTable() {const { teamId } = useNavigation();diff --git a/src/app/(main)/links/LinksPage.tsx b/src/app/(main)/links/LinksPage.tsxindex e94bccf83..a6e4c7c4e 100644--- a/src/app/(main)/links/LinksPage.tsx+++ b/src/app/(main)/links/LinksPage.tsx@@ -1,11 +1,11 @@'use client';-import { PageBody } from '@/components/common/PageBody';import { Column } from '@umami/react-zen';-import { PageHeader } from '@/components/common/PageHeader';-import { LinkAddButton } from './LinkAddButton';-import { useMessages, useNavigation } from '@/components/hooks';import { LinksDataTable } from '@/app/(main)/links/LinksDataTable';+import { PageBody } from '@/components/common/PageBody';+import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';+import { useMessages, useNavigation } from '@/components/hooks';+import { LinkAddButton } from './LinkAddButton';export function LinksPage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/links/LinksTable.tsx b/src/app/(main)/links/LinksTable.tsxindex 5df15b787..2ce4ba497 100644--- a/src/app/(main)/links/LinksTable.tsx+++ b/src/app/(main)/links/LinksTable.tsx@@ -1,10 +1,10 @@+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';import Link from 'next/link';-import { DataTable, DataColumn, Row, DataTableProps } from '@umami/react-zen';-import { useMessages, useNavigation, useSlug } from '@/components/hooks';import { DateDistance } from '@/components/common/DateDistance';import { ExternalLink } from '@/components/common/ExternalLink';-import { LinkEditButton } from './LinkEditButton';+import { useMessages, useNavigation, useSlug } from '@/components/hooks';import { LinkDeleteButton } from './LinkDeleteButton';+import { LinkEditButton } from './LinkEditButton';export function LinksTable(props: DataTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/links/[linkId]/LinkControls.tsx b/src/app/(main)/links/[linkId]/LinkControls.tsxindex 4e43c7607..1d1147a82 100644--- a/src/app/(main)/links/[linkId]/LinkControls.tsx+++ b/src/app/(main)/links/[linkId]/LinkControls.tsx@@ -1,9 +1,9 @@import { Column, Row } from '@umami/react-zen';-import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';+import { ExportButton } from '@/components/input/ExportButton';import { FilterBar } from '@/components/input/FilterBar';import { MonthFilter } from '@/components/input/MonthFilter';-import { ExportButton } from '@/components/input/ExportButton';+import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';export function LinkControls({linkId: websiteId,diff --git a/src/app/(main)/links/[linkId]/LinkHeader.tsx b/src/app/(main)/links/[linkId]/LinkHeader.tsxindex ba1de3ee2..b7c70f076 100644--- a/src/app/(main)/links/[linkId]/LinkHeader.tsx+++ b/src/app/(main)/links/[linkId]/LinkHeader.tsx@@ -1,8 +1,8 @@-import { useLink, useMessages, useSlug } from '@/components/hooks';-import { PageHeader } from '@/components/common/PageHeader';import { Icon, Text } from '@umami/react-zen';-import { ExternalLink, Link } from '@/components/icons';import { LinkButton } from '@/components/common/LinkButton';+import { PageHeader } from '@/components/common/PageHeader';+import { useLink, useMessages, useSlug } from '@/components/hooks';+import { ExternalLink, Link } from '@/components/icons';export function LinkHeader() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx b/src/app/(main)/links/[linkId]/LinkMetricsBar.tsxindex 43c14050f..1fe8c45fa 100644--- a/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx+++ b/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx@@ -1,9 +1,9 @@+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useDateRange, useMessages } from '@/components/hooks';+import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatLongNumber } from '@/lib/format';-import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';-import { LoadingPanel } from '@/components/common/LoadingPanel';export function LinkMetricsBar({linkId,diff --git a/src/app/(main)/links/[linkId]/LinkPage.tsx b/src/app/(main)/links/[linkId]/LinkPage.tsxindex b4377e5cd..ddacf08fc 100644--- a/src/app/(main)/links/[linkId]/LinkPage.tsx+++ b/src/app/(main)/links/[linkId]/LinkPage.tsx@@ -1,14 +1,14 @@'use client';-import { PageBody } from '@/components/common/PageBody';-import { LinkProvider } from '@/app/(main)/links/LinkProvider';+import { Column, Grid } from '@umami/react-zen';+import { LinkControls } from '@/app/(main)/links/[linkId]/LinkControls';import { LinkHeader } from '@/app/(main)/links/[linkId]/LinkHeader';-import { Panel } from '@/components/common/Panel';-import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';import { LinkMetricsBar } from '@/app/(main)/links/[linkId]/LinkMetricsBar';-import { LinkControls } from '@/app/(main)/links/[linkId]/LinkControls';import { LinkPanels } from '@/app/(main)/links/[linkId]/LinkPanels';-import { Column, Grid } from '@umami/react-zen';+import { LinkProvider } from '@/app/(main)/links/LinkProvider';import { ExpandedViewModal } from '@/app/(main)/websites/[websiteId]/ExpandedViewModal';+import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';+import { PageBody } from '@/components/common/PageBody';+import { Panel } from '@/components/common/Panel';const excludedIds = ['path', 'entry', 'exit', 'title', 'language', 'screen', 'event'];diff --git a/src/app/(main)/links/[linkId]/LinkPanels.tsx b/src/app/(main)/links/[linkId]/LinkPanels.tsxindex ed43f5488..f33525e70 100644--- a/src/app/(main)/links/[linkId]/LinkPanels.tsx+++ b/src/app/(main)/links/[linkId]/LinkPanels.tsx@@ -1,9 +1,9 @@-import { Grid, Tabs, Tab, TabList, TabPanel, Heading } from '@umami/react-zen';+import { Grid, Heading, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';import { GridRow } from '@/components/common/GridRow';import { Panel } from '@/components/common/Panel';-import { WorldMap } from '@/components/metrics/WorldMap';-import { MetricsTable } from '@/components/metrics/MetricsTable';import { useMessages } from '@/components/hooks';+import { MetricsTable } from '@/components/metrics/MetricsTable';+import { WorldMap } from '@/components/metrics/WorldMap';export function LinkPanels({ linkId }: { linkId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/links/[linkId]/page.tsx b/src/app/(main)/links/[linkId]/page.tsxindex ae3b2c9a9..4317ada23 100644--- a/src/app/(main)/links/[linkId]/page.tsx+++ b/src/app/(main)/links/[linkId]/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { LinkPage } from './LinkPage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ linkId: string }> }) {const { linkId } = await params;diff --git a/src/app/(main)/links/page.tsx b/src/app/(main)/links/page.tsxindex ed89c727e..24c9c18e3 100644--- a/src/app/(main)/links/page.tsx+++ b/src/app/(main)/links/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { LinksPage } from './LinksPage';-import { Metadata } from 'next';export default function () {return <LinksPage />;diff --git a/src/app/(main)/pixels/PixelAddButton.tsx b/src/app/(main)/pixels/PixelAddButton.tsxindex 8c89c795c..1573b9e0f 100644--- a/src/app/(main)/pixels/PixelAddButton.tsx+++ b/src/app/(main)/pixels/PixelAddButton.tsx@@ -1,7 +1,7 @@import { useMessages } from '@/components/hooks';import { Plus } from '@/components/icons';-import { PixelEditForm } from './PixelEditForm';import { DialogButton } from '@/components/input/DialogButton';+import { PixelEditForm } from './PixelEditForm';export function PixelAddButton({ teamId }: { teamId?: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/pixels/PixelDeleteButton.tsx b/src/app/(main)/pixels/PixelDeleteButton.tsxindex 977ce5efc..436dba5c4 100644--- a/src/app/(main)/pixels/PixelDeleteButton.tsx+++ b/src/app/(main)/pixels/PixelDeleteButton.tsx@@ -1,8 +1,8 @@-import { Trash } from '@/components/icons';import { ConfirmationForm } from '@/components/common/ConfirmationForm';-import { messages } from '@/components/messages';import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';+import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { messages } from '@/components/messages';export function PixelDeleteButton({pixelId,diff --git a/src/app/(main)/pixels/PixelEditButton.tsx b/src/app/(main)/pixels/PixelEditButton.tsxindex d8627bb95..3c5924da4 100644--- a/src/app/(main)/pixels/PixelEditButton.tsx+++ b/src/app/(main)/pixels/PixelEditButton.tsx@@ -1,7 +1,7 @@-import { Edit } from '@/components/icons';-import { PixelEditForm } from './PixelEditForm';import { useMessages } from '@/components/hooks';+import { Edit } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { PixelEditForm } from './PixelEditForm';export function PixelEditButton({ pixelId }: { pixelId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/pixels/PixelEditForm.tsx b/src/app/(main)/pixels/PixelEditForm.tsxindex a3a4f0c80..aedd3a3b6 100644--- a/src/app/(main)/pixels/PixelEditForm.tsx+++ b/src/app/(main)/pixels/PixelEditForm.tsx@@ -1,22 +1,21 @@import {+ Button,+ Column,Form,FormField,FormSubmitButton,- Row,- TextField,- Button,- Label,- Column,Icon,+ Label,Loading,+ Row,+ TextField,} from '@umami/react-zen';-import { useConfig, usePixelQuery } from '@/components/hooks';-import { useMessages } from '@/components/hooks';-import { RefreshCw } from '@/components/icons';-import { getRandomChars } from '@/lib/generate';-import { useUpdateQuery } from '@/components/hooks/queries/useUpdateQuery';import { useEffect, useState } from 'react';+import { useConfig, useMessages, usePixelQuery } from '@/components/hooks';+import { useUpdateQuery } from '@/components/hooks/queries/useUpdateQuery';+import { RefreshCw } from '@/components/icons';import { PIXELS_URL } from '@/lib/constants';+import { getRandomChars } from '@/lib/generate';const generateId = () => getRandomChars(9);diff --git a/src/app/(main)/pixels/PixelProvider.tsx b/src/app/(main)/pixels/PixelProvider.tsxindex 3ba4c5e5c..9e929d8c3 100644--- a/src/app/(main)/pixels/PixelProvider.tsx+++ b/src/app/(main)/pixels/PixelProvider.tsx@@ -1,8 +1,8 @@'use client';-import { createContext, ReactNode } from 'react';import { Loading } from '@umami/react-zen';-import { Pixel } from '@/generated/prisma/client';+import { createContext, type ReactNode } from 'react';import { usePixelQuery } from '@/components/hooks/queries/usePixelQuery';+import type { Pixel } from '@/generated/prisma/client';export const PixelContext = createContext<Pixel>(null);diff --git a/src/app/(main)/pixels/PixelsDataTable.tsx b/src/app/(main)/pixels/PixelsDataTable.tsxindex 6a1eb982b..51b8c5a0b 100644--- a/src/app/(main)/pixels/PixelsDataTable.tsx+++ b/src/app/(main)/pixels/PixelsDataTable.tsx@@ -1,6 +1,6 @@-import { usePixelsQuery, useNavigation } from '@/components/hooks';-import { PixelsTable } from './PixelsTable';import { DataGrid } from '@/components/common/DataGrid';+import { useNavigation, usePixelsQuery } from '@/components/hooks';+import { PixelsTable } from './PixelsTable';export function PixelsDataTable() {const { teamId } = useNavigation();diff --git a/src/app/(main)/pixels/PixelsPage.tsx b/src/app/(main)/pixels/PixelsPage.tsxindex 0733d5b11..4f6acefe5 100644--- a/src/app/(main)/pixels/PixelsPage.tsx+++ b/src/app/(main)/pixels/PixelsPage.tsx@@ -1,11 +1,11 @@'use client';-import { PageBody } from '@/components/common/PageBody';import { Column } from '@umami/react-zen';+import { PageBody } from '@/components/common/PageBody';import { PageHeader } from '@/components/common/PageHeader';-import { PixelAddButton } from './PixelAddButton';+import { Panel } from '@/components/common/Panel';import { useMessages, useNavigation } from '@/components/hooks';+import { PixelAddButton } from './PixelAddButton';import { PixelsDataTable } from './PixelsDataTable';-import { Panel } from '@/components/common/Panel';export function PixelsPage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/pixels/PixelsTable.tsx b/src/app/(main)/pixels/PixelsTable.tsxindex 4edbb1cf4..48f2121ba 100644--- a/src/app/(main)/pixels/PixelsTable.tsx+++ b/src/app/(main)/pixels/PixelsTable.tsx@@ -1,10 +1,10 @@+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';import Link from 'next/link';-import { DataTable, DataColumn, Row, DataTableProps } from '@umami/react-zen';-import { useMessages, useNavigation, useSlug } from '@/components/hooks';import { DateDistance } from '@/components/common/DateDistance';-import { PixelEditButton } from './PixelEditButton';-import { PixelDeleteButton } from './PixelDeleteButton';import { ExternalLink } from '@/components/common/ExternalLink';+import { useMessages, useNavigation, useSlug } from '@/components/hooks';+import { PixelDeleteButton } from './PixelDeleteButton';+import { PixelEditButton } from './PixelEditButton';export function PixelsTable(props: DataTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/pixels/[pixelId]/PixelControls.tsx b/src/app/(main)/pixels/[pixelId]/PixelControls.tsxindex 33f49222b..55dcd5764 100644--- a/src/app/(main)/pixels/[pixelId]/PixelControls.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelControls.tsx@@ -1,9 +1,9 @@import { Column, Row } from '@umami/react-zen';-import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';+import { ExportButton } from '@/components/input/ExportButton';import { FilterBar } from '@/components/input/FilterBar';import { MonthFilter } from '@/components/input/MonthFilter';-import { ExportButton } from '@/components/input/ExportButton';+import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';export function PixelControls({pixelId: websiteId,diff --git a/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx b/src/app/(main)/pixels/[pixelId]/PixelHeader.tsxindex a49729910..8171aaf17 100644--- a/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx@@ -1,8 +1,8 @@-import { usePixel, useMessages, useSlug } from '@/components/hooks';-import { PageHeader } from '@/components/common/PageHeader';import { Icon, Text } from '@umami/react-zen';-import { ExternalLink, Grid2x2 } from '@/components/icons';import { LinkButton } from '@/components/common/LinkButton';+import { PageHeader } from '@/components/common/PageHeader';+import { useMessages, usePixel, useSlug } from '@/components/hooks';+import { ExternalLink, Grid2x2 } from '@/components/icons';export function PixelHeader() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx b/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsxindex 0305df7f3..c9dcd357c 100644--- a/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx@@ -1,9 +1,9 @@+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useDateRange, useMessages } from '@/components/hooks';+import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatLongNumber } from '@/lib/format';-import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';-import { LoadingPanel } from '@/components/common/LoadingPanel';export function PixelMetricsBar({pixelId,diff --git a/src/app/(main)/pixels/[pixelId]/PixelPage.tsx b/src/app/(main)/pixels/[pixelId]/PixelPage.tsxindex 46cfe3381..7a4ae9d79 100644--- a/src/app/(main)/pixels/[pixelId]/PixelPage.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelPage.tsx@@ -1,14 +1,14 @@'use client';-import { PageBody } from '@/components/common/PageBody';-import { PixelProvider } from '@/app/(main)/pixels/PixelProvider';+import { Column, Grid } from '@umami/react-zen';+import { PixelControls } from '@/app/(main)/pixels/[pixelId]/PixelControls';import { PixelHeader } from '@/app/(main)/pixels/[pixelId]/PixelHeader';-import { Panel } from '@/components/common/Panel';-import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';import { PixelMetricsBar } from '@/app/(main)/pixels/[pixelId]/PixelMetricsBar';-import { PixelControls } from '@/app/(main)/pixels/[pixelId]/PixelControls';import { PixelPanels } from '@/app/(main)/pixels/[pixelId]/PixelPanels';-import { Column, Grid } from '@umami/react-zen';+import { PixelProvider } from '@/app/(main)/pixels/PixelProvider';import { ExpandedViewModal } from '@/app/(main)/websites/[websiteId]/ExpandedViewModal';+import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';+import { PageBody } from '@/components/common/PageBody';+import { Panel } from '@/components/common/Panel';const excludedIds = ['path', 'entry', 'exit', 'title', 'language', 'screen', 'event'];diff --git a/src/app/(main)/pixels/[pixelId]/PixelPanels.tsx b/src/app/(main)/pixels/[pixelId]/PixelPanels.tsxindex d3adc1a3a..9cc24c923 100644--- a/src/app/(main)/pixels/[pixelId]/PixelPanels.tsx+++ b/src/app/(main)/pixels/[pixelId]/PixelPanels.tsx@@ -1,9 +1,9 @@-import { Grid, Tabs, Tab, TabList, TabPanel, Heading } from '@umami/react-zen';+import { Grid, Heading, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';import { GridRow } from '@/components/common/GridRow';import { Panel } from '@/components/common/Panel';-import { WorldMap } from '@/components/metrics/WorldMap';-import { MetricsTable } from '@/components/metrics/MetricsTable';import { useMessages } from '@/components/hooks';+import { MetricsTable } from '@/components/metrics/MetricsTable';+import { WorldMap } from '@/components/metrics/WorldMap';export function PixelPanels({ pixelId }: { pixelId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/pixels/[pixelId]/page.tsx b/src/app/(main)/pixels/[pixelId]/page.tsxindex 85456d29e..d1db92f3d 100644--- a/src/app/(main)/pixels/[pixelId]/page.tsx+++ b/src/app/(main)/pixels/[pixelId]/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { PixelPage } from './PixelPage';-import { Metadata } from 'next';export default async function ({ params }: { params: { pixelId: string } }) {const { pixelId } = await params;diff --git a/src/app/(main)/pixels/page.tsx b/src/app/(main)/pixels/page.tsxindex 4573b0655..cc240cd24 100644--- a/src/app/(main)/pixels/page.tsx+++ b/src/app/(main)/pixels/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { PixelsPage } from './PixelsPage';-import { Metadata } from 'next';export default function () {return <PixelsPage />;diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsxindex fc7b11e75..adfaaa4f6 100644--- a/src/app/(main)/settings/SettingsLayout.tsx+++ b/src/app/(main)/settings/SettingsLayout.tsx@@ -1,7 +1,7 @@'use client';-import { PageBody } from '@/components/common/PageBody';import { Column, Grid } from '@umami/react-zen';-import { ReactNode } from 'react';+import type { ReactNode } from 'react';+import { PageBody } from '@/components/common/PageBody';import { SettingsNav } from './SettingsNav';export function SettingsLayout({ children }: { children: ReactNode }) {diff --git a/src/app/(main)/settings/layout.tsx b/src/app/(main)/settings/layout.tsxindex c934d596c..e8dfb30d7 100644--- a/src/app/(main)/settings/layout.tsx+++ b/src/app/(main)/settings/layout.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { SettingsLayout } from './SettingsLayout';export default function ({ children }) {diff --git a/src/app/(main)/settings/preferences/DateRangeSetting.tsx b/src/app/(main)/settings/preferences/DateRangeSetting.tsxindex c0e8221e8..3f5e6647f 100644--- a/src/app/(main)/settings/preferences/DateRangeSetting.tsx+++ b/src/app/(main)/settings/preferences/DateRangeSetting.tsx@@ -1,9 +1,9 @@-import { useState } from 'react';-import { DateFilter } from '@/components/input/DateFilter';import { Button, Row } from '@umami/react-zen';+import { useState } from 'react';import { useMessages } from '@/components/hooks';+import { DateFilter } from '@/components/input/DateFilter';import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';-import { setItem, getItem } from '@/lib/storage';+import { getItem, setItem } from '@/lib/storage';export function DateRangeSetting() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/settings/preferences/LanguageSetting.tsx b/src/app/(main)/settings/preferences/LanguageSetting.tsxindex 0bcaa6ba8..00a2d74f0 100644--- a/src/app/(main)/settings/preferences/LanguageSetting.tsx+++ b/src/app/(main)/settings/preferences/LanguageSetting.tsx@@ -1,5 +1,5 @@+import { Button, ListItem, Row, Select } from '@umami/react-zen';import { useState } from 'react';-import { Button, Select, ListItem, Row } from '@umami/react-zen';import { useLocale, useMessages } from '@/components/hooks';import { DEFAULT_LOCALE } from '@/lib/constants';import { languages } from '@/lib/lang';diff --git a/src/app/(main)/settings/preferences/PreferenceSettings.tsx b/src/app/(main)/settings/preferences/PreferenceSettings.tsxindex 9192a905a..a2890ce90 100644--- a/src/app/(main)/settings/preferences/PreferenceSettings.tsx+++ b/src/app/(main)/settings/preferences/PreferenceSettings.tsx@@ -1,9 +1,9 @@import { Column, Label } from '@umami/react-zen';import { useLoginQuery, useMessages } from '@/components/hooks';-import { TimezoneSetting } from './TimezoneSetting';import { DateRangeSetting } from './DateRangeSetting';import { LanguageSetting } from './LanguageSetting';import { ThemeSetting } from './ThemeSetting';+import { TimezoneSetting } from './TimezoneSetting';export function PreferenceSettings() {const { user } = useLoginQuery();diff --git a/src/app/(main)/settings/preferences/PreferencesPage.tsx b/src/app/(main)/settings/preferences/PreferencesPage.tsxindex 4ddd3511a..61e26694f 100644--- a/src/app/(main)/settings/preferences/PreferencesPage.tsx+++ b/src/app/(main)/settings/preferences/PreferencesPage.tsx@@ -1,10 +1,10 @@'use client';import { Column } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';+import { PageBody } from '@/components/common/PageBody';+import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';+import { useMessages } from '@/components/hooks';import { PreferenceSettings } from './PreferenceSettings';-import { PageHeader } from '@/components/common/PageHeader';-import { PageBody } from '@/components/common/PageBody';export function PreferencesPage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/settings/preferences/ThemeSetting.tsx b/src/app/(main)/settings/preferences/ThemeSetting.tsxindex d0c4fb288..03bd6a6e4 100644--- a/src/app/(main)/settings/preferences/ThemeSetting.tsx+++ b/src/app/(main)/settings/preferences/ThemeSetting.tsx@@ -1,5 +1,5 @@-import { Row, Button, Icon, useTheme } from '@umami/react-zen';-import { Sun, Moon } from '@/components/icons';+import { Button, Icon, Row, useTheme } from '@umami/react-zen';+import { Moon, Sun } from '@/components/icons';export function ThemeSetting() {const { theme, setTheme } = useTheme();diff --git a/src/app/(main)/settings/preferences/TimezoneSetting.tsx b/src/app/(main)/settings/preferences/TimezoneSetting.tsxindex 68d8fadb0..cf20b20da 100644--- a/src/app/(main)/settings/preferences/TimezoneSetting.tsx+++ b/src/app/(main)/settings/preferences/TimezoneSetting.tsx@@ -1,6 +1,6 @@+import { Button, ListItem, Row, Select } from '@umami/react-zen';import { useState } from 'react';-import { Row, Select, ListItem, Button } from '@umami/react-zen';-import { useTimezone, useMessages } from '@/components/hooks';+import { useMessages, useTimezone } from '@/components/hooks';import { getTimezone } from '@/lib/date';const timezones = Intl.supportedValuesOf('timeZone');diff --git a/src/app/(main)/settings/preferences/page.tsx b/src/app/(main)/settings/preferences/page.tsxindex bc1398f38..dd16870e1 100644--- a/src/app/(main)/settings/preferences/page.tsx+++ b/src/app/(main)/settings/preferences/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { PreferencesPage } from './PreferencesPage';export default function () {diff --git a/src/app/(main)/settings/profile/PasswordChangeButton.tsx b/src/app/(main)/settings/profile/PasswordChangeButton.tsxindex 885e4d660..6ce8ef842 100644--- a/src/app/(main)/settings/profile/PasswordChangeButton.tsx+++ b/src/app/(main)/settings/profile/PasswordChangeButton.tsx@@ -1,7 +1,7 @@-import { Button, Icon, Text, useToast, DialogTrigger, Dialog, Modal } from '@umami/react-zen';-import { PasswordEditForm } from './PasswordEditForm';-import { LockKeyhole } from '@/components/icons';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';import { useMessages } from '@/components/hooks';+import { LockKeyhole } from '@/components/icons';+import { PasswordEditForm } from './PasswordEditForm';export function PasswordChangeButton() {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/settings/profile/PasswordEditForm.tsx b/src/app/(main)/settings/profile/PasswordEditForm.tsxindex 2c27a2d51..6f782e44b 100644--- a/src/app/(main)/settings/profile/PasswordEditForm.tsx+++ b/src/app/(main)/settings/profile/PasswordEditForm.tsx@@ -1,10 +1,10 @@import {+ Button,Form,- FormField,FormButtons,- PasswordField,- Button,+ FormField,FormSubmitButton,+ PasswordField,} from '@umami/react-zen';import { useMessages, useUpdateQuery } from '@/components/hooks';diff --git a/src/app/(main)/settings/profile/ProfilePage.tsx b/src/app/(main)/settings/profile/ProfilePage.tsxindex dab836dee..f03499a37 100644--- a/src/app/(main)/settings/profile/ProfilePage.tsx+++ b/src/app/(main)/settings/profile/ProfilePage.tsx@@ -1,10 +1,10 @@'use client';-import { ProfileSettings } from './ProfileSettings';-import { useMessages } from '@/components/hooks';-import { Panel } from '@/components/common/Panel';import { Column } from '@umami/react-zen';-import { PageHeader } from '@/components/common/PageHeader';import { PageBody } from '@/components/common/PageBody';+import { PageHeader } from '@/components/common/PageHeader';+import { Panel } from '@/components/common/Panel';+import { useMessages } from '@/components/hooks';+import { ProfileSettings } from './ProfileSettings';export function ProfilePage() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/settings/profile/ProfileSettings.tsx b/src/app/(main)/settings/profile/ProfileSettings.tsxindex 156bf28e2..fae73a53f 100644--- a/src/app/(main)/settings/profile/ProfileSettings.tsx+++ b/src/app/(main)/settings/profile/ProfileSettings.tsx@@ -1,4 +1,4 @@-import { Row, Column, Label } from '@umami/react-zen';+import { Column, Label, Row } from '@umami/react-zen';import { useConfig, useLoginQuery, useMessages } from '@/components/hooks';import { ROLES } from '@/lib/constants';import { PasswordChangeButton } from './PasswordChangeButton';diff --git a/src/app/(main)/settings/profile/page.tsx b/src/app/(main)/settings/profile/page.tsxindex ad2b9bcc1..6060b91f6 100644--- a/src/app/(main)/settings/profile/page.tsx+++ b/src/app/(main)/settings/profile/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { ProfilePage } from './ProfilePage';export default function () {diff --git a/src/app/(main)/settings/teams/TeamsSettingsPage.tsx b/src/app/(main)/settings/teams/TeamsSettingsPage.tsxindex 9d5c8acd2..dc3e3bc85 100644--- a/src/app/(main)/settings/teams/TeamsSettingsPage.tsx+++ b/src/app/(main)/settings/teams/TeamsSettingsPage.tsx@@ -1,7 +1,7 @@'use client';+import { Column } from '@umami/react-zen';import { TeamsDataTable } from '@/app/(main)/teams/TeamsDataTable';import { TeamsHeader } from '@/app/(main)/teams/TeamsHeader';-import { Column } from '@umami/react-zen';import { Panel } from '@/components/common/Panel';export function TeamsSettingsPage() {diff --git a/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsx b/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsxindex 8ad2b694b..9539625f8 100644--- a/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsx+++ b/src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsx@@ -1,6 +1,6 @@'use client';-import { TeamProvider } from '@/app/(main)/teams/TeamProvider';import { TeamSettings } from '@/app/(main)/teams/[teamId]/TeamSettings';+import { TeamProvider } from '@/app/(main)/teams/TeamProvider';export function TeamSettingsPage({ teamId }: { teamId: string }) {return (diff --git a/src/app/(main)/settings/teams/[teamId]/page.tsx b/src/app/(main)/settings/teams/[teamId]/page.tsxindex 5a9aaacb8..58a380bc2 100644--- a/src/app/(main)/settings/teams/[teamId]/page.tsx+++ b/src/app/(main)/settings/teams/[teamId]/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { TeamSettingsPage } from './TeamSettingsPage';export default async function ({ params }: { params: Promise<{ teamId: string }> }) {diff --git a/src/app/(main)/settings/teams/page.tsx b/src/app/(main)/settings/teams/page.tsxindex dd3bdade6..a0913f45a 100644--- a/src/app/(main)/settings/teams/page.tsx+++ b/src/app/(main)/settings/teams/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { TeamsSettingsPage } from './TeamsSettingsPage';export default function () {diff --git a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsxindex c1812ed07..5009ec6c6 100644--- a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx+++ b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx@@ -1,8 +1,8 @@'use client';import { Column } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';import { WebsitesDataTable } from '@/app/(main)/websites/WebsitesDataTable';import { SectionHeader } from '@/components/common/SectionHeader';+import { useMessages } from '@/components/hooks';export function WebsitesSettingsPage({ teamId }: { teamId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsxindex 0dc7bcc14..53b4cd9c7 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx@@ -1,8 +1,8 @@'use client';-import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';+import { Column } from '@umami/react-zen';import { WebsiteSettings } from '@/app/(main)/websites/[websiteId]/settings/WebsiteSettings';import { WebsiteSettingsHeader } from '@/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader';-import { Column } from '@umami/react-zen';+import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';export function WebsiteSettingsPage({ websiteId }: { websiteId: string }) {return (diff --git a/src/app/(main)/settings/websites/[websiteId]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsxindex a65a5a9fb..9adfc915e 100644--- a/src/app/(main)/settings/websites/[websiteId]/page.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { WebsiteSettingsPage } from './WebsiteSettingsPage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsxindex cc8f886af..19c14fd66 100644--- a/src/app/(main)/settings/websites/page.tsx+++ b/src/app/(main)/settings/websites/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { WebsitesSettingsPage } from './WebsitesSettingsPage';export default async function ({ params }: { params: Promise<{ teamId: string }> }) {diff --git a/src/app/(main)/teams/TeamAddForm.tsx b/src/app/(main)/teams/TeamAddForm.tsxindex 87a6a4fd6..c95259f47 100644--- a/src/app/(main)/teams/TeamAddForm.tsx+++ b/src/app/(main)/teams/TeamAddForm.tsx@@ -1,4 +1,3 @@-import { useMessages, useUpdateQuery } from '@/components/hooks';import {Button,Form,@@ -7,6 +6,7 @@ import {FormSubmitButton,TextField,} from '@umami/react-zen';+import { useMessages, useUpdateQuery } from '@/components/hooks';export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {const { formatMessage, labels, getErrorMessage } = useMessages();diff --git a/src/app/(main)/teams/TeamJoinForm.tsx b/src/app/(main)/teams/TeamJoinForm.tsxindex 0c896747e..697807889 100644--- a/src/app/(main)/teams/TeamJoinForm.tsx+++ b/src/app/(main)/teams/TeamJoinForm.tsx@@ -1,10 +1,10 @@import {+ Button,Form,- FormField,FormButtons,- TextField,- Button,+ FormField,FormSubmitButton,+ TextField,} from '@umami/react-zen';import { useMessages, useUpdateQuery } from '@/components/hooks';diff --git a/src/app/(main)/teams/TeamLeaveButton.tsx b/src/app/(main)/teams/TeamLeaveButton.tsxindex 6e455d7dd..2cca76f86 100644--- a/src/app/(main)/teams/TeamLeaveButton.tsx+++ b/src/app/(main)/teams/TeamLeaveButton.tsx@@ -1,6 +1,6 @@-import { useLoginQuery, useMessages, useModified } from '@/components/hooks';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';import { useRouter } from 'next/navigation';-import { Button, Icon, Modal, DialogTrigger, Dialog, Text } from '@umami/react-zen';+import { useLoginQuery, useMessages, useModified } from '@/components/hooks';import { LogOut } from '@/components/icons';import { TeamLeaveForm } from './TeamLeaveForm';diff --git a/src/app/(main)/teams/TeamLeaveForm.tsx b/src/app/(main)/teams/TeamLeaveForm.tsxindex 1c7846b8d..b3dcaf585 100644--- a/src/app/(main)/teams/TeamLeaveForm.tsx+++ b/src/app/(main)/teams/TeamLeaveForm.tsx@@ -1,5 +1,5 @@-import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';import { ConfirmationForm } from '@/components/common/ConfirmationForm';+import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';export function TeamLeaveForm({teamId,diff --git a/src/app/(main)/teams/TeamProvider.tsx b/src/app/(main)/teams/TeamProvider.tsxindex d4d319865..cea416142 100644--- a/src/app/(main)/teams/TeamProvider.tsx+++ b/src/app/(main)/teams/TeamProvider.tsx@@ -1,8 +1,8 @@'use client';-import { createContext, ReactNode } from 'react';import { Loading } from '@umami/react-zen';+import { createContext, type ReactNode } from 'react';import { useTeamQuery } from '@/components/hooks/queries/useTeamQuery';-import { Team } from '@/generated/prisma/client';+import type { Team } from '@/generated/prisma/client';export const TeamContext = createContext<Team>(null);diff --git a/src/app/(main)/teams/TeamsAddButton.tsx b/src/app/(main)/teams/TeamsAddButton.tsxindex 911c3b2b0..578a273a1 100644--- a/src/app/(main)/teams/TeamsAddButton.tsx+++ b/src/app/(main)/teams/TeamsAddButton.tsx@@ -1,8 +1,8 @@-import { Button, Icon, Modal, DialogTrigger, Dialog, Text, useToast } from '@umami/react-zen';-import { Plus } from '@/components/icons';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';import { useMessages, useModified } from '@/components/hooks';-import { TeamAddForm } from './TeamAddForm';+import { Plus } from '@/components/icons';import { messages } from '@/components/messages';+import { TeamAddForm } from './TeamAddForm';export function TeamsAddButton({ onSave }: { onSave?: () => void }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/teams/TeamsDataTable.tsx b/src/app/(main)/teams/TeamsDataTable.tsxindex 4bc939b12..cdce7b936 100644--- a/src/app/(main)/teams/TeamsDataTable.tsx+++ b/src/app/(main)/teams/TeamsDataTable.tsx@@ -1,6 +1,6 @@+import Link from 'next/link';import { DataGrid } from '@/components/common/DataGrid';import { useLoginQuery, useNavigation, useUserTeamsQuery } from '@/components/hooks';-import Link from 'next/link';import { TeamsTable } from './TeamsTable';export function TeamsDataTable() {diff --git a/src/app/(main)/teams/TeamsHeader.tsx b/src/app/(main)/teams/TeamsHeader.tsxindex c45bc85cf..579ba5957 100644--- a/src/app/(main)/teams/TeamsHeader.tsx+++ b/src/app/(main)/teams/TeamsHeader.tsx@@ -1,9 +1,9 @@import { Row } from '@umami/react-zen';import { PageHeader } from '@/components/common/PageHeader';-import { ROLES } from '@/lib/constants';import { useLoginQuery, useMessages } from '@/components/hooks';-import { TeamsJoinButton } from './TeamsJoinButton';+import { ROLES } from '@/lib/constants';import { TeamsAddButton } from './TeamsAddButton';+import { TeamsJoinButton } from './TeamsJoinButton';export function TeamsHeader({allowCreate = true,diff --git a/src/app/(main)/teams/TeamsJoinButton.tsx b/src/app/(main)/teams/TeamsJoinButton.tsxindex 742954970..017211e2f 100644--- a/src/app/(main)/teams/TeamsJoinButton.tsx+++ b/src/app/(main)/teams/TeamsJoinButton.tsx@@ -1,6 +1,6 @@-import { Button, Icon, Modal, DialogTrigger, Dialog, Text, useToast } from '@umami/react-zen';-import { UserPlus } from '@/components/icons';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';import { useMessages, useModified } from '@/components/hooks';+import { UserPlus } from '@/components/icons';import { TeamJoinForm } from './TeamJoinForm';export function TeamsJoinButton() {diff --git a/src/app/(main)/teams/TeamsPage.tsx b/src/app/(main)/teams/TeamsPage.tsxindex 3b0f57ea4..5b11bcf83 100644--- a/src/app/(main)/teams/TeamsPage.tsx+++ b/src/app/(main)/teams/TeamsPage.tsx@@ -1,9 +1,9 @@'use client';+import { Column } from '@umami/react-zen';import { TeamsDataTable } from '@/app/(main)/teams/TeamsDataTable';import { TeamsHeader } from '@/app/(main)/teams/TeamsHeader';-import { Column } from '@umami/react-zen';-import { Panel } from '@/components/common/Panel';import { PageBody } from '@/components/common/PageBody';+import { Panel } from '@/components/common/Panel';export function TeamsPage() {return (diff --git a/src/app/(main)/teams/TeamsTable.tsx b/src/app/(main)/teams/TeamsTable.tsxindex b5f112331..754f0b2b1 100644--- a/src/app/(main)/teams/TeamsTable.tsx+++ b/src/app/(main)/teams/TeamsTable.tsx@@ -1,7 +1,7 @@-import { DataColumn, DataTable, DataTableProps } from '@umami/react-zen';+import { DataColumn, DataTable, type DataTableProps } from '@umami/react-zen';+import type { ReactNode } from 'react';import { useMessages } from '@/components/hooks';import { ROLES } from '@/lib/constants';-import { ReactNode } from 'react';export interface TeamsTableProps extends DataTableProps {renderLink?: (row: any) => ReactNode;diff --git a/src/app/(main)/teams/[teamId]/TeamEditForm.tsx b/src/app/(main)/teams/[teamId]/TeamEditForm.tsxindex eb05d362b..74e038f6a 100644--- a/src/app/(main)/teams/[teamId]/TeamEditForm.tsx+++ b/src/app/(main)/teams/[teamId]/TeamEditForm.tsx@@ -1,16 +1,16 @@import {+ Button,Form,- FormField,FormButtons,+ FormField,FormSubmitButton,- TextField,- Button,IconLabel,Row,+ TextField,} from '@umami/react-zen';-import { getRandomChars } from '@/lib/generate';import { useMessages, useTeam, useUpdateQuery } from '@/components/hooks';import { RefreshCw } from '@/components/icons';+import { getRandomChars } from '@/lib/generate';const generateId = () => `team_${getRandomChars(16)}`;diff --git a/src/app/(main)/teams/[teamId]/TeamManage.tsx b/src/app/(main)/teams/[teamId]/TeamManage.tsxindex 6c0fe46e0..88cbad9ee 100644--- a/src/app/(main)/teams/[teamId]/TeamManage.tsx+++ b/src/app/(main)/teams/[teamId]/TeamManage.tsx@@ -1,7 +1,7 @@-import { useMessages, useModified } from '@/components/hooks';+import { Button, Dialog, DialogTrigger, Modal } from '@umami/react-zen';import { useRouter } from 'next/navigation';-import { Button, Modal, DialogTrigger, Dialog } from '@umami/react-zen';import { ActionForm } from '@/components/common/ActionForm';+import { useMessages, useModified } from '@/components/hooks';import { TeamDeleteForm } from './TeamDeleteForm';export function TeamManage({ teamId }: { teamId: string }) {diff --git a/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsx b/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsxindex eb24d2aaf..f75b6d18e 100644--- a/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMemberEditButton.tsx@@ -1,8 +1,8 @@-import { useMessages, useModified } from '@/components/hooks';import { useToast } from '@umami/react-zen';-import { TeamMemberEditForm } from './TeamMemberEditForm';-import { DialogButton } from '@/components/input/DialogButton';+import { useMessages, useModified } from '@/components/hooks';import { Edit } from '@/components/icons';+import { DialogButton } from '@/components/input/DialogButton';+import { TeamMemberEditForm } from './TeamMemberEditForm';export function TeamMemberEditButton({teamId,diff --git a/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx b/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsxindex 76f0800f1..4826746fd 100644--- a/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx@@ -1,14 +1,14 @@-import { useMessages, useUpdateQuery } from '@/components/hooks';-import { ROLES } from '@/lib/constants';import {Button,- Select,Form,FormButtons,FormField,- ListItem,FormSubmitButton,+ ListItem,+ Select,} from '@umami/react-zen';+import { useMessages, useUpdateQuery } from '@/components/hooks';+import { ROLES } from '@/lib/constants';export function TeamMemberEditForm({teamId,diff --git a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsxindex 4ea83540a..4d3e8e91e 100644--- a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx@@ -1,8 +1,8 @@import { ConfirmationForm } from '@/components/common/ConfirmationForm';import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';-import { messages } from '@/components/messages';import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { messages } from '@/components/messages';export function TeamMemberRemoveButton({teamId,diff --git a/src/app/(main)/teams/[teamId]/TeamMembersDataTable.tsx b/src/app/(main)/teams/[teamId]/TeamMembersDataTable.tsxindex d5f993104..52c0fe38f 100644--- a/src/app/(main)/teams/[teamId]/TeamMembersDataTable.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMembersDataTable.tsx@@ -1,6 +1,6 @@import { DataGrid } from '@/components/common/DataGrid';-import { TeamMembersTable } from './TeamMembersTable';import { useTeamMembersQuery } from '@/components/hooks';+import { TeamMembersTable } from './TeamMembersTable';export function TeamMembersDataTable({teamId,diff --git a/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx b/src/app/(main)/teams/[teamId]/TeamMembersTable.tsxindex 8d06360d5..8414908c1 100644--- a/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx+++ b/src/app/(main)/teams/[teamId]/TeamMembersTable.tsx@@ -1,8 +1,8 @@import { DataColumn, DataTable, Row } from '@umami/react-zen';import { useMessages } from '@/components/hooks';import { ROLES } from '@/lib/constants';-import { TeamMemberRemoveButton } from './TeamMemberRemoveButton';import { TeamMemberEditButton } from './TeamMemberEditButton';+import { TeamMemberRemoveButton } from './TeamMemberRemoveButton';export function TeamMembersTable({data = [],diff --git a/src/app/(main)/teams/[teamId]/TeamSettings.tsx b/src/app/(main)/teams/[teamId]/TeamSettings.tsxindex 7ddd3b2fc..3ddbe000b 100644--- a/src/app/(main)/teams/[teamId]/TeamSettings.tsx+++ b/src/app/(main)/teams/[teamId]/TeamSettings.tsx@@ -1,13 +1,13 @@import { Column } from '@umami/react-zen';+import { TeamLeaveButton } from '@/app/(main)/teams/TeamLeaveButton';+import { PageHeader } from '@/components/common/PageHeader';+import { Panel } from '@/components/common/Panel';import { useLoginQuery, useNavigation, useTeam } from '@/components/hooks';-import { ROLES } from '@/lib/constants';import { Users } from '@/components/icons';-import { TeamLeaveButton } from '@/app/(main)/teams/TeamLeaveButton';-import { TeamManage } from './TeamManage';+import { ROLES } from '@/lib/constants';import { TeamEditForm } from './TeamEditForm';+import { TeamManage } from './TeamManage';import { TeamMembersDataTable } from './TeamMembersDataTable';-import { PageHeader } from '@/components/common/PageHeader';-import { Panel } from '@/components/common/Panel';export function TeamSettings({ teamId }: { teamId: string }) {const team: any = useTeam();diff --git a/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx b/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsxindex c3a68c57f..f2b4ecea0 100644--- a/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx+++ b/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx@@ -1,5 +1,5 @@-import { useDeleteQuery, useMessages } from '@/components/hooks';import { Icon, LoadingButton, Text } from '@umami/react-zen';+import { useDeleteQuery, useMessages } from '@/components/hooks';import { X } from '@/components/icons';export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {diff --git a/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx b/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsxindex b9542eef1..10f565432 100644--- a/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx+++ b/src/app/(main)/teams/[teamId]/TeamWebsitesTable.tsx@@ -1,9 +1,9 @@import { DataColumn, DataTable, Row } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';import Link from 'next/link';-import { ROLES } from '@/lib/constants';import { TeamMemberEditButton } from '@/app/(main)/teams/[teamId]/TeamMemberEditButton';import { TeamMemberRemoveButton } from '@/app/(main)/teams/[teamId]/TeamMemberRemoveButton';+import { useMessages } from '@/components/hooks';+import { ROLES } from '@/lib/constants';export function TeamWebsitesTable({teamId,diff --git a/src/app/(main)/teams/page.tsx b/src/app/(main)/teams/page.tsxindex ce3538955..7344f1509 100644--- a/src/app/(main)/teams/page.tsx+++ b/src/app/(main)/teams/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { TeamsPage } from './TeamsPage';export default function () {diff --git a/src/app/(main)/websites/WebsiteAddButton.tsx b/src/app/(main)/websites/WebsiteAddButton.tsxindex db0349cf2..76710abbd 100644--- a/src/app/(main)/websites/WebsiteAddButton.tsx+++ b/src/app/(main)/websites/WebsiteAddButton.tsx@@ -1,8 +1,8 @@-import { useMessages, useModified } from '@/components/hooks';import { useToast } from '@umami/react-zen';+import { useMessages, useModified } from '@/components/hooks';import { Plus } from '@/components/icons';-import { WebsiteAddForm } from './WebsiteAddForm';import { DialogButton } from '@/components/input/DialogButton';+import { WebsiteAddForm } from './WebsiteAddForm';export function WebsiteAddButton({ teamId, onSave }: { teamId: string; onSave?: () => void }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/websites/WebsiteAddForm.tsx b/src/app/(main)/websites/WebsiteAddForm.tsxindex b8ff7b459..df17ad5a6 100644--- a/src/app/(main)/websites/WebsiteAddForm.tsx+++ b/src/app/(main)/websites/WebsiteAddForm.tsx@@ -1,7 +1,6 @@-import { Form, FormField, FormSubmitButton, Row, TextField, Button } from '@umami/react-zen';-import { useUpdateQuery } from '@/components/hooks';+import { Button, Form, FormField, FormSubmitButton, Row, TextField } from '@umami/react-zen';+import { useMessages, useUpdateQuery } from '@/components/hooks';import { DOMAIN_REGEX } from '@/lib/constants';-import { useMessages } from '@/components/hooks';export function WebsiteAddForm({teamId,diff --git a/src/app/(main)/websites/WebsiteProvider.tsx b/src/app/(main)/websites/WebsiteProvider.tsxindex 4129cdd3c..75e8a3582 100644--- a/src/app/(main)/websites/WebsiteProvider.tsx+++ b/src/app/(main)/websites/WebsiteProvider.tsx@@ -1,8 +1,8 @@'use client';-import { createContext, ReactNode } from 'react';import { Loading } from '@umami/react-zen';-import { Website } from '@/generated/prisma/client';+import { createContext, type ReactNode } from 'react';import { useWebsiteQuery } from '@/components/hooks/queries/useWebsiteQuery';+import type { Website } from '@/generated/prisma/client';export const WebsiteContext = createContext<Website>(null);diff --git a/src/app/(main)/websites/WebsitesDataTable.tsx b/src/app/(main)/websites/WebsitesDataTable.tsxindex 93b1a7c79..2203262b8 100644--- a/src/app/(main)/websites/WebsitesDataTable.tsx+++ b/src/app/(main)/websites/WebsitesDataTable.tsx@@ -1,7 +1,7 @@import Link from 'next/link';-import { WebsitesTable } from './WebsitesTable';import { DataGrid } from '@/components/common/DataGrid';import { useLoginQuery, useNavigation, useUserWebsitesQuery } from '@/components/hooks';+import { WebsitesTable } from './WebsitesTable';export function WebsitesDataTable({userId,diff --git a/src/app/(main)/websites/WebsitesHeader.tsx b/src/app/(main)/websites/WebsitesHeader.tsxindex 86231a984..889b6025f 100644--- a/src/app/(main)/websites/WebsitesHeader.tsx+++ b/src/app/(main)/websites/WebsitesHeader.tsx@@ -1,6 +1,6 @@+import { PageHeader } from '@/components/common/PageHeader';import { useMessages, useNavigation } from '@/components/hooks';import { WebsiteAddButton } from './WebsiteAddButton';-import { PageHeader } from '@/components/common/PageHeader';export interface WebsitesHeaderProps {allowCreate?: boolean;diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsxindex 313dccc7d..31de7047c 100644--- a/src/app/(main)/websites/WebsitesPage.tsx+++ b/src/app/(main)/websites/WebsitesPage.tsx@@ -1,11 +1,11 @@'use client';-import { WebsitesDataTable } from './WebsitesDataTable';-import { WebsiteAddButton } from './WebsiteAddButton';-import { useMessages, useNavigation } from '@/components/hooks';import { Column } from '@umami/react-zen';+import { PageBody } from '@/components/common/PageBody';import { PageHeader } from '@/components/common/PageHeader';import { Panel } from '@/components/common/Panel';-import { PageBody } from '@/components/common/PageBody';+import { useMessages, useNavigation } from '@/components/hooks';+import { WebsiteAddButton } from './WebsiteAddButton';+import { WebsitesDataTable } from './WebsitesDataTable';export function WebsitesPage() {const { teamId } = useNavigation();diff --git a/src/app/(main)/websites/WebsitesTable.tsx b/src/app/(main)/websites/WebsitesTable.tsxindex c2f7e0d46..70648ed78 100644--- a/src/app/(main)/websites/WebsitesTable.tsx+++ b/src/app/(main)/websites/WebsitesTable.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';-import { Icon, DataTable, DataColumn, DataTableProps } from '@umami/react-zen';+import { DataColumn, DataTable, type DataTableProps, Icon } from '@umami/react-zen';+import type { ReactNode } from 'react';import { LinkButton } from '@/components/common/LinkButton';import { useMessages, useNavigation } from '@/components/hooks';import { SquarePen } from '@/components/icons';diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsxindex f014bbbea..264923a61 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/Attribution.tsx@@ -1,13 +1,13 @@-import { Grid, Column } from '@umami/react-zen';-import { useMessages, useResultQuery } from '@/components/hooks';-import { Panel } from '@/components/common/Panel';+import { Column, Grid } from '@umami/react-zen';import { LoadingPanel } from '@/components/common/LoadingPanel';+import { Panel } from '@/components/common/Panel';+import { SectionHeader } from '@/components/common/SectionHeader';+import { useMessages, useResultQuery } from '@/components/hooks';import { ListTable } from '@/components/metrics/ListTable';import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';-import { SectionHeader } from '@/components/common/SectionHeader';-import { formatLongNumber } from '@/lib/format';import { percentFilter } from '@/lib/filters';+import { formatLongNumber } from '@/lib/format';export interface AttributionProps {websiteId: string;@@ -97,34 +97,28 @@ export function Attribution({<SectionHeader title={formatMessage(labels.sources)} /><Grid columns={{ xs: '1fr', md: '1fr 1fr' }} gap><Panel>- <AttributionTable data={data?.['referrer']} title={formatMessage(labels.referrer)} />+ <AttributionTable data={data?.referrer} title={formatMessage(labels.referrer)} /></Panel><Panel>- <AttributionTable data={data?.['paidAds']} title={formatMessage(labels.paidAds)} />+ <AttributionTable data={data?.paidAds} title={formatMessage(labels.paidAds)} /></Panel></Grid><SectionHeader title="UTM" /><Grid columns={{ xs: '1fr', md: '1fr 1fr' }} gap><Panel>- <AttributionTable data={data?.['utm_source']} title={formatMessage(labels.sources)} />+ <AttributionTable data={data?.utm_source} title={formatMessage(labels.sources)} /></Panel><Panel>- <AttributionTable data={data?.['utm_medium']} title={formatMessage(labels.medium)} />+ <AttributionTable data={data?.utm_medium} title={formatMessage(labels.medium)} /></Panel><Panel>- <AttributionTable- data={data?.['utm_cmapaign']}- title={formatMessage(labels.campaigns)}- />+ <AttributionTable data={data?.utm_cmapaign} title={formatMessage(labels.campaigns)} /></Panel><Panel>- <AttributionTable- data={data?.['utm_content']}- title={formatMessage(labels.content)}- />+ <AttributionTable data={data?.utm_content} title={formatMessage(labels.content)} /></Panel><Panel>- <AttributionTable data={data?.['utm_term']} title={formatMessage(labels.terms)} />+ <AttributionTable data={data?.utm_term} title={formatMessage(labels.terms)} /></Panel></Grid></Column>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsxindex 9fe9012bc..48611c46e 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx@@ -1,9 +1,9 @@'use client';+import { Column, Grid, ListItem, SearchField, Select } from '@umami/react-zen';import { useState } from 'react';-import { Column, Grid, Select, ListItem, SearchField } from '@umami/react-zen';-import { Attribution } from './Attribution';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { useDateRange, useMessages } from '@/components/hooks';+import { Attribution } from './Attribution';export function AttributionPage({ websiteId }: { websiteId: string }) {const [model, setModel] = useState('first-click');diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/page.tsxindex ec75c58c6..1368d4bcc 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { AttributionPage } from './AttributionPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsxindex cd5b5d718..4532d9728 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/Breakdown.tsx@@ -1,6 +1,6 @@-import { Text, DataTable, DataColumn, Column } from '@umami/react-zen';-import { useMessages, useResultQuery, useFormat, useFields } from '@/components/hooks';+import { Column, DataColumn, DataTable, Text } from '@umami/react-zen';import { LoadingPanel } from '@/components/common/LoadingPanel';+import { useFields, useFormat, useMessages, useResultQuery } from '@/components/hooks';import { formatShortTime } from '@/lib/format';export interface BreakdownProps {@@ -54,13 +54,13 @@ export function Breakdown({ websiteId, selectedFields = [], startDate, endDate }align="end"width="120px">- {row => row?.['visitors']?.toLocaleString()}+ {row => row?.visitors?.toLocaleString()}</DataColumn><DataColumn id="visits" label={formatMessage(labels.visits)} align="end" width="120px">- {row => row?.['visits']?.toLocaleString()}+ {row => row?.visits?.toLocaleString()}</DataColumn><DataColumn id="views" label={formatMessage(labels.views)} align="end" width="120px">- {row => row?.['views']?.toLocaleString()}+ {row => row?.views?.toLocaleString()}</DataColumn><DataColumnid="bounceRate"@@ -69,8 +69,8 @@ export function Breakdown({ websiteId, selectedFields = [], startDate, endDate }width="120px">{row => {- const n = (Math.min(row?.['visits'], row?.['bounces']) / row?.['visits']) * 100;- return Math.round(+n) + '%';+ const n = (Math.min(row?.visits, row?.bounces) / row?.visits) * 100;+ return `${Math.round(+n)}%`;}}</DataColumn><DataColumn@@ -80,7 +80,7 @@ export function Breakdown({ websiteId, selectedFields = [], startDate, endDate }width="120px">{row => {- const n = row?.['totaltime'] / row?.['visits'];+ const n = row?.totaltime / row?.visits;return `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`;}}</DataColumn>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsxindex e1bb67119..fdead9fbf 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx@@ -1,12 +1,12 @@'use client';+import { Column, Row } from '@umami/react-zen';+import { useState } from 'react';import { FieldSelectForm } from '@/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { Panel } from '@/components/common/Panel';import { useDateRange, useMessages } from '@/components/hooks';import { ListCheck } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';-import { Column, Row } from '@umami/react-zen';-import { useState } from 'react';import { Breakdown } from './Breakdown';export function BreakdownPage({ websiteId }: { websiteId: string }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsxindex bbf69a5b5..28e33682a 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx@@ -1,6 +1,6 @@-import { Column, List, ListItem, Grid, Button } from '@umami/react-zen';-import { useFields, useMessages } from '@/components/hooks';+import { Button, Column, Grid, List, ListItem } from '@umami/react-zen';import { useState } from 'react';+import { useFields, useMessages } from '@/components/hooks';export function FieldSelectForm({selectedFields = [],diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/page.tsxindex 89295b3d0..841d86350 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { BreakdownPage } from './BreakdownPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsxindex 5e266dd6c..e336a3db6 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx@@ -1,11 +1,11 @@-import { Grid, Column, Row, Text, Icon, ProgressBar, Dialog, Box } from '@umami/react-zen';-import { useMessages, useResultQuery } from '@/components/hooks';+import { Box, Column, Dialog, Grid, Icon, ProgressBar, Row, Text } from '@umami/react-zen';import { LoadingPanel } from '@/components/common/LoadingPanel';+import { useMessages, useResultQuery } from '@/components/hooks';import { File, User } from '@/components/icons';-import { Lightning } from '@/components/svg';-import { formatLongNumber } from '@/lib/format';import { ReportEditButton } from '@/components/input/ReportEditButton';import { ChangeLabel } from '@/components/metrics/ChangeLabel';+import { Lightning } from '@/components/svg';+import { formatLongNumber } from '@/lib/format';import { FunnelEditForm } from './FunnelEditForm';type FunnelResult = {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsxindex 7e776737e..29b548032 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelAddButton.tsx@@ -1,7 +1,7 @@-import { Button, DialogTrigger, Dialog, Icon, Text, Modal } from '@umami/react-zen';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';import { useMessages } from '@/components/hooks';-import { FunnelEditForm } from './FunnelEditForm';import { Plus } from '@/components/icons';+import { FunnelEditForm } from './FunnelEditForm';export function FunnelAddButton({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsxindex 13712f2ad..5d950ea66 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx@@ -1,20 +1,20 @@import {+ Button,+ Column,Form,+ FormButtons,FormField,FormFieldArray,- TextField,- Grid,- FormButtons,FormSubmitButton,- Button,- Text,+ Grid,Icon,- Row,Loading,- Column,+ Row,+ Text,+ TextField,} from '@umami/react-zen';import { useMessages, useReportQuery, useUpdateQuery } from '@/components/hooks';-import { X, Plus } from '@/components/icons';+import { Plus, X } from '@/components/icons';import { ActionSelect } from '@/components/input/ActionSelect';import { LookupField } from '@/components/input/LookupField';diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsxindex c155662ff..57bce52f8 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsx@@ -1,12 +1,12 @@'use client';-import { Grid, Column } from '@umami/react-zen';-import { SectionHeader } from '@/components/common/SectionHeader';-import { Funnel } from './Funnel';-import { FunnelAddButton } from './FunnelAddButton';+import { Column, Grid } from '@umami/react-zen';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';-import { useDateRange, useReportsQuery } from '@/components/hooks';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';+import { SectionHeader } from '@/components/common/SectionHeader';+import { useDateRange, useReportsQuery } from '@/components/hooks';+import { Funnel } from './Funnel';+import { FunnelAddButton } from './FunnelAddButton';export function FunnelsPage({ websiteId }: { websiteId: string }) {const { data, isLoading, error } = useReportsQuery({ websiteId, type: 'funnel' });@@ -23,7 +23,7 @@ export function FunnelsPage({ websiteId }: { websiteId: string }) {<LoadingPanel data={data} isLoading={isLoading} error={error}>{data && (<Grid gap>- {data['data']?.map((report: any) => (+ {data.data?.map((report: any) => (<Panel key={report.id}><Funnel {...report} startDate={startDate} endDate={endDate} /></Panel>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/page.tsxindex 0209b8062..2fdcf3b7b 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { FunnelsPage } from './FunnelsPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsxindex dead3cab0..b6c4a11d6 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx@@ -1,9 +1,9 @@-import { Grid, Row, Column, Text, Icon, ProgressBar, Dialog } from '@umami/react-zen';-import { ReportEditButton } from '@/components/input/ReportEditButton';+import { Column, Dialog, Grid, Icon, ProgressBar, Row, Text } from '@umami/react-zen';+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages, useResultQuery } from '@/components/hooks';import { File, User } from '@/components/icons';+import { ReportEditButton } from '@/components/input/ReportEditButton';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)/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsxindex c75d72b02..c85b79c54 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx@@ -1,7 +1,7 @@-import { Button, DialogTrigger, Dialog, Icon, Text, Modal } from '@umami/react-zen';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';import { useMessages } from '@/components/hooks';-import { GoalEditForm } from './GoalEditForm';import { Plus } from '@/components/icons';+import { GoalEditForm } from './GoalEditForm';export function GoalAddButton({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsxindex 394cdec90..7f68047c3 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx@@ -1,18 +1,18 @@import {+ Button,+ Column,Form,- FormField,- TextField,- Grid,FormButtons,+ FormField,FormSubmitButton,- Button,- Loading,- Column,+ Grid,Label,+ Loading,+ TextField,} from '@umami/react-zen';import { useMessages, useReportQuery, useUpdateQuery } from '@/components/hooks';-import { LookupField } from '@/components/input/LookupField';import { ActionSelect } from '@/components/input/ActionSelect';+import { LookupField } from '@/components/input/LookupField';export function GoalEditForm({id,diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsxindex 29961110b..ff7b49fbd 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsx@@ -1,12 +1,12 @@'use client';-import { Grid, Column } from '@umami/react-zen';-import { SectionHeader } from '@/components/common/SectionHeader';-import { Goal } from './Goal';-import { GoalAddButton } from './GoalAddButton';+import { Column, Grid } from '@umami/react-zen';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';-import { useDateRange, useReportsQuery } from '@/components/hooks';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';+import { SectionHeader } from '@/components/common/SectionHeader';+import { useDateRange, useReportsQuery } from '@/components/hooks';+import { Goal } from './Goal';+import { GoalAddButton } from './GoalAddButton';export function GoalsPage({ websiteId }: { websiteId: string }) {const { data, isLoading, error } = useReportsQuery({ websiteId, type: 'goal' });@@ -23,7 +23,7 @@ export function GoalsPage({ websiteId }: { websiteId: string }) {<LoadingPanel data={data} isLoading={isLoading} error={error}>{data && (<Grid columns={{ xs: '1fr', md: '1fr 1fr' }} gap>- {data['data'].map((report: any) => (+ {data.data.map((report: any) => (<Panel key={report.id}><Goal {...report} startDate={startDate} endDate={endDate} /></Panel>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/page.tsxindex e59b2c7c7..b1ab691a0 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { GoalsPage } from './GoalsPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsxindex d897a76a0..3327a425a 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.tsx@@ -1,13 +1,13 @@+import { Column, Focusable, Icon, Row, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';+import classNames from 'classnames';import { useMemo, useState } from 'react';-import { TooltipTrigger, Tooltip, Focusable, Icon, Text, Row, Column } from '@umami/react-zen';import { firstBy } from 'thenby';-import classNames from 'classnames';+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useEscapeKey, useMessages, useResultQuery } from '@/components/hooks';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';import styles from './Journey.module.css';const NODE_HEIGHT = 60;diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsxindex 269279625..14b8341df 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx@@ -1,10 +1,10 @@'use client';+import { Column, Grid, ListItem, SearchField, Select } from '@umami/react-zen';import { useState } from 'react';-import { ListItem, Select, Column, Grid, SearchField } from '@umami/react-zen';-import { useDateRange, useMessages } from '@/components/hooks';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { Panel } from '@/components/common/Panel';+import { useDateRange, useMessages } from '@/components/hooks';import { Journey } from './Journey';-import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';const JOURNEY_STEPS = [2, 3, 4, 5, 6, 7];const DEFAULT_STEP = 3;diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/page.tsxindex c055dacd6..f6062a61d 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { JourneysPage } from './JourneysPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx b/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsxindex a8cff4577..fdd8a146b 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/retention/Retention.tsx@@ -1,11 +1,11 @@-import { ReactNode } from 'react';-import { Grid, Row, Column, Text, Icon } from '@umami/react-zen';+import { Column, Grid, Icon, Row, Text } from '@umami/react-zen';+import type { ReactNode } from 'react';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { Panel } from '@/components/common/Panel';+import { useLocale, useMessages, useResultQuery } from '@/components/hooks';import { Users } from '@/components/icons';-import { useMessages, useLocale, useResultQuery } from '@/components/hooks';import { formatDate } from '@/lib/date';import { formatLongNumber } from '@/lib/format';-import { Panel } from '@/components/common/Panel';-import { LoadingPanel } from '@/components/common/LoadingPanel';const DAYS = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];diff --git a/src/app/(main)/websites/[websiteId]/(reports)/retention/RetentionPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/retention/RetentionPage.tsxindex 348cfb33d..0ec6e95ed 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/retention/RetentionPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/retention/RetentionPage.tsx@@ -1,9 +1,9 @@'use client';import { Column } from '@umami/react-zen';-import { Retention } from './Retention';+import { endOfMonth, startOfMonth } from 'date-fns';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { useDateRange } from '@/components/hooks';-import { endOfMonth, startOfMonth } from 'date-fns';+import { Retention } from './Retention';export function RetentionPage({ websiteId }: { websiteId: string }) {const {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/retention/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/retention/page.tsxindex 41713860b..2fbbc0ac3 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/retention/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/retention/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { RetentionPage } from './RetentionPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsxindex a5d3b1011..0e782a164 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx@@ -1,3 +1,7 @@+import { Column, Grid, Row, Text } from '@umami/react-zen';+import classNames from 'classnames';+import { colord } from 'colord';+import { useCallback, useMemo, useState } from 'react';import { BarChart } from '@/components/charts/BarChart';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';@@ -11,10 +15,6 @@ import { renderDateLabels } from '@/lib/charts';import { CHART_COLORS } from '@/lib/constants';import { generateTimeSeries } from '@/lib/date';import { formatLongCurrency, formatLongNumber } from '@/lib/format';-import { Column, Grid, Row, Text } from '@umami/react-zen';-import classNames from 'classnames';-import { colord } from 'colord';-import { useCallback, useMemo, useState } from 'react';export interface RevenueProps {websiteId: string;diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsxindex ed5120620..3e429c187 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx@@ -1,8 +1,8 @@'use client';import { Column } from '@umami/react-zen';-import { Revenue } from './Revenue';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { useDateRange } from '@/components/hooks';+import { Revenue } from './Revenue';export function RevenuePage({ websiteId }: { websiteId: string }) {const {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/page.tsxindex 4bc563318..fba10f155 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { RevenuePage } from './RevenuePage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsx b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsxindex 2bf887546..1399174a1 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTM.tsx@@ -1,10 +1,10 @@+import { Column, Grid, Heading, Text } from '@umami/react-zen';import { PieChart } from '@/components/charts/PieChart';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';import { useMessages, useResultQuery } from '@/components/hooks';import { ListTable } from '@/components/metrics/ListTable';import { CHART_COLORS, UTM_PARAMS } from '@/lib/constants';-import { Column, Grid, Heading, Text } from '@umami/react-zen';export interface UTMProps {websiteId: string;diff --git a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsxindex 30b9bff22..0d2a73292 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsx@@ -1,8 +1,8 @@'use client';import { Column } from '@umami/react-zen';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { useDateRange } from '@/components/hooks';import { UTM } from './UTM';-import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';export function UTMPage({ websiteId }: { websiteId: string }) {const {diff --git a/src/app/(main)/websites/[websiteId]/(reports)/utm/page.tsx b/src/app/(main)/websites/[websiteId]/(reports)/utm/page.tsxindex d51592cc1..8b8fd6af3 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/utm/page.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/utm/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { UTMPage } from './UTMPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/ExpandedViewModal.tsx b/src/app/(main)/websites/[websiteId]/ExpandedViewModal.tsxindex cd6239296..36638121d 100644--- a/src/app/(main)/websites/[websiteId]/ExpandedViewModal.tsx+++ b/src/app/(main)/websites/[websiteId]/ExpandedViewModal.tsx@@ -1,6 +1,6 @@import { Dialog, Modal } from '@umami/react-zen';import { WebsiteExpandedView } from '@/app/(main)/websites/[websiteId]/WebsiteExpandedView';-import { useNavigation, useMobile } from '@/components/hooks';+import { useMobile, useNavigation } from '@/components/hooks';export function ExpandedViewModal({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsxindex b949e60fc..b2ea2a83e 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx@@ -1,8 +1,8 @@+import { useMemo } from 'react';import { LoadingPanel } from '@/components/common/LoadingPanel';import { useDateRange, useTimezone } from '@/components/hooks';import { useWebsitePageviewsQuery } from '@/components/hooks/queries/useWebsitePageviewsQuery';import { PageviewsChart } from '@/components/metrics/PageviewsChart';-import { useMemo } from 'react';export function WebsiteChart({websiteId,@@ -28,7 +28,7 @@ export function WebsiteChart({};if (compare) {- result['compare'] = {+ result.compare = {pageviews: result.pageviews.map(({ x }, i) => ({x,y: compare.pageviews[i]?.y,diff --git a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsxindex 9757a974a..6223dbc0b 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx@@ -1,9 +1,9 @@-import { Column, Row, Grid } from '@umami/react-zen';-import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';+import { Column, Grid, Row } from '@umami/react-zen';+import { ExportButton } from '@/components/input/ExportButton';import { FilterBar } from '@/components/input/FilterBar';import { MonthFilter } from '@/components/input/MonthFilter';-import { ExportButton } from '@/components/input/ExportButton';+import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';export function WebsiteControls({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsxindex 63e8f4134..29c3954f2 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedMenu.tsx@@ -1,24 +1,24 @@-import { useMessages, useNavigation } from '@/components/hooks';import { SideMenu } from '@/components/common/SideMenu';+import { useMessages, useNavigation } from '@/components/hooks';import {- LogOut,- LogIn,- Search,- Type,- SquareSlash,- Share2,- Megaphone,+ AppWindow,+ Cpu,Earth,Globe,Landmark,- MapPin,- AppWindow,- Laptop,Languages,+ Laptop,+ LogIn,+ LogOut,+ MapPin,+ Megaphone,Monitor,- Cpu,Network,+ Search,+ Share2,+ SquareSlash,Tag,+ Type,} from '@/components/icons';import { Lightning } from '@/components/svg';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsxindex 448027b6e..2c670df1e 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx@@ -1,8 +1,8 @@-import { Grid, Column, Row } from '@umami/react-zen';-import { useMessages, useNavigation } from '@/components/hooks';-import { MetricsExpandedTable } from '@/components/metrics/MetricsExpandedTable';+import { Column, Grid, Row } from '@umami/react-zen';import { WebsiteExpandedMenu } from '@/app/(main)/websites/[websiteId]/WebsiteExpandedMenu';+import { useMessages, useNavigation } from '@/components/hooks';import { MobileMenuButton } from '@/components/input/MobileMenuButton';+import { MetricsExpandedTable } from '@/components/metrics/MetricsExpandedTable';export function WebsiteExpandedView({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsxindex 73eb96b2b..7db229126 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx@@ -1,12 +1,12 @@-import { Icon, Text, Row } from '@umami/react-zen';-import { PageHeader } from '@/components/common/PageHeader';-import { Share, Edit } from '@/components/icons';-import { Favicon } from '@/components/common/Favicon';-import { ActiveUsers } from '@/components/metrics/ActiveUsers';+import { Icon, Row, Text } from '@umami/react-zen';import { WebsiteShareForm } from '@/app/(main)/websites/[websiteId]/settings/WebsiteShareForm';-import { useMessages, useNavigation, useWebsite } from '@/components/hooks';+import { Favicon } from '@/components/common/Favicon';import { LinkButton } from '@/components/common/LinkButton';+import { PageHeader } from '@/components/common/PageHeader';+import { useMessages, useNavigation, useWebsite } from '@/components/hooks';+import { Edit, Share } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { ActiveUsers } from '@/components/metrics/ActiveUsers';export function WebsiteHeader({ showActions }: { showActions?: boolean }) {const website = useWebsite();diff --git a/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx b/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsxindex c92bbd9c8..7260a7ea6 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx@@ -1,6 +1,6 @@'use client';-import { ReactNode } from 'react';import { Column, Grid } from '@umami/react-zen';+import type { ReactNode } from 'react';import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';import { PageBody } from '@/components/common/PageBody';import { WebsiteHeader } from './WebsiteHeader';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsxindex 03c72008b..301895341 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteMenu.tsx@@ -9,8 +9,8 @@ import {Text,} from '@umami/react-zen';import { Fragment } from 'react';-import { More, Share, Edit } from '@/components/icons';import { useMessages, useNavigation } from '@/components/hooks';+import { Edit, More, Share } from '@/components/icons';export function WebsiteMenu({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsxindex 7522c8ec0..6c91ba6dd 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx@@ -1,9 +1,9 @@+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useDateRange, useMessages } from '@/components/hooks';+import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';-import { formatShortTime, formatLongNumber } from '@/lib/format';-import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';-import { LoadingPanel } from '@/components/common/LoadingPanel';+import { formatLongNumber, formatShortTime } from '@/lib/format';export function WebsiteMetricsBar({websiteId,@@ -45,7 +45,7 @@ export function WebsiteMetricsBar({change:(Math.min(visits, bounces) / visits) * 100 -(Math.min(comparison.visits, comparison.bounces) / comparison.visits) * 100,- formatValue: n => Math.round(+n) + '%',+ formatValue: n => `${Math.round(+n)}%`,reverseColors: true,},{diff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex 0fb6d5652..ad05b7065 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@ -1,18 +1,18 @@-import { Text, Column } from '@umami/react-zen';+import { Column, Text } from '@umami/react-zen';+import { SideMenu } from '@/components/common/SideMenu';+import { useMessages, useNavigation } from '@/components/hooks';import {- Eye,- User,+ AlignEndHorizontal,+ ChartPie,Clock,+ Eye,Sheet,Tag,- ChartPie,+ User,UserPlus,- AlignEndHorizontal,} from '@/components/icons';-import { Lightning, Path, Money, Target, Funnel, Magnet, Network } from '@/components/svg';-import { useMessages, useNavigation } from '@/components/hooks';-import { SideMenu } from '@/components/common/SideMenu';import { WebsiteSelect } from '@/components/input/WebsiteSelect';+import { Funnel, Lightning, Magnet, Money, Network, Path, Target } from '@/components/svg';export function WebsiteNav({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/WebsitePage.tsx b/src/app/(main)/websites/[websiteId]/WebsitePage.tsxindex bf8afe98f..f587e1121 100644--- a/src/app/(main)/websites/[websiteId]/WebsitePage.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsitePage.tsx@@ -1,11 +1,11 @@'use client';import { Column } from '@umami/react-zen';+import { ExpandedViewModal } from '@/app/(main)/websites/[websiteId]/ExpandedViewModal';import { Panel } from '@/components/common/Panel';import { WebsiteChart } from './WebsiteChart';+import { WebsiteControls } from './WebsiteControls';import { WebsiteMetricsBar } from './WebsiteMetricsBar';import { WebsitePanels } from './WebsitePanels';-import { WebsiteControls } from './WebsiteControls';-import { ExpandedViewModal } from '@/app/(main)/websites/[websiteId]/ExpandedViewModal';export function WebsitePage({ websiteId }: { websiteId: string }) {return (diff --git a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsxindex db52573db..a91d562e2 100644--- a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx@@ -1,3 +1,4 @@+import { Grid, Heading, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';import { GridRow } from '@/components/common/GridRow';import { Panel } from '@/components/common/Panel';import { useMessages, useNavigation } from '@/components/hooks';@@ -5,7 +6,6 @@ import { EventsChart } from '@/components/metrics/EventsChart';import { MetricsTable } from '@/components/metrics/MetricsTable';import { WeeklyTraffic } from '@/components/metrics/WeeklyTraffic';import { WorldMap } from '@/components/metrics/WorldMap';-import { Grid, Heading, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';export function WebsitePanels({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsxindex 04db76f12..ac978a238 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteTabs.tsx@@ -1,6 +1,6 @@-import { Tabs, TabList, Tab, Icon, Text, Row } from '@umami/react-zen';+import { Icon, Row, Tab, TabList, Tabs, Text } from '@umami/react-zen';import { useMessages, useNavigation, useWebsite } from '@/components/hooks';-import { Clock, Eye, User, ChartPie } from '@/components/icons';+import { ChartPie, Clock, Eye, User } from '@/components/icons';import { Lightning } from '@/components/svg';export function WebsiteTabs() {diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsxindex 7571bf620..94d62ff2a 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx@@ -1,8 +1,8 @@-import { Trash } from '@/components/icons';-import { messages } from '@/components/messages';-import { useDeleteQuery, useMessages } from '@/components/hooks';import { ConfirmationForm } from '@/components/common/ConfirmationForm';+import { useDeleteQuery, useMessages } from '@/components/hooks';+import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { messages } from '@/components/messages';export function CohortDeleteButton({cohortId,diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsxindex aea022094..07990712a 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx@@ -1,8 +1,8 @@-import { Edit } from '@/components/icons';import { CohortEditForm } from '@/app/(main)/websites/[websiteId]/cohorts/CohortEditForm';import { useMessages } from '@/components/hooks';-import { Filter } from '@/lib/types';+import { Edit } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import type { Filter } from '@/lib/types';export function CohortEditButton({cohortId,diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsxindex 2c1ed1038..c7550352e 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx@@ -1,20 +1,20 @@import {Button,+ Column,Form,FormButtons,FormField,FormSubmitButton,- TextField,+ Grid,Label,Loading,- Column,- Grid,+ TextField,} from '@umami/react-zen';import { useMessages, useUpdateQuery, useWebsiteCohortQuery } from '@/components/hooks';+import { ActionSelect } from '@/components/input/ActionSelect';import { DateFilter } from '@/components/input/DateFilter';import { FieldFilters } from '@/components/input/FieldFilters';import { LookupField } from '@/components/input/LookupField';-import { ActionSelect } from '@/components/input/ActionSelect';export function CohortEditForm({cohortId,diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsDataTable.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsDataTable.tsxindex 5944d4152..6734384e3 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortsDataTable.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsDataTable.tsx@@ -1,7 +1,7 @@-import { CohortAddButton } from './CohortAddButton';+import { DataGrid } from '@/components/common/DataGrid';import { useWebsiteCohortsQuery } from '@/components/hooks';+import { CohortAddButton } from './CohortAddButton';import { CohortsTable } from './CohortsTable';-import { DataGrid } from '@/components/common/DataGrid';export function CohortsDataTable({ websiteId }: { websiteId?: string }) {const query = useWebsiteCohortsQuery(websiteId, { type: 'cohort' });diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsPage.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsPage.tsxindex 211e25263..14f366e59 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsPage.tsx@@ -1,8 +1,8 @@'use client';import { Column } from '@umami/react-zen';-import { CohortsDataTable } from './CohortsDataTable';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { Panel } from '@/components/common/Panel';+import { CohortsDataTable } from './CohortsDataTable';export function CohortsPage({ websiteId }) {return (diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsxindex f9a412559..5c7ac03fa 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortsTable.tsx@@ -1,10 +1,10 @@-import { DataTable, DataColumn, Row, DataTableProps } from '@umami/react-zen';-import { useMessages, useNavigation } from '@/components/hooks';+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';+import Link from 'next/link';+import { CohortDeleteButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton';+import { CohortEditButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortEditButton';import { DateDistance } from '@/components/common/DateDistance';+import { useMessages, useNavigation } from '@/components/hooks';import { filtersObjectToArray } from '@/lib/params';-import { CohortEditButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortEditButton';-import { CohortDeleteButton } from '@/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton';-import Link from 'next/link';export function CohortsTable(props: DataTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/cohorts/page.tsx b/src/app/(main)/websites/[websiteId]/cohorts/page.tsxindex a9519c2cd..9946f6026 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/page.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { CohortsPage } from './CohortsPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/compare/ComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/ComparePage.tsxindex 4c5b7b932..bca8d2447 100644--- a/src/app/(main)/websites/[websiteId]/compare/ComparePage.tsx+++ b/src/app/(main)/websites/[websiteId]/compare/ComparePage.tsx@@ -1,10 +1,10 @@'use client';import { Column } from '@umami/react-zen';-import { CompareTables } from './CompareTables';+import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { WebsiteMetricsBar } from '@/app/(main)/websites/[websiteId]/WebsiteMetricsBar';import { Panel } from '@/components/common/Panel';-import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';+import { CompareTables } from './CompareTables';export function ComparePage({ websiteId }: { websiteId: string }) {return (diff --git a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsxindex 2c67b76a9..13c05160a 100644--- a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx+++ b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx@@ -1,11 +1,11 @@+import { Column, Grid, Heading, ListItem, Row, Select } from '@umami/react-zen';+import { useState } from 'react';import { DateDisplay } from '@/components/common/DateDisplay';import { Panel } from '@/components/common/Panel';import { useDateRange, useMessages, useNavigation } from '@/components/hooks';import { ChangeLabel } from '@/components/metrics/ChangeLabel';import { MetricsTable } from '@/components/metrics/MetricsTable';import { formatNumber } from '@/lib/format';-import { Column, Grid, Heading, ListItem, Row, Select } from '@umami/react-zen';-import { useState } from 'react';export function CompareTables({ websiteId }: { websiteId: string }) {const [data, setData] = useState([]);@@ -106,7 +106,7 @@ export function CompareTables({ websiteId }: { websiteId: string }) {const change = Math.abs(((count - prev) / prev) * 100);return (- !isNaN(change) && (+ !Number.isNaN(change) && (<Row alignItems="center" marginRight="3"><ChangeLabel value={value}>{formatNumber(change)}%</ChangeLabel></Row>diff --git a/src/app/(main)/websites/[websiteId]/compare/page.tsx b/src/app/(main)/websites/[websiteId]/compare/page.tsxindex 2b2cf5b14..1b2899b29 100644--- a/src/app/(main)/websites/[websiteId]/compare/page.tsx+++ b/src/app/(main)/websites/[websiteId]/compare/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { ComparePage } from './ComparePage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsxindex 41a8cfc2d..c3b1325db 100644--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx@@ -1,14 +1,14 @@+import { Column, Grid, ListItem, Select } from '@umami/react-zen';import { useMemo, useState } from 'react';-import { Select, ListItem, Grid, Column } from '@umami/react-zen';+import { PieChart } from '@/components/charts/PieChart';+import { LoadingPanel } from '@/components/common/LoadingPanel';import {useEventDataPropertiesQuery,useEventDataValuesQuery,useMessages,} from '@/components/hooks';-import { LoadingPanel } from '@/components/common/LoadingPanel';-import { PieChart } from '@/components/charts/PieChart';-import { CHART_COLORS } from '@/lib/constants';import { ListTable } from '@/components/metrics/ListTable';+import { CHART_COLORS } from '@/lib/constants';export function EventProperties({ websiteId }: { websiteId: string }) {const [propertyName, setPropertyName] = useState('');diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsxindex 805f1252f..f686b3fd4 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx@@ -1,9 +1,8 @@-import { useState } from 'react';-import { useMessages, useWebsiteEventsQuery } from '@/components/hooks';-import { EventsTable } from './EventsTable';+import { type ReactNode, useState } from 'react';import { DataGrid } from '@/components/common/DataGrid';-import { ReactNode } from 'react';+import { useMessages, useWebsiteEventsQuery } from '@/components/hooks';import { FilterButtons } from '@/components/input/FilterButtons';+import { EventsTable } from './EventsTable';export function EventsDataTable({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsxindex 2712c985e..a7ed399ce 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx@@ -1,9 +1,9 @@+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages } from '@/components/hooks';import { useWebsiteSessionStatsQuery } from '@/components/hooks/queries/useWebsiteSessionStatsQuery';import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatLongNumber } from '@/lib/format';-import { LoadingPanel } from '@/components/common/LoadingPanel';export function EventsMetricsBar({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsxindex 780891b57..55ec04037 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx@@ -1,15 +1,15 @@'use client';-import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';-import { MetricsTable } from '@/components/metrics/MetricsTable';-import { useState, Key } from 'react';-import { EventsDataTable } from './EventsDataTable';+import { Column, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';+import { type Key, useState } from 'react';+import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';+import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { Panel } from '@/components/common/Panel';-import { EventsChart } from '@/components/metrics/EventsChart';import { useMessages } from '@/components/hooks';-import { EventProperties } from './EventProperties';-import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';+import { EventsChart } from '@/components/metrics/EventsChart';+import { MetricsTable } from '@/components/metrics/MetricsTable';import { getItem, setItem } from '@/lib/storage';-import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';+import { EventProperties } from './EventProperties';+import { EventsDataTable } from './EventsDataTable';const KEY_NAME = 'umami.events.tab';diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsxindex ea0edde1b..7fb2eb41f 100644--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx@@ -1,24 +1,24 @@import {- DataTable,- DataColumn,- Row,- Text,- DataTableProps,- IconLabel,Button,+ DataColumn,+ DataTable,+ type DataTableProps,Dialog,DialogTrigger,Icon,+ IconLabel,Popover,+ Row,+ Text,} from '@umami/react-zen';-import { useFormat, useMessages, useNavigation } from '@/components/hooks';-import { Avatar } from '@/components/common/Avatar';import Link from 'next/link';-import { Eye, FileText } from '@/components/icons';-import { Lightning } from '@/components/svg';+import { Avatar } from '@/components/common/Avatar';import { DateDistance } from '@/components/common/DateDistance';import { TypeIcon } from '@/components/common/TypeIcon';+import { useFormat, useMessages, useNavigation } from '@/components/hooks';+import { Eye, FileText } from '@/components/icons';import { EventData } from '@/components/metrics/EventData';+import { Lightning } from '@/components/svg';export function EventsTable(props: DataTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/events/page.tsx b/src/app/(main)/websites/[websiteId]/events/page.tsxindex d68d727d5..d77ba3bdc 100644--- a/src/app/(main)/websites/[websiteId]/events/page.tsx+++ b/src/app/(main)/websites/[websiteId]/events/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { EventsPage } from './EventsPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/layout.tsx b/src/app/(main)/websites/[websiteId]/layout.tsxindex 8a3ab2a43..67595e9d1 100644--- a/src/app/(main)/websites/[websiteId]/layout.tsx+++ b/src/app/(main)/websites/[websiteId]/layout.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { WebsiteLayout } from '@/app/(main)/websites/[websiteId]/WebsiteLayout';export default async function ({diff --git a/src/app/(main)/websites/[websiteId]/page.tsx b/src/app/(main)/websites/[websiteId]/page.tsxindex 9755e6d01..d4889c5dc 100644--- a/src/app/(main)/websites/[websiteId]/page.tsx+++ b/src/app/(main)/websites/[websiteId]/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { WebsitePage } from './WebsitePage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsxindex c4ee9c023..6e2495b53 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx@@ -1,8 +1,8 @@-import { useCallback } from 'react';import { IconLabel } from '@umami/react-zen';-import { ListTable } from '@/components/metrics/ListTable';-import { useLocale, useCountryNames, useMessages } from '@/components/hooks';+import { useCallback } from 'react';import { TypeIcon } from '@/components/common/TypeIcon';+import { useCountryNames, useLocale, useMessages } from '@/components/hooks';+import { ListTable } from '@/components/metrics/ListTable';export function RealtimeCountries({ data }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsxindex cdd67e7a4..2b9d881ee 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx@@ -1,5 +1,5 @@-import { MetricCard } from '@/components/metrics/MetricCard';import { useMessages } from '@/components/hooks';+import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';export function RealtimeHeader({ data }: { data: any }) {diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsxindex 3dec340f2..10763618b 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx@@ -1,10 +1,11 @@+import { Column, Heading, IconLabel, Row, SearchField, Text } from '@umami/react-zen';+import Link from 'next/link';import { useMemo, useState } from 'react';import { FixedSizeList } from 'react-window';-import { SearchField, Text, Column, Row, IconLabel, Heading } from '@umami/react-zen';-import Link from 'next/link';+import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';import { useFormat } from '@/components//hooks/useFormat';+import { Avatar } from '@/components/common/Avatar';import { Empty } from '@/components/common/Empty';-import { FilterButtons } from '@/components/input/FilterButtons';import {useCountryNames,useLocale,@@ -15,10 +16,9 @@ import {useWebsite,} from '@/components/hooks';import { Eye, User } from '@/components/icons';+import { FilterButtons } from '@/components/input/FilterButtons';import { Lightning } from '@/components/svg';import { BROWSERS, OS_NAMES } from '@/lib/constants';-import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';-import { Avatar } from '@/components/common/Avatar';const TYPE_ALL = 'all';const TYPE_PAGEVIEW = 'pageview';diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsxindex 0f9fa358b..6220c6957 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsx@@ -1,18 +1,18 @@'use client';-import { firstBy } from 'thenby';import { Grid } from '@umami/react-zen';+import { firstBy } from 'thenby';import { GridRow } from '@/components/common/GridRow';import { PageBody } from '@/components/common/PageBody';import { Panel } from '@/components/common/Panel';+import { useMobile, useRealtimeQuery } from '@/components/hooks';import { RealtimeChart } from '@/components/metrics/RealtimeChart';import { WorldMap } from '@/components/metrics/WorldMap';-import { useMobile, useRealtimeQuery } from '@/components/hooks';-import { RealtimeLog } from './RealtimeLog';+import { percentFilter } from '@/lib/filters';+import { RealtimeCountries } from './RealtimeCountries';import { RealtimeHeader } from './RealtimeHeader';+import { RealtimeLog } from './RealtimeLog';import { RealtimePaths } from './RealtimePaths';import { RealtimeReferrers } from './RealtimeReferrers';-import { RealtimeCountries } from './RealtimeCountries';-import { percentFilter } from '@/lib/filters';export function RealtimePage({ websiteId }: { websiteId: string }) {const { data, isLoading, error } = useRealtimeQuery(websiteId);diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsxindex 91c6b4d88..1f90ad831 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimePaths.tsx@@ -1,7 +1,7 @@import thenby from 'thenby';-import { percentFilter } from '@/lib/filters';-import { ListTable } from '@/components/metrics/ListTable';import { useMessages, useWebsite } from '@/components/hooks';+import { ListTable } from '@/components/metrics/ListTable';+import { percentFilter } from '@/lib/filters';export function RealtimePaths({ data }: { data: any }) {const website = useWebsite();diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsxindex 85326cd09..9fd4477b7 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeReferrers.tsx@@ -1,7 +1,7 @@import thenby from 'thenby';-import { percentFilter } from '@/lib/filters';-import { ListTable } from '@/components/metrics/ListTable';import { useMessages, useWebsite } from '@/components/hooks';+import { ListTable } from '@/components/metrics/ListTable';+import { percentFilter } from '@/lib/filters';export function RealtimeReferrers({ data }: { data: any }) {const website = useWebsite();diff --git a/src/app/(main)/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/websites/[websiteId]/realtime/page.tsxindex c1bdd4c51..1552196c7 100644--- a/src/app/(main)/websites/[websiteId]/realtime/page.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { RealtimePage } from './RealtimePage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsxindex 052d3185b..7b70fee6a 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx@@ -1,7 +1,7 @@import { useMessages } from '@/components/hooks';import { Plus } from '@/components/icons';-import { SegmentEditForm } from './SegmentEditForm';import { DialogButton } from '@/components/input/DialogButton';+import { SegmentEditForm } from './SegmentEditForm';export function SegmentAddButton({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsxindex 35ef83bb3..bb52a2209 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx@@ -1,8 +1,8 @@-import { Trash } from '@/components/icons';import { ConfirmationForm } from '@/components/common/ConfirmationForm';-import { messages } from '@/components/messages';import { useDeleteQuery, useMessages } from '@/components/hooks';+import { Trash } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import { messages } from '@/components/messages';export function SegmentDeleteButton({segmentId,diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsxindex 6d422c95b..5c56cf1ea 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx@@ -1,8 +1,8 @@-import { Edit } from '@/components/icons';import { useMessages } from '@/components/hooks';-import { SegmentEditForm } from './SegmentEditForm';-import { Filter } from '@/lib/types';+import { Edit } from '@/components/icons';import { DialogButton } from '@/components/input/DialogButton';+import type { Filter } from '@/lib/types';+import { SegmentEditForm } from './SegmentEditForm';export function SegmentEditButton({segmentId,diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsxindex 26b973529..c3529d97c 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx@@ -4,12 +4,12 @@ import {FormButtons,FormField,FormSubmitButton,- TextField,- Loading,Label,+ Loading,+ TextField,} from '@umami/react-zen';-import { FieldFilters } from '@/components/input/FieldFilters';import { useMessages, useUpdateQuery, useWebsiteSegmentQuery } from '@/components/hooks';+import { FieldFilters } from '@/components/input/FieldFilters';import { messages } from '@/components/messages';export function SegmentEditForm({diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentsDataTable.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentsDataTable.tsxindex d98bad028..c1ba82ebb 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentsDataTable.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentsDataTable.tsx@@ -1,7 +1,7 @@-import { SegmentAddButton } from './SegmentAddButton';+import { DataGrid } from '@/components/common/DataGrid';import { useWebsiteSegmentsQuery } from '@/components/hooks';+import { SegmentAddButton } from './SegmentAddButton';import { SegmentsTable } from './SegmentsTable';-import { DataGrid } from '@/components/common/DataGrid';export function SegmentsDataTable({ websiteId }: { websiteId?: string }) {const query = useWebsiteSegmentsQuery(websiteId, { type: 'segment' });diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentsPage.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentsPage.tsxindex 9f2d8097c..cbe7a1c1f 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentsPage.tsx@@ -1,8 +1,8 @@'use client';import { Column } from '@umami/react-zen';-import { SegmentsDataTable } from './SegmentsDataTable';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { Panel } from '@/components/common/Panel';+import { SegmentsDataTable } from './SegmentsDataTable';export function SegmentsPage({ websiteId }) {return (diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsxindex 573572aac..4dbe51146 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentsTable.tsx@@ -1,9 +1,9 @@-import { DataTable, DataColumn, Row, DataTableProps } from '@umami/react-zen';-import { useMessages, useNavigation } from '@/components/hooks';-import { DateDistance } from '@/components/common/DateDistance';-import { SegmentEditButton } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditButton';-import { SegmentDeleteButton } from '@/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton';+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';import Link from 'next/link';+import { SegmentDeleteButton } from '@/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton';+import { SegmentEditButton } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditButton';+import { DateDistance } from '@/components/common/DateDistance';+import { useMessages, useNavigation } from '@/components/hooks';export function SegmentsTable(props: DataTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/segments/page.tsx b/src/app/(main)/websites/[websiteId]/segments/page.tsxindex 9f406b16b..0d3faacbf 100644--- a/src/app/(main)/websites/[websiteId]/segments/page.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { SegmentsPage } from './SegmentsPage';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsxindex 7bcf1b760..cbb281083 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx@@ -1,21 +1,21 @@-import { isSameDay } from 'date-fns';import {- Icon,- StatusLight,- Column,- Row,- Heading,- Text,Button,+ Column,+ Dialog,DialogTrigger,+ Heading,+ Icon,Popover,- Dialog,+ Row,+ StatusLight,+ Text,} from '@umami/react-zen';+import { isSameDay } from 'date-fns';import { LoadingPanel } from '@/components/common/LoadingPanel';-import { Eye, FileText } from '@/components/icons';-import { Lightning } from '@/components/svg';import { useMessages, useMobile, useSessionActivityQuery, useTimezone } from '@/components/hooks';+import { Eye, FileText } from '@/components/icons';import { EventData } from '@/components/metrics/EventData';+import { Lightning } from '@/components/svg';export function SessionActivity({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsxindex 849e0b7db..7c82c17ad 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsx@@ -1,8 +1,8 @@-import { Text, Column, Row, Label, Box } from '@umami/react-zen';-import { useSessionDataQuery } from '@/components/hooks';+import { Box, Column, Label, Row, Text } from '@umami/react-zen';import { Empty } from '@/components/common/Empty';-import { DATA_TYPES } from '@/lib/constants';import { LoadingPanel } from '@/components/common/LoadingPanel';+import { useSessionDataQuery } from '@/components/hooks';+import { DATA_TYPES } from '@/lib/constants';export function SessionData({ websiteId, sessionId }: { websiteId: string; sessionId: string }) {const { data, isLoading, error } = useSessionDataQuery(websiteId, sessionId);diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsxindex e968daba1..f15e6ee51 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionInfo.tsx@@ -1,9 +1,9 @@-import { ReactNode } from 'react';-import { Icon, Grid, Column, Row, Label } from '@umami/react-zen';-import { useFormat, useLocale, useMessages, useRegionNames } from '@/components/hooks';-import { TypeIcon } from '@/components/common/TypeIcon';-import { KeyRound, Calendar, MapPin, Landmark } from '@/components/icons';+import { Column, Grid, Icon, Label, Row } from '@umami/react-zen';+import type { ReactNode } from 'react';import { DateDistance } from '@/components/common/DateDistance';+import { TypeIcon } from '@/components/common/TypeIcon';+import { useFormat, useLocale, useMessages, useRegionNames } from '@/components/hooks';+import { Calendar, KeyRound, Landmark, MapPin } from '@/components/icons';export function SessionInfo({ data }) {const { locale } = useLocale();diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsxindex 6c34b97b8..d6580388c 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionModal.tsx@@ -1,4 +1,4 @@-import { Dialog, Modal, ModalProps, Column } from '@umami/react-zen';+import { Column, Dialog, Modal, type ModalProps } from '@umami/react-zen';import { SessionProfile } from '@/app/(main)/websites/[websiteId]/sessions/SessionProfile';import { useNavigation } from '@/components/hooks';diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsxindex e83c7957f..6624d439d 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProfile.tsx@@ -1,14 +1,15 @@import {- TextField,- Row,+ Button,Column,- Tabs,- TabList,+ Icon,+ Row,Tab,+ TabList,TabPanel,- Button,- Icon,+ Tabs,+ TextField,} from '@umami/react-zen';+import { X } from 'lucide-react';import { Avatar } from '@/components/common/Avatar';import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages, useWebsiteSessionQuery } from '@/components/hooks';@@ -16,7 +17,6 @@ import { SessionActivity } from './SessionActivity';import { SessionData } from './SessionData';import { SessionInfo } from './SessionInfo';import { SessionStats } from './SessionStats';-import { X } from 'lucide-react';export function SessionProfile({websiteId,diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsxindex e66302ad6..1693d0570 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx@@ -1,14 +1,14 @@+import { Column, Grid, ListItem, Select } from '@umami/react-zen';import { useMemo, useState } from 'react';-import { Select, ListItem, Grid, Column } from '@umami/react-zen';+import { PieChart } from '@/components/charts/PieChart';+import { LoadingPanel } from '@/components/common/LoadingPanel';import {useMessages,useSessionDataPropertiesQuery,useSessionDataValuesQuery,} from '@/components/hooks';-import { LoadingPanel } from '@/components/common/LoadingPanel';-import { PieChart } from '@/components/charts/PieChart';-import { CHART_COLORS } from '@/lib/constants';import { ListTable } from '@/components/metrics/ListTable';+import { CHART_COLORS } from '@/lib/constants';export function SessionProperties({ websiteId }: { websiteId: string }) {const [propertyName, setPropertyName] = useState('');diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsxindex 53b35b214..b1b9f658a 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx@@ -1,6 +1,6 @@+import { DataGrid } from '@/components/common/DataGrid';import { useWebsiteSessionsQuery } from '@/components/hooks';import { SessionsTable } from './SessionsTable';-import { DataGrid } from '@/components/common/DataGrid';export function SessionsDataTable({ websiteId }: { websiteId?: string; teamId?: string }) {const queryResult = useWebsiteSessionsQuery(websiteId);diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsxindex b959f0dac..c8317a2be 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx@@ -1,9 +1,9 @@+import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages } from '@/components/hooks';import { useWebsiteSessionStatsQuery } from '@/components/hooks/queries/useWebsiteSessionStatsQuery';import { MetricCard } from '@/components/metrics/MetricCard';import { MetricsBar } from '@/components/metrics/MetricsBar';import { formatLongNumber } from '@/lib/format';-import { LoadingPanel } from '@/components/common/LoadingPanel';export function SessionsMetricsBar({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsxindex 8a096aa78..8e9d2f218 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx@@ -1,13 +1,13 @@'use client';-import { Key, useState } from 'react';-import { TabList, Tab, Tabs, TabPanel, Column } from '@umami/react-zen';-import { SessionsDataTable } from './SessionsDataTable';-import { SessionProperties } from './SessionProperties';-import { useMessages } from '@/components/hooks';-import { Panel } from '@/components/common/Panel';+import { Column, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';+import { type Key, useState } from 'react';+import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';+import { Panel } from '@/components/common/Panel';+import { useMessages } from '@/components/hooks';import { getItem, setItem } from '@/lib/storage';-import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';+import { SessionProperties } from './SessionProperties';+import { SessionsDataTable } from './SessionsDataTable';const KEY_NAME = 'umami.sessions.tab';diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsxindex ab4977ea2..5d3bb374e 100644--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx@@ -1,9 +1,9 @@+import { DataColumn, DataTable, type DataTableProps } from '@umami/react-zen';import Link from 'next/link';-import { DataColumn, DataTable, DataTableProps } from '@umami/react-zen';-import { useFormat, useMessages, useNavigation } from '@/components/hooks';import { Avatar } from '@/components/common/Avatar';-import { TypeIcon } from '@/components/common/TypeIcon';import { DateDistance } from '@/components/common/DateDistance';+import { TypeIcon } from '@/components/common/TypeIcon';+import { useFormat, useMessages, useNavigation } from '@/components/hooks';export function SessionsTable(props: DataTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/sessions/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/page.tsxindex 7bf8216bf..221ab71cc 100644--- a/src/app/(main)/websites/[websiteId]/sessions/page.tsx+++ b/src/app/(main)/websites/[websiteId]/sessions/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { SessionsPage } from './SessionsPage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsxindex 1c1863859..21cd61370 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteData.tsx@@ -1,16 +1,16 @@-import { Button, Modal, DialogTrigger, Dialog, Column } from '@umami/react-zen';+import { Button, Column, Dialog, DialogTrigger, Modal } from '@umami/react-zen';+import { ActionForm } from '@/components/common/ActionForm';import {useLoginQuery,useMessages,useModified,- useUserTeamsQuery,useNavigation,+ useUserTeamsQuery,} from '@/components/hooks';+import { ROLES } from '@/lib/constants';import { WebsiteDeleteForm } from './WebsiteDeleteForm';import { WebsiteResetForm } from './WebsiteResetForm';import { WebsiteTransferForm } from './WebsiteTransferForm';-import { ActionForm } from '@/components/common/ActionForm';-import { ROLES } from '@/lib/constants';export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsxindex 780aab74e..2fc027687 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx@@ -1,5 +1,5 @@-import { useDeleteQuery, useMessages } from '@/components/hooks';import { TypeConfirmationForm } from '@/components/common/TypeConfirmationForm';+import { useDeleteQuery, useMessages } from '@/components/hooks';const CONFIRM_VALUE = 'DELETE';diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsxindex c7cb3d89f..4ae819ee5 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx@@ -1,4 +1,4 @@-import { FormSubmitButton, Form, FormField, FormButtons, TextField } from '@umami/react-zen';+import { Form, FormButtons, FormField, FormSubmitButton, TextField } from '@umami/react-zen';import { useMessages, useUpdateQuery, useWebsite } from '@/components/hooks';import { DOMAIN_REGEX } from '@/lib/constants';diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsxindex 43583c3e2..d791bc965 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx@@ -1,5 +1,5 @@-import { useMessages, useUpdateQuery } from '@/components/hooks';import { TypeConfirmationForm } from '@/components/common/TypeConfirmationForm';+import { useMessages, useUpdateQuery } from '@/components/hooks';const CONFIRM_VALUE = 'RESET';diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettings.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettings.tsxindex a50aceeea..3970cdbdb 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettings.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettings.tsx@@ -1,10 +1,10 @@import { Column } from '@umami/react-zen';+import { Panel } from '@/components/common/Panel';import { useWebsite } from '@/components/hooks';-import { WebsiteShareForm } from './WebsiteShareForm';-import { WebsiteTrackingCode } from './WebsiteTrackingCode';import { WebsiteData } from './WebsiteData';import { WebsiteEditForm } from './WebsiteEditForm';-import { Panel } from '@/components/common/Panel';+import { WebsiteShareForm } from './WebsiteShareForm';+import { WebsiteTrackingCode } from './WebsiteTrackingCode';export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal?: boolean }) {const website = useWebsite();diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsxindex 216142ec9..99977a0be 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader.tsx@@ -1,8 +1,8 @@+import { IconLabel, Row } from '@umami/react-zen';import Link from 'next/link';import { PageHeader } from '@/components/common/PageHeader';-import { Globe, ArrowLeft } from '@/components/icons';import { useMessages, useNavigation, useWebsite } from '@/components/hooks';-import { IconLabel, Row } from '@umami/react-zen';+import { ArrowLeft, Globe } from '@/components/icons';export function WebsiteSettingsHeader() {const website = useWebsite();diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsxindex f89d25fdd..56c6f436f 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx@@ -1,19 +1,19 @@import {+ Button,+ Column,Form,FormButtons,- TextField,- Button,- Switch,FormSubmitButton,- Column,+ IconLabel,Label,Row,- IconLabel,+ Switch,+ TextField,} from '@umami/react-zen';+import { RefreshCcw } from 'lucide-react';import { useState } from 'react';+import { useConfig, useMessages, useUpdateQuery } from '@/components/hooks';import { getRandomChars } from '@/lib/generate';-import { useMessages, useUpdateQuery, useConfig } from '@/components/hooks';-import { RefreshCcw } from 'lucide-react';const generateId = () => getRandomChars(16);diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsxindex bdc49c759..d24f9485d 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode.tsx@@ -1,5 +1,5 @@-import { TextField, Text, Column, Label } from '@umami/react-zen';-import { useMessages, useConfig } from '@/components/hooks';+import { Column, Label, Text, TextField } from '@umami/react-zen';+import { useConfig, useMessages } from '@/components/hooks';const SCRIPT_NAME = 'script.js';diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsxindex f16ab93c0..8af4f05c2 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx@@ -1,15 +1,15 @@-import { Key, useState } from 'react';import {Button,Form,FormButtons,FormField,FormSubmitButton,+ ListItem,Loading,Select,- ListItem,Text,} from '@umami/react-zen';+import { type Key, useState } from 'react';import {useLoginQuery,useMessages,diff --git a/src/app/(main)/websites/[websiteId]/settings/page.tsx b/src/app/(main)/websites/[websiteId]/settings/page.tsxindex a3aed621b..a26d14f72 100644--- a/src/app/(main)/websites/[websiteId]/settings/page.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { SettingsPage } from './SettingsPage';-import { Metadata } from 'next';export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;diff --git a/src/app/(main)/websites/page.tsx b/src/app/(main)/websites/page.tsxindex c3e54be69..cefaf8096 100644--- a/src/app/(main)/websites/page.tsx+++ b/src/app/(main)/websites/page.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { WebsitesPage } from './WebsitesPage';-import { Metadata } from 'next';export default function () {return <WebsitesPage />;diff --git a/src/app/Providers.tsx b/src/app/Providers.tsxindex b8898e884..ae1a00073 100644--- a/src/app/Providers.tsx+++ b/src/app/Providers.tsx@@ -1,9 +1,9 @@'use client';-import { useEffect } from 'react';-import { IntlProvider } from 'react-intl';import { QueryClient, QueryClientProvider } from '@tanstack/react-query';-import { ZenProvider, RouterProvider } from '@umami/react-zen';+import { RouterProvider, ZenProvider } from '@umami/react-zen';import { useRouter } from 'next/navigation';+import { useEffect } from 'react';+import { IntlProvider } from 'react-intl';import { ErrorBoundary } from '@/components/common/ErrorBoundary';import { useLocale } from '@/components/hooks';import 'chartjs-adapter-date-fns';diff --git a/src/app/api/admin/websites/route.ts b/src/app/api/admin/websites/route.tsindex 8d6d81bfc..09b2ef98d 100644--- a/src/app/api/admin/websites/route.ts+++ b/src/app/api/admin/websites/route.ts@@ -1,10 +1,10 @@import { z } from 'zod';+import { ROLES } from '@/lib/constants';import { parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';import { canViewAllWebsites } from '@/permissions';import { getWebsites } from '@/queries/prisma/website';-import { ROLES } from '@/lib/constants';export async function GET(request: Request) {const schema = z.object({diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.tsindex 2c312a918..7c2b2fed0 100644--- a/src/app/api/auth/login/route.ts+++ b/src/app/api/auth/login/route.ts@@ -1,13 +1,13 @@import { z } from 'zod';+import { saveAuth } from '@/lib/auth';+import { ROLES } from '@/lib/constants';+import { secret } from '@/lib/crypto';import { createSecureToken } from '@/lib/jwt';+import { checkPassword } from '@/lib/password';import redis from '@/lib/redis';-import { getUserByUsername } from '@/queries/prisma';-import { json, unauthorized } from '@/lib/response';import { parseRequest } from '@/lib/request';-import { saveAuth } from '@/lib/auth';-import { checkPassword } from '@/lib/password';-import { secret } from '@/lib/crypto';-import { ROLES } from '@/lib/constants';+import { json, unauthorized } from '@/lib/response';+import { getUserByUsername } from '@/queries/prisma';export async function POST(request: Request) {const schema = z.object({diff --git a/src/app/api/auth/sso/route.ts b/src/app/api/auth/sso/route.tsindex fc8fb9bf3..bba3dde30 100644--- a/src/app/api/auth/sso/route.ts+++ b/src/app/api/auth/sso/route.ts@@ -1,7 +1,7 @@+import { saveAuth } from '@/lib/auth';import redis from '@/lib/redis';-import { json } from '@/lib/response';import { parseRequest } from '@/lib/request';-import { saveAuth } from '@/lib/auth';+import { json } from '@/lib/response';export async function POST(request: Request) {const { auth, error } = await parseRequest(request);diff --git a/src/app/api/links/[linkId]/route.ts b/src/app/api/links/[linkId]/route.tsindex 512f39c96..92f572c43 100644--- a/src/app/api/links/[linkId]/route.ts+++ b/src/app/api/links/[linkId]/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { canUpdateLink, canDeleteLink, canViewLink } from '@/permissions';import { parseRequest } from '@/lib/request';-import { ok, json, unauthorized, serverError, badRequest } from '@/lib/response';+import { badRequest, json, ok, serverError, unauthorized } from '@/lib/response';+import { canDeleteLink, canUpdateLink, canViewLink } from '@/permissions';import { deleteLink, getLink, updateLink } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ linkId: string }> }) {diff --git a/src/app/api/links/route.ts b/src/app/api/links/route.tsindex 2d1e70ea3..a639888bd 100644--- a/src/app/api/links/route.ts+++ b/src/app/api/links/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';-import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';-import { json, unauthorized } from '@/lib/response';import { uuid } from '@/lib/crypto';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';+import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';import { createLink, getUserLinks } from '@/queries/prisma';export async function GET(request: Request) {diff --git a/src/app/api/me/password/route.ts b/src/app/api/me/password/route.tsindex 51812910d..24c737053 100644--- a/src/app/api/me/password/route.ts+++ b/src/app/api/me/password/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { checkPassword, hashPassword } from '@/lib/password';import { parseRequest } from '@/lib/request';-import { json, badRequest } from '@/lib/response';+import { badRequest, json } from '@/lib/response';import { getUser, updateUser } from '@/queries/prisma/user';export async function POST(request: Request) {diff --git a/src/app/api/me/teams/route.ts b/src/app/api/me/teams/route.tsindex 3fa5b4195..555bf3003 100644--- a/src/app/api/me/teams/route.ts+++ b/src/app/api/me/teams/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';+import { getQueryFilters, parseRequest } from '@/lib/request';+import { json } from '@/lib/response';import { pagingParams } from '@/lib/schema';import { getUserTeams } from '@/queries/prisma';-import { json } from '@/lib/response';-import { getQueryFilters, parseRequest } from '@/lib/request';export async function GET(request: Request) {const schema = z.object({diff --git a/src/app/api/me/websites/route.ts b/src/app/api/me/websites/route.tsindex 06d5daaa6..9ec39c78d 100644--- a/src/app/api/me/websites/route.ts+++ b/src/app/api/me/websites/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';+import { getQueryFilters, parseRequest } from '@/lib/request';+import { json } from '@/lib/response';import { pagingParams } from '@/lib/schema';import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma';-import { json } from '@/lib/response';-import { parseRequest, getQueryFilters } from '@/lib/request';export async function GET(request: Request) {const schema = z.object({diff --git a/src/app/api/pixels/[pixelId]/route.ts b/src/app/api/pixels/[pixelId]/route.tsindex 2f547c04f..ecaf1fdf6 100644--- a/src/app/api/pixels/[pixelId]/route.ts+++ b/src/app/api/pixels/[pixelId]/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { canUpdatePixel, canDeletePixel, canViewPixel } from '@/permissions';import { parseRequest } from '@/lib/request';-import { ok, json, unauthorized, serverError, badRequest } from '@/lib/response';+import { badRequest, json, ok, serverError, unauthorized } from '@/lib/response';+import { canDeletePixel, canUpdatePixel, canViewPixel } from '@/permissions';import { deletePixel, getPixel, updatePixel } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ pixelId: string }> }) {diff --git a/src/app/api/pixels/route.ts b/src/app/api/pixels/route.tsindex 2302c4246..8baae4f3e 100644--- a/src/app/api/pixels/route.ts+++ b/src/app/api/pixels/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';-import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';-import { json, unauthorized } from '@/lib/response';import { uuid } from '@/lib/crypto';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';+import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';import { createPixel, getUserPixels } from '@/queries/prisma';export async function GET(request: Request) {diff --git a/src/app/api/realtime/[websiteId]/route.ts b/src/app/api/realtime/[websiteId]/route.tsindex eaa0bbd8c..32b7a16c1 100644--- a/src/app/api/realtime/[websiteId]/route.ts+++ b/src/app/api/realtime/[websiteId]/route.ts@@ -1,9 +1,9 @@+import { startOfMinute, subMinutes } from 'date-fns';import { REALTIME_RANGE } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getRealtimeData } from '@/queries/sql';-import { startOfMinute, subMinutes } from 'date-fns';export async function GET(request: Request,diff --git a/src/app/api/reports/attribution/route.ts b/src/app/api/reports/attribution/route.tsindex 4c5003773..bd7d86dc7 100644--- a/src/app/api/reports/attribution/route.ts+++ b/src/app/api/reports/attribution/route.ts@@ -1,8 +1,8 @@-import { canViewWebsite } from '@/permissions';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';-import { AttributionParameters, getAttribution } from '@/queries/sql/reports/getAttribution';+import { canViewWebsite } from '@/permissions';+import { type AttributionParameters, getAttribution } from '@/queries/sql/reports/getAttribution';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/reports/breakdown/route.ts b/src/app/api/reports/breakdown/route.tsindex 8d96cf5d6..3c5931458 100644--- a/src/app/api/reports/breakdown/route.ts+++ b/src/app/api/reports/breakdown/route.ts@@ -1,8 +1,8 @@-import { canViewWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';-import { BreakdownParameters, getBreakdown } from '@/queries/sql';+import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';+import { type BreakdownParameters, getBreakdown } from '@/queries/sql';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/reports/funnel/route.ts b/src/app/api/reports/funnel/route.tsindex 2ba4b8627..c13f6f1c8 100644--- a/src/app/api/reports/funnel/route.ts+++ b/src/app/api/reports/funnel/route.ts@@ -1,8 +1,8 @@-import { canViewWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';-import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';-import { FunnelParameters, getFunnel } from '@/queries/sql';+import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';+import { type FunnelParameters, getFunnel } from '@/queries/sql';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/reports/goal/route.ts b/src/app/api/reports/goal/route.tsindex f9848fa7e..3bd0415d6 100644--- a/src/app/api/reports/goal/route.ts+++ b/src/app/api/reports/goal/route.ts@@ -1,8 +1,8 @@-import { canViewWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';-import { getGoal, GoalParameters } from '@/queries/sql/reports/getGoal';+import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';+import { type GoalParameters, getGoal } from '@/queries/sql/reports/getGoal';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/reports/journey/route.ts b/src/app/api/reports/journey/route.tsindex d4e5e18d6..29e853196 100644--- a/src/app/api/reports/journey/route.ts+++ b/src/app/api/reports/journey/route.ts@@ -1,8 +1,8 @@-import { canViewWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';import { getQueryFilters, parseRequest } from '@/lib/request';-import { getJourney } from '@/queries/sql';+import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';+import { getJourney } from '@/queries/sql';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/reports/retention/route.ts b/src/app/api/reports/retention/route.tsindex 69d61c0e3..d1a7d698b 100644--- a/src/app/api/reports/retention/route.ts+++ b/src/app/api/reports/retention/route.ts@@ -1,8 +1,8 @@-import { canViewWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';-import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';-import { getRetention, RetentionParameters } from '@/queries/sql';+import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';+import { getRetention, type RetentionParameters } from '@/queries/sql';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/reports/revenue/route.ts b/src/app/api/reports/revenue/route.tsindex 75930adcb..6a556612b 100644--- a/src/app/api/reports/revenue/route.ts+++ b/src/app/api/reports/revenue/route.ts@@ -1,8 +1,8 @@-import { canViewWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';-import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';+import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';-import { getRevenue, RevenuParameters } from '@/queries/sql/reports/getRevenue';+import { canViewWebsite } from '@/permissions';+import { getRevenue, type RevenuParameters } from '@/queries/sql/reports/getRevenue';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/reports/route.ts b/src/app/api/reports/route.tsindex 123a7e66a..b0a413543 100644--- a/src/app/api/reports/route.ts+++ b/src/app/api/reports/route.ts@@ -1,10 +1,10 @@import { z } from 'zod';import { uuid } from '@/lib/crypto';-import { pagingParams, reportSchema, reportTypeParam } from '@/lib/schema';import { parseRequest } from '@/lib/request';-import { canViewWebsite, canUpdateWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';-import { getReports, createReport } from '@/queries/prisma';+import { json, unauthorized } from '@/lib/response';+import { pagingParams, reportSchema, reportTypeParam } from '@/lib/schema';+import { canUpdateWebsite, canViewWebsite } from '@/permissions';+import { createReport, getReports } from '@/queries/prisma';export async function GET(request: Request) {const schema = z.object({diff --git a/src/app/api/reports/utm/route.ts b/src/app/api/reports/utm/route.tsindex ef0ff5fea..577fdab79 100644--- a/src/app/api/reports/utm/route.ts+++ b/src/app/api/reports/utm/route.ts@@ -1,9 +1,9 @@-import { canViewWebsite } from '@/permissions';-import { unauthorized, json } from '@/lib/response';+import { UTM_PARAMS } from '@/lib/constants';import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';-import { getUTM, UTMParameters } from '@/queries/sql';+import { json, unauthorized } from '@/lib/response';import { reportResultSchema } from '@/lib/schema';-import { UTM_PARAMS } from '@/lib/constants';+import { canViewWebsite } from '@/permissions';+import { getUTM, type UTMParameters } from '@/queries/sql';export async function POST(request: Request) {const { auth, body, error } = await parseRequest(request, reportResultSchema);diff --git a/src/app/api/send/route.ts b/src/app/api/send/route.tsindex 2c2085bfb..d1a7b90ba 100644--- a/src/app/api/send/route.ts+++ b/src/app/api/send/route.ts@@ -1,18 +1,18 @@-import { z } from 'zod';-import { isbot } from 'isbot';import { startOfHour, startOfMonth } from 'date-fns';+import { isbot } from 'isbot';+import { serializeError } from 'serialize-error';+import { z } from 'zod';import clickhouse from '@/lib/clickhouse';-import { parseRequest } from '@/lib/request';-import { badRequest, json, forbidden, serverError } from '@/lib/response';-import { fetchWebsite } from '@/lib/load';+import { COLLECTION_TYPE, EVENT_TYPE } from '@/lib/constants';+import { hash, secret, uuid } from '@/lib/crypto';import { getClientInfo, hasBlockedIp } from '@/lib/detect';import { createToken, parseToken } from '@/lib/jwt';-import { secret, uuid, hash } from '@/lib/crypto';-import { COLLECTION_TYPE, EVENT_TYPE } from '@/lib/constants';+import { fetchWebsite } from '@/lib/load';+import { parseRequest } from '@/lib/request';+import { badRequest, forbidden, json, serverError } from '@/lib/response';import { anyObjectParam, urlOrPathParam } from '@/lib/schema';import { safeDecodeURI, safeDecodeURIComponent } from '@/lib/url';import { createSession, saveEvent, saveSessionData } from '@/queries/sql';-import { serializeError } from 'serialize-error';interface Cache {websiteId: string;@@ -125,7 +125,7 @@ export async function POST(request: Request) {}const createdAt = timestamp ? new Date(timestamp * 1000) : new Date();- const now = Math.floor(new Date().getTime() / 1000);+ const now = Math.floor(Date.now() / 1000);const sessionSalt = hash(startOfMonth(createdAt).toUTCString());const visitSalt = hash(startOfHour(createdAt).toUTCString());diff --git a/src/app/api/share/[shareId]/route.ts b/src/app/api/share/[shareId]/route.tsindex 9b2960a1d..bef87c4fb 100644--- a/src/app/api/share/[shareId]/route.ts+++ b/src/app/api/share/[shareId]/route.ts@@ -1,9 +1,9 @@-import { json, notFound } from '@/lib/response';-import { createToken } from '@/lib/jwt';import { secret } from '@/lib/crypto';+import { createToken } from '@/lib/jwt';+import { json, notFound } from '@/lib/response';import { getSharedWebsite } from '@/queries/prisma';-export async function GET(request: Request, { params }: { params: Promise<{ shareId: string }> }) {+export async function GET(_request: Request, { params }: { params: Promise<{ shareId: string }> }) {const { shareId } = await params;const website = await getSharedWebsite(shareId);diff --git a/src/app/api/teams/[teamId]/links/route.ts b/src/app/api/teams/[teamId]/links/route.tsindex 39ac769ee..41e139b33 100644--- a/src/app/api/teams/[teamId]/links/route.ts+++ b/src/app/api/teams/[teamId]/links/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';-import { unauthorized, json } from '@/lib/response';-import { canViewTeam } from '@/permissions';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';+import { canViewTeam } from '@/permissions';import { getTeamLinks } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {diff --git a/src/app/api/teams/[teamId]/pixels/route.ts b/src/app/api/teams/[teamId]/pixels/route.tsindex bacb66680..daac2040d 100644--- a/src/app/api/teams/[teamId]/pixels/route.ts+++ b/src/app/api/teams/[teamId]/pixels/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';-import { unauthorized, json } from '@/lib/response';-import { canViewTeam } from '@/permissions';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';+import { canViewTeam } from '@/permissions';import { getTeamPixels } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {diff --git a/src/app/api/teams/[teamId]/route.ts b/src/app/api/teams/[teamId]/route.tsindex de3e3143c..c334b2af0 100644--- a/src/app/api/teams/[teamId]/route.ts+++ b/src/app/api/teams/[teamId]/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { unauthorized, json, notFound, ok } from '@/lib/response';-import { canDeleteTeam, canUpdateTeam, canViewTeam } from '@/permissions';import { parseRequest } from '@/lib/request';+import { json, notFound, ok, unauthorized } from '@/lib/response';+import { canDeleteTeam, canUpdateTeam, canViewTeam } from '@/permissions';import { deleteTeam, getTeam, updateTeam } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {diff --git a/src/app/api/teams/[teamId]/users/[userId]/route.ts b/src/app/api/teams/[teamId]/users/[userId]/route.tsindex 7e3c154b3..d09af9da6 100644--- a/src/app/api/teams/[teamId]/users/[userId]/route.ts+++ b/src/app/api/teams/[teamId]/users/[userId]/route.ts@@ -1,9 +1,9 @@-import { canDeleteTeamUser, canUpdateTeam } from '@/permissions';+import { z } from 'zod';import { parseRequest } from '@/lib/request';import { badRequest, json, ok, unauthorized } from '@/lib/response';-import { deleteTeamUser, getTeamUser, updateTeamUser } from '@/queries/prisma';-import { z } from 'zod';import { teamRoleParam } from '@/lib/schema';+import { canDeleteTeamUser, canUpdateTeam } from '@/permissions';+import { deleteTeamUser, getTeamUser, updateTeamUser } from '@/queries/prisma';export async function GET(request: Request,diff --git a/src/app/api/teams/[teamId]/users/route.ts b/src/app/api/teams/[teamId]/users/route.tsindex 6f97ac29c..c1297636e 100644--- a/src/app/api/teams/[teamId]/users/route.ts+++ b/src/app/api/teams/[teamId]/users/route.ts@@ -1,9 +1,9 @@+import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';import { pagingParams, searchParams, teamRoleParam } from '@/lib/schema';import { canUpdateTeam, canViewTeam } from '@/permissions';import { createTeamUser, getTeamUser, getTeamUsers } from '@/queries/prisma';-import { z } from 'zod';export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {const schema = z.object({diff --git a/src/app/api/teams/[teamId]/websites/route.ts b/src/app/api/teams/[teamId]/websites/route.tsindex a51076dc4..05c6d8045 100644--- a/src/app/api/teams/[teamId]/websites/route.ts+++ b/src/app/api/teams/[teamId]/websites/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';-import { unauthorized, json } from '@/lib/response';-import { canViewTeam } from '@/permissions';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';+import { canViewTeam } from '@/permissions';import { getTeamWebsites } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {diff --git a/src/app/api/teams/join/route.ts b/src/app/api/teams/join/route.tsindex e6bfb8712..3ce0913f7 100644--- a/src/app/api/teams/join/route.ts+++ b/src/app/api/teams/join/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { json, badRequest, notFound } from '@/lib/response';-import { parseRequest } from '@/lib/request';import { ROLES } from '@/lib/constants';+import { parseRequest } from '@/lib/request';+import { badRequest, json, notFound } from '@/lib/response';import { createTeamUser, findTeam, getTeamUser } from '@/queries/prisma';export async function POST(request: Request) {diff --git a/src/app/api/teams/route.ts b/src/app/api/teams/route.tsindex 2b9985ba4..53ef59239 100644--- a/src/app/api/teams/route.ts+++ b/src/app/api/teams/route.ts@@ -1,11 +1,11 @@import { z } from 'zod';-import { getRandomChars } from '@/lib/generate';-import { unauthorized, json } from '@/lib/response';-import { canCreateTeam } from '@/permissions';import { uuid } from '@/lib/crypto';+import { getRandomChars } from '@/lib/generate';import { getQueryFilters, parseRequest } from '@/lib/request';-import { createTeam, getUserTeams } from '@/queries/prisma';+import { json, unauthorized } from '@/lib/response';import { pagingParams } from '@/lib/schema';+import { canCreateTeam } from '@/permissions';+import { createTeam, getUserTeams } from '@/queries/prisma';export async function GET(request: Request) {const schema = z.object({diff --git a/src/app/api/users/[userId]/route.ts b/src/app/api/users/[userId]/route.tsindex c15b4b71b..aade8aa8d 100644--- a/src/app/api/users/[userId]/route.ts+++ b/src/app/api/users/[userId]/route.ts@@ -1,10 +1,10 @@import { z } from 'zod';-import { canUpdateUser, canViewUser, canDeleteUser } from '@/permissions';-import { getUser, getUserByUsername, updateUser, deleteUser } from '@/queries/prisma';-import { json, unauthorized, badRequest, ok } from '@/lib/response';import { hashPassword } from '@/lib/password';import { parseRequest } from '@/lib/request';+import { badRequest, json, ok, unauthorized } from '@/lib/response';import { userRoleParam } from '@/lib/schema';+import { canDeleteUser, canUpdateUser, canViewUser } from '@/permissions';+import { deleteUser, getUser, getUserByUsername, updateUser } from '@/queries/prisma';export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {const { auth, error } = await parseRequest(request);diff --git a/src/app/api/users/[userId]/teams/route.ts b/src/app/api/users/[userId]/teams/route.tsindex c2c34342a..7a834a3f1 100644--- a/src/app/api/users/[userId]/teams/route.ts+++ b/src/app/api/users/[userId]/teams/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';+import { parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { pagingParams } from '@/lib/schema';import { getUserTeams } from '@/queries/prisma';-import { unauthorized, json } from '@/lib/response';-import { parseRequest } from '@/lib/request';export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {const schema = z.object({diff --git a/src/app/api/users/[userId]/websites/route.ts b/src/app/api/users/[userId]/websites/route.tsindex 1c2285baf..1107d8e16 100644--- a/src/app/api/users/[userId]/websites/route.ts+++ b/src/app/api/users/[userId]/websites/route.ts@@ -1,7 +1,7 @@import { z } from 'zod';-import { unauthorized, json } from '@/lib/response';-import { pagingParams, searchParams } from '@/lib/schema';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';+import { pagingParams, searchParams } from '@/lib/schema';import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {diff --git a/src/app/api/users/route.ts b/src/app/api/users/route.tsindex 1e7ed9eb2..dbb114cf7 100644--- a/src/app/api/users/route.ts+++ b/src/app/api/users/route.ts@@ -1,10 +1,10 @@import { z } from 'zod';-import { hashPassword } from '@/lib/password';-import { canCreateUser } from '@/permissions';import { ROLES } from '@/lib/constants';import { uuid } from '@/lib/crypto';+import { hashPassword } from '@/lib/password';import { parseRequest } from '@/lib/request';-import { unauthorized, json, badRequest } from '@/lib/response';+import { badRequest, json, unauthorized } from '@/lib/response';+import { canCreateUser } from '@/permissions';import { createUser, getUserByUsername } from '@/queries/prisma';export async function POST(request: Request) {diff --git a/src/app/api/websites/[websiteId]/active/route.ts b/src/app/api/websites/[websiteId]/active/route.tsindex f0abd4c3e..233b97e50 100644--- a/src/app/api/websites/[websiteId]/active/route.ts+++ b/src/app/api/websites/[websiteId]/active/route.ts@@ -1,7 +1,7 @@-import { canViewWebsite } from '@/permissions';+import { parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';+import { canViewWebsite } from '@/permissions';import { getActiveVisitors } from '@/queries/sql';-import { parseRequest } from '@/lib/request';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/daterange/route.ts b/src/app/api/websites/[websiteId]/daterange/route.tsindex 312daad68..14a241fd9 100644--- a/src/app/api/websites/[websiteId]/daterange/route.ts+++ b/src/app/api/websites/[websiteId]/daterange/route.ts@@ -1,7 +1,7 @@+import { parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getWebsiteDateRange } from '@/queries/sql';-import { json, unauthorized } from '@/lib/response';-import { parseRequest } from '@/lib/request';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/event-data/[eventId]/route.ts b/src/app/api/websites/[websiteId]/event-data/[eventId]/route.tsindex 1dea78963..54afab214 100644--- a/src/app/api/websites/[websiteId]/event-data/[eventId]/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/[eventId]/route.ts@@ -1,5 +1,5 @@import { parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { json, unauthorized } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getEventData } from '@/queries/sql/events/getEventData';diff --git a/src/app/api/websites/[websiteId]/event-data/events/route.ts b/src/app/api/websites/[websiteId]/event-data/events/route.tsindex 2420f0fac..eb6ee6ed8 100644--- a/src/app/api/websites/[websiteId]/event-data/events/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/events/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { json, unauthorized } from '@/lib/response';+import { filterParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getEventDataEvents } from '@/queries/sql/events/getEventDataEvents';-import { filterParams } from '@/lib/schema';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/event-data/fields/route.ts b/src/app/api/websites/[websiteId]/event-data/fields/route.tsindex cfee49679..bce6a977c 100644--- a/src/app/api/websites/[websiteId]/event-data/fields/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/fields/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { json, unauthorized } from '@/lib/response';+import { filterParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getEventDataFields } from '@/queries/sql';-import { filterParams } from '@/lib/schema';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/event-data/properties/route.ts b/src/app/api/websites/[websiteId]/event-data/properties/route.tsindex df513e5a4..52d15cfbd 100644--- a/src/app/api/websites/[websiteId]/event-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/properties/route.ts@@ -1,9 +1,9 @@+import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { filterParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getEventDataProperties } from '@/queries/sql';-import { z } from 'zod';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/event-data/stats/route.ts b/src/app/api/websites/[websiteId]/event-data/stats/route.tsindex bb482e2cd..042e989a4 100644--- a/src/app/api/websites/[websiteId]/event-data/stats/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/stats/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { json, unauthorized } from '@/lib/response';+import { filterParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getEventDataStats } from '@/queries/sql';-import { filterParams } from '@/lib/schema';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/event-data/values/route.ts b/src/app/api/websites/[websiteId]/event-data/values/route.tsindex 2921af9fe..12e8f2dc0 100644--- a/src/app/api/websites/[websiteId]/event-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/values/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { json, unauthorized } from '@/lib/response';+import { filterParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getEventDataValues } from '@/queries/sql';-import { filterParams } from '@/lib/schema';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/events/route.ts b/src/app/api/websites/[websiteId]/events/route.tsindex 6dbdea7d8..74ec3ece4 100644--- a/src/app/api/websites/[websiteId]/events/route.ts+++ b/src/app/api/websites/[websiteId]/events/route.ts@@ -1,9 +1,9 @@+import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { filterParams, pagingParams, searchParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getWebsiteEvents } from '@/queries/sql';-import { z } from 'zod';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/events/series/route.ts b/src/app/api/websites/[websiteId]/events/series/route.tsindex a579991b3..977e9c813 100644--- a/src/app/api/websites/[websiteId]/events/series/route.ts+++ b/src/app/api/websites/[websiteId]/events/series/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';-import { parseRequest, getQueryFilters } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/permissions';+import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { filterParams, timezoneParam, unitParam } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';import { getEventStats } from '@/queries/sql';export async function GET(diff --git a/src/app/api/websites/[websiteId]/export/route.ts b/src/app/api/websites/[websiteId]/export/route.tsindex fbf250e65..eec81c6d4 100644--- a/src/app/api/websites/[websiteId]/export/route.ts+++ b/src/app/api/websites/[websiteId]/export/route.ts@@ -1,10 +1,10 @@-import { z } from 'zod';import JSZip from 'jszip';import Papa from 'papaparse';+import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { json, unauthorized } from '@/lib/response';+import { dateRangeParams, pagingParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';-import { pagingParams, dateRangeParams } from '@/lib/schema';import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries/sql';export async function GET(diff --git a/src/app/api/websites/[websiteId]/metrics/expanded/route.ts b/src/app/api/websites/[websiteId]/metrics/expanded/route.tsindex 703cf5ee7..d52c17736 100644--- a/src/app/api/websites/[websiteId]/metrics/expanded/route.ts+++ b/src/app/api/websites/[websiteId]/metrics/expanded/route.ts@@ -1,3 +1,4 @@+import { z } from 'zod';import { EVENT_COLUMNS, EVENT_TYPE, SESSION_COLUMNS } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';@@ -9,7 +10,6 @@ import {getPageviewExpandedMetrics,getSessionExpandedMetrics,} from '@/queries/sql';-import { z } from 'zod';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/metrics/route.ts b/src/app/api/websites/[websiteId]/metrics/route.tsindex 3bfeaa6a4..12784adbe 100644--- a/src/app/api/websites/[websiteId]/metrics/route.ts+++ b/src/app/api/websites/[websiteId]/metrics/route.ts@@ -1,3 +1,4 @@+import { z } from 'zod';import { EVENT_COLUMNS, EVENT_TYPE, SESSION_COLUMNS } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';@@ -9,7 +10,6 @@ import {getPageviewMetrics,getSessionMetrics,} from '@/queries/sql';-import { z } from 'zod';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/pageviews/route.ts b/src/app/api/websites/[websiteId]/pageviews/route.tsindex 939fa7f4c..af59bce46 100644--- a/src/app/api/websites/[websiteId]/pageviews/route.ts+++ b/src/app/api/websites/[websiteId]/pageviews/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';-import { canViewWebsite } from '@/permissions';+import { getCompareDate } from '@/lib/date';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { dateRangeParams, filterParams } from '@/lib/schema';-import { getCompareDate } from '@/lib/date';-import { unauthorized, json } from '@/lib/response';+import { canViewWebsite } from '@/permissions';import { getPageviewStats, getSessionStats } from '@/queries/sql';export async function GET(diff --git a/src/app/api/websites/[websiteId]/reports/route.ts b/src/app/api/websites/[websiteId]/reports/route.tsindex 22851f445..93e7ab468 100644--- a/src/app/api/websites/[websiteId]/reports/route.ts+++ b/src/app/api/websites/[websiteId]/reports/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';+import { parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';+import { filterParams, pagingParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getReports } from '@/queries/prisma';-import { filterParams, pagingParams } from '@/lib/schema';-import { parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/reset/route.ts b/src/app/api/websites/[websiteId]/reset/route.tsindex c5ac3dffe..e0be5a53e 100644--- a/src/app/api/websites/[websiteId]/reset/route.ts+++ b/src/app/api/websites/[websiteId]/reset/route.ts@@ -1,7 +1,7 @@+import { parseRequest } from '@/lib/request';+import { ok, unauthorized } from '@/lib/response';import { canUpdateWebsite } from '@/permissions';import { resetWebsite } from '@/queries/prisma';-import { unauthorized, ok } from '@/lib/response';-import { parseRequest } from '@/lib/request';export async function POST(request: Request,diff --git a/src/app/api/websites/[websiteId]/route.ts b/src/app/api/websites/[websiteId]/route.tsindex 4c1477079..b4c0e7e88 100644--- a/src/app/api/websites/[websiteId]/route.ts+++ b/src/app/api/websites/[websiteId]/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';-import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/permissions';import { SHARE_ID_REGEX } from '@/lib/constants';import { parseRequest } from '@/lib/request';-import { ok, json, unauthorized, serverError, badRequest } from '@/lib/response';+import { badRequest, json, ok, serverError, unauthorized } from '@/lib/response';+import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/permissions';import { deleteWebsite, getWebsite, updateWebsite } from '@/queries/prisma';export async function GET(diff --git a/src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts b/src/app/api/websites/[websiteId]/segments/[segmentId]/route.tsindex 0aa36e702..b51f783bf 100644--- a/src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts+++ b/src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts@@ -1,9 +1,9 @@-import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/permissions';+import { z } from 'zod';import { parseRequest } from '@/lib/request';import { json, notFound, ok, unauthorized } from '@/lib/response';import { anyObjectParam, segmentTypeParam } from '@/lib/schema';+import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/permissions';import { deleteSegment, getSegment, updateSegment } from '@/queries/prisma';-import { z } from 'zod';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/segments/route.ts b/src/app/api/websites/[websiteId]/segments/route.tsindex 26afd99ea..45927656c 100644--- a/src/app/api/websites/[websiteId]/segments/route.ts+++ b/src/app/api/websites/[websiteId]/segments/route.ts@@ -1,10 +1,10 @@-import { canUpdateWebsite, canViewWebsite } from '@/permissions';+import { z } from 'zod';import { uuid } from '@/lib/crypto';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';-import { segmentTypeParam, searchParams, anyObjectParam } from '@/lib/schema';+import { anyObjectParam, searchParams, segmentTypeParam } from '@/lib/schema';+import { canUpdateWebsite, canViewWebsite } from '@/permissions';import { createSegment, getWebsiteSegments } from '@/queries/prisma';-import { z } from 'zod';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/session-data/properties/route.ts b/src/app/api/websites/[websiteId]/session-data/properties/route.tsindex 64328ce56..2d8db1535 100644--- a/src/app/api/websites/[websiteId]/session-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/session-data/properties/route.ts@@ -1,9 +1,9 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { json, unauthorized } from '@/lib/response';+import { filterParams } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getSessionDataProperties } from '@/queries/sql';-import { filterParams } from '@/lib/schema';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/session-data/values/route.ts b/src/app/api/websites/[websiteId]/session-data/values/route.tsindex 75464ba4b..7d06870ac 100644--- a/src/app/api/websites/[websiteId]/session-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/session-data/values/route.ts@@ -1,9 +1,9 @@-import { canViewWebsite } from '@/permissions';+import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';-import { getSessionDataValues } from '@/queries/sql';-import { z } from 'zod';import { filterParams } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';+import { getSessionDataValues } from '@/queries/sql';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.tsindex f68a9cc32..41b766d03 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { parseRequest, getQueryFilters } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';+import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getSessionActivity } from '@/queries/sql';diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.tsindex ca108d76a..6b5c2418a 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts@@ -1,7 +1,7 @@-import { unauthorized, json } from '@/lib/response';+import { parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getSessionData } from '@/queries/sql';-import { parseRequest } from '@/lib/request';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.tsindex 3001b8570..109166370 100644--- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts@@ -1,7 +1,7 @@-import { unauthorized, json } from '@/lib/response';+import { parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getWebsiteSession } from '@/queries/sql';-import { parseRequest } from '@/lib/request';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/sessions/route.ts b/src/app/api/websites/[websiteId]/sessions/route.tsindex 340774b21..ed4757a1c 100644--- a/src/app/api/websites/[websiteId]/sessions/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/permissions';+import { json, unauthorized } from '@/lib/response';import { dateRangeParams, filterParams, pagingParams, searchParams } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';import { getWebsiteSessions } from '@/queries/sql';export async function GET(diff --git a/src/app/api/websites/[websiteId]/sessions/stats/route.ts b/src/app/api/websites/[websiteId]/sessions/stats/route.tsindex 8179bdb23..459830edf 100644--- a/src/app/api/websites/[websiteId]/sessions/stats/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/stats/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';-import { parseRequest, getQueryFilters } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/permissions';+import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { filterParams } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';import { getWebsiteSessionStats } from '@/queries/sql';export async function GET(diff --git a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts b/src/app/api/websites/[websiteId]/sessions/weekly/route.tsindex f3d17f946..b9ccf3ef0 100644--- a/src/app/api/websites/[websiteId]/sessions/weekly/route.ts+++ b/src/app/api/websites/[websiteId]/sessions/weekly/route.ts@@ -1,9 +1,9 @@+import { z } from 'zod';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';import { filterParams, timezoneParam } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getWeeklyTraffic } from '@/queries/sql';-import { z } from 'zod';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/stats/route.ts b/src/app/api/websites/[websiteId]/stats/route.tsindex 8fcb01325..07c8b9699 100644--- a/src/app/api/websites/[websiteId]/stats/route.ts+++ b/src/app/api/websites/[websiteId]/stats/route.ts@@ -1,10 +1,10 @@import { z } from 'zod';-import { parseRequest, getQueryFilters } from '@/lib/request';-import { unauthorized, json } from '@/lib/response';-import { canViewWebsite } from '@/permissions';+import { getCompareDate } from '@/lib/date';+import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { dateRangeParams, filterParams } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';import { getWebsiteStats } from '@/queries/sql';-import { getCompareDate } from '@/lib/date';export async function GET(request: Request,diff --git a/src/app/api/websites/[websiteId]/transfer/route.ts b/src/app/api/websites/[websiteId]/transfer/route.tsindex 8ae7a9272..df2fed20d 100644--- a/src/app/api/websites/[websiteId]/transfer/route.ts+++ b/src/app/api/websites/[websiteId]/transfer/route.ts@@ -1,8 +1,8 @@import { z } from 'zod';+import { parseRequest } from '@/lib/request';+import { badRequest, json, unauthorized } from '@/lib/response';import { canTransferWebsiteToTeam, canTransferWebsiteToUser } from '@/permissions';import { updateWebsite } from '@/queries/prisma';-import { parseRequest } from '@/lib/request';-import { badRequest, unauthorized, json } from '@/lib/response';export async function POST(request: Request,diff --git a/src/app/api/websites/[websiteId]/values/route.ts b/src/app/api/websites/[websiteId]/values/route.tsindex 35983d04e..172325e3f 100644--- a/src/app/api/websites/[websiteId]/values/route.ts+++ b/src/app/api/websites/[websiteId]/values/route.ts@@ -1,11 +1,11 @@-import { canViewWebsite } from '@/permissions';+import { z } from 'zod';import { EVENT_COLUMNS, FILTER_COLUMNS, SEGMENT_TYPES, SESSION_COLUMNS } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { badRequest, json, unauthorized } from '@/lib/response';-import { getValues } from '@/queries/sql';-import { getWebsiteSegments } from '@/queries/prisma';-import { z } from 'zod';import { dateRangeParams, fieldsParam, searchParams } from '@/lib/schema';+import { canViewWebsite } from '@/permissions';+import { getWebsiteSegments } from '@/queries/prisma';+import { getValues } from '@/queries/sql';export async function GET(request: Request,diff --git a/src/app/api/websites/route.ts b/src/app/api/websites/route.tsindex 994e22bd7..e2b26c108 100644--- a/src/app/api/websites/route.ts+++ b/src/app/api/websites/route.ts@@ -1,10 +1,10 @@import { z } from 'zod';-import redis from '@/lib/redis';-import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';-import { json, unauthorized } from '@/lib/response';import { uuid } from '@/lib/crypto';+import redis from '@/lib/redis';import { getQueryFilters, parseRequest } from '@/lib/request';+import { json, unauthorized } from '@/lib/response';import { pagingParams, searchParams } from '@/lib/schema';+import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';import { createWebsite, getWebsiteCount } from '@/queries/prisma';import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';diff --git a/src/app/layout.tsx b/src/app/layout.tsxindex 745f6461c..afcbfc604 100644--- a/src/app/layout.tsx+++ b/src/app/layout.tsx@@ -1,5 +1,5 @@+import type { Metadata } from 'next';import { Suspense } from 'react';-import { Metadata } from 'next';import { Providers } from './Providers';import '@fontsource/inter/300.css';import '@fontsource/inter/400.css';diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsxindex b151b94ea..63711795e 100644--- a/src/app/login/LoginForm.tsx+++ b/src/app/login/LoginForm.tsx@@ -1,19 +1,19 @@import {+ Column,Form,FormButtons,FormField,FormSubmitButton,- TextField,- PasswordField,- Icon,- Column,Heading,+ Icon,+ PasswordField,+ TextField,} from '@umami/react-zen';import { useRouter } from 'next/navigation';import { useMessages, useUpdateQuery } from '@/components/hooks';-import { setUser } from '@/store/app';-import { setClientAuthToken } from '@/lib/client';import { Logo } from '@/components/svg';+import { setClientAuthToken } from '@/lib/client';+import { setUser } from '@/store/app';export function LoginForm() {const { formatMessage, labels, getErrorMessage } = useMessages();diff --git a/src/app/login/page.tsx b/src/app/login/page.tsxindex 8abf7a4e0..ea27735ac 100644--- a/src/app/login/page.tsx+++ b/src/app/login/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { LoginPage } from './LoginPage';export default async function () {diff --git a/src/app/logout/LogoutPage.tsx b/src/app/logout/LogoutPage.tsxindex d66d62a98..33e1615d2 100644--- a/src/app/logout/LogoutPage.tsx+++ b/src/app/logout/LogoutPage.tsx@@ -1,9 +1,9 @@'use client';-import { useEffect } from 'react';import { useRouter } from 'next/navigation';+import { useEffect } from 'react';import { useApi } from '@/components/hooks';-import { setUser } from '@/store/app';import { removeClientAuthToken } from '@/lib/client';+import { setUser } from '@/store/app';export function LogoutPage() {const router = useRouter();diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsxindex 0617c2e2d..20952788a 100644--- a/src/app/logout/page.tsx+++ b/src/app/logout/page.tsx@@ -1,4 +1,4 @@-import { Metadata } from 'next';+import type { Metadata } from 'next';import { LogoutPage } from './LogoutPage';export default function () {diff --git a/src/app/page.tsx b/src/app/page.tsxindex 8bf748f9b..38eda1dea 100644--- a/src/app/page.tsx+++ b/src/app/page.tsx@@ -1,8 +1,8 @@'use client';-import { useEffect } from 'react';import { redirect } from 'next/navigation';-import { getItem, removeItem } from '@/lib/storage';+import { useEffect } from 'react';import { LAST_TEAM_CONFIG } from '@/lib/constants';+import { getItem, removeItem } from '@/lib/storage';export default function RootPage() {useEffect(() => {diff --git a/src/app/share/[...shareId]/Header.tsx b/src/app/share/[...shareId]/Header.tsxindex ef4fe5eac..d7b7dcb42 100644--- a/src/app/share/[...shareId]/Header.tsx+++ b/src/app/share/[...shareId]/Header.tsx@@ -1,4 +1,4 @@-import { Row, Icon, Text, ThemeButton } from '@umami/react-zen';+import { Icon, Row, Text, ThemeButton } from '@umami/react-zen';import { LanguageButton } from '@/components/input/LanguageButton';import { PreferencesButton } from '@/components/input/PreferencesButton';import { Logo } from '@/components/svg';@@ -6,7 +6,7 @@ import { Logo } from '@/components/svg';export function Header() {return (<Row as="header" justifyContent="space-between" alignItems="center" paddingY="3">- <a href="https://umami.is" target="_blank">+ <a href="https://umami.is" target="_blank" rel="noopener"><Row alignItems="center" gap><Icon><Logo />diff --git a/src/app/share/[...shareId]/SharePage.tsx b/src/app/share/[...shareId]/SharePage.tsxindex f33798a1c..55d3ee9f1 100644--- a/src/app/share/[...shareId]/SharePage.tsx+++ b/src/app/share/[...shareId]/SharePage.tsx@@ -1,12 +1,12 @@'use client';import { Column } from '@umami/react-zen';-import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';+import { WebsiteHeader } from '@/app/(main)/websites/[websiteId]/WebsiteHeader';import { WebsitePage } from '@/app/(main)/websites/[websiteId]/WebsitePage';-import { useShareTokenQuery } from '@/components/hooks';+import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';import { PageBody } from '@/components/common/PageBody';-import { Header } from './Header';+import { useShareTokenQuery } from '@/components/hooks';import { Footer } from './Footer';-import { WebsiteHeader } from '@/app/(main)/websites/[websiteId]/WebsiteHeader';+import { Header } from './Header';export function SharePage({ shareId }) {const { shareToken, isLoading } = useShareTokenQuery(shareId);diff --git a/src/app/sso/SSOPage.tsx b/src/app/sso/SSOPage.tsxindex ec04c0901..3cc950938 100644--- a/src/app/sso/SSOPage.tsx+++ b/src/app/sso/SSOPage.tsx@@ -1,7 +1,7 @@'use client';-import { useEffect } from 'react';import { Loading } from '@umami/react-zen';import { useRouter, useSearchParams } from 'next/navigation';+import { useEffect } from 'react';import { setClientAuthToken } from '@/lib/client';export function SSOPage() {diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsxindex 3f3efd3be..7bfc72d21 100644--- a/src/components/charts/BarChart.tsx+++ b/src/components/charts/BarChart.tsx@@ -1,11 +1,11 @@-import { useMemo, useState } from 'react';import { useTheme } from '@umami/react-zen';+import { useMemo, useState } from 'react';+import { Chart, type ChartProps } from '@/components/charts/Chart';import { ChartTooltip } from '@/components/charts/ChartTooltip';-import { Chart, ChartProps } from '@/components/charts/Chart';import { useLocale } from '@/components/hooks';import { renderNumberLabels } from '@/lib/charts';import { getThemeColors } from '@/lib/colors';-import { formatDate, DATE_FORMATS } from '@/lib/date';+import { DATE_FORMATS, formatDate } from '@/lib/date';import { formatLongCurrency, formatLongNumber } from '@/lib/format';const dateFormats = {@@ -52,7 +52,7 @@ export function BarChart({const chartOptions: any = useMemo(() => {return {- __id: new Date().getTime(),+ __id: Date.now(),scales: {x: {type: XAxisType,diff --git a/src/components/charts/BubbleChart.tsx b/src/components/charts/BubbleChart.tsxindex 91c47b590..bf487ac05 100644--- a/src/components/charts/BubbleChart.tsx+++ b/src/components/charts/BubbleChart.tsx@@ -1,5 +1,5 @@-import { Chart, ChartProps } from '@/components/charts/Chart';import { useState } from 'react';+import { Chart, type ChartProps } from '@/components/charts/Chart';import { ChartTooltip } from '@/components/charts/ChartTooltip';export interface BubbleChartProps extends ChartProps {diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsxindex b68e45a05..b6ae9d794 100644--- a/src/components/charts/Chart.tsx+++ b/src/components/charts/Chart.tsx@@ -1,6 +1,11 @@-import { useState, useRef, useEffect, useMemo } from 'react';-import { Box, Column, BoxProps } from '@umami/react-zen';-import ChartJS, { LegendItem, ChartOptions, ChartData, UpdateMode } from 'chart.js/auto';+import { Box, type BoxProps, Column } from '@umami/react-zen';+import ChartJS, {+ type ChartData,+ type ChartOptions,+ type LegendItem,+ type UpdateMode,+} from 'chart.js/auto';+import { useEffect, useMemo, useRef, useState } from 'react';import { Legend } from '@/components/metrics/Legend';import { DEFAULT_ANIMATION_DURATION } from '@/lib/constants';diff --git a/src/components/charts/ChartTooltip.tsx b/src/components/charts/ChartTooltip.tsxindex e93d669eb..95ba2a2b4 100644--- a/src/components/charts/ChartTooltip.tsx+++ b/src/components/charts/ChartTooltip.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';-import { Column, Row, StatusLight, FloatingTooltip } from '@umami/react-zen';+import { Column, FloatingTooltip, Row, StatusLight } from '@umami/react-zen';+import type { ReactNode } from 'react';export function ChartTooltip({title,diff --git a/src/components/charts/PieChart.tsx b/src/components/charts/PieChart.tsxindex f9a9ea52b..2470fe77e 100644--- a/src/components/charts/PieChart.tsx+++ b/src/components/charts/PieChart.tsx@@ -1,5 +1,5 @@-import { Chart, ChartProps } from '@/components/charts/Chart';import { useState } from 'react';+import { Chart, type ChartProps } from '@/components/charts/Chart';import { ChartTooltip } from '@/components/charts/ChartTooltip';export interface PieChartProps extends ChartProps {diff --git a/src/components/common/ActionForm.tsx b/src/components/common/ActionForm.tsxindex d97064757..c6f44e802 100644--- a/src/components/common/ActionForm.tsx+++ b/src/components/common/ActionForm.tsx@@ -1,4 +1,4 @@-import { Row, Column, Text } from '@umami/react-zen';+import { Column, Row, Text } from '@umami/react-zen';export function ActionForm({ label, description, children }) {return (diff --git a/src/components/common/AnimatedDiv.tsx b/src/components/common/AnimatedDiv.tsxindex 04a28c5bb..f9948971a 100644--- a/src/components/common/AnimatedDiv.tsx+++ b/src/components/common/AnimatedDiv.tsx@@ -1,3 +1,3 @@-import { animated, AnimatedComponent } from '@react-spring/web';+import { type AnimatedComponent, animated } from '@react-spring/web';export const AnimatedDiv: AnimatedComponent<any> = animated.div;diff --git a/src/components/common/Avatar.tsx b/src/components/common/Avatar.tsxindex f8ed7c948..9b198b30c 100644--- a/src/components/common/Avatar.tsx+++ b/src/components/common/Avatar.tsx@@ -1,6 +1,6 @@-import { useMemo } from 'react';-import { createAvatar } from '@dicebear/core';import { lorelei } from '@dicebear/collection';+import { createAvatar } from '@dicebear/core';+import { useMemo } from 'react';import { getColor, getPastel } from '@/lib/colors';const lib = lorelei;diff --git a/src/components/common/ConfirmationForm.tsx b/src/components/common/ConfirmationForm.tsxindex ce82b54f0..b909ef58a 100644--- a/src/components/common/ConfirmationForm.tsx+++ b/src/components/common/ConfirmationForm.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';-import { Box, Button, FormSubmitButton, Form, FormButtons } from '@umami/react-zen';+import { Box, Button, Form, FormButtons, FormSubmitButton } from '@umami/react-zen';+import type { ReactNode } from 'react';import { useMessages } from '@/components/hooks';export interface ConfirmationFormProps {diff --git a/src/components/common/DataGrid.tsx b/src/components/common/DataGrid.tsxindex 4d09135f0..7e07b8dcd 100644--- a/src/components/common/DataGrid.tsx+++ b/src/components/common/DataGrid.tsx@@ -1,18 +1,18 @@+import type { UseQueryResult } from '@tanstack/react-query';+import { Column, Row, SearchField } from '@umami/react-zen';import {- ReactNode,- useState,- useCallback,- ReactElement,cloneElement,isValidElement,+ type ReactElement,+ type ReactNode,+ useCallback,+ useState,} from 'react';-import { SearchField, Row, Column } from '@umami/react-zen';-import { UseQueryResult } from '@tanstack/react-query';-import { useMessages, useMobile, useNavigation } from '@/components/hooks';-import { Pager } from '@/components/common/Pager';-import { LoadingPanel } from '@/components/common/LoadingPanel';-import { PageResult } from '@/lib/types';import { Empty } from '@/components/common/Empty';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { Pager } from '@/components/common/Pager';+import { useMessages, useMobile, useNavigation } from '@/components/hooks';+import type { PageResult } from '@/lib/types';const DEFAULT_SEARCH_DELAY = 600;diff --git a/src/components/common/DateDisplay.tsx b/src/components/common/DateDisplay.tsxindex ea94d7273..0bece8aed 100644--- a/src/components/common/DateDisplay.tsx+++ b/src/components/common/DateDisplay.tsx@@ -15,7 +15,7 @@ export function DateDisplay({ startDate, endDate }) {</Icon><Text wrap="nowrap">{isSingleDate ? (- <>{formatDate(startDate, 'PP', locale)}</>+ formatDate(startDate, 'PP', locale)) : (<>{formatDate(startDate, 'PP', locale)}diff --git a/src/components/common/EmptyPlaceholder.tsx b/src/components/common/EmptyPlaceholder.tsxindex 16f6cb902..64492e043 100644--- a/src/components/common/EmptyPlaceholder.tsx+++ b/src/components/common/EmptyPlaceholder.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';-import { Icon, Text, Column } from '@umami/react-zen';+import { Column, Icon, Text } from '@umami/react-zen';+import type { ReactNode } from 'react';export interface EmptyPlaceholderProps {title?: string;diff --git a/src/components/common/ErrorBoundary.tsx b/src/components/common/ErrorBoundary.tsxindex acb979ed2..4c0c82ed3 100644--- a/src/components/common/ErrorBoundary.tsx+++ b/src/components/common/ErrorBoundary.tsx@@ -1,6 +1,6 @@-import { ErrorInfo, ReactNode } from 'react';-import { ErrorBoundary as Boundary } from 'react-error-boundary';import { Button, Column } from '@umami/react-zen';+import type { ErrorInfo, ReactNode } from 'react';+import { ErrorBoundary as Boundary } from 'react-error-boundary';import { useMessages } from '@/components/hooks';const logError = (error: Error, info: ErrorInfo) => {diff --git a/src/components/common/ErrorMessage.tsx b/src/components/common/ErrorMessage.tsxindex 6bf9003cc..3c3015131 100644--- a/src/components/common/ErrorMessage.tsx+++ b/src/components/common/ErrorMessage.tsx@@ -1,4 +1,4 @@-import { Icon, Text, Row } from '@umami/react-zen';+import { Icon, Row, Text } from '@umami/react-zen';import { useMessages } from '@/components/hooks';import { AlertTriangle } from '@/components/icons';diff --git a/src/components/common/ExternalLink.tsx b/src/components/common/ExternalLink.tsxindex 330e972a1..6b6dbb998 100644--- a/src/components/common/ExternalLink.tsx+++ b/src/components/common/ExternalLink.tsx@@ -1,5 +1,5 @@-import Link from 'next/link';import { Icon, Row, Text } from '@umami/react-zen';+import Link from 'next/link';import { ExternalLink as LinkIcon } from '@/components/icons';export function ExternalLink({ href, children, ...props }) {diff --git a/src/components/common/FilterLink.tsx b/src/components/common/FilterLink.tsxindex 69e225b9e..d719a37e8 100644--- a/src/components/common/FilterLink.tsx+++ b/src/components/common/FilterLink.tsx@@ -1,6 +1,6 @@-import { HTMLAttributes, ReactNode, useState } from 'react';-import Link from 'next/link';import { Icon, Row, Text } from '@umami/react-zen';+import Link from 'next/link';+import { type HTMLAttributes, type ReactNode, useState } from 'react';import { useMessages, useNavigation } from '@/components/hooks';import { ExternalLink } from '@/components/icons';diff --git a/src/components/common/FilterRecord.tsx b/src/components/common/FilterRecord.tsxindex c1ff59eb0..04002648c 100644--- a/src/components/common/FilterRecord.tsx+++ b/src/components/common/FilterRecord.tsx@@ -1,9 +1,9 @@+import { Button, Column, Grid, Icon, Label, ListItem, Select, TextField } from '@umami/react-zen';import { useState } from 'react';-import { Grid, Column, TextField, Label, Select, Icon, Button, ListItem } from '@umami/react-zen';+import { Empty } from '@/components/common/Empty';import { useFilters, useFormat, useWebsiteValuesQuery } from '@/components/hooks';import { X } from '@/components/icons';import { isSearchOperator } from '@/lib/params';-import { Empty } from '@/components/common/Empty';export interface FilterRecordProps {websiteId: string;diff --git a/src/components/common/LinkButton.tsx b/src/components/common/LinkButton.tsxindex 251f77626..682970e8e 100644--- a/src/components/common/LinkButton.tsx+++ b/src/components/common/LinkButton.tsx@@ -1,6 +1,6 @@-import { ReactNode } from 'react';+import { Button, type ButtonProps } from '@umami/react-zen';import Link from 'next/link';-import { Button, ButtonProps } from '@umami/react-zen';+import type { ReactNode } from 'react';import { useLocale } from '@/components/hooks';export interface LinkButtonProps extends ButtonProps {diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsxindex c781bd905..fb37e1408 100644--- a/src/components/common/LoadingPanel.tsx+++ b/src/components/common/LoadingPanel.tsx@@ -1,7 +1,7 @@-import { ReactNode } from 'react';-import { Loading, Column, type ColumnProps } from '@umami/react-zen';-import { ErrorMessage } from '@/components/common/ErrorMessage';+import { Column, type ColumnProps, Loading } from '@umami/react-zen';+import type { ReactNode } from 'react';import { Empty } from '@/components/common/Empty';+import { ErrorMessage } from '@/components/common/ErrorMessage';export interface LoadingPanelProps extends ColumnProps {data?: any;diff --git a/src/components/common/PageBody.tsx b/src/components/common/PageBody.tsxindex a05224f0f..f07e589ba 100644--- a/src/components/common/PageBody.tsx+++ b/src/components/common/PageBody.tsx@@ -1,6 +1,6 @@'use client';-import { ReactNode } from 'react';-import { AlertBanner, Loading, Column, ColumnProps } from '@umami/react-zen';+import { AlertBanner, Column, type ColumnProps, Loading } from '@umami/react-zen';+import type { ReactNode } from 'react';import { useMessages } from '@/components/hooks';const DEFAULT_WIDTH = '1320px';diff --git a/src/components/common/PageHeader.tsx b/src/components/common/PageHeader.tsxindex 12b1a6442..b46051508 100644--- a/src/components/common/PageHeader.tsx+++ b/src/components/common/PageHeader.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';-import { Heading, Icon, Row, Text, Column, Grid } from '@umami/react-zen';+import { Column, Grid, Heading, Icon, Row, Text } from '@umami/react-zen';+import type { ReactNode } from 'react';export function PageHeader({title,diff --git a/src/components/common/Panel.tsx b/src/components/common/Panel.tsxindex da901d419..bb667465f 100644--- a/src/components/common/Panel.tsx+++ b/src/components/common/Panel.tsx@@ -1,16 +1,16 @@-import { useState } from 'react';import {+ Button,Column,type ColumnProps,- Row,+ Heading,Icon,- Button,- TooltipTrigger,+ Row,Tooltip,- Heading,+ TooltipTrigger,} from '@umami/react-zen';-import { Maximize, X } from '@/components/icons';+import { useState } from 'react';import { useMessages } from '@/components/hooks';+import { Maximize, X } from '@/components/icons';export interface PanelProps extends ColumnProps {title?: string;diff --git a/src/components/common/SectionHeader.tsx b/src/components/common/SectionHeader.tsxindex baaaa8b91..5b911efb4 100644--- a/src/components/common/SectionHeader.tsx+++ b/src/components/common/SectionHeader.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';-import { Heading, Icon, Row, Text, RowProps } from '@umami/react-zen';+import { Heading, Icon, Row, type RowProps, Text } from '@umami/react-zen';+import type { ReactNode } from 'react';export function SectionHeader({title,diff --git a/src/components/common/SideMenu.tsx b/src/components/common/SideMenu.tsxindex 429ec3369..bdd249521 100644--- a/src/components/common/SideMenu.tsx+++ b/src/components/common/SideMenu.tsx@@ -1,12 +1,12 @@import {+ Column,Heading,+ IconLabel,NavMenu,+ NavMenuGroup,NavMenuItem,+ type NavMenuProps,Row,- Column,- NavMenuGroup,- NavMenuProps,- IconLabel,} from '@umami/react-zen';import Link from 'next/link';@@ -72,6 +72,7 @@ export function SideMenu({</NavMenuGroup>);}+ return null;})}</NavMenu></Column>diff --git a/src/components/common/TypeConfirmationForm.tsx b/src/components/common/TypeConfirmationForm.tsxindex a28dd3c15..1121fa7d6 100644--- a/src/components/common/TypeConfirmationForm.tsx+++ b/src/components/common/TypeConfirmationForm.tsx@@ -3,8 +3,8 @@ import {Form,FormButtons,FormField,- TextField,FormSubmitButton,+ TextField,} from '@umami/react-zen';import { useMessages } from '@/components/hooks';diff --git a/src/components/common/TypeIcon.tsx b/src/components/common/TypeIcon.tsxindex af2ce5d85..8894b3a97 100644--- a/src/components/common/TypeIcon.tsx+++ b/src/components/common/TypeIcon.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';import { Row } from '@umami/react-zen';+import type { ReactNode } from 'react';export function TypeIcon({type,diff --git a/src/components/hooks/context/useLink.ts b/src/components/hooks/context/useLink.tsindex 765b9f59b..8766bbb64 100644--- a/src/components/hooks/context/useLink.ts+++ b/src/components/hooks/context/useLink.ts@@ -1,5 +1,5 @@-import { LinkContext } from '@/app/(main)/links/LinkProvider';import { useContext } from 'react';+import { LinkContext } from '@/app/(main)/links/LinkProvider';export function useLink() {return useContext(LinkContext);diff --git a/src/components/hooks/context/usePixel.ts b/src/components/hooks/context/usePixel.tsindex bb129c31c..69cad6f59 100644--- a/src/components/hooks/context/usePixel.ts+++ b/src/components/hooks/context/usePixel.ts@@ -1,5 +1,5 @@-import { PixelContext } from '@/app/(main)/pixels/PixelProvider';import { useContext } from 'react';+import { PixelContext } from '@/app/(main)/pixels/PixelProvider';export function usePixel() {return useContext(PixelContext);diff --git a/src/components/hooks/context/useTeam.ts b/src/components/hooks/context/useTeam.tsindex 11b23daf5..95ff4bee4 100644--- a/src/components/hooks/context/useTeam.ts+++ b/src/components/hooks/context/useTeam.ts@@ -1,5 +1,5 @@-import { TeamContext } from '@/app/(main)/teams/TeamProvider';import { useContext } from 'react';+import { TeamContext } from '@/app/(main)/teams/TeamProvider';export function useTeam() {return useContext(TeamContext);diff --git a/src/components/hooks/context/useUser.ts b/src/components/hooks/context/useUser.tsindex dfdf67f11..fa97ea9df 100644--- a/src/components/hooks/context/useUser.ts+++ b/src/components/hooks/context/useUser.ts@@ -1,5 +1,5 @@-import { UserContext } from '@/app/(main)/admin/users/[userId]/UserProvider';import { useContext } from 'react';+import { UserContext } from '@/app/(main)/admin/users/[userId]/UserProvider';export function useUser() {return useContext(UserContext);diff --git a/src/components/hooks/context/useWebsite.ts b/src/components/hooks/context/useWebsite.tsindex eb731875a..3d4be27f4 100644--- a/src/components/hooks/context/useWebsite.ts+++ b/src/components/hooks/context/useWebsite.ts@@ -1,5 +1,5 @@-import { WebsiteContext } from '@/app/(main)/websites/WebsiteProvider';import { useContext } from 'react';+import { WebsiteContext } from '@/app/(main)/websites/WebsiteProvider';export function useWebsite() {return useContext(WebsiteContext);diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.tsindex 04c3e37db..e8e5c135e 100644--- a/src/components/hooks/index.ts+++ b/src/components/hooks/index.ts@@ -31,13 +31,13 @@ export * from './queries/useSessionDataValuesQuery';export * from './queries/useShareTokenQuery';export * from './queries/useTeamMembersQuery';export * from './queries/useTeamQuery';-export * from './queries/useTeamWebsitesQuery';export * from './queries/useTeamsQuery';+export * from './queries/useTeamWebsitesQuery';export * from './queries/useUpdateQuery';export * from './queries/useUserQuery';+export * from './queries/useUsersQuery';export * from './queries/useUserTeamsQuery';export * from './queries/useUserWebsitesQuery';-export * from './queries/useUsersQuery';export * from './queries/useWebsiteCohortQuery';export * from './queries/useWebsiteCohortsQuery';export * from './queries/useWebsiteEventsQuery';@@ -51,10 +51,10 @@ export * from './queries/useWebsiteSegmentsQuery';export * from './queries/useWebsiteSessionQuery';export * from './queries/useWebsiteSessionStatsQuery';export * from './queries/useWebsiteSessionsQuery';-export * from './queries/useWeeklyTrafficQuery';export * from './queries/useWebsiteStatsQuery';-export * from './queries/useWebsiteValuesQuery';export * from './queries/useWebsitesQuery';+export * from './queries/useWebsiteValuesQuery';+export * from './queries/useWeeklyTrafficQuery';// Regular hooksexport * from './useApi';diff --git a/src/components/hooks/queries/useActiveUsersQuery.ts b/src/components/hooks/queries/useActiveUsersQuery.tsindex d0538dc7a..42867c19d 100644--- a/src/components/hooks/queries/useActiveUsersQuery.ts+++ b/src/components/hooks/queries/useActiveUsersQuery.ts@@ -1,5 +1,5 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { ReactQueryOptions } from '@/lib/types';export function useActyiveUsersQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useDateRangeQuery.ts b/src/components/hooks/queries/useDateRangeQuery.tsindex 32b5cd466..84b7eec7d 100644--- a/src/components/hooks/queries/useDateRangeQuery.ts+++ b/src/components/hooks/queries/useDateRangeQuery.ts@@ -1,5 +1,5 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { ReactQueryOptions } from '@/lib/types';type DateRange = {startDate?: string;diff --git a/src/components/hooks/queries/useEventDataEventsQuery.ts b/src/components/hooks/queries/useEventDataEventsQuery.tsindex 26a825e3c..1401989f3 100644--- a/src/components/hooks/queries/useEventDataEventsQuery.ts+++ b/src/components/hooks/queries/useEventDataEventsQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export function useEventDataEventsQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useEventDataPropertiesQuery.ts b/src/components/hooks/queries/useEventDataPropertiesQuery.tsindex 74dd58ef2..dfa6e9295 100644--- a/src/components/hooks/queries/useEventDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useEventDataPropertiesQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export function useEventDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useEventDataQuery.ts b/src/components/hooks/queries/useEventDataQuery.tsindex 5e21081ac..2ccbd634d 100644--- a/src/components/hooks/queries/useEventDataQuery.ts+++ b/src/components/hooks/queries/useEventDataQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export function useEventDataQuery(websiteId: string, eventId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useEventDataValuesQuery.ts b/src/components/hooks/queries/useEventDataValuesQuery.tsindex 18bb6b2e0..6529e1426 100644--- a/src/components/hooks/queries/useEventDataValuesQuery.ts+++ b/src/components/hooks/queries/useEventDataValuesQuery.ts@@ -1,4 +1,4 @@-import { ReactQueryOptions } from '@/lib/types';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useDateParameters } from '../useDateParameters';import { useFilterParameters } from '../useFilterParameters';diff --git a/src/components/hooks/queries/useLinksQuery.ts b/src/components/hooks/queries/useLinksQuery.tsindex 93de47dc3..ebf945fbe 100644--- a/src/components/hooks/queries/useLinksQuery.ts+++ b/src/components/hooks/queries/useLinksQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';-import { ReactQueryOptions } from '@/lib/types';+import { usePagedQuery } from '../usePagedQuery';export function useLinksQuery({ teamId }: { teamId?: string }, options?: ReactQueryOptions) {const { modified } = useModified('links');diff --git a/src/components/hooks/queries/useLoginQuery.ts b/src/components/hooks/queries/useLoginQuery.tsindex e800621a3..a64b7844f 100644--- a/src/components/hooks/queries/useLoginQuery.ts+++ b/src/components/hooks/queries/useLoginQuery.ts@@ -1,4 +1,4 @@-import { useApp, setUser } from '@/store/app';+import { setUser, useApp } from '@/store/app';import { useApi } from '../useApi';const selector = (state: { user: any }) => state.user;diff --git a/src/components/hooks/queries/usePixelsQuery.ts b/src/components/hooks/queries/usePixelsQuery.tsindex 466b13d06..c431179bb 100644--- a/src/components/hooks/queries/usePixelsQuery.ts+++ b/src/components/hooks/queries/usePixelsQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';-import { ReactQueryOptions } from '@/lib/types';+import { usePagedQuery } from '../usePagedQuery';export function usePixelsQuery({ teamId }: { teamId?: string }, options?: ReactQueryOptions) {const { modified } = useModified('pixels');diff --git a/src/components/hooks/queries/useRealtimeQuery.ts b/src/components/hooks/queries/useRealtimeQuery.tsindex 9e20da049..1a5bd1c53 100644--- a/src/components/hooks/queries/useRealtimeQuery.ts+++ b/src/components/hooks/queries/useRealtimeQuery.ts@@ -1,6 +1,6 @@import { REALTIME_INTERVAL } from '@/lib/constants';+import type { RealtimeData } from '@/lib/types';import { useApi } from '../useApi';-import { RealtimeData } from '@/lib/types';export function useRealtimeQuery(websiteId: string) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useReportsQuery.ts b/src/components/hooks/queries/useReportsQuery.tsindex fed150140..ba1bdd4d5 100644--- a/src/components/hooks/queries/useReportsQuery.ts+++ b/src/components/hooks/queries/useReportsQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';-import { ReactQueryOptions } from '@/lib/types';+import { usePagedQuery } from '../usePagedQuery';export function useReportsQuery({ websiteId, type }: { websiteId: string; type?: string },diff --git a/src/components/hooks/queries/useResultQuery.ts b/src/components/hooks/queries/useResultQuery.tsindex 7b7a7bd18..c6fce1289 100644--- a/src/components/hooks/queries/useResultQuery.ts+++ b/src/components/hooks/queries/useResultQuery.ts@@ -1,7 +1,7 @@+import { useDateParameters } from '@/components/hooks/useDateParameters';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useFilterParameters } from '../useFilterParameters';-import { ReactQueryOptions } from '@/lib/types';-import { useDateParameters } from '@/components/hooks/useDateParameters';export function useResultQuery<T = any>(type: string,diff --git a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts b/src/components/hooks/queries/useSessionDataPropertiesQuery.tsindex 975c728ae..ac651bb96 100644--- a/src/components/hooks/queries/useSessionDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useSessionDataPropertiesQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export function useSessionDataPropertiesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useSessionDataValuesQuery.ts b/src/components/hooks/queries/useSessionDataValuesQuery.tsindex 7df35938a..d5e180bbe 100644--- a/src/components/hooks/queries/useSessionDataValuesQuery.ts+++ b/src/components/hooks/queries/useSessionDataValuesQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export function useSessionDataValuesQuery(websiteId: string,diff --git a/src/components/hooks/queries/useShareTokenQuery.ts b/src/components/hooks/queries/useShareTokenQuery.tsindex 122dc4849..dbad3dcd7 100644--- a/src/components/hooks/queries/useShareTokenQuery.ts+++ b/src/components/hooks/queries/useShareTokenQuery.ts@@ -1,4 +1,4 @@-import { useApp, setShareToken } from '@/store/app';+import { setShareToken, useApp } from '@/store/app';import { useApi } from '../useApi';const selector = (state: { shareToken: string }) => state.shareToken;diff --git a/src/components/hooks/queries/useTeamMembersQuery.ts b/src/components/hooks/queries/useTeamMembersQuery.tsindex 87956ed05..6f6f815c1 100644--- a/src/components/hooks/queries/useTeamMembersQuery.ts+++ b/src/components/hooks/queries/useTeamMembersQuery.ts@@ -1,6 +1,6 @@import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';+import { usePagedQuery } from '../usePagedQuery';export function useTeamMembersQuery(teamId: string) {const { get } = useApi();diff --git a/src/components/hooks/queries/useTeamQuery.ts b/src/components/hooks/queries/useTeamQuery.tsindex 1ba1a6eab..c076a6aa3 100644--- a/src/components/hooks/queries/useTeamQuery.ts+++ b/src/components/hooks/queries/useTeamQuery.ts@@ -1,7 +1,7 @@+import { keepPreviousData } from '@tanstack/react-query';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useModified } from '../useModified';-import { keepPreviousData } from '@tanstack/react-query';-import { ReactQueryOptions } from '@/lib/types';export function useTeamQuery(teamId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useTeamWebsitesQuery.ts b/src/components/hooks/queries/useTeamWebsitesQuery.tsindex 892cc848e..ffe601bf2 100644--- a/src/components/hooks/queries/useTeamWebsitesQuery.ts+++ b/src/components/hooks/queries/useTeamWebsitesQuery.ts@@ -1,6 +1,6 @@import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';+import { usePagedQuery } from '../usePagedQuery';export function useTeamWebsitesQuery(teamId: string) {const { get } = useApi();diff --git a/src/components/hooks/queries/useTeamsQuery.ts b/src/components/hooks/queries/useTeamsQuery.tsindex 6a0ecc34f..f1a09f4da 100644--- a/src/components/hooks/queries/useTeamsQuery.ts+++ b/src/components/hooks/queries/useTeamsQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useModified } from '../useModified';import { usePagedQuery } from '../usePagedQuery';-import { ReactQueryOptions } from '@/lib/types';export function useTeamsQuery(params?: Record<string, any>, options?: ReactQueryOptions) {const { get } = useApi();diff --git a/src/components/hooks/queries/useUserQuery.ts b/src/components/hooks/queries/useUserQuery.tsindex 2f3a15ca4..07e23f08b 100644--- a/src/components/hooks/queries/useUserQuery.ts+++ b/src/components/hooks/queries/useUserQuery.ts@@ -1,7 +1,7 @@+import { keepPreviousData } from '@tanstack/react-query';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useModified } from '../useModified';-import { keepPreviousData } from '@tanstack/react-query';-import { ReactQueryOptions } from '@/lib/types';export function useUserQuery(userId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useUserWebsitesQuery.ts b/src/components/hooks/queries/useUserWebsitesQuery.tsindex c63127000..f98eaffbc 100644--- a/src/components/hooks/queries/useUserWebsitesQuery.ts+++ b/src/components/hooks/queries/useUserWebsitesQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';-import { ReactQueryOptions } from '@/lib/types';+import { usePagedQuery } from '../usePagedQuery';export function useUserWebsitesQuery({ userId, teamId }: { userId?: string; teamId?: string },diff --git a/src/components/hooks/queries/useUsersQuery.ts b/src/components/hooks/queries/useUsersQuery.tsindex 03e66ce00..d87900bab 100644--- a/src/components/hooks/queries/useUsersQuery.ts+++ b/src/components/hooks/queries/useUsersQuery.ts@@ -1,6 +1,6 @@import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';+import { usePagedQuery } from '../usePagedQuery';export function useUsersQuery() {const { get } = useApi();diff --git a/src/components/hooks/queries/useWebsiteCohortQuery.ts b/src/components/hooks/queries/useWebsiteCohortQuery.tsindex 50ac76b38..975766e91 100644--- a/src/components/hooks/queries/useWebsiteCohortQuery.ts+++ b/src/components/hooks/queries/useWebsiteCohortQuery.ts@@ -1,7 +1,7 @@+import { keepPreviousData } from '@tanstack/react-query';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useModified } from '../useModified';-import { keepPreviousData } from '@tanstack/react-query';-import { ReactQueryOptions } from '@/lib/types';export function useWebsiteCohortQuery(websiteId: string,diff --git a/src/components/hooks/queries/useWebsiteCohortsQuery.ts b/src/components/hooks/queries/useWebsiteCohortsQuery.tsindex d1032fa2e..e0cbf4ce9 100644--- a/src/components/hooks/queries/useWebsiteCohortsQuery.ts+++ b/src/components/hooks/queries/useWebsiteCohortsQuery.ts@@ -1,8 +1,8 @@-import { useApi } from '../useApi';-import { useModified } from '../useModified';import { keepPreviousData } from '@tanstack/react-query';-import { ReactQueryOptions } from '@/lib/types';import { useFilterParameters } from '@/components/hooks/useFilterParameters';+import type { ReactQueryOptions } from '@/lib/types';+import { useApi } from '../useApi';+import { useModified } from '../useModified';export function useWebsiteCohortsQuery(websiteId: string,diff --git a/src/components/hooks/queries/useWebsiteEventsQuery.ts b/src/components/hooks/queries/useWebsiteEventsQuery.tsindex 9d89be524..fc4dad5b1 100644--- a/src/components/hooks/queries/useWebsiteEventsQuery.ts+++ b/src/components/hooks/queries/useWebsiteEventsQuery.ts@@ -1,8 +1,8 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';+import { useFilterParameters } from '../useFilterParameters';import { usePagedQuery } from '../usePagedQuery';-import { ReactQueryOptions } from '@/lib/types';const EVENT_TYPES = {views: 1,diff --git a/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts b/src/components/hooks/queries/useWebsiteEventsSeriesQuery.tsindex 5db852785..6c1d112dd 100644--- a/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts+++ b/src/components/hooks/queries/useWebsiteEventsSeriesQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export function useWebsiteEventsSeriesQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.ts b/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.tsindex 89f95ada0..b2e90199f 100644--- a/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.ts+++ b/src/components/hooks/queries/useWebsiteExpandedMetricsQuery.ts@@ -1,8 +1,8 @@import { keepPreviousData } from '@tanstack/react-query';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export type WebsiteExpandedMetricsData = {name: string;diff --git a/src/components/hooks/queries/useWebsiteMetricsQuery.ts b/src/components/hooks/queries/useWebsiteMetricsQuery.tsindex a5ec7ac99..67c5e4d47 100644--- a/src/components/hooks/queries/useWebsiteMetricsQuery.ts+++ b/src/components/hooks/queries/useWebsiteMetricsQuery.ts@@ -1,5 +1,5 @@-import { ReactQueryOptions } from '@/lib/types';import { keepPreviousData } from '@tanstack/react-query';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useDateParameters } from '../useDateParameters';import { useFilterParameters } from '../useFilterParameters';diff --git a/src/components/hooks/queries/useWebsitePageviewsQuery.ts b/src/components/hooks/queries/useWebsitePageviewsQuery.tsindex 6f471bab0..b35c8200c 100644--- a/src/components/hooks/queries/useWebsitePageviewsQuery.ts+++ b/src/components/hooks/queries/useWebsitePageviewsQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export interface WebsitePageviewsData {pageviews: { x: string; y: number }[];diff --git a/src/components/hooks/queries/useWebsiteQuery.ts b/src/components/hooks/queries/useWebsiteQuery.tsindex 044b2bacb..b9a5533d9 100644--- a/src/components/hooks/queries/useWebsiteQuery.ts+++ b/src/components/hooks/queries/useWebsiteQuery.ts@@ -1,7 +1,7 @@+import { keepPreviousData } from '@tanstack/react-query';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useModified } from '../useModified';-import { keepPreviousData } from '@tanstack/react-query';-import { ReactQueryOptions } from '@/lib/types';export function useWebsiteQuery(websiteId: string, options?: ReactQueryOptions) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useWebsiteSegmentQuery.ts b/src/components/hooks/queries/useWebsiteSegmentQuery.tsindex 075616222..1923fbd86 100644--- a/src/components/hooks/queries/useWebsiteSegmentQuery.ts+++ b/src/components/hooks/queries/useWebsiteSegmentQuery.ts@@ -1,7 +1,7 @@+import { keepPreviousData } from '@tanstack/react-query';+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';import { useModified } from '../useModified';-import { keepPreviousData } from '@tanstack/react-query';-import { ReactQueryOptions } from '@/lib/types';export function useWebsiteSegmentQuery(websiteId: string,diff --git a/src/components/hooks/queries/useWebsiteSegmentsQuery.ts b/src/components/hooks/queries/useWebsiteSegmentsQuery.tsindex 1da72fc2a..8d3af9631 100644--- a/src/components/hooks/queries/useWebsiteSegmentsQuery.ts+++ b/src/components/hooks/queries/useWebsiteSegmentsQuery.ts@@ -1,8 +1,8 @@-import { useApi } from '../useApi';-import { useModified } from '../useModified';import { keepPreviousData } from '@tanstack/react-query';-import { ReactQueryOptions } from '@/lib/types';import { useFilterParameters } from '@/components/hooks/useFilterParameters';+import type { ReactQueryOptions } from '@/lib/types';+import { useApi } from '../useApi';+import { useModified } from '../useModified';export function useWebsiteSegmentsQuery(websiteId: string,diff --git a/src/components/hooks/queries/useWebsiteSessionStatsQuery.ts b/src/components/hooks/queries/useWebsiteSessionStatsQuery.tsindex 82a7c05f0..bac9fc90e 100644--- a/src/components/hooks/queries/useWebsiteSessionStatsQuery.ts+++ b/src/components/hooks/queries/useWebsiteSessionStatsQuery.ts@@ -1,6 +1,6 @@import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';+import { useFilterParameters } from '../useFilterParameters';export function useWebsiteSessionStatsQuery(websiteId: string, options?: Record<string, string>) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/queries/useWebsiteStatsQuery.ts b/src/components/hooks/queries/useWebsiteStatsQuery.tsindex 64304b1b9..e9a0c48ca 100644--- a/src/components/hooks/queries/useWebsiteStatsQuery.ts+++ b/src/components/hooks/queries/useWebsiteStatsQuery.ts@@ -1,7 +1,7 @@-import { UseQueryOptions } from '@tanstack/react-query';+import type { UseQueryOptions } from '@tanstack/react-query';+import { useDateParameters } from '@/components/hooks/useDateParameters';import { useApi } from '../useApi';import { useFilterParameters } from '../useFilterParameters';-import { useDateParameters } from '@/components/hooks/useDateParameters';export interface WebsiteStatsData {pageviews: number;diff --git a/src/components/hooks/queries/useWebsiteValuesQuery.ts b/src/components/hooks/queries/useWebsiteValuesQuery.tsindex 7320e08c7..1e097369e 100644--- a/src/components/hooks/queries/useWebsiteValuesQuery.ts+++ b/src/components/hooks/queries/useWebsiteValuesQuery.ts@@ -1,6 +1,6 @@-import { useApi } from '../useApi';import { useCountryNames } from '@/components/hooks/useCountryNames';import { useRegionNames } from '@/components/hooks/useRegionNames';+import { useApi } from '../useApi';import { useLocale } from '../useLocale';export function useWebsiteValuesQuery({diff --git a/src/components/hooks/queries/useWebsitesQuery.ts b/src/components/hooks/queries/useWebsitesQuery.tsindex 819b42a9a..a7b661864 100644--- a/src/components/hooks/queries/useWebsitesQuery.ts+++ b/src/components/hooks/queries/useWebsitesQuery.ts@@ -1,7 +1,7 @@+import type { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';-import { ReactQueryOptions } from '@/lib/types';+import { usePagedQuery } from '../usePagedQuery';export function useWebsitesQuery(params?: Record<string, any>, options?: ReactQueryOptions) {const { get } = useApi();diff --git a/src/components/hooks/queries/useWeeklyTrafficQuery.ts b/src/components/hooks/queries/useWeeklyTrafficQuery.tsindex 273347382..a76ebb3db 100644--- a/src/components/hooks/queries/useWeeklyTrafficQuery.ts+++ b/src/components/hooks/queries/useWeeklyTrafficQuery.ts@@ -1,7 +1,7 @@+import { useFilterParameters } from '@/components/hooks/useFilterParameters';import { useApi } from '../useApi';-import { useModified } from '../useModified';import { useDateParameters } from '../useDateParameters';-import { useFilterParameters } from '@/components/hooks/useFilterParameters';+import { useModified } from '../useModified';export function useWeeklyTrafficQuery(websiteId: string, params?: Record<string, string | number>) {const { get, useQuery } = useApi();diff --git a/src/components/hooks/useApi.ts b/src/components/hooks/useApi.tsindex 994163ade..35cabd529 100644--- a/src/components/hooks/useApi.ts+++ b/src/components/hooks/useApi.ts@@ -1,8 +1,8 @@+import { useMutation, useQuery } from '@tanstack/react-query';import { useCallback } from 'react';-import { useQuery, useMutation } from '@tanstack/react-query';import { getClientAuthToken } from '@/lib/client';import { SHARE_TOKEN_HEADER } from '@/lib/constants';-import { httpGet, httpPost, httpPut, httpDelete, FetchResponse } from '@/lib/fetch';+import { type FetchResponse, httpDelete, httpGet, httpPost, httpPut } from '@/lib/fetch';import { useApp } from '@/store/app';const selector = (state: { shareToken: { token?: string } }) => state.shareToken;diff --git a/src/components/hooks/useConfig.ts b/src/components/hooks/useConfig.tsindex 643b9cbc7..c1cdcaf67 100644--- a/src/components/hooks/useConfig.ts+++ b/src/components/hooks/useConfig.ts@@ -1,6 +1,6 @@import { useEffect } from 'react';-import { useApp, setConfig } from '@/store/app';import { useApi } from '@/components/hooks/useApi';+import { setConfig, useApp } from '@/store/app';export type Config = {cloudMode: boolean;diff --git a/src/components/hooks/useCountryNames.ts b/src/components/hooks/useCountryNames.tsindex 45019ebfa..1ec9fc138 100644--- a/src/components/hooks/useCountryNames.ts+++ b/src/components/hooks/useCountryNames.ts@@ -1,4 +1,4 @@-import { useState, useEffect } from 'react';+import { useEffect, useState } from 'react';import { httpGet } from '@/lib/fetch';import enUS from '../../../public/intl/country/en-US.json';diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.tsindex 7d3884334..755f36eeb 100644--- a/src/components/hooks/useDateRange.ts+++ b/src/components/hooks/useDateRange.ts@@ -1,8 +1,8 @@-import { useNavigation } from '@/components/hooks/useNavigation';import { useMemo } from 'react';-import { getCompareDate, getOffsetDateRange, parseDateRange } from '@/lib/date';import { useLocale } from '@/components/hooks/useLocale';+import { useNavigation } from '@/components/hooks/useNavigation';import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';+import { getCompareDate, getOffsetDateRange, parseDateRange } from '@/lib/date';import { getItem } from '@/lib/storage';export function useDateRange(options: { ignoreOffset?: boolean; timezone?: string } = {}) {diff --git a/src/components/hooks/useEscapeKey.ts b/src/components/hooks/useEscapeKey.tsindex f05ad7690..cc1d30892 100644--- a/src/components/hooks/useEscapeKey.ts+++ b/src/components/hooks/useEscapeKey.ts@@ -1,4 +1,4 @@-import { useEffect, useCallback, KeyboardEvent } from 'react';+import { type KeyboardEvent, useCallback, useEffect } from 'react';export function useEscapeKey(handler: (event: KeyboardEvent) => void) {const escFunction = useCallback((event: KeyboardEvent) => {diff --git a/src/components/hooks/useFilters.ts b/src/components/hooks/useFilters.tsindex 6115c1bf3..850e2afb1 100644--- a/src/components/hooks/useFilters.ts+++ b/src/components/hooks/useFilters.ts@@ -1,8 +1,8 @@import { FILTER_COLUMNS, OPERATORS } from '@/lib/constants';import { safeDecodeURIComponent } from '@/lib/url';+import { useFields } from './useFields';import { useMessages } from './useMessages';import { useNavigation } from './useNavigation';-import { useFields } from './useFields';export function useFilters() {const { formatMessage, labels } = useMessages();diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.tsindex 039959cda..896fa0769 100644--- a/src/components/hooks/useFormat.ts+++ b/src/components/hooks/useFormat.ts@@ -1,9 +1,9 @@-import { useMessages } from './useMessages';import { BROWSERS, OS_NAMES } from '@/lib/constants';-import { useLocale } from './useLocale';+import regions from '../../../public/iso-3166-2.json';import { useCountryNames } from './useCountryNames';import { useLanguageNames } from './useLanguageNames';-import regions from '../../../public/iso-3166-2.json';+import { useLocale } from './useLocale';+import { useMessages } from './useMessages';export function useFormat() {const { formatMessage, labels } = useMessages();diff --git a/src/components/hooks/useLanguageNames.ts b/src/components/hooks/useLanguageNames.tsindex 6b79ac52a..0cc03d7c1 100644--- a/src/components/hooks/useLanguageNames.ts+++ b/src/components/hooks/useLanguageNames.ts@@ -1,4 +1,4 @@-import { useState, useEffect } from 'react';+import { useEffect, useState } from 'react';import { httpGet } from '@/lib/fetch';import enUS from '../../../public/intl/language/en-US.json';diff --git a/src/components/hooks/useLocale.ts b/src/components/hooks/useLocale.tsindex 8d96fdde9..3eb669e16 100644--- a/src/components/hooks/useLocale.ts+++ b/src/components/hooks/useLocale.ts@@ -1,11 +1,11 @@import { useEffect } from 'react';-import { httpGet } from '@/lib/fetch';-import { setItem } from '@/lib/storage';import { LOCALE_CONFIG } from '@/lib/constants';+import { httpGet } from '@/lib/fetch';import { getDateLocale, getTextDirection } from '@/lib/lang';-import { useApp, setLocale } from '@/store/app';-import { useForceUpdate } from './useForceUpdate';+import { setItem } from '@/lib/storage';+import { setLocale, useApp } from '@/store/app';import enUS from '../../../public/intl/country/en-US.json';+import { useForceUpdate } from './useForceUpdate';const messages = {'en-US': enUS,diff --git a/src/components/hooks/useMessages.ts b/src/components/hooks/useMessages.tsindex 42bbeb01e..19f12d9a4 100644--- a/src/components/hooks/useMessages.ts+++ b/src/components/hooks/useMessages.ts@@ -1,5 +1,5 @@-import { useIntl, FormattedMessage, type MessageDescriptor } from 'react-intl';-import { messages, labels } from '@/components/messages';+import { FormattedMessage, type MessageDescriptor, useIntl } from 'react-intl';+import { labels, messages } from '@/components/messages';type FormatMessage = (descriptor: MessageDescriptor,@@ -30,9 +30,9 @@ export function useMessages(): UseMessages {return undefined;}- const code = error?.['code'];+ const code = error?.code;- return code ? getMessage(code) : error?.['message'] || 'Unknown error';+ return code ? getMessage(code) : error?.message || 'Unknown error';};const formatMessage = (diff --git a/src/components/hooks/useNavigation.ts b/src/components/hooks/useNavigation.tsindex 1b7250602..0a18ac7b2 100644--- a/src/components/hooks/useNavigation.ts+++ b/src/components/hooks/useNavigation.ts@@ -1,5 +1,5 @@-import { useState, useEffect } from 'react';import { usePathname, useRouter, useSearchParams } from 'next/navigation';+import { useEffect, useState } from 'react';import { buildPath } from '@/lib/url';export function useNavigation() {diff --git a/src/components/hooks/usePagedQuery.ts b/src/components/hooks/usePagedQuery.tsindex 726c7b22a..c818de643 100644--- a/src/components/hooks/usePagedQuery.ts+++ b/src/components/hooks/usePagedQuery.ts@@ -1,7 +1,7 @@-import { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';+import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';+import type { PageResult } from '@/lib/types';import { useApi } from './useApi';import { useNavigation } from './useNavigation';-import { PageResult } from '@/lib/types';export function usePagedQuery<TData = any, TError = Error>({queryKey,diff --git a/src/components/hooks/useRegionNames.ts b/src/components/hooks/useRegionNames.tsindex 746bd97e7..57dcc416c 100644--- a/src/components/hooks/useRegionNames.ts+++ b/src/components/hooks/useRegionNames.ts@@ -1,5 +1,5 @@-import { useCountryNames } from './useCountryNames';import regions from '../../../public/iso-3166-2.json';+import { useCountryNames } from './useCountryNames';export function useRegionNames(locale: string) {const { countryNames } = useCountryNames(locale);diff --git a/src/components/hooks/useSticky.ts b/src/components/hooks/useSticky.tsindex 8e6722adf..ef9fb36f3 100644--- a/src/components/hooks/useSticky.ts+++ b/src/components/hooks/useSticky.ts@@ -1,4 +1,4 @@-import { useState, useEffect, useRef } from 'react';+import { useEffect, useRef, useState } from 'react';export function useSticky({ enabled = true, threshold = 1 }) {const [isSticky, setIsSticky] = useState(false);diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.tsindex 22a34194c..ef2553902 100644--- a/src/components/hooks/useTimezone.ts+++ b/src/components/hooks/useTimezone.ts@@ -1,9 +1,9 @@-import { setItem } from '@/lib/storage';+import { formatInTimeZone, utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';import { TIMEZONE_CONFIG, TIMEZONE_LEGACY } from '@/lib/constants';-import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz';-import { useApp, setTimezone } from '@/store/app';-import { useLocale } from './useLocale';import { getTimezone } from '@/lib/date';+import { setItem } from '@/lib/storage';+import { setTimezone, useApp } from '@/store/app';+import { useLocale } from './useLocale';const selector = (state: { timezone: string }) => state.timezone;@@ -21,7 +21,7 @@ export function useTimezone() {return formatInTimeZone(/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]{3})?Z$/.test(date)? date- : date.split(' ').join('T') + 'Z',+ : `${date.split(' ').join('T')}Z`,timezone,pattern,{ locale: dateLocale },diff --git a/src/components/input/ActionSelect.tsx b/src/components/input/ActionSelect.tsxindex 3de118d21..616ee3471 100644--- a/src/components/input/ActionSelect.tsx+++ b/src/components/input/ActionSelect.tsx@@ -1,4 +1,4 @@-import { Select, ListItem } from '@umami/react-zen';+import { ListItem, Select } from '@umami/react-zen';import { useMessages } from '@/components/hooks';export interface ActionSelectProps {diff --git a/src/components/input/CurrencySelect.tsx b/src/components/input/CurrencySelect.tsxindex be0cec7d1..2b6045b45 100644--- a/src/components/input/CurrencySelect.tsx+++ b/src/components/input/CurrencySelect.tsx@@ -1,7 +1,7 @@-import { CURRENCIES } from '@/lib/constants';import { ListItem, Select } from '@umami/react-zen';import { useState } from 'react';import { useMessages } from '@/components/hooks';+import { CURRENCIES } from '@/lib/constants';export function CurrencySelect({ value, onChange }) {const { formatMessage, labels } = useMessages();diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsxindex f72ea281b..2e175298d 100644--- a/src/components/input/DateFilter.tsx+++ b/src/components/input/DateFilter.tsx@@ -1,9 +1,9 @@-import { useState, Key, Fragment } from 'react';-import { Modal, Select, ListItem, ListSeparator, Dialog, SelectProps } from '@umami/react-zen';+import { Dialog, ListItem, ListSeparator, Modal, Select, type SelectProps } from '@umami/react-zen';import { endOfYear } from 'date-fns';-import { DatePickerForm } from '@/components/metrics/DatePickerForm';-import { useMessages, useMobile } from '@/components/hooks';+import { Fragment, type Key, useState } from 'react';import { DateDisplay } from '@/components/common/DateDisplay';+import { useMessages, useMobile } from '@/components/hooks';+import { DatePickerForm } from '@/components/metrics/DatePickerForm';import { parseDateRange } from '@/lib/date';export interface DateFilterProps extends SelectProps {diff --git a/src/components/input/DialogButton.tsx b/src/components/input/DialogButton.tsxindex a3a49252a..7527226d0 100644--- a/src/components/input/DialogButton.tsx+++ b/src/components/input/DialogButton.tsx@@ -1,13 +1,13 @@-import { CSSProperties, ReactNode } from 'react';import {Button,- ButtonProps,- Modal,+ type ButtonProps,Dialog,+ type DialogProps,DialogTrigger,- DialogProps,IconLabel,+ Modal,} from '@umami/react-zen';+import type { CSSProperties, ReactNode } from 'react';import { useMobile } from '@/components/hooks';export interface DialogButtonProps extends Omit<ButtonProps, 'children'> {diff --git a/src/components/input/DownloadButton.tsx b/src/components/input/DownloadButton.tsxindex 9fd46c0b0..5df3305d4 100644--- a/src/components/input/DownloadButton.tsx+++ b/src/components/input/DownloadButton.tsx@@ -1,7 +1,7 @@+import { Button, Icon, Tooltip, TooltipTrigger } from '@umami/react-zen';import Papa from 'papaparse';-import { Button, Icon, TooltipTrigger, Tooltip } from '@umami/react-zen';-import { Download } from '@/components/icons';import { useMessages } from '@/components/hooks';+import { Download } from '@/components/icons';export function DownloadButton({filename = 'data',diff --git a/src/components/input/ExportButton.tsx b/src/components/input/ExportButton.tsxindex 15fb21240..7b65a57bc 100644--- a/src/components/input/ExportButton.tsx+++ b/src/components/input/ExportButton.tsx@@ -1,10 +1,10 @@-import { useState } from 'react';-import { Icon, Tooltip, TooltipTrigger, LoadingButton } from '@umami/react-zen';-import { Download } from '@/components/icons';-import { useMessages, useApi } from '@/components/hooks';+import { Icon, LoadingButton, Tooltip, TooltipTrigger } from '@umami/react-zen';import { useSearchParams } from 'next/navigation';+import { useState } from 'react';+import { useApi, useMessages } from '@/components/hooks';import { useDateParameters } from '@/components/hooks/useDateParameters';import { useFilterParameters } from '@/components/hooks/useFilterParameters';+import { Download } from '@/components/icons';export function ExportButton({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/components/input/FieldFilters.tsx b/src/components/input/FieldFilters.tsxindex e61b9cc7f..2174068fc 100644--- a/src/components/input/FieldFilters.tsx+++ b/src/components/input/FieldFilters.tsx@@ -1,22 +1,22 @@-import { Key } from 'react';-import { subMonths, endOfDay } from 'date-fns';import {- Grid,+ Button,Column,+ Grid,+ Icon,List,ListItem,- Row,- Button,- Popover,- MenuTrigger,Menu,MenuItem,- Icon,+ MenuTrigger,+ Popover,+ Row,} from '@umami/react-zen';+import { endOfDay, subMonths } from 'date-fns';+import type { Key } from 'react';+import { Empty } from '@/components/common/Empty';+import { FilterRecord } from '@/components/common/FilterRecord';import { useFields, useMessages, useMobile } from '@/components/hooks';import { Plus } from '@/components/icons';-import { FilterRecord } from '@/components/common/FilterRecord';-import { Empty } from '@/components/common/Empty';export interface FieldFiltersProps {websiteId: string;diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsxindex b81f77e30..5a52e5666 100644--- a/src/components/input/FilterBar.tsx+++ b/src/components/input/FilterBar.tsx@@ -1,24 +1,24 @@import {Button,+ Dialog,+ DialogTrigger,Icon,- Text,+ Modal,Row,- TooltipTrigger,+ Text,Tooltip,- Modal,- Dialog,- DialogTrigger,+ TooltipTrigger,} from '@umami/react-zen';+import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';import {- useNavigation,- useMessages,- useFormat,useFilters,+ useFormat,+ useMessages,+ useNavigation,useWebsiteSegmentQuery,} from '@/components/hooks';-import { X, Bookmark } from '@/components/icons';+import { Bookmark, X } from '@/components/icons';import { isSearchOperator } from '@/lib/params';-import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';export function FilterBar({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/components/input/FilterButtons.tsx b/src/components/input/FilterButtons.tsxindex 4340ad971..ff37fb197 100644--- a/src/components/input/FilterButtons.tsx+++ b/src/components/input/FilterButtons.tsx@@ -1,5 +1,5 @@+import { Box, ToggleGroup, ToggleGroupItem } from '@umami/react-zen';import { useState } from 'react';-import { ToggleGroup, ToggleGroupItem, Box } from '@umami/react-zen';export interface FilterButtonsProps {items: { id: string; label: string }[];diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsxindex c69c69e5c..44f43844a 100644--- a/src/components/input/FilterEditForm.tsx+++ b/src/components/input/FilterEditForm.tsx@@ -1,8 +1,8 @@+import { Button, Column, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';+import { useState } from 'react';import { useFilters, useMessages, useMobile, useNavigation } from '@/components/hooks';import { FieldFilters } from '@/components/input/FieldFilters';import { SegmentFilters } from '@/components/input/SegmentFilters';-import { Button, Column, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';-import { useState } from 'react';export interface FilterEditFormProps {websiteId?: string;diff --git a/src/components/input/LanguageButton.tsx b/src/components/input/LanguageButton.tsxindex 6d43f11a5..ac43dcb6b 100644--- a/src/components/input/LanguageButton.tsx+++ b/src/components/input/LanguageButton.tsx@@ -1,7 +1,7 @@-import { Icon, Button, MenuTrigger, Popover, Grid, Text, Dialog } from '@umami/react-zen';-import { languages } from '@/lib/lang';-import { useLocale } from '@/components/hooks';+import { Button, Dialog, Grid, Icon, MenuTrigger, Popover, Text } from '@umami/react-zen';import { Globe } from 'lucide-react';+import { useLocale } from '@/components/hooks';+import { languages } from '@/lib/lang';export function LanguageButton() {const { locale, saveLocale } = useLocale();diff --git a/src/components/input/LookupField.tsx b/src/components/input/LookupField.tsxindex 06b5006a3..c1d419f74 100644--- a/src/components/input/LookupField.tsx+++ b/src/components/input/LookupField.tsx@@ -1,6 +1,6 @@-import { SetStateAction, useMemo, useState } from 'react';+import { ComboBox, type ComboBoxProps, ListItem, Loading, useDebounce } from '@umami/react-zen';import { endOfDay, subMonths } from 'date-fns';-import { ComboBox, ListItem, Loading, useDebounce, ComboBoxProps } from '@umami/react-zen';+import { type SetStateAction, useMemo, useState } from 'react';import { Empty } from '@/components/common/Empty';import { useMessages, useWebsiteValuesQuery } from '@/components/hooks';diff --git a/src/components/input/MenuButton.tsx b/src/components/input/MenuButton.tsxindex b861577c7..bac307fef 100644--- a/src/components/input/MenuButton.tsx+++ b/src/components/input/MenuButton.tsx@@ -1,5 +1,5 @@-import { ReactNode, Key } from 'react';-import { DialogTrigger, Button, Menu, Popover, Icon } from '@umami/react-zen';+import { Button, DialogTrigger, Icon, Menu, Popover } from '@umami/react-zen';+import type { Key, ReactNode } from 'react';import { Ellipsis } from '@/components/icons';export function MenuButton({diff --git a/src/components/input/MobileMenuButton.tsx b/src/components/input/MobileMenuButton.tsxindex bd32272dd..5e59cbbbe 100644--- a/src/components/input/MobileMenuButton.tsx+++ b/src/components/input/MobileMenuButton.tsx@@ -1,4 +1,4 @@-import { Dialog, DialogTrigger, Button, Icon, Modal, DialogProps } from '@umami/react-zen';+import { Button, Dialog, type DialogProps, DialogTrigger, Icon, Modal } from '@umami/react-zen';import { Menu } from '@/components/icons';export function MobileMenuButton(props: DialogProps) {diff --git a/src/components/input/MonthSelect.tsx b/src/components/input/MonthSelect.tsxindex efaf6a5ef..241634edf 100644--- a/src/components/input/MonthSelect.tsx+++ b/src/components/input/MonthSelect.tsx@@ -1,4 +1,4 @@-import { Row, Select, ListItem } from '@umami/react-zen';+import { ListItem, Row, Select } from '@umami/react-zen';import { useLocale } from '@/components/hooks';import { formatDate } from '@/lib/date';diff --git a/src/components/input/NavButton.tsx b/src/components/input/NavButton.tsxindex b57c2ecdc..7ea966cc9 100644--- a/src/components/input/NavButton.tsx+++ b/src/components/input/NavButton.tsx@@ -1,18 +1,19 @@import {- Text,+ Column,Icon,+ IconLabel,Menu,MenuItem,- MenuTrigger,MenuSection,MenuSeparator,- SubmenuTrigger,+ MenuTrigger,Popover,- Row,- Column,Pressable,- IconLabel,+ Row,+ SubmenuTrigger,+ Text,} from '@umami/react-zen';+import { ArrowRight } from 'lucide-react';import {useConfig,useLoginQuery,@@ -33,7 +34,6 @@ import {} from '@/components/icons';import { Switch } from '@/components/svg';import { DOCS_URL } from '@/lib/constants';-import { ArrowRight } from 'lucide-react';export interface TeamsButtonProps {showText?: boolean;diff --git a/src/components/input/PanelButton.tsx b/src/components/input/PanelButton.tsxindex 2f7687419..500c40c4f 100644--- a/src/components/input/PanelButton.tsx+++ b/src/components/input/PanelButton.tsx@@ -1,6 +1,6 @@-import { Button, Icon, ButtonProps } from '@umami/react-zen';-import { PanelLeft } from '@/components/icons';+import { Button, type ButtonProps, Icon } from '@umami/react-zen';import { useGlobalState } from '@/components/hooks';+import { PanelLeft } from '@/components/icons';export function PanelButton(props: ButtonProps) {const [isCollapsed, setIsCollapsed] = useGlobalState('sidenav-collapsed');diff --git a/src/components/input/PreferencesButton.tsx b/src/components/input/PreferencesButton.tsxindex 03092fe5a..710a7faeb 100644--- a/src/components/input/PreferencesButton.tsx+++ b/src/components/input/PreferencesButton.tsx@@ -1,9 +1,9 @@-import { Button, Icon, DialogTrigger, Popover, Column, Label } from '@umami/react-zen';-import { TimezoneSetting } from '@/app/(main)/settings/preferences/TimezoneSetting';+import { Button, Column, DialogTrigger, Icon, Label, Popover } from '@umami/react-zen';import { DateRangeSetting } from '@/app/(main)/settings/preferences/DateRangeSetting';-import { Settings } from '@/components/icons';-import { useMessages } from '@/components/hooks';+import { TimezoneSetting } from '@/app/(main)/settings/preferences/TimezoneSetting';import { Panel } from '@/components/common/Panel';+import { useMessages } from '@/components/hooks';+import { Settings } from '@/components/icons';export function PreferencesButton() {const { formatMessage, labels } = useMessages();diff --git a/src/components/input/ProfileButton.tsx b/src/components/input/ProfileButton.tsxindex 03f14d071..505cd8889 100644--- a/src/components/input/ProfileButton.tsx+++ b/src/components/input/ProfileButton.tsx@@ -1,18 +1,18 @@-import { Fragment } from 'react';import {- Icon,Button,- MenuTrigger,- Popover,+ Icon,Menu,MenuItem,- MenuSeparator,MenuSection,- Text,+ MenuSeparator,+ MenuTrigger,+ Popover,Row,+ Text,} from '@umami/react-zen';-import { useMessages, useLoginQuery, useNavigation } from '@/components/hooks';-import { LogOut, UserCircle, LockKeyhole } from '@/components/icons';+import { Fragment } from 'react';+import { useLoginQuery, useMessages, useNavigation } from '@/components/hooks';+import { LockKeyhole, LogOut, UserCircle } from '@/components/icons';export function ProfileButton() {const { formatMessage, labels } = useMessages();diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsxindex 29b719864..b52f830eb 100644--- a/src/components/input/RefreshButton.tsx+++ b/src/components/input/RefreshButton.tsx@@ -1,8 +1,7 @@-import { LoadingButton, Icon, Tooltip, TooltipTrigger } from '@umami/react-zen';-import { setWebsiteDateRange } from '@/store/websites';-import { useDateRange } from '@/components/hooks';+import { Icon, LoadingButton, Tooltip, TooltipTrigger } from '@umami/react-zen';+import { useDateRange, useMessages } from '@/components/hooks';import { RefreshCw } from '@/components/icons';-import { useMessages } from '@/components/hooks';+import { setWebsiteDateRange } from '@/store/websites';export function RefreshButton({websiteId,diff --git a/src/components/input/ReportEditButton.tsx b/src/components/input/ReportEditButton.tsxindex 8f0c7a3cc..b333077ac 100644--- a/src/components/input/ReportEditButton.tsx+++ b/src/components/input/ReportEditButton.tsx@@ -1,6 +1,3 @@-import { ReactNode, useState } from 'react';-import { useMessages } from '@/components/hooks';-import { useDeleteQuery } from '@/components/hooks/queries/useDeleteQuery';import {AlertDialog,Button,@@ -10,9 +7,12 @@ import {MenuTrigger,Modal,Popover,- Text,Row,+ Text,} from '@umami/react-zen';+import { type ReactNode, useState } from 'react';+import { useMessages } from '@/components/hooks';+import { useDeleteQuery } from '@/components/hooks/queries/useDeleteQuery';import { Edit, MoreHorizontal, Trash } from '@/components/icons';export function ReportEditButton({diff --git a/src/components/input/SegmentFilters.tsx b/src/components/input/SegmentFilters.tsxindex d0906d676..f03a1dead 100644--- a/src/components/input/SegmentFilters.tsx+++ b/src/components/input/SegmentFilters.tsx@@ -1,7 +1,7 @@import { IconLabel, List, ListItem } from '@umami/react-zen';-import { useWebsiteSegmentsQuery } from '@/components/hooks';-import { LoadingPanel } from '@/components/common/LoadingPanel';import { Empty } from '@/components/common/Empty';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { useWebsiteSegmentsQuery } from '@/components/hooks';import { ChartPie, UserPlus } from '@/components/icons';export interface SegmentFiltersProps {diff --git a/src/components/input/SegmentSaveButton.tsx b/src/components/input/SegmentSaveButton.tsxindex f6cee0e1e..5f6cac10d 100644--- a/src/components/input/SegmentSaveButton.tsx+++ b/src/components/input/SegmentSaveButton.tsx@@ -1,7 +1,7 @@-import { Button, DialogTrigger, Modal, Text, Icon, Dialog } from '@umami/react-zen';+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';+import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';import { useMessages } from '@/components/hooks';import { Plus } from '@/components/icons';-import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';export function SegmentSaveButton({ websiteId }: { websiteId: string }) {const { formatMessage, labels } = useMessages();diff --git a/src/components/input/SettingsButton.tsx b/src/components/input/SettingsButton.tsxindex 23ad91d31..bd51fb532 100644--- a/src/components/input/SettingsButton.tsx+++ b/src/components/input/SettingsButton.tsx@@ -1,23 +1,23 @@-import { Key } from 'react';import {- Icon,Button,- MenuTrigger,- Popover,+ Icon,Menu,MenuItem,- MenuSeparator,MenuSection,+ MenuSeparator,+ MenuTrigger,+ Popover,} from '@umami/react-zen';-import { useMessages, useLoginQuery, useNavigation, useConfig } from '@/components/hooks';+import type { Key } from 'react';+import { useConfig, useLoginQuery, useMessages, useNavigation } from '@/components/hooks';import {- LogOut,+ BookText,+ ExternalLink,+ LifeBuoy,LockKeyhole,+ LogOut,Settings,UserCircle,- LifeBuoy,- BookText,- ExternalLink,} from '@/components/icons';import { DOCS_URL } from '@/lib/constants';diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsxindex dbe41f324..beb6f3711 100644--- a/src/components/input/WebsiteDateFilter.tsx+++ b/src/components/input/WebsiteDateFilter.tsx@@ -1,8 +1,8 @@-import { useCallback, useMemo } from 'react';-import { Button, Icon, Row, Text, Select, ListItem } from '@umami/react-zen';+import { Button, Icon, ListItem, Row, Select, Text } from '@umami/react-zen';import { isAfter } from 'date-fns';-import { ChevronRight } from '@/components/icons';+import { useCallback, useMemo } from 'react';import { useDateRange, useDateRangeQuery, useMessages, useNavigation } from '@/components/hooks';+import { ChevronRight } from '@/components/icons';import { getDateRangeValue } from '@/lib/date';import { DateFilter } from './DateFilter';diff --git a/src/components/input/WebsiteFilterButton.tsx b/src/components/input/WebsiteFilterButton.tsxindex 25f81af41..7db850a19 100644--- a/src/components/input/WebsiteFilterButton.tsx+++ b/src/components/input/WebsiteFilterButton.tsx@@ -1,7 +1,7 @@+import { useMessages, useNavigation } from '@/components/hooks';import { ListFilter } from '@/components/icons';-import { FilterEditForm } from '@/components/input/FilterEditForm';import { DialogButton } from '@/components/input/DialogButton';-import { useMessages, useNavigation } from '@/components/hooks';+import { FilterEditForm } from '@/components/input/FilterEditForm';import { filtersArrayToObject } from '@/lib/params';export function WebsiteFilterButton({diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsxindex 29ae040b0..8d81eb9a0 100644--- a/src/components/input/WebsiteSelect.tsx+++ b/src/components/input/WebsiteSelect.tsx@@ -1,12 +1,12 @@+import { ListItem, Row, Select, type SelectProps, Text } from '@umami/react-zen';import { useState } from 'react';-import { Select, SelectProps, ListItem, Text, Row } from '@umami/react-zen';+import { Empty } from '@/components/common/Empty';import {- useUserWebsitesQuery,- useMessages,useLoginQuery,+ useMessages,+ useUserWebsitesQuery,useWebsiteQuery,} from '@/components/hooks';-import { Empty } from '@/components/common/Empty';export function WebsiteSelect({websiteId,@@ -28,7 +28,7 @@ export function WebsiteSelect({{ userId: user?.id, teamId },{ search, pageSize: 10, includeTeams },);- const listItems: { id: string; name: string }[] = data?.['data'] || [];+ const listItems: { id: string; name: string }[] = data?.data || [];const handleSearch = (value: string) => {setSearch(value);diff --git a/src/components/metrics/ActiveUsers.tsx b/src/components/metrics/ActiveUsers.tsxindex 0627020eb..a7f6e6044 100644--- a/src/components/metrics/ActiveUsers.tsx+++ b/src/components/metrics/ActiveUsers.tsx@@ -1,6 +1,6 @@+import { StatusLight, Text } from '@umami/react-zen';import { useMemo } from 'react';-import { Text, StatusLight } from '@umami/react-zen';-import { useMessages, useActyiveUsersQuery } from '@/components/hooks';+import { useActyiveUsersQuery, useMessages } from '@/components/hooks';export function ActiveUsers({websiteId,diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsxindex 8ac413551..192f0ff21 100644--- a/src/components/metrics/ChangeLabel.tsx+++ b/src/components/metrics/ChangeLabel.tsx@@ -1,5 +1,5 @@-import { Icon, Text, Row, RowProps } from '@umami/react-zen';-import { ReactNode } from 'react';+import { Icon, Row, type RowProps, Text } from '@umami/react-zen';+import type { ReactNode } from 'react';import { ArrowRight } from '@/components/icons';const STYLES = {@@ -33,7 +33,7 @@ export function ChangeLabel({} & RowProps) {const positive = value >= 0;const negative = value < 0;- const neutral = value === 0 || isNaN(value);+ const neutral = value === 0 || Number.isNaN(value);const good = reverseColors ? negative : positive;const style =diff --git a/src/components/metrics/DatePickerForm.tsx b/src/components/metrics/DatePickerForm.tsxindex 8094e30a7..59d170937 100644--- a/src/components/metrics/DatePickerForm.tsx+++ b/src/components/metrics/DatePickerForm.tsx@@ -1,6 +1,6 @@+import { Button, Calendar, Column, Row, ToggleGroup, ToggleGroupItem } from '@umami/react-zen';+import { endOfDay, isAfter, isBefore, isSameDay, startOfDay } from 'date-fns';import { useState } from 'react';-import { Button, Row, Column, Calendar, ToggleGroup, ToggleGroupItem } from '@umami/react-zen';-import { isAfter, isBefore, isSameDay, startOfDay, endOfDay } from 'date-fns';import { useMessages } from '@/components/hooks';const FILTER_DAY = 'filter-day';diff --git a/src/components/metrics/EventData.tsx b/src/components/metrics/EventData.tsxindex cc11dea27..48d21c573 100644--- a/src/components/metrics/EventData.tsx+++ b/src/components/metrics/EventData.tsx@@ -1,6 +1,6 @@-import { Grid, Column, Text, Label } from '@umami/react-zen';-import { useEventDataQuery } from '@/components/hooks';+import { Column, Grid, Label, Text } from '@umami/react-zen';import { LoadingPanel } from '@/components/common/LoadingPanel';+import { useEventDataQuery } from '@/components/hooks';export function EventData({ websiteId, eventId }: { websiteId: string; eventId: string }) {const { data, isLoading, error } = useEventDataQuery(websiteId, eventId);diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsxindex 03ed6e298..3a53ba9a6 100644--- a/src/components/metrics/EventsChart.tsx+++ b/src/components/metrics/EventsChart.tsx@@ -1,4 +1,6 @@-import { BarChart, BarChartProps } from '@/components/charts/BarChart';+import { colord } from 'colord';+import { useCallback, useEffect, useMemo, useState } from 'react';+import { BarChart, type BarChartProps } from '@/components/charts/BarChart';import { LoadingPanel } from '@/components/common/LoadingPanel';import {useDateRange,@@ -9,8 +11,6 @@ import {import { renderDateLabels } from '@/lib/charts';import { CHART_COLORS } from '@/lib/constants';import { generateTimeSeries } from '@/lib/date';-import { colord } from 'colord';-import { useCallback, useEffect, useMemo, useState } from 'react';export interface EventsChartProps extends BarChartProps {websiteId: string;diff --git a/src/components/metrics/Legend.tsx b/src/components/metrics/Legend.tsxindex 341ed647c..63231919d 100644--- a/src/components/metrics/Legend.tsx+++ b/src/components/metrics/Legend.tsx@@ -1,6 +1,6 @@import { Row, StatusLight, Text } from '@umami/react-zen';+import type { LegendItem } from 'chart.js/auto';import { colord } from 'colord';-import { LegendItem } from 'chart.js/auto';export function Legend({items = [],diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsxindex e76e01745..f233bfe7e 100644--- a/src/components/metrics/ListTable.tsx+++ b/src/components/metrics/ListTable.tsx@@ -1,7 +1,7 @@-import { ReactNode } from 'react';+import { config, useSpring } from '@react-spring/web';+import { Column, Grid, Row, Text } from '@umami/react-zen';+import type { ReactNode } from 'react';import { FixedSizeList } from 'react-window';-import { useSpring, config } from '@react-spring/web';-import { Grid, Row, Column, Text } from '@umami/react-zen';import { AnimatedDiv } from '@/components/common/AnimatedDiv';import { Empty } from '@/components/common/Empty';import { useMessages, useMobile } from '@/components/hooks';@@ -105,7 +105,7 @@ const AnimatedRow = ({}) => {const props = useSpring({width: percent,- y: !isNaN(value) ? value : 0,+ y: !Number.isNaN(value) ? value : 0,from: { width: 0, y: 0 },config: animate ? config.default : { duration: 0 },});diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsxindex 4b3577e8d..d15bcf135 100644--- a/src/components/metrics/MetricCard.tsx+++ b/src/components/metrics/MetricCard.tsx@@ -1,8 +1,8 @@-import { Text, Column } from '@umami/react-zen';import { useSpring } from '@react-spring/web';-import { formatNumber } from '@/lib/format';+import { Column, Text } from '@umami/react-zen';import { AnimatedDiv } from '@/components/common/AnimatedDiv';import { ChangeLabel } from '@/components/metrics/ChangeLabel';+import { formatNumber } from '@/lib/format';export interface MetricCardProps {value: number;diff --git a/src/components/metrics/MetricLabel.tsx b/src/components/metrics/MetricLabel.tsxindex c755516c7..31c331f5f 100644--- a/src/components/metrics/MetricLabel.tsx+++ b/src/components/metrics/MetricLabel.tsx@@ -1,14 +1,14 @@import { Row } from '@umami/react-zen';+import { Favicon } from '@/components/common/Favicon';+import { FilterLink } from '@/components/common/FilterLink';+import { TypeIcon } from '@/components/common/TypeIcon';import {useCountryNames,+ useFormat,useLocale,useMessages,useRegionNames,- useFormat,} from '@/components/hooks';-import { FilterLink } from '@/components/common/FilterLink';-import { TypeIcon } from '@/components/common/TypeIcon';-import { Favicon } from '@/components/common/Favicon';import { GROUPED_DOMAINS } from '@/lib/constants';export interface MetricLabelProps {diff --git a/src/components/metrics/MetricsBar.tsx b/src/components/metrics/MetricsBar.tsxindex 403cd2c27..850c6bc9a 100644--- a/src/components/metrics/MetricsBar.tsx+++ b/src/components/metrics/MetricsBar.tsx@@ -1,5 +1,5 @@-import { ReactNode } from 'react';-import { Grid, GridProps } from '@umami/react-zen';+import { Grid, type GridProps } from '@umami/react-zen';+import type { ReactNode } from 'react';export interface MetricsBarProps extends GridProps {children?: ReactNode;diff --git a/src/components/metrics/MetricsExpandedTable.tsx b/src/components/metrics/MetricsExpandedTable.tsxindex d35e61d09..f24c952de 100644--- a/src/components/metrics/MetricsExpandedTable.tsx+++ b/src/components/metrics/MetricsExpandedTable.tsx@@ -1,12 +1,12 @@-import { ReactNode, useState } from 'react';import { Button, Column, DataColumn, DataTable, Icon, Row, SearchField } from '@umami/react-zen';+import { type ReactNode, useState } from 'react';import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages, useWebsiteExpandedMetricsQuery } from '@/components/hooks';import { X } from '@/components/icons';import { DownloadButton } from '@/components/input/DownloadButton';-import { formatShortTime } from '@/lib/format';import { MetricLabel } from '@/components/metrics/MetricLabel';import { SESSION_COLUMNS } from '@/lib/constants';+import { formatShortTime } from '@/lib/format';export interface MetricsExpandedTableProps {websiteId: string;@@ -85,7 +85,7 @@ export function MetricsExpandedTable({align="end"width="120px">- {row => row?.['visitors']?.toLocaleString()}+ {row => row?.visitors?.toLocaleString()}</DataColumn><DataColumnid="visits"@@ -93,7 +93,7 @@ export function MetricsExpandedTable({align="end"width="120px">- {row => row?.['visits']?.toLocaleString()}+ {row => row?.visits?.toLocaleString()}</DataColumn><DataColumnid="pageviews"@@ -101,7 +101,7 @@ export function MetricsExpandedTable({align="end"width="120px">- {row => row?.['pageviews']?.toLocaleString()}+ {row => row?.pageviews?.toLocaleString()}</DataColumn>{showBounceDuration && [<DataColumn@@ -112,8 +112,8 @@ export function MetricsExpandedTable({width="120px">{row => {- const n = (Math.min(row?.['visits'], row?.['bounces']) / row?.['visits']) * 100;- return Math.round(+n) + '%';+ const n = (Math.min(row?.visits, row?.bounces) / row?.visits) * 100;+ return `${Math.round(+n)}%`;}}</DataColumn>,@@ -125,7 +125,7 @@ export function MetricsExpandedTable({width="120px">{row => {- const n = row?.['totaltime'] / row?.['visits'];+ const n = row?.totaltime / row?.visits;return `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`;}}</DataColumn>,diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsxindex 48b06f0b8..e99bd2166 100644--- a/src/components/metrics/MetricsTable.tsx+++ b/src/components/metrics/MetricsTable.tsx@@ -1,12 +1,12 @@+import { Grid, Icon, Row, Text } from '@umami/react-zen';import { useEffect, useMemo } from 'react';-import { Icon, Text, Row, Grid } from '@umami/react-zen';import { LinkButton } from '@/components/common/LinkButton';import { LoadingPanel } from '@/components/common/LoadingPanel';import { useMessages, useNavigation, useWebsiteMetricsQuery } from '@/components/hooks';import { Maximize } from '@/components/icons';import { MetricLabel } from '@/components/metrics/MetricLabel';import { percentFilter } from '@/lib/filters';-import { ListTable, ListTableProps } from './ListTable';+import { ListTable, type ListTableProps } from './ListTable';export interface MetricsTableProps extends ListTableProps {websiteId: string;diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsxindex 8e713bb0e..b83f8dc3a 100644--- a/src/components/metrics/PageviewsChart.tsx+++ b/src/components/metrics/PageviewsChart.tsx@@ -1,6 +1,6 @@-import { useCallback, useMemo } from 'react';import { useTheme } from '@umami/react-zen';-import { BarChart, BarChartProps } from '@/components/charts/BarChart';+import { useCallback, useMemo } from 'react';+import { BarChart, type BarChartProps } from '@/components/charts/BarChart';import { useLocale, useMessages } from '@/components/hooks';import { renderDateLabels } from '@/lib/charts';import { getThemeColors } from '@/lib/colors';@@ -28,7 +28,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagevif (!data) return;return {- __id: new Date().getTime(),+ __id: Date.now(),datasets: [{type: 'bar',diff --git a/src/components/metrics/RealtimeChart.tsx b/src/components/metrics/RealtimeChart.tsxindex a71c03c36..a43dcb429 100644--- a/src/components/metrics/RealtimeChart.tsx+++ b/src/components/metrics/RealtimeChart.tsx@@ -1,9 +1,9 @@+import { isBefore, startOfMinute, subMinutes } from 'date-fns';import { useMemo, useRef } from 'react';-import { startOfMinute, subMinutes, isBefore } from 'date-fns';-import { PageviewsChart } from './PageviewsChart';-import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from '@/lib/constants';-import { RealtimeData } from '@/lib/types';import { useTimezone } from '@/components/hooks';+import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from '@/lib/constants';+import type { RealtimeData } from '@/lib/types';+import { PageviewsChart } from './PageviewsChart';export interface RealtimeChartProps {data: RealtimeData;diff --git a/src/components/metrics/WeeklyTraffic.tsx b/src/components/metrics/WeeklyTraffic.tsxindex 82d1c1c1f..90e47c636 100644--- a/src/components/metrics/WeeklyTraffic.tsx+++ b/src/components/metrics/WeeklyTraffic.tsx@@ -1,9 +1,8 @@-import { Row, Grid, Text } from '@umami/react-zen';-import { format, startOfDay, addHours } from 'date-fns';-import { useLocale, useMessages, useWeeklyTrafficQuery } from '@/components/hooks';+import { Focusable, Grid, Row, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';+import { addHours, format, startOfDay } from 'date-fns';import { LoadingPanel } from '@/components/common/LoadingPanel';+import { useLocale, useMessages, useWeeklyTrafficQuery } from '@/components/hooks';import { getDayOfWeekAsDate } from '@/lib/date';-import { Focusable, Tooltip, TooltipTrigger } from '@umami/react-zen';export function WeeklyTraffic({ websiteId }: { websiteId: string }) {const { data, isLoading, error } = useWeeklyTrafficQuery(websiteId);diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsxindex b0936c0dc..3c8fadb80 100644--- a/src/components/metrics/WorldMap.tsx+++ b/src/components/metrics/WorldMap.tsx@@ -1,17 +1,17 @@-import { FloatingTooltip, Column, useTheme, ColumnProps } from '@umami/react-zen';-import { useState, useMemo } from 'react';-import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';+import { Column, type ColumnProps, FloatingTooltip, useTheme } from '@umami/react-zen';import { colord } from 'colord';-import { ISO_COUNTRIES, MAP_FILE } from '@/lib/constants';+import { useMemo, useState } from 'react';+import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';import {- useWebsiteMetricsQuery,useCountryNames,useLocale,useMessages,+ useWebsiteMetricsQuery,} from '@/components/hooks';-import { formatLongNumber } from '@/lib/format';-import { percentFilter } from '@/lib/filters';import { getThemeColors } from '@/lib/colors';+import { ISO_COUNTRIES, MAP_FILE } from '@/lib/constants';+import { percentFilter } from '@/lib/filters';+import { formatLongNumber } from '@/lib/format';export interface WorldMapProps extends ColumnProps {websiteId?: string;diff --git a/src/components/svg/AddUser.tsx b/src/components/svg/AddUser.tsxindex 1e8b298bf..d1eb50956 100644--- a/src/components/svg/AddUser.tsx+++ b/src/components/svg/AddUser.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgAddUser = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/BarChart.tsx b/src/components/svg/BarChart.tsxindex 4a2e65e81..96ebe0001 100644--- a/src/components/svg/BarChart.tsx+++ b/src/components/svg/BarChart.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgBarChart = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 24 24" {...props}><path d="M7 13v9a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1m7-12h-4a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1m8 5h-4a1 1 0 0 0-1 1v15a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1" />diff --git a/src/components/svg/Bars.tsx b/src/components/svg/Bars.tsxindex c9464f0f8..1ce88f724 100644--- a/src/components/svg/Bars.tsx+++ b/src/components/svg/Bars.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgBars = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" {...props}><path d="M424 392H24c-13.2 0-24 10.8-24 24s10.8 24 24 24h400c13.2 0 24-10.8 24-24s-10.8-24-24-24m0-320H24C10.8 72 0 82.8 0 96s10.8 24 24 24h400c13.2 0 24-10.8 24-24s-10.8-24-24-24m0 160H24c-13.2 0-24 10.8-24 24s10.8 24 24 24h400c13.2 0 24-10.8 24-24s-10.8-24-24-24" />diff --git a/src/components/svg/Bolt.tsx b/src/components/svg/Bolt.tsxindex 4a42189aa..23b1e76b5 100644--- a/src/components/svg/Bolt.tsx+++ b/src/components/svg/Bolt.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgBolt = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" {...props}><path d="M296 160H180.6l42.6-129.8C227.2 15 215.7 0 200 0H56C44 0 33.8 8.9 32.2 20.8l-32 240C-1.7 275.2 9.5 288 24 288h118.7L96.6 482.5c-3.6 15.2 8 29.5 23.3 29.5 8.4 0 16.4-4.4 20.8-12l176-304c9.3-15.9-2.2-36-20.7-36" />diff --git a/src/components/svg/Bookmark.tsx b/src/components/svg/Bookmark.tsxindex a1606b0d9..089f61fe2 100644--- a/src/components/svg/Bookmark.tsx+++ b/src/components/svg/Bookmark.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgBookmark = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 24 24" {...props}><path d="M3.515 22.875a1 1 0 0 0 1.015-.027L12 18.179l7.47 4.669A1 1 0 0 0 21 22V4a3 3 0 0 0-3-3H6a3 3 0 0 0-3 3v18a1 1 0 0 0 .515.875M5 4a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v16.2l-6.47-4.044a1 1 0 0 0-1.06 0L5 20.2z" />diff --git a/src/components/svg/Calendar.tsx b/src/components/svg/Calendar.tsxindex df9783106..dfb848a9c 100644--- a/src/components/svg/Calendar.tsx+++ b/src/components/svg/Calendar.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgCalendar = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" {...props}><path d="M400 64h-48V12c0-6.6-5.4-12-12-12h-8c-6.6 0-12 5.4-12 12v52H128V12c0-6.6-5.4-12-12-12h-8c-6.6 0-12 5.4-12 12v52H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48M48 96h352c8.8 0 16 7.2 16 16v48H32v-48c0-8.8 7.2-16 16-16m352 384H48c-8.8 0-16-7.2-16-16V192h384v272c0 8.8-7.2 16-16 16M148 320h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12m96 0h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12m96 0h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12m-96 96h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12m-96 0h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12m192 0h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12" />diff --git a/src/components/svg/Change.tsx b/src/components/svg/Change.tsxindex 239b30b7f..935a2f7a8 100644--- a/src/components/svg/Change.tsx+++ b/src/components/svg/Change.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgChange = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Clock.tsx b/src/components/svg/Clock.tsxindex 56c9ef179..2dfa6a6ee 100644--- a/src/components/svg/Clock.tsx+++ b/src/components/svg/Clock.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgClock = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 24 24" {...props}><g clipRule="evenodd">diff --git a/src/components/svg/Compare.tsx b/src/components/svg/Compare.tsxindex fef3f55f5..3434461a3 100644--- a/src/components/svg/Compare.tsx+++ b/src/components/svg/Compare.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgCompare = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 24 24" {...props}><path d="M6 22a1 1 0 0 1-.71-.29l-4-4a1 1 0 0 1 0-1.42l4-4a1 1 0 0 1 1.42 1.42L4.41 16H22a1 1 0 0 1 0 2H4.41l2.3 2.29a1 1 0 0 1 0 1.42A1 1 0 0 1 6 22m12-10a1 1 0 0 1-.71-.29 1 1 0 0 1 0-1.42L19.59 8H2a1 1 0 0 1 0-2h17.59l-2.3-2.29a1 1 0 0 1 1.42-1.42l4 4a1 1 0 0 1 0 1.42l-4 4A1 1 0 0 1 18 12" />diff --git a/src/components/svg/Dashboard.tsx b/src/components/svg/Dashboard.tsxindex ca2780403..5696244fd 100644--- a/src/components/svg/Dashboard.tsx+++ b/src/components/svg/Dashboard.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgDashboard = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Download.tsx b/src/components/svg/Download.tsxindex 56d4d683c..5f58724cc 100644--- a/src/components/svg/Download.tsx+++ b/src/components/svg/Download.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgDownload = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" {...props}><path d="M97.5 82.656V71.357a3.545 3.545 0 0 0-3.545-3.544H89.17a3.545 3.545 0 0 0-3.545 3.544v11.3c0 1.639-1.33 2.968-2.969 2.968H17.344a2.97 2.97 0 0 1-2.969-2.969V71.357a3.545 3.545 0 0 0-3.545-3.545H6.045A3.545 3.545 0 0 0 2.5 71.357v11.3C2.5 90.853 9.146 97.5 17.344 97.5h65.312c8.198 0 14.844-6.646 14.844-14.844" />diff --git a/src/components/svg/Expand.tsx b/src/components/svg/Expand.tsxindex 8cdb792b8..a0f472e57 100644--- a/src/components/svg/Expand.tsx+++ b/src/components/svg/Expand.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgExpand = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Export.tsx b/src/components/svg/Export.tsxindex 355321cf1..5c1ef14dc 100644--- a/src/components/svg/Export.tsx+++ b/src/components/svg/Export.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgExport = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 24 24" {...props}><switch>diff --git a/src/components/svg/Flag.tsx b/src/components/svg/Flag.tsxindex 8deaa9588..34af943a9 100644--- a/src/components/svg/Flag.tsx+++ b/src/components/svg/Flag.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgFlag = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 510 510" {...props}><path d="m393.159 121.41 69.152-86.44c-16.753-2.022-149.599-37.363-282.234-8.913V0h-30v361.898c-25.85 6.678-45 30.195-45 58.102v1.509c-34.191 6.969-60 37.272-60 73.491v15h240v-15c0-36.22-25.809-66.522-60-73.491V420c0-27.906-19.15-51.424-45-58.102V237.165c153.335-30.989 264.132 7.082 284.847 9.834zM252.506 480H77.647c6.19-17.461 22.873-30 42.43-30h90c19.556 0 36.238 12.539 42.429 30m-57.429-60h-60c0-16.542 13.458-30 30-30s30 13.458 30 30m-15-213.427V56.771c66.329-15.269 141.099-15.756 227.537-1.455l-50.619 63.274 48.8 85.4c-75.047-12.702-150.759-11.841-225.718 2.583" />diff --git a/src/components/svg/Funnel.tsx b/src/components/svg/Funnel.tsxindex 05a243787..63cf47d7b 100644--- a/src/components/svg/Funnel.tsx+++ b/src/components/svg/Funnel.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgFunnel = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Gear.tsx b/src/components/svg/Gear.tsxindex a5d37f0ba..539b838c9 100644--- a/src/components/svg/Gear.tsx+++ b/src/components/svg/Gear.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgGear = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {...props}><path d="M504.265 315.978c0-8.652-4.607-16.844-12.359-21.392l-32.908-18.971a199 199 0 0 0 0-39.23l32.908-18.971c7.752-4.548 12.359-12.74 12.359-21.392 0-21.267-49.318-128.176-84.519-128.176-4.244 0-8.51 1.093-12.367 3.357l-32.78 18.969a195 195 0 0 0-34.068-19.744v-37.94c0-11.226-7.484-21.035-18.326-23.875C300.654 2.871 278.425 0 256.181 0a257.7 257.7 0 0 0-66.121 8.613c-10.842 2.84-18.326 12.649-18.326 23.875v37.94a195 195 0 0 0-34.068 19.744l-32.78-18.969a24.36 24.36 0 0 0-12.367-3.357h-.007C60.048 67.846 8 169.591 8 196.022c0 8.652 4.607 16.844 12.359 21.392l32.908 18.971a199 199 0 0 0 0 39.23l-32.908 18.971C12.607 299.134 8 307.326 8 315.978c0 21.267 49.318 128.176 84.519 128.176 4.244 0 8.51-1.093 12.367-3.357l32.78-18.969a195 195 0 0 0 34.068 19.744v37.94c0 11.226 7.484 21.035 18.326 23.875 21.551 5.742 43.78 8.613 66.024 8.613 22.246 0 44.506-2.871 66.121-8.613 10.842-2.84 18.326-12.649 18.326-23.875v-37.94a195 195 0 0 0 34.068-19.744l32.78 18.969a24.36 24.36 0 0 0 12.367 3.357c32.463 0 84.519-101.731 84.519-128.176m-88.904 73.981c-23.8-13.773-11.26-6.515-43.656-25.264-42.056 30.395-32.33 24.731-79.174 45.887v50.238a210 210 0 0 1-36.438 3.18 209 209 0 0 1-36.359-3.176v-50.242c-46.955-21.206-37.182-15.538-79.174-45.887l-43.636 25.254a207.4 207.4 0 0 1-36.407-63.109c21.126-12.177 11.844-6.826 43.571-25.117-2.539-25.64-3.811-35.644-3.811-45.683 0-10.022 1.268-20.08 3.811-45.763-31.89-18.385-22.517-12.982-43.584-25.125a207.1 207.1 0 0 1 36.4-63.111c23.8 13.773 11.26 6.515 43.656 25.264 42.056-30.395 32.33-24.731 79.174-45.887V51.18A210 210 0 0 1 256.172 48c15.425 0 27.954 1.694 36.359 3.176v50.242c46.955 21.206 37.182 15.538 79.174 45.887l43.638-25.254a207.4 207.4 0 0 1 36.405 63.109c-21.126 12.177-11.844 6.826-43.571 25.117 2.539 25.64 3.811 35.644 3.811 45.683 0 10.022-1.268 20.08-3.811 45.763 31.89 18.385 22.517 12.982 43.584 25.125a207.1 207.1 0 0 1-36.4 63.111M256.133 160c-52.875 0-96 43.125-96 96s43.125 96 96 96 96-43.125 96-96-43.125-96-96-96m0 144c-26.467 0-48-21.533-48-48s21.533-48 48-48 48 21.533 48 48-21.534 48-48 48" />diff --git a/src/components/svg/Globe.tsx b/src/components/svg/Globe.tsxindex 5586c1244..385017d40 100644--- a/src/components/svg/Globe.tsx+++ b/src/components/svg/Globe.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgGlobe = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512" {...props}><path d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8m179.3 160h-67.2c-6.7-36.5-17.5-68.8-31.2-94.7 42.9 19 77.7 52.7 98.4 94.7M248 56c18.6 0 48.6 41.2 63.2 112H184.8C199.4 97.2 229.4 56 248 56M48 256c0-13.7 1.4-27.1 4-40h77.7c-1 13.1-1.7 26.3-1.7 40s.7 26.9 1.7 40H52c-2.6-12.9-4-26.3-4-40m20.7 88h67.2c6.7 36.5 17.5 68.8 31.2 94.7-42.9-19-77.7-52.7-98.4-94.7m67.2-176H68.7c20.7-42 55.5-75.7 98.4-94.7-13.7 25.9-24.5 58.2-31.2 94.7M248 456c-18.6 0-48.6-41.2-63.2-112h126.5c-14.7 70.8-44.7 112-63.3 112m70.1-160H177.9c-1.1-12.8-1.9-26-1.9-40s.8-27.2 1.9-40h140.3c1.1 12.8 1.9 26 1.9 40s-.9 27.2-2 40m10.8 142.7c13.7-25.9 24.4-58.2 31.2-94.7h67.2c-20.7 42-55.5 75.7-98.4 94.7M366.3 296c1-13.1 1.7-26.3 1.7-40s-.7-26.9-1.7-40H444c2.6 12.9 4 26.3 4 40s-1.4 27.1-4 40z" />diff --git a/src/components/svg/Lightbulb.tsx b/src/components/svg/Lightbulb.tsxindex 9a16b5c4e..8d86170e2 100644--- a/src/components/svg/Lightbulb.tsx+++ b/src/components/svg/Lightbulb.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgLightbulb = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Lightning.tsx b/src/components/svg/Lightning.tsxindex 48118cbbb..9539a9614 100644--- a/src/components/svg/Lightning.tsx+++ b/src/components/svg/Lightning.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgLightning = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Link.tsx b/src/components/svg/Link.tsxindex 5a794774b..4ce88e78b 100644--- a/src/components/svg/Link.tsx+++ b/src/components/svg/Link.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgLink = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {...props}><path d="M314.222 197.78c51.091 51.091 54.377 132.287 9.75 187.16-6.242 7.73-2.784 3.865-84.94 86.02-54.696 54.696-143.266 54.745-197.99 0-54.711-54.69-54.734-143.255 0-197.99 32.773-32.773 51.835-51.899 63.409-63.457 7.463-7.452 20.331-2.354 20.486 8.192a173.3 173.3 0 0 0 4.746 37.828c.966 4.029-.272 8.269-3.202 11.198L80.632 312.57c-32.755 32.775-32.887 85.892 0 118.8 32.775 32.755 85.892 32.887 118.8 0l75.19-75.2c32.718-32.725 32.777-86.013 0-118.79a83.7 83.7 0 0 0-22.814-16.229c-4.623-2.233-7.182-7.25-6.561-12.346 1.356-11.122 6.296-21.885 14.815-30.405l4.375-4.375c3.625-3.626 9.177-4.594 13.76-2.294 12.999 6.524 25.187 15.211 36.025 26.049M470.958 41.04c-54.724-54.745-143.294-54.696-197.99 0-82.156 82.156-78.698 78.29-84.94 86.02-44.627 54.873-41.341 136.069 9.75 187.16 10.838 10.838 23.026 19.525 36.025 26.049 4.582 2.3 10.134 1.331 13.76-2.294l4.375-4.375c8.52-8.519 13.459-19.283 14.815-30.405.621-5.096-1.938-10.113-6.561-12.346a83.7 83.7 0 0 1-22.814-16.229c-32.777-32.777-32.718-86.065 0-118.79l75.19-75.2c32.908-32.887 86.025-32.755 118.8 0 32.887 32.908 32.755 86.025 0 118.8l-45.848 45.84c-2.93 2.929-4.168 7.169-3.202 11.198a173.3 173.3 0 0 1 4.746 37.828c.155 10.546 13.023 15.644 20.486 8.192 11.574-11.558 30.636-30.684 63.409-63.457 54.733-54.735 54.71-143.3-.001-197.991" />diff --git a/src/components/svg/Location.tsx b/src/components/svg/Location.tsxindex b1b658dcd..0fd7d165f 100644--- a/src/components/svg/Location.tsx+++ b/src/components/svg/Location.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgLocation = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 64 64" {...props}><path d="M32 0A24.03 24.03 0 0 0 8 24c0 17.23 22.36 38.81 23.31 39.72a.99.99 0 0 0 1.38 0C33.64 62.81 56 41.23 56 24A24.03 24.03 0 0 0 32 0m0 35a11 11 0 1 1 11-11 11.007 11.007 0 0 1-11 11" />diff --git a/src/components/svg/Lock.tsx b/src/components/svg/Lock.tsxindex 8f588cf01..2b62eb9e0 100644--- a/src/components/svg/Lock.tsx+++ b/src/components/svg/Lock.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgLock = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 24 24" {...props}><path d="M18.75 9H18V6c0-3.309-2.691-6-6-6S6 2.691 6 6v3h-.75A2.253 2.253 0 0 0 3 11.25v10.5C3 22.991 4.01 24 5.25 24h13.5c1.24 0 2.25-1.009 2.25-2.25v-10.5C21 10.009 19.99 9 18.75 9M8 6c0-2.206 1.794-4 4-4s4 1.794 4 4v3H8zm5 10.722V19a1 1 0 1 1-2 0v-2.278c-.595-.347-1-.985-1-1.722 0-1.103.897-2 2-2s2 .897 2 2c0 .737-.405 1.375-1 1.722" />diff --git a/src/components/svg/Logo.tsx b/src/components/svg/Logo.tsxindex 79fa813c2..eb9fdf5bb 100644--- a/src/components/svg/Logo.tsx+++ b/src/components/svg/Logo.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgLogo = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/LogoWhite.tsx b/src/components/svg/LogoWhite.tsxindex ff677eaf7..fb8c5f9bb 100644--- a/src/components/svg/LogoWhite.tsx+++ b/src/components/svg/LogoWhite.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgLogoWhite = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Magnet.tsx b/src/components/svg/Magnet.tsxindex 3cd4ded77..88b0f03ae 100644--- a/src/components/svg/Magnet.tsx+++ b/src/components/svg/Magnet.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgMagnet = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Money.tsx b/src/components/svg/Money.tsxindex a3e74364f..7d7b1e562 100644--- a/src/components/svg/Money.tsx+++ b/src/components/svg/Money.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgMoney = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Moon.tsx b/src/components/svg/Moon.tsxindex e6c96a5df..40e3e8b98 100644--- a/src/components/svg/Moon.tsx+++ b/src/components/svg/Moon.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgMoon = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1399.98 1400" {...props}><path d="M562.44 837.55C335.89 611 288.08 273.54 418.71 0a734.3 734.3 0 0 0-203.17 143.73c-287.39 287.39-287.39 753.33 0 1040.72s753.33 287.4 1040.74 0A733.8 733.8 0 0 0 1400 981.29c-273.55 130.63-611 82.8-837.56-143.74" />diff --git a/src/components/svg/Network.tsx b/src/components/svg/Network.tsxindex 32860aa75..15941a99f 100644--- a/src/components/svg/Network.tsx+++ b/src/components/svg/Network.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgNetwork = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Nodes.tsx b/src/components/svg/Nodes.tsxindex d9cc937b5..1adfcb84e 100644--- a/src/components/svg/Nodes.tsx+++ b/src/components/svg/Nodes.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgNodes = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" width={512} height={512} viewBox="0 0 24 24" {...props}><pathdiff --git a/src/components/svg/Overview.tsx b/src/components/svg/Overview.tsxindex 9c5186169..67e6af146 100644--- a/src/components/svg/Overview.tsx+++ b/src/components/svg/Overview.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgOverview = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" xmlSpace="preserve" viewBox="0 0 512 512" {...props}><path d="M452 36H60C26.916 36 0 62.916 0 96v240c0 33.084 26.916 60 60 60h176v40H132v40h248v-40H276v-40h176c33.084 0 60-26.916 60-60V96c0-33.084-26.916-60-60-60m20 300c0 11.028-8.972 20-20 20H60c-11.028 0-20-8.972-20-20V96c0-11.028 8.972-20 20-20h392c11.028 0 20 8.972 20 20z" />diff --git a/src/components/svg/Path.tsx b/src/components/svg/Path.tsxindex c49b1b3f0..7538ba442 100644--- a/src/components/svg/Path.tsx+++ b/src/components/svg/Path.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgPath = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Profile.tsx b/src/components/svg/Profile.tsxindex 7d0c1e9fa..c955fce2f 100644--- a/src/components/svg/Profile.tsx+++ b/src/components/svg/Profile.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgProfile = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {...props}><path d="M437.02 74.98C388.668 26.63 324.379 0 256 0S123.332 26.629 74.98 74.98C26.63 123.332 0 187.621 0 256s26.629 132.668 74.98 181.02C123.332 485.37 187.621 512 256 512s132.668-26.629 181.02-74.98C485.37 388.668 512 324.379 512 256s-26.629-132.668-74.98-181.02M111.105 429.297c8.454-72.735 70.989-128.89 144.895-128.89 38.96 0 75.598 15.179 103.156 42.734 23.281 23.285 37.965 53.687 41.742 86.152C361.641 462.172 311.094 482 256 482s-105.637-19.824-144.895-52.703M256 269.507c-42.871 0-77.754-34.882-77.754-77.753C178.246 148.879 213.13 114 256 114s77.754 34.879 77.754 77.754c0 42.871-34.883 77.754-77.754 77.754zm170.719 134.427a175.9 175.9 0 0 0-46.352-82.004c-18.437-18.438-40.25-32.27-64.039-40.938 28.598-19.394 47.426-52.16 47.426-89.238C363.754 132.34 315.414 84 256 84s-107.754 48.34-107.754 107.754c0 37.098 18.844 69.875 47.465 89.266-21.887 7.976-42.14 20.308-59.566 36.542-25.235 23.5-42.758 53.465-50.883 86.348C50.852 364.242 30 312.512 30 256 30 131.383 131.383 30 256 30s226 101.383 226 226c0 56.523-20.86 108.266-55.281 147.934m0 0" />diff --git a/src/components/svg/Pushpin.tsx b/src/components/svg/Pushpin.tsxindex e82c60eff..d19e98ea0 100644--- a/src/components/svg/Pushpin.tsx+++ b/src/components/svg/Pushpin.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgPushpin = (props: SVGProps<SVGSVGElement>) => (<svg width="1em" height="1em" fill="currentColor" viewBox="0 0 1024 1024" {...props}><path d="M878.3 392.1 631.9 145.7c-6.5-6.5-15-9.7-23.5-9.7s-17 3.2-23.5 9.7L423.8 306.9c-12.2-1.4-24.5-2-36.8-2-73.2 0-146.4 24.1-206.5 72.3-15.4 12.3-16.6 35.4-2.7 49.4l181.7 181.7-215.4 215.2a15.8 15.8 0 0 0-4.6 9.8l-3.4 37.2c-.9 9.4 6.6 17.4 15.9 17.4.5 0 1 0 1.5-.1l37.2-3.4c3.7-.3 7.2-2 9.8-4.6l215.4-215.4 181.7 181.7c6.5 6.5 15 9.7 23.5 9.7 9.7 0 19.3-4.2 25.9-12.4 56.3-70.3 79.7-158.3 70.2-243.4l161.1-161.1c12.9-12.8 12.9-33.8 0-46.8" />diff --git a/src/components/svg/Redo.tsx b/src/components/svg/Redo.tsxindex af032d422..04c389f6e 100644--- a/src/components/svg/Redo.tsx+++ b/src/components/svg/Redo.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgRedo = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {...props}><path d="M500 8h-27.711c-6.739 0-12.157 5.548-11.997 12.286l2.347 98.568C418.075 51.834 341.788 7.73 255.207 8.001 118.82 8.428 7.787 120.009 8 256.396 8.214 393.181 119.165 504 256 504c63.926 0 122.202-24.187 166.178-63.908 5.113-4.618 5.354-12.561.482-17.433l-19.738-19.738c-4.498-4.498-11.753-4.785-16.501-.552C351.787 433.246 306.105 452 256 452c-108.322 0-196-87.662-196-196 0-108.322 87.662-196 196-196 79.545 0 147.941 47.282 178.675 115.302l-126.389-3.009c-6.737-.16-12.286 5.257-12.286 11.997V212c0 6.627 5.373 12 12 12h192c6.627 0 12-5.373 12-12V20c0-6.627-5.373-12-12-12" />diff --git a/src/components/svg/Reports.tsx b/src/components/svg/Reports.tsxindex 27c73fe30..b5489668a 100644--- a/src/components/svg/Reports.tsx+++ b/src/components/svg/Reports.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgReports = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" {...props}><path d="M61.17 18.91A32 32 0 1 0 46.4 60.54l.15-.06.16-.1a31.93 31.93 0 0 0 14.47-41.44s-.01-.02-.01-.03m-4.53-.16L34 28.91V4.1a28 28 0 0 1 22.64 14.65M4 32A28 28 0 0 1 30 4.1V32a1.7 1.7 0 0 0 0 .39.2.2 0 0 0 0 .07 1.5 1.5 0 0 0 .15.4l12.76 24.9A28 28 0 0 1 4 32m42.47 23.94L34.74 33l23.54-10.6a28 28 0 0 1-11.81 33.54" />diff --git a/src/components/svg/Security.tsx b/src/components/svg/Security.tsxindex 97a4afca3..d075a9385 100644--- a/src/components/svg/Security.tsx+++ b/src/components/svg/Security.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgSecurity = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Speaker.tsx b/src/components/svg/Speaker.tsxindex 14976b5bc..eb724ae9c 100644--- a/src/components/svg/Speaker.tsx+++ b/src/components/svg/Speaker.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgSpeaker = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" {...props}><path d="M232.011 88.828c-5.664-5.664-13.217-8.784-21.269-8.784s-15.605 3.12-21.269 8.783c-9.917 9.917-11.446 25.09-4.593 36.632-23.293 86.372-34.167 96.094-78.604 135.776-15.831 14.138-35.533 31.731-61.302 57.5-5.434 5.434-8.426 12.673-8.426 20.383s2.993 14.949 8.426 20.383l70.981 70.98c5.434 5.435 12.672 8.427 20.382 8.427a28.7 28.7 0 0 0 14.046-3.637l72.768 72.768c2.574 2.574 6.09 3.962 9.896 3.961q1.185 0 2.398-.181c3.883-.581 7.662-2.543 10.641-5.521l25.329-25.329c6.918-6.919 7.684-16.993 1.741-22.936l-39.164-39.164c11.586-20.762 9.203-46.431-6.187-64.762 29.684-32.251 46.532-43.128 122.192-63.532a30.1 30.1 0 0 0 15.361 4.203c7.703 0 15.405-2.933 21.269-8.796 11.728-11.729 11.728-30.811 0-42.539zM127.268 419.167l-70.981-70.981c-2.412-2.411-3.74-5.632-3.74-9.068s1.328-6.657 3.74-9.068c17.786-17.786 32.665-31.645 45.371-43.163l86.911 86.911c-11.519 12.706-25.378 27.585-43.164 45.371-2.412 2.411-5.632 3.74-9.068 3.74-3.437-.001-6.657-1.33-9.069-3.742M260.1 469.653l-25.33 25.33a4.1 4.1 0 0 1-1.197.85L162.45 424.71a1244 1244 0 0 0 26.786-27.968l71.714 71.713a4 4 0 0 1-.85 1.198m-38.055-62.731-21.982-21.981a2608 2608 0 0 0 14.157-15.763l2.712-3.035c8.895 11.831 10.752 27.329 5.113 40.779m-19.759-48.401-3.004 3.362-85.711-85.711 3.361-3.003c44.419-39.665 57.85-51.661 80.687-133.656l138.322 138.322c-81.993 22.837-93.99 36.268-133.655 80.686m173.027-83.854c-5.489 5.49-14.422 5.49-19.911 0L200.786 120.052c-5.489-5.489-5.489-14.421 0-19.91 2.642-2.643 6.178-4.098 9.956-4.098s7.313 1.455 9.955 4.098l154.616 154.615c5.489 5.489 5.489 14.421 0 19.91m-22.558-151.968a8 8 0 0 1 0-11.314l43.904-43.904a8 8 0 0 1 11.313 11.314l-43.904 43.904c-1.562 1.562-3.609 2.343-5.657 2.343s-4.094-.781-5.656-2.343m122.699 107.695a8 8 0 0 1-8 8h-62.09a8 8 0 0 1 0-16h62.09a8 8 0 0 1 8 8M237.061 70.09V8a8 8 0 0 1 16 0v62.09a8 8 0 0 1-16 0" />diff --git a/src/components/svg/Sun.tsx b/src/components/svg/Sun.tsxindex 26370988f..61880f5cc 100644--- a/src/components/svg/Sun.tsx+++ b/src/components/svg/Sun.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgSun = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 1400" {...props}><path d="M367.43 422.13a54.44 54.44 0 0 1-38.66-16L205 282.35A54.69 54.69 0 0 1 282.37 205l123.74 123.79a54.68 54.68 0 0 1-38.68 93.34M1156.3 1211a54.5 54.5 0 0 1-38.67-16l-123.74-123.79a54.68 54.68 0 1 1 77.34-77.33L1195 1117.65a54.7 54.7 0 0 1-38.7 93.35m-912.6 0a54.7 54.7 0 0 1-38.7-93.35l123.74-123.76a54.69 54.69 0 0 1 77.36 77.32L282.37 1195a54.5 54.5 0 0 1-38.67 16m788.87-788.87a54.68 54.68 0 0 1-38.68-93.34L1117.61 205a54.69 54.69 0 0 1 77.39 77.35l-123.77 123.76a54.44 54.44 0 0 1-38.66 16.02M229.69 754.69h-175a54.69 54.69 0 0 1 0-109.38h175a54.69 54.69 0 0 1 0 109.38m1115.62 0h-175a54.69 54.69 0 0 1 0-109.38h175a54.69 54.69 0 0 1 0 109.38M700 1400a54.68 54.68 0 0 1-54.69-54.69v-175a54.69 54.69 0 0 1 109.38 0v175A54.68 54.68 0 0 1 700 1400m0-1115.62a54.7 54.7 0 0 1-54.69-54.69v-175a54.69 54.69 0 0 1 109.38 0v175A54.7 54.7 0 0 1 700 284.38" />diff --git a/src/components/svg/Switch.tsx b/src/components/svg/Switch.tsxindex 2a12f3936..0196d850f 100644--- a/src/components/svg/Switch.tsx+++ b/src/components/svg/Switch.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgSwitch = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Tag.tsx b/src/components/svg/Tag.tsxindex e908664db..2ff51f4dc 100644--- a/src/components/svg/Tag.tsx+++ b/src/components/svg/Tag.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgTag = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Target.tsx b/src/components/svg/Target.tsxindex 5102e2de8..3fe76d21f 100644--- a/src/components/svg/Target.tsx+++ b/src/components/svg/Target.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgTarget = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/Visitor.tsx b/src/components/svg/Visitor.tsxindex e3ca2b4ec..16db58589 100644--- a/src/components/svg/Visitor.tsx+++ b/src/components/svg/Visitor.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgVisitor = (props: SVGProps<SVGSVGElement>) => (<svg xmlns="http://www.w3.org/2000/svg" xmlSpace="preserve" viewBox="0 0 512 512" {...props}><path d="M256 0c-74.439 0-135 60.561-135 135s60.561 135 135 135 135-60.561 135-135S330.439 0 256 0m167.966 358.195C387.006 320.667 338.009 300 286 300h-60c-52.008 0-101.006 20.667-137.966 58.195C51.255 395.539 31 444.833 31 497c0 8.284 6.716 15 15 15h420c8.284 0 15-6.716 15-15 0-52.167-20.255-101.461-57.034-138.805" />diff --git a/src/components/svg/Website.tsx b/src/components/svg/Website.tsxindex 8e11c7cbd..20a18a49f 100644--- a/src/components/svg/Website.tsx+++ b/src/components/svg/Website.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import type { SVGProps } from 'react';+const SvgWebsite = (props: SVGProps<SVGSVGElement>) => (<svgxmlns="http://www.w3.org/2000/svg"diff --git a/src/components/svg/index.ts b/src/components/svg/index.tsindex 1bfc728a8..76756af44 100644--- a/src/components/svg/index.ts+++ b/src/components/svg/index.ts@@ -16,8 +16,8 @@ export { default as Lightbulb } from './Lightbulb';export { default as Lightning } from './Lightning';export { default as Location } from './Location';export { default as Lock } from './Lock';-export { default as LogoWhite } from './LogoWhite';export { default as Logo } from './Logo';+export { default as LogoWhite } from './LogoWhite';export { default as Magnet } from './Magnet';export { default as Money } from './Money';export { default as Network } from './Network';diff --git a/src/index.ts b/src/index.tsindex dfb4f66b8..907c5623b 100644--- a/src/index.ts+++ b/src/index.ts@@ -2,16 +2,15 @@ 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]/TeamDeleteForm';+export * from '@/app/(main)/teams/[teamId]/TeamEditForm';+export * from '@/app/(main)/teams/[teamId]/TeamManage';export * from '@/app/(main)/teams/[teamId]/TeamMemberEditButton';export * from '@/app/(main)/teams/[teamId]/TeamMemberEditForm';export * from '@/app/(main)/teams/[teamId]/TeamMemberRemoveButton';export * from '@/app/(main)/teams/[teamId]/TeamMembersDataTable';export * from '@/app/(main)/teams/[teamId]/TeamMembersTable';-export * from '@/app/(main)/teams/[teamId]/TeamDeleteForm';export * from '@/app/(main)/teams/[teamId]/TeamSettings';-export * from '@/app/(main)/teams/[teamId]/TeamEditForm';-export * from '@/app/(main)/teams/[teamId]/TeamManage';export * from '@/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton';export * from '@/app/(main)/teams/[teamId]/TeamWebsitesDataTable';export * from '@/app/(main)/teams/[teamId]/TeamWebsitesTable';@@ -26,21 +25,20 @@ export * from '@/app/(main)/teams/TeamsDataTable';export * from '@/app/(main)/teams/TeamsHeader';export * from '@/app/(main)/teams/TeamsJoinButton';export * from '@/app/(main)/teams/TeamsTable';--export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteShareForm';-export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode';export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteData';export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm';export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteEditForm';export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteResetForm';export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteSettings';+export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteShareForm';+export * from '@/app/(main)/websites/[websiteId]/settings/WebsiteTrackingCode';export * from '@/app/(main)/websites/WebsiteAddButton';export * from '@/app/(main)/websites/WebsiteAddForm';+export * from '@/app/(main)/websites/WebsiteProvider';export * from '@/app/(main)/websites/WebsitesDataTable';export * from '@/app/(main)/websites/WebsitesHeader';export * from '@/app/(main)/websites/WebsitesTable';-export * from '@/app/(main)/websites/WebsiteProvider';export * from '@/components/charts/BarChart';export * from '@/components/charts/BubbleChart';@@ -68,7 +66,7 @@ export * from '@/components/common/Panel';export * from '@/components/common/SectionHeader';export * from '@/components/common/SideMenu';export * from '@/components/common/TypeConfirmationForm';-+export * from '@/components/hooks';export * from '@/components/input/DateFilter';export * from '@/components/input/DialogButton';export * from '@/components/input/DownloadButton';@@ -77,11 +75,8 @@ export * from '@/components/input/FilterButtons';export * from '@/components/input/NavButton';export * from '@/components/input/ProfileButton';export * from '@/components/input/WebsiteSelect';-export * from '@/components/metrics/ChangeLabel';export * from '@/components/metrics/ListTable';export * from '@/components/metrics/MetricCard';export * from '@/components/metrics/MetricLabel';export * from '@/components/metrics/MetricsBar';--export * from '@/components/hooks';diff --git a/src/lib/auth.ts b/src/lib/auth.tsindex 890e535f4..ba6d8b09f 100644--- a/src/lib/auth.ts+++ b/src/lib/auth.ts@@ -3,8 +3,8 @@ import { ROLE_PERMISSIONS, ROLES, SHARE_TOKEN_HEADER } from '@/lib/constants';import { secret } from '@/lib/crypto';import { getRandomChars } from '@/lib/generate';import { createSecureToken, parseSecureToken, parseToken } from '@/lib/jwt';-import { ensureArray } from '@/lib/utils';import redis from '@/lib/redis';+import { ensureArray } from '@/lib/utils';import { getUser } from '@/queries/prisma/user';const log = debug('umami:auth');diff --git a/src/lib/client.ts b/src/lib/client.tsindex 795e7780c..e176215e6 100644--- a/src/lib/client.ts+++ b/src/lib/client.ts@@ -1,4 +1,4 @@-import { getItem, setItem, removeItem } from '@/lib/storage';+import { getItem, removeItem, setItem } from '@/lib/storage';import { AUTH_TOKEN } from './constants';export function getClientAuthToken() {diff --git a/src/lib/crypto.ts b/src/lib/crypto.tsindex f9387460b..9911ef7f0 100644--- a/src/lib/crypto.ts+++ b/src/lib/crypto.ts@@ -1,4 +1,4 @@-import crypto from 'crypto';+import crypto from 'node:crypto';import { v4, v5 } from 'uuid';const ALGORITHM = 'aes-256-gcm';diff --git a/src/lib/data.ts b/src/lib/data.tsindex 4739ae76b..fe69edf04 100644--- a/src/lib/data.ts+++ b/src/lib/data.ts@@ -1,5 +1,5 @@import { DATA_TYPE, DATETIME_REGEX } from './constants';-import { DynamicDataType } from './types';+import type { DynamicDataType } from './types';export function flattenJSON(eventData: Record<string, any>,diff --git a/src/lib/date.ts b/src/lib/date.tsindex f0f54de41..3c1fd1b7d 100644--- a/src/lib/date.ts+++ b/src/lib/date.ts@@ -1,5 +1,3 @@-import { getDateLocale } from '@/lib/lang';-import { DateRange } from '@/lib/types';import {addDays,addHours,@@ -40,6 +38,8 @@ import {subYears,} from 'date-fns';import { utcToZonedTime } from 'date-fns-tz';+import { getDateLocale } from '@/lib/lang';+import type { DateRange } from '@/lib/types';export const TIME_UNIT = {minute: 'minute',@@ -371,5 +371,5 @@ export function getMonthDateRangeValue(date: Date) {}export function isInvalidDate(date: any) {- return date instanceof Date && isNaN(date.getTime());+ return date instanceof Date && Number.isNaN(date.getTime());}diff --git a/src/lib/db.ts b/src/lib/db.tsindex 72a18c062..7b6e8368b 100644--- a/src/lib/db.ts+++ b/src/lib/db.ts@@ -5,12 +5,12 @@ export const KAFKA = 'kafka';export const KAFKA_PRODUCER = 'kafka-producer';// Fixes issue with converting bigint values-BigInt.prototype['toJSON'] = function () {+BigInt.prototype.toJSON = function () {return Number(this);};export function getDatabaseType(url = process.env.DATABASE_URL) {- const type = url && url.split(':')[0];+ const type = url?.split(':')[0];if (type === 'postgres') {return POSTGRESQL;diff --git a/src/lib/detect.ts b/src/lib/detect.tsindex c5528465d..f33012958 100644--- a/src/lib/detect.ts+++ b/src/lib/detect.ts@@ -1,11 +1,11 @@import path from 'node:path';-import { UAParser } from 'ua-parser-js';import { browserName, detectOS } from 'detect-browser';-import isLocalhost from 'is-localhost-ip';import ipaddr from 'ipaddr.js';+import isLocalhost from 'is-localhost-ip';import maxmind from 'maxmind';+import { UAParser } from 'ua-parser-js';+import { getIpAddress, stripPort } from '@/lib/ip';import { safeDecodeURIComponent } from '@/lib/url';-import { stripPort, getIpAddress } from '@/lib/ip';const MAXMIND = 'maxmind';@@ -145,6 +145,8 @@ export function hasBlockedIp(clientIp: string) {return true;}}++ return false;});}diff --git a/src/lib/format.ts b/src/lib/format.tsindex e5319b2af..52fd3048d 100644--- a/src/lib/format.ts+++ b/src/lib/format.ts@@ -77,7 +77,7 @@ export function stringToColor(str: string) {let color = '#';for (let i = 0; i < 3; i++) {const value = (hash >> (i * 8)) & 0xff;- color += ('00' + value.toString(16)).slice(-2);+ color += `00${value.toString(16)}`.slice(-2);}return color;}diff --git a/src/lib/kafka.ts b/src/lib/kafka.tsindex a81f3d4bc..1d60e1f28 100644--- a/src/lib/kafka.ts+++ b/src/lib/kafka.ts@@ -1,8 +1,8 @@-import { serializeError } from 'serialize-error';+import type * as tls from 'node:tls';import debug from 'debug';-import { Kafka, Producer, RecordMetadata, SASLOptions, logLevel } from 'kafkajs';+import { Kafka, logLevel, type Producer, type RecordMetadata, type SASLOptions } from 'kafkajs';+import { serializeError } from 'serialize-error';import { KAFKA, KAFKA_PRODUCER } from '@/lib/db';-import * as tls from 'tls';const log = debug('umami:kafka');const CONNECT_TIMEOUT = 5000;diff --git a/src/lib/lang.ts b/src/lib/lang.tsindex 96acc3698..f874640c4 100644--- a/src/lib/lang.ts+++ b/src/lib/lang.ts@@ -1,23 +1,24 @@import {arSA,be,- bn,bg,+ bn,bs,+ ca,cs,- sk,da,de,el,- enUS,enGB,+ enUS,es,+ faIR,fi,fr,- faIR,he,hi,hr,+ hu,id,it,ja,@@ -33,18 +34,17 @@ import {ptBR,ro,ru,+ sk,sl,sv,ta,th,tr,uk,+ uz,+ vi,zhCN,zhTW,- ca,- hu,- vi,- uz,} from 'date-fns/locale';export const languages = {diff --git a/src/lib/load.ts b/src/lib/load.tsindex a831bc163..d4d6c3c75 100644--- a/src/lib/load.ts+++ b/src/lib/load.ts@@ -1,4 +1,4 @@-import { Website, Session } from '@/generated/prisma/client';+import type { Session, Website } from '@/generated/prisma/client';import redis from '@/lib/redis';import { getWebsite } from '@/queries/prisma';import { getWebsiteSession } from '@/queries/sql';diff --git a/src/lib/params.ts b/src/lib/params.tsindex 7f383a2ef..ab2d58663 100644--- a/src/lib/params.ts+++ b/src/lib/params.ts@@ -1,5 +1,5 @@import { FILTER_COLUMNS, OPERATORS } from '@/lib/constants';-import { Filter, QueryFilters, QueryOptions } from '@/lib/types';+import type { Filter, QueryFilters, QueryOptions } from '@/lib/types';export function parseFilterValue(param: any) {if (typeof param === 'string') {diff --git a/src/lib/react.ts b/src/lib/react.tsindex decc1d6f8..668cdf1fb 100644--- a/src/lib/react.ts+++ b/src/lib/react.ts@@ -1,16 +1,16 @@import {Children,cloneElement,- FC,+ type FC,Fragment,isValidElement,- ReactElement,- ReactNode,+ type ReactElement,+ type ReactNode,} from 'react';export function getFragmentChildren(children: ReactNode) {return (children as ReactElement)?.type === Fragment- ? (children as ReactElement).props['children']+ ? (children as ReactElement).props.children: children;}diff --git a/src/lib/request.ts b/src/lib/request.tsindex 32db8e951..42c449048 100644--- a/src/lib/request.ts+++ b/src/lib/request.ts@@ -16,7 +16,7 @@ export async function parseRequest(const url = new URL(request.url);let query = Object.fromEntries(url.searchParams);let body = await getJsonBody(request);- let error: () => void | undefined;+ let error: () => undefined | undefined;let auth = null;if (schema) {diff --git a/src/lib/schema.ts b/src/lib/schema.tsindex 24ef99c3d..38f7339a1 100644--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@ -116,8 +116,8 @@ export const goalReportSchema = z.object({property: z.string().optional(),}).refine(data => {- if (data['type'] === 'event' && data['property']) {- return data['operator'] && data['property'];+ if (data.type === 'event' && data.property) {+ return data.operator && data.property;}return true;}),diff --git a/src/lib/types.ts b/src/lib/types.tsindex e5d4ecc5f..e727c87a3 100644--- a/src/lib/types.ts+++ b/src/lib/types.ts@@ -1,6 +1,6 @@-import { UseQueryOptions } from '@tanstack/react-query';-import { DATA_TYPE, ROLES, OPERATORS } from './constants';-import { TIME_UNIT } from './date';+import type { UseQueryOptions } from '@tanstack/react-query';+import type { DATA_TYPE, OPERATORS, ROLES } from './constants';+import type { TIME_UNIT } from './date';export type ObjectValues<T> = T[keyof T];diff --git a/src/permissions/index.ts b/src/permissions/index.tsindex d0f6b53de..a70808e69 100644--- a/src/permissions/index.ts+++ b/src/permissions/index.ts@@ -2,5 +2,5 @@ export * from './link';export * from './pixel';export * from './report';export * from './team';-export * from './website';export * from './user';+export * from './website';diff --git a/src/permissions/link.ts b/src/permissions/link.tsindex 8a10d5124..c027a0b6c 100644--- a/src/permissions/link.ts+++ b/src/permissions/link.ts@@ -1,7 +1,7 @@-import { Auth } from '@/lib/types';-import { getLink, getTeamUser } from '@/queries/prisma';import { hasPermission } from '@/lib/auth';import { PERMISSIONS } from '@/lib/constants';+import type { Auth } from '@/lib/types';+import { getLink, getTeamUser } from '@/queries/prisma';export async function canViewLink({ user }: Auth, linkId: string) {if (user?.isAdmin) {diff --git a/src/permissions/pixel.ts b/src/permissions/pixel.tsindex 95bf02282..2131874f1 100644--- a/src/permissions/pixel.ts+++ b/src/permissions/pixel.ts@@ -1,7 +1,7 @@-import { Auth } from '@/lib/types';-import { getPixel, getTeamUser } from '@/queries/prisma';import { hasPermission } from '@/lib/auth';import { PERMISSIONS } from '@/lib/constants';+import type { Auth } from '@/lib/types';+import { getPixel, getTeamUser } from '@/queries/prisma';export async function canViewPixel({ user }: Auth, pixelId: string) {if (user?.isAdmin) {diff --git a/src/permissions/report.ts b/src/permissions/report.tsindex d7270ed30..01b547694 100644--- a/src/permissions/report.ts+++ b/src/permissions/report.ts@@ -1,5 +1,5 @@-import { Auth } from '@/lib/types';-import { Report } from '@/generated/prisma/client';+import type { Report } from '@/generated/prisma/client';+import type { Auth } from '@/lib/types';import { canViewWebsite } from './website';export async function canViewReport(auth: Auth, report: Report) {@@ -7,7 +7,7 @@ export async function canViewReport(auth: Auth, report: Report) {return true;}- if (auth.user.id == report.userId) {+ if (auth.user.id === report.userId) {return true;}@@ -19,7 +19,7 @@ export async function canUpdateReport({ user }: Auth, report: Report) {return true;}- return user.id == report.userId;+ return user.id === report.userId;}export async function canDeleteReport(auth: Auth, report: Report) {diff --git a/src/permissions/team.ts b/src/permissions/team.tsindex a62eff2e4..0f07c1a4f 100644--- a/src/permissions/team.ts+++ b/src/permissions/team.ts@@ -1,7 +1,7 @@-import { Auth } from '@/lib/types';+import { hasPermission } from '@/lib/auth';import { PERMISSIONS } from '@/lib/constants';+import type { Auth } from '@/lib/types';import { getTeamUser } from '@/queries/prisma';-import { hasPermission } from '@/lib/auth';export async function canViewTeam({ user }: Auth, teamId: string) {if (user.isAdmin) {diff --git a/src/permissions/user.ts b/src/permissions/user.tsindex c9a9a5f5d..2ed8f276e 100644--- a/src/permissions/user.ts+++ b/src/permissions/user.ts@@ -1,4 +1,4 @@-import { Auth } from '@/lib/types';+import type { Auth } from '@/lib/types';export async function canCreateUser({ user }: Auth) {return user.isAdmin;diff --git a/src/permissions/website.ts b/src/permissions/website.tsindex 8bd81517a..97952eed9 100644--- a/src/permissions/website.ts+++ b/src/permissions/website.ts@@ -1,6 +1,6 @@-import { Auth } from '@/lib/types';-import { PERMISSIONS } from '@/lib/constants';import { hasPermission } from '@/lib/auth';+import { PERMISSIONS } from '@/lib/constants';+import type { Auth } from '@/lib/types';import { getLink, getPixel, getTeamUser, getWebsite } from '@/queries/prisma';export async function canViewWebsite({ user, shareToken }: Auth, websiteId: string) {diff --git a/src/queries/prisma/link.ts b/src/queries/prisma/link.tsindex 95e202b04..9b971dec4 100644--- a/src/queries/prisma/link.ts+++ b/src/queries/prisma/link.ts@@ -1,6 +1,6 @@-import { Prisma } from '@/generated/prisma/client';+import type { Prisma } from '@/generated/prisma/client';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export async function findLink(criteria: Prisma.LinkFindUniqueArgs) {return prisma.client.link.findUnique(criteria);diff --git a/src/queries/prisma/report.ts b/src/queries/prisma/report.tsindex c612864d3..4a5b755c8 100644--- a/src/queries/prisma/report.ts+++ b/src/queries/prisma/report.ts@@ -1,6 +1,7 @@import { Prisma } from '@/generated/prisma/client';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';+import ReportFindManyArgs = Prisma.ReportFindManyArgs;async function findReport(criteria: Prisma.ReportFindUniqueArgs) {diff --git a/src/queries/prisma/segment.ts b/src/queries/prisma/segment.tsindex f5507a4bb..3a17d2735 100644--- a/src/queries/prisma/segment.ts+++ b/src/queries/prisma/segment.ts@@ -1,6 +1,6 @@+import type { Prisma } from '@/generated/prisma/client';import prisma from '@/lib/prisma';-import { Prisma } from '@/generated/prisma/client';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';async function findSegment(criteria: Prisma.SegmentFindUniqueArgs) {return prisma.client.segment.findUnique(criteria);diff --git a/src/queries/prisma/team.ts b/src/queries/prisma/team.tsindex 64ae0ec88..5987c1d7b 100644--- a/src/queries/prisma/team.ts+++ b/src/queries/prisma/team.ts@@ -1,8 +1,9 @@-import { uuid } from '@/lib/crypto';-import { Prisma, Team } from '@/generated/prisma/client';+import { Prisma, type Team } from '@/generated/prisma/client';import { ROLES } from '@/lib/constants';+import { uuid } from '@/lib/crypto';import prisma from '@/lib/prisma';-import { PageResult, QueryFilters } from '@/lib/types';+import type { PageResult, QueryFilters } from '@/lib/types';+import TeamFindManyArgs = Prisma.TeamFindManyArgs;export async function findTeam(criteria: Prisma.TeamFindUniqueArgs): Promise<Team> {diff --git a/src/queries/prisma/teamUser.ts b/src/queries/prisma/teamUser.tsindex d7c3807ca..2210deeb5 100644--- a/src/queries/prisma/teamUser.ts+++ b/src/queries/prisma/teamUser.ts@@ -1,7 +1,8 @@-import { uuid } from '@/lib/crypto';import { Prisma } from '@/generated/prisma/client';+import { uuid } from '@/lib/crypto';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';+import TeamUserFindManyArgs = Prisma.TeamUserFindManyArgs;export async function findTeamUser(criteria: Prisma.TeamUserFindUniqueArgs) {diff --git a/src/queries/prisma/user.ts b/src/queries/prisma/user.tsindex c599e3866..14376fc26 100644--- a/src/queries/prisma/user.ts+++ b/src/queries/prisma/user.ts@@ -1,8 +1,9 @@import { Prisma } from '@/generated/prisma/client';import { ROLES } from '@/lib/constants';-import prisma from '@/lib/prisma';-import { Role, QueryFilters } from '@/lib/types';import { getRandomChars } from '@/lib/generate';+import prisma from '@/lib/prisma';+import type { QueryFilters, Role } from '@/lib/types';+import UserFindManyArgs = Prisma.UserFindManyArgs;export interface GetUserOptions {diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.tsindex cc5f2e6f4..d6ba6d381 100644--- a/src/queries/prisma/website.ts+++ b/src/queries/prisma/website.ts@@ -1,8 +1,8 @@-import { Prisma } from '@/generated/prisma/client';-import redis from '@/lib/redis';-import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { Prisma } from '@/generated/prisma/client';import { ROLES } from '@/lib/constants';+import prisma from '@/lib/prisma';+import redis from '@/lib/redis';+import type { QueryFilters } from '@/lib/types';export async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs) {return prisma.client.website.findUnique(criteria);diff --git a/src/queries/sql/events/getEventData.ts b/src/queries/sql/events/getEventData.tsindex 269258a8d..f12c95ca0 100644--- a/src/queries/sql/events/getEventData.ts+++ b/src/queries/sql/events/getEventData.ts@@ -1,7 +1,7 @@-import { EventData } from '@/generated/prisma/client';-import prisma from '@/lib/prisma';+import type { EventData } from '@/generated/prisma/client';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';const FUNCTION_NAME = 'getEventData';diff --git a/src/queries/sql/events/getEventDataEvents.ts b/src/queries/sql/events/getEventDataEvents.tsindex 0d856371d..6c8f12c19 100644--- a/src/queries/sql/events/getEventDataEvents.ts+++ b/src/queries/sql/events/getEventDataEvents.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventDataEvents';diff --git a/src/queries/sql/events/getEventDataFields.ts b/src/queries/sql/events/getEventDataFields.tsindex 42c46cd12..933776909 100644--- a/src/queries/sql/events/getEventDataFields.ts+++ b/src/queries/sql/events/getEventDataFields.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventDataFields';diff --git a/src/queries/sql/events/getEventDataProperties.ts b/src/queries/sql/events/getEventDataProperties.tsindex 7a618fd2e..82c078f8d 100644--- a/src/queries/sql/events/getEventDataProperties.ts+++ b/src/queries/sql/events/getEventDataProperties.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventDataProperties';diff --git a/src/queries/sql/events/getEventDataStats.ts b/src/queries/sql/events/getEventDataStats.tsindex 28e2f4d03..89e135828 100644--- a/src/queries/sql/events/getEventDataStats.ts+++ b/src/queries/sql/events/getEventDataStats.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventDataStats';diff --git a/src/queries/sql/events/getEventDataUsage.ts b/src/queries/sql/events/getEventDataUsage.tsindex c72f5b3e6..50613a7a5 100644--- a/src/queries/sql/events/getEventDataUsage.ts+++ b/src/queries/sql/events/getEventDataUsage.ts@@ -1,6 +1,6 @@import clickhouse from '@/lib/clickhouse';-import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import { CLICKHOUSE, notImplemented, PRISMA, runQuery } from '@/lib/db';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventDataUsage';diff --git a/src/queries/sql/events/getEventDataValues.ts b/src/queries/sql/events/getEventDataValues.tsindex e1975e2e4..0426e646e 100644--- a/src/queries/sql/events/getEventDataValues.ts+++ b/src/queries/sql/events/getEventDataValues.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventDataValues';diff --git a/src/queries/sql/events/getEventExpandedMetrics.ts b/src/queries/sql/events/getEventExpandedMetrics.tsindex fb200c4ae..f03a347df 100644--- a/src/queries/sql/events/getEventExpandedMetrics.ts+++ b/src/queries/sql/events/getEventExpandedMetrics.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventExpandedMetrics';diff --git a/src/queries/sql/events/getEventMetrics.ts b/src/queries/sql/events/getEventMetrics.tsindex 75e7574cb..500c67e94 100644--- a/src/queries/sql/events/getEventMetrics.ts+++ b/src/queries/sql/events/getEventMetrics.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventMetrics';diff --git a/src/queries/sql/events/getEventStats.ts b/src/queries/sql/events/getEventStats.tsindex baa6f700d..81d12a0ff 100644--- a/src/queries/sql/events/getEventStats.ts+++ b/src/queries/sql/events/getEventStats.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventStats';diff --git a/src/queries/sql/events/getEventUsage.ts b/src/queries/sql/events/getEventUsage.tsindex 0bd0a5f3a..40f5a9682 100644--- a/src/queries/sql/events/getEventUsage.ts+++ b/src/queries/sql/events/getEventUsage.ts@@ -1,6 +1,6 @@import clickhouse from '@/lib/clickhouse';-import { CLICKHOUSE, PRISMA, runQuery, notImplemented } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import { CLICKHOUSE, notImplemented, PRISMA, runQuery } from '@/lib/db';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getEventUsage';diff --git a/src/queries/sql/events/getWebsiteEvents.ts b/src/queries/sql/events/getWebsiteEvents.tsindex fec9be367..f11d3ff13 100644--- a/src/queries/sql/events/getWebsiteEvents.ts+++ b/src/queries/sql/events/getWebsiteEvents.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getWebsiteEvents';diff --git a/src/queries/sql/events/saveEvent.ts b/src/queries/sql/events/saveEvent.tsindex c8a9cbe9f..7313fe472 100644--- a/src/queries/sql/events/saveEvent.ts+++ b/src/queries/sql/events/saveEvent.ts@@ -1,7 +1,7 @@+import clickhouse from '@/lib/clickhouse';+import { EVENT_NAME_LENGTH, PAGE_TITLE_LENGTH, URL_LENGTH } from '@/lib/constants';import { uuid } from '@/lib/crypto';-import { EVENT_NAME_LENGTH, URL_LENGTH, PAGE_TITLE_LENGTH } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import clickhouse from '@/lib/clickhouse';import kafka from '@/lib/kafka';import prisma from '@/lib/prisma';import { saveEventData } from './saveEventData';diff --git a/src/queries/sql/events/saveEventData.ts b/src/queries/sql/events/saveEventData.tsindex 0fb869376..b8b0e02fc 100644--- a/src/queries/sql/events/saveEventData.ts+++ b/src/queries/sql/events/saveEventData.ts@@ -1,11 +1,11 @@+import clickhouse from '@/lib/clickhouse';import { DATA_TYPE } from '@/lib/constants';import { uuid } from '@/lib/crypto';-import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import { flattenJSON, getStringValue } from '@/lib/data';-import clickhouse from '@/lib/clickhouse';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import kafka from '@/lib/kafka';import prisma from '@/lib/prisma';-import { DynamicData } from '@/lib/types';+import type { DynamicData } from '@/lib/types';export interface SaveEventDataArgs {websiteId: string;diff --git a/src/queries/sql/getActiveVisitors.ts b/src/queries/sql/getActiveVisitors.tsindex 20327424d..d763c12ec 100644--- a/src/queries/sql/getActiveVisitors.ts+++ b/src/queries/sql/getActiveVisitors.ts@@ -1,7 +1,7 @@import { subMinutes } from 'date-fns';-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';-import { runQuery, CLICKHOUSE, PRISMA } from '@/lib/db';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';const FUNCTION_NAME = 'getActiveVisitors';diff --git a/src/queries/sql/getChannelExpandedMetrics.ts b/src/queries/sql/getChannelExpandedMetrics.tsindex 5ce884ad0..33640d599 100644--- a/src/queries/sql/getChannelExpandedMetrics.ts+++ b/src/queries/sql/getChannelExpandedMetrics.ts@@ -9,7 +9,7 @@ import {} from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getChannelExpandedMetrics';diff --git a/src/queries/sql/getChannelMetrics.ts b/src/queries/sql/getChannelMetrics.tsindex a608ec5ef..78e4142ef 100644--- a/src/queries/sql/getChannelMetrics.ts+++ b/src/queries/sql/getChannelMetrics.ts@@ -9,7 +9,7 @@ import {} from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getChannelMetrics';diff --git a/src/queries/sql/getRealtimeActivity.ts b/src/queries/sql/getRealtimeActivity.tsindex d7aa06e93..075b65e2e 100644--- a/src/queries/sql/getRealtimeActivity.ts+++ b/src/queries/sql/getRealtimeActivity.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';-import { runQuery, CLICKHOUSE, PRISMA } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getRealtimeActivity';diff --git a/src/queries/sql/getRealtimeData.ts b/src/queries/sql/getRealtimeData.tsindex 58384a545..4b97cb055 100644--- a/src/queries/sql/getRealtimeData.ts+++ b/src/queries/sql/getRealtimeData.ts@@ -1,4 +1,4 @@-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';import { getRealtimeActivity } from '@/queries/sql/getRealtimeActivity';import { getPageviewStats } from '@/queries/sql/pageviews/getPageviewStats';import { getSessionStats } from '@/queries/sql/sessions/getSessionStats';diff --git a/src/queries/sql/getValues.ts b/src/queries/sql/getValues.tsindex 6251fe3b8..cc6bb7d2d 100644--- a/src/queries/sql/getValues.ts+++ b/src/queries/sql/getValues.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';-import { runQuery, CLICKHOUSE, PRISMA } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getValues';diff --git a/src/queries/sql/getWebsiteDateRange.ts b/src/queries/sql/getWebsiteDateRange.tsindex 58d8ab25e..d6333ad52 100644--- a/src/queries/sql/getWebsiteDateRange.ts+++ b/src/queries/sql/getWebsiteDateRange.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';-import { runQuery, CLICKHOUSE, PRISMA } from '@/lib/db';import { DEFAULT_RESET_DATE } from '@/lib/constants';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';export async function getWebsiteDateRange(...args: [websiteId: string]) {return runQuery({diff --git a/src/queries/sql/getWebsiteStats.ts b/src/queries/sql/getWebsiteStats.tsindex 4a4bef78b..69068394d 100644--- a/src/queries/sql/getWebsiteStats.ts+++ b/src/queries/sql/getWebsiteStats.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getWebsiteStats';diff --git a/src/queries/sql/getWeeklyTraffic.ts b/src/queries/sql/getWeeklyTraffic.tsindex ea2029935..7bbe78a7a 100644--- a/src/queries/sql/getWeeklyTraffic.ts+++ b/src/queries/sql/getWeeklyTraffic.ts@@ -1,8 +1,8 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';-import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';-import { QueryFilters } from '@/lib/types';import { EVENT_COLUMNS } from '@/lib/constants';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getWeeklyTraffic';diff --git a/src/queries/sql/index.ts b/src/queries/sql/index.tsindex 682ac6d27..1573bdefd 100644--- a/src/queries/sql/index.ts+++ b/src/queries/sql/index.ts@@ -1,41 +1,41 @@export * from './events/getEventDataEvents';export * from './events/getEventDataFields';export * from './events/getEventDataProperties';-export * from './events/getEventDataValues';export * from './events/getEventDataStats';export * from './events/getEventDataUsage';-export * from './events/getEventMetrics';+export * from './events/getEventDataValues';export * from './events/getEventExpandedMetrics';+export * from './events/getEventMetrics';export * from './events/getEventStats';-export * from './events/getWebsiteEvents';export * from './events/getEventUsage';+export * from './events/getWebsiteEvents';export * from './events/saveEvent';+export * from './getActiveVisitors';+export * from './getChannelExpandedMetrics';+export * from './getChannelMetrics';+export * from './getRealtimeActivity';+export * from './getRealtimeData';+export * from './getValues';+export * from './getWebsiteDateRange';+export * from './getWebsiteStats';+export * from './getWeeklyTraffic';+export * from './pageviews/getPageviewExpandedMetrics';+export * from './pageviews/getPageviewMetrics';+export * from './pageviews/getPageviewStats';+export * from './reports/getBreakdown';export * from './reports/getFunnel';export * from './reports/getJourney';export * from './reports/getRetention';-export * from './reports/getBreakdown';export * from './reports/getUTM';-export * from './pageviews/getPageviewMetrics';-export * from './pageviews/getPageviewExpandedMetrics';-export * from './pageviews/getPageviewStats';export * from './sessions/createSession';-export * from './sessions/getWebsiteSession';+export * from './sessions/getSessionActivity';export * from './sessions/getSessionData';export * from './sessions/getSessionDataProperties';export * from './sessions/getSessionDataValues';-export * from './sessions/getSessionMetrics';export * from './sessions/getSessionExpandedMetrics';-export * from './sessions/getWebsiteSessions';-export * from './sessions/getWebsiteSessionStats';-export * from './sessions/getSessionActivity';+export * from './sessions/getSessionMetrics';export * from './sessions/getSessionStats';+export * from './sessions/getWebsiteSession';+export * from './sessions/getWebsiteSessionStats';+export * from './sessions/getWebsiteSessions';export * from './sessions/saveSessionData';-export * from './getActiveVisitors';-export * from './getChannelMetrics';-export * from './getChannelExpandedMetrics';-export * from './getRealtimeActivity';-export * from './getRealtimeData';-export * from './getValues';-export * from './getWebsiteDateRange';-export * from './getWebsiteStats';-export * from './getWeeklyTraffic';diff --git a/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts b/src/queries/sql/pageviews/getPageviewExpandedMetrics.tsindex 2e234ab17..938b28acd 100644--- a/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { FILTER_COLUMNS, GROUPED_DOMAINS, SESSION_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getPageviewExpandedMetrics';diff --git a/src/queries/sql/pageviews/getPageviewMetrics.ts b/src/queries/sql/pageviews/getPageviewMetrics.tsindex 0a92e6afd..9d4f62782 100644--- a/src/queries/sql/pageviews/getPageviewMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewMetrics.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getPageviewMetrics';diff --git a/src/queries/sql/pageviews/getPageviewStats.ts b/src/queries/sql/pageviews/getPageviewStats.tsindex a6619e87d..251d5b142 100644--- a/src/queries/sql/pageviews/getPageviewStats.ts+++ b/src/queries/sql/pageviews/getPageviewStats.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getPageviewStats';diff --git a/src/queries/sql/reports/getAttribution.ts b/src/queries/sql/reports/getAttribution.tsindex 9277bbf7b..1d040781d 100644--- a/src/queries/sql/reports/getAttribution.ts+++ b/src/queries/sql/reports/getAttribution.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export interface AttributionParameters {startDate: Date;diff --git a/src/queries/sql/reports/getBreakdown.ts b/src/queries/sql/reports/getBreakdown.tsindex 6cea68f3f..51773d864 100644--- a/src/queries/sql/reports/getBreakdown.ts+++ b/src/queries/sql/reports/getBreakdown.ts@@ -1,8 +1,8 @@-import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';-import { QueryFilters } from '@/lib/types';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';export interface BreakdownParameters {startDate: Date;diff --git a/src/queries/sql/reports/getFunnel.ts b/src/queries/sql/reports/getFunnel.tsindex ada5eeb2d..4840123fe 100644--- a/src/queries/sql/reports/getFunnel.ts+++ b/src/queries/sql/reports/getFunnel.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export interface FunnelParameters {startDate: Date;diff --git a/src/queries/sql/reports/getGoal.ts b/src/queries/sql/reports/getGoal.tsindex 702c160ab..7e790ff48 100644--- a/src/queries/sql/reports/getGoal.ts+++ b/src/queries/sql/reports/getGoal.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export interface GoalParameters {startDate: Date;diff --git a/src/queries/sql/reports/getJourney.ts b/src/queries/sql/reports/getJourney.tsindex 51e0d16f0..283e0fad4 100644--- a/src/queries/sql/reports/getJourney.ts+++ b/src/queries/sql/reports/getJourney.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export interface JourneyParameters {startDate: Date;@@ -91,7 +91,7 @@ async function relationalQuery(// create start Step params queryif (startStep) {startStepQuery = `and e1 = {{startStep}}`;- params['startStep'] = startStep;+ params.startStep = startStep;}// create end Step params query@@ -102,7 +102,7 @@ async function relationalQuery(}endStepQuery += `\nor (e${steps} = {{endStep}}))`;- params['endStep'] = endStep;+ params.endStep = endStep;}return {@@ -203,7 +203,7 @@ async function clickhouseQuery(// create start Step params queryif (startStep) {startStepQuery = `and e1 = {startStep:String}`;- params['startStep'] = startStep;+ params.startStep = startStep;}// create end Step params query@@ -214,7 +214,7 @@ async function clickhouseQuery(}endStepQuery += `\nor (e${steps} = {endStep:String}))`;- params['endStep'] = endStep;+ params.endStep = endStep;}return {diff --git a/src/queries/sql/reports/getRetention.ts b/src/queries/sql/reports/getRetention.tsindex d99098c00..87b55e03d 100644--- a/src/queries/sql/reports/getRetention.ts+++ b/src/queries/sql/reports/getRetention.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export interface RetentionParameters {startDate: Date;diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.tsindex 5771bdef0..f5e3ec82f 100644--- a/src/queries/sql/reports/getRevenue.ts+++ b/src/queries/sql/reports/getRevenue.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export interface RevenuParameters {startDate: Date;diff --git a/src/queries/sql/reports/getUTM.ts b/src/queries/sql/reports/getUTM.tsindex 5dee7a7b0..4d43eb45b 100644--- a/src/queries/sql/reports/getUTM.ts+++ b/src/queries/sql/reports/getUTM.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_TYPE } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';export interface UTMParameters {column: string;diff --git a/src/queries/sql/sessions/createSession.ts b/src/queries/sql/sessions/createSession.tsindex b5106a541..8d07a5540 100644--- a/src/queries/sql/sessions/createSession.ts+++ b/src/queries/sql/sessions/createSession.ts@@ -1,4 +1,4 @@-import { Prisma } from '@/generated/prisma/client';+import type { Prisma } from '@/generated/prisma/client';import prisma from '@/lib/prisma';const FUNCTION_NAME = 'createSession';diff --git a/src/queries/sql/sessions/getSessionActivity.ts b/src/queries/sql/sessions/getSessionActivity.tsindex 3dd4fa9d8..af31fca6a 100644--- a/src/queries/sql/sessions/getSessionActivity.ts+++ b/src/queries/sql/sessions/getSessionActivity.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getSessionActivity';diff --git a/src/queries/sql/sessions/getSessionData.ts b/src/queries/sql/sessions/getSessionData.tsindex 09679fc82..8f1e49332 100644--- a/src/queries/sql/sessions/getSessionData.ts+++ b/src/queries/sql/sessions/getSessionData.ts@@ -1,6 +1,6 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';-import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';const FUNCTION_NAME = 'getSessionData';diff --git a/src/queries/sql/sessions/getSessionDataProperties.ts b/src/queries/sql/sessions/getSessionDataProperties.tsindex 96cc17bf6..9b429f9b9 100644--- a/src/queries/sql/sessions/getSessionDataProperties.ts+++ b/src/queries/sql/sessions/getSessionDataProperties.ts@@ -1,7 +1,7 @@import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getSessionDataProperties';diff --git a/src/queries/sql/sessions/getSessionDataValues.ts b/src/queries/sql/sessions/getSessionDataValues.tsindex 0093575d8..5790141c5 100644--- a/src/queries/sql/sessions/getSessionDataValues.ts+++ b/src/queries/sql/sessions/getSessionDataValues.ts@@ -1,7 +1,7 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';-import { QueryFilters } from '@/lib/types';+import prisma from '@/lib/prisma';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getSessionDataValues';diff --git a/src/queries/sql/sessions/getSessionExpandedMetrics.ts b/src/queries/sql/sessions/getSessionExpandedMetrics.tsindex 1d2111377..85c129391 100644--- a/src/queries/sql/sessions/getSessionExpandedMetrics.ts+++ b/src/queries/sql/sessions/getSessionExpandedMetrics.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getSessionExpandedMetrics';diff --git a/src/queries/sql/sessions/getSessionMetrics.ts b/src/queries/sql/sessions/getSessionMetrics.tsindex 7133332b5..c519bdd0d 100644--- a/src/queries/sql/sessions/getSessionMetrics.ts+++ b/src/queries/sql/sessions/getSessionMetrics.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getSessionMetrics';diff --git a/src/queries/sql/sessions/getSessionStats.ts b/src/queries/sql/sessions/getSessionStats.tsindex ea93b2263..fd457720c 100644--- a/src/queries/sql/sessions/getSessionStats.ts+++ b/src/queries/sql/sessions/getSessionStats.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getSessionStats';diff --git a/src/queries/sql/sessions/getWebsiteSession.ts b/src/queries/sql/sessions/getWebsiteSession.tsindex 36c48c204..3c1608713 100644--- a/src/queries/sql/sessions/getWebsiteSession.ts+++ b/src/queries/sql/sessions/getWebsiteSession.ts@@ -1,6 +1,6 @@-import prisma from '@/lib/prisma';import clickhouse from '@/lib/clickhouse';-import { runQuery, PRISMA, CLICKHOUSE } from '@/lib/db';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';+import prisma from '@/lib/prisma';const FUNCTION_NAME = 'getWebsiteSession';diff --git a/src/queries/sql/sessions/getWebsiteSessionStats.ts b/src/queries/sql/sessions/getWebsiteSessionStats.tsindex 2e824f0d0..a12e6c614 100644--- a/src/queries/sql/sessions/getWebsiteSessionStats.ts+++ b/src/queries/sql/sessions/getWebsiteSessionStats.ts@@ -2,7 +2,7 @@ import clickhouse from '@/lib/clickhouse';import { EVENT_COLUMNS } from '@/lib/constants';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getWebsiteSessionStats';diff --git a/src/queries/sql/sessions/getWebsiteSessions.ts b/src/queries/sql/sessions/getWebsiteSessions.tsindex 5ebd1740b..df640d6d8 100644--- a/src/queries/sql/sessions/getWebsiteSessions.ts+++ b/src/queries/sql/sessions/getWebsiteSessions.ts@@ -1,8 +1,8 @@import clickhouse from '@/lib/clickhouse';-import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import { EVENT_COLUMNS } from '@/lib/constants';+import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-import { QueryFilters } from '@/lib/types';+import type { QueryFilters } from '@/lib/types';const FUNCTION_NAME = 'getWebsiteSessions';diff --git a/src/queries/sql/sessions/saveSessionData.ts b/src/queries/sql/sessions/saveSessionData.tsindex cffe8e6e5..740931777 100644--- a/src/queries/sql/sessions/saveSessionData.ts+++ b/src/queries/sql/sessions/saveSessionData.ts@@ -1,11 +1,11 @@+import clickhouse from '@/lib/clickhouse';import { DATA_TYPE } from '@/lib/constants';import { uuid } from '@/lib/crypto';import { flattenJSON, getStringValue } from '@/lib/data';-import prisma from '@/lib/prisma';-import { DynamicData } from '@/lib/types';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import kafka from '@/lib/kafka';-import clickhouse from '@/lib/clickhouse';+import prisma from '@/lib/prisma';+import type { DynamicData } from '@/lib/types';export interface SaveSessionDataArgs {websiteId: string;diff --git a/src/store/app.ts b/src/store/app.tsindex 9ed3641c3..bb54e5650 100644--- a/src/store/app.ts+++ b/src/store/app.ts@@ -8,8 +8,8 @@ import {THEME_CONFIG,TIMEZONE_CONFIG,} from '@/lib/constants';-import { getItem } from '@/lib/storage';import { getTimezone } from '@/lib/date';+import { getItem } from '@/lib/storage';const initialState = {locale: getItem(LOCALE_CONFIG) || process.env.defaultLocale || DEFAULT_LOCALE,diff --git a/src/store/version.ts b/src/store/version.tsindex c62924194..95367afd7 100644--- a/src/store/version.ts+++ b/src/store/version.ts@@ -1,7 +1,7 @@-import { create } from 'zustand';import { produce } from 'immer';import semver from 'semver';-import { CURRENT_VERSION, VERSION_CHECK, UPDATES_URL } from '@/lib/constants';+import { create } from 'zustand';+import { CURRENT_VERSION, UPDATES_URL, VERSION_CHECK } from '@/lib/constants';import { getItem } from '@/lib/storage';const initialState = {diff --git a/src/store/websites.ts b/src/store/websites.tsindex fe5c1f926..4ddcab05f 100644--- a/src/store/websites.ts+++ b/src/store/websites.ts@@ -1,6 +1,6 @@-import { create } from 'zustand';import { produce } from 'immer';-import { DateRange } from '@/lib/types';+import { create } from 'zustand';+import type { DateRange } from '@/lib/types';const store = create(() => ({}));diff --git a/src/tracker/index.d.ts b/src/tracker/index.d.tsindex 05497da20..32fbee97f 100644--- a/src/tracker/index.d.ts+++ b/src/tracker/index.d.ts@@ -148,6 +148,6 @@ export type UmamiTracker = {};};-interface Window {+export interface Window {umami: UmamiTracker;}diff --git a/src/tracker/index.js b/src/tracker/index.jsindex a9966198a..ad3648aca 100644--- a/src/tracker/index.js+++ b/src/tracker/index.js@@ -19,16 +19,16 @@const _true = 'true';const attr = currentScript.getAttribute.bind(currentScript);- const website = attr(_data + 'website-id');- const hostUrl = attr(_data + 'host-url');- const beforeSend = attr(_data + 'before-send');- const tag = attr(_data + 'tag') || undefined;- const autoTrack = attr(_data + 'auto-track') !== _false;- const dnt = attr(_data + 'do-not-track') === _true;- const excludeSearch = attr(_data + 'exclude-search') === _true;- const excludeHash = attr(_data + 'exclude-hash') === _true;- const domain = attr(_data + 'domains') || '';- const credentials = attr(_data + 'fetch-credentials') || 'omit';+ const website = attr(`${_data}website-id`);+ const hostUrl = attr(`${_data}host-url`);+ const beforeSend = attr(`${_data}before-send`);+ const tag = attr(`${_data}tag`) || undefined;+ const autoTrack = attr(`${_data}auto-track`) !== _false;+ const dnt = attr(`${_data}do-not-track`) === _true;+ const excludeSearch = attr(`${_data}exclude-search`) === _true;+ const excludeHash = attr(`${_data}exclude-hash`) === _true;+ const domain = attr(`${_data}domains`) || '';+ const credentials = attr(`${_data}fetch-credentials`) || 'omit';const domains = domain.split(',').map(n => n.trim());const host =@@ -36,7 +36,7 @@const endpoint = `${host.replace(/\/$/, '')}__COLLECT_API_ENDPOINT__`;const screen = `${width}x${height}`;const eventRegex = /data-umami-event-([\w-_]+)/;- const eventNameAttribute = _data + 'umami-event';+ const eventNameAttribute = `${_data}umami-event`;const delayDuration = 300;/* Helper functions */@@ -144,7 +144,7 @@const trackingDisabled = () =>disabled ||!website ||- (localStorage && localStorage.getItem('umami.disabled')) ||+ localStorage?.getItem('umami.disabled') ||(domain && !domains.includes(hostname)) ||(dnt && hasDoNotTrack());@@ -177,7 +177,7 @@cache = data.cache;}// eslint-disable-next-line @typescript-eslint/no-unused-vars- } catch (e) {+ } catch (_e) {/* no-op */}};