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
More work on reports. Added Funnel page.
Mike Cao3847e32f396d
diff --git a/Dockerfile b/Dockerfileindex 4b156643b..78419e652 100644--- a/Dockerfile+++ b/Dockerfile@@ -41,7 +41,7 @@ RUN set -x \&& apk add --no-cache curl# Script dependencies-RUN pnpm add npm-run-all dotenv [email protected]+RUN pnpm add npm-run-all dotenv [email protected]# Permissions for prismaRUN chown -R nextjs:nodejs node_modules/.pnpm/diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prismaindex 15bdafe8f..6733bca6a 100644--- a/db/postgresql/schema.prisma+++ b/db/postgresql/schema.prisma@@ -1,9 +1,8 @@generator client {- provider = "prisma-client"- output = "../src/generated/prisma"- moduleFormat = "esm"- generatedFileExtension = "ts"- importFileExtension = "ts"+ provider = "prisma-client"+ previewFeatures = ["driverAdapters"]+ output = "../src/generated/prisma"+ moduleFormat = "esm"}datasource db {@@ -223,7 +222,7 @@ model Report {type String @db.VarChar(200)name String @db.VarChar(200)description String @db.VarChar(500)- parameters Json+ parameters JsoncreatedAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)@@ -238,15 +237,15 @@ model Report {}model Segment {- id String @id() @unique() @map("segment_id") @db.Uuid- websiteId String @map("website_id") @db.Uuid- name String @db.VarChar(200)- filters Json- createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)- updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)+ id String @id() @unique() @map("segment_id") @db.Uuid+ websiteId String @map("website_id") @db.Uuid+ name String @db.VarChar(200)+ filters Json+ createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)+ updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)website Website @relation(fields: [websiteId], references: [id])@@index([websiteId])@@map("segment")-}\ No newline at end of file+}diff --git a/package.json b/package.jsonindex 75d879a8b..516732c5b 100644--- a/package.json+++ b/package.json@@ -74,12 +74,13 @@"@dicebear/core": "^9.2.1","@fontsource/inter": "^4.5.15","@hello-pangea/dnd": "^17.0.0",+ "@prisma/adapter-pg": "^6.8.2","@prisma/client": "^6.8.2","@prisma/extension-read-replicas": "^0.4.1","@react-spring/web": "^9.7.3","@svgr/cli": "^8.1.0","@tanstack/react-query": "^5.28.6",- "@umami/react-zen": "^0.127.0",+ "@umami/react-zen": "^0.133.0","@umami/redis-client": "^0.27.0","bcryptjs": "^2.4.3","chalk": "^4.1.1",@@ -111,6 +112,7 @@"next": "15.3.1","node-fetch": "^3.2.8","npm-run-all": "^4.1.5",+ "pg": "^8.16.0","prisma": "6.8.2","pure-rand": "^6.1.0","react": "^19.0.0",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 9cbab1fe8..269c7c15d 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -26,6 +26,9 @@ importers:'@hello-pangea/dnd':specifier: ^17.0.0+ '@prisma/adapter-pg':+ specifier: ^6.8.2+ version: 6.8.2([email protected])'@prisma/client':specifier: ^6.8.2@@ -42,8 +45,8 @@ importers:specifier: ^5.28.6version: 5.77.2([email protected])'@umami/react-zen':- specifier: ^0.127.0- version: 0.127.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))+ specifier: ^0.133.0+ version: 0.133.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))'@umami/redis-client':specifier: ^0.27.0version: 0.27.0@@ -137,6 +140,9 @@ importers:npm-run-all:specifier: ^4.1.5version: 4.1.5+ pg:+ specifier: ^8.16.0+ version: 8.16.0prisma:specifier: 6.8.2version: 6.8.2([email protected])@@ -1248,17 +1254,17 @@ packages:cpu: [x64]os: [win32]- '@internationalized/[email protected]':- resolution: {integrity: sha512-PgVE6B6eIZtzf9Gu5HvJxRK3ufUFz9DhspELuhW/N0GuMGMTLvPQNRkHP2hTuP9lblOk+f+1xi96sPiPXANXAA==}+ '@internationalized/[email protected]':+ resolution: {integrity: sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA==}- '@internationalized/[email protected]':- resolution: {integrity: sha512-gLQlhEW4iO7DEFPf/U7IrIdA3UyLGS0opeqouaFwlMObLUzwexRjbygONHDVbC9G9oFLXsLyGKYkJwqXw/QADg==}+ '@internationalized/[email protected]':+ resolution: {integrity: sha512-Rwk3j/TlYZhn3HQ6PyXUV0XP9Uv42jqZGNegt0BXlxjE6G3+LwHjbQZAGHhCnCPdaA6Tvd3ma/7QzLlLkJxAWA==}- '@internationalized/[email protected]':- resolution: {integrity: sha512-E5QTOlMg9wo5OrKdHD6edo1JJlIoOsylh0+mbf0evi1tHJwMZfJSaBpGtnJV9N7w3jeiioox9EG/EWRWPh82vg==}+ '@internationalized/[email protected]':+ resolution: {integrity: sha512-p+Zh1sb6EfrfVaS86jlHGQ9HA66fJhV9x5LiE5vCbZtXEHAuhcmUZUdZ4WrFpUBfNalr2OkAJI5AcKEQF+Lebw==}- '@internationalized/[email protected]':- resolution: {integrity: sha512-LR2lnM4urJta5/wYJVV7m8qk5DrMZmLRTuFhbQO5b9/sKLHgty6unQy1Li4+Su2DWydmB4aZdS5uxBRXIq2aAw==}+ '@internationalized/[email protected]':+ resolution: {integrity: sha512-D4OHBjrinH+PFZPvfCXvG28n2LSykWcJ7GIioQL+ok0LON15SdfoUssoHzzOUmVZLbRoREsQXVzA6r8JKsbP6A==}'@isaacs/[email protected]':resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}@@ -1375,8 +1381,8 @@ packages:'@next/[email protected]':resolution: {integrity: sha512-cwK27QdzrMblHSn9DZRV+DQscHXRuJv6MydlJRpFSqJWZrTYMLzKDeyueJNN9MGd8NNiUKzDQADAf+dMLXX7YQ==}- '@next/[email protected]':- resolution: {integrity: sha512-xURk++7P7qR9JG1jJtLzPzf0qEvqCN0A/T3DXf8IPMKo9/6FfjxtEffRJIIew/bIL4T3C2jLLqBor8B/zVlx6g==}+ '@next/[email protected]':+ resolution: {integrity: sha512-OdiMrzCl2Xi0VTjiQQUK0Xh7bJHnOuET2s+3V+Y40WJBAXrJeGA3f+I8MZJ/YQ3mVGi5XGR1L66oFlgqXhQ4Vw==}'@next/[email protected]':resolution: {integrity: sha512-qpxSYiPNJTr9RzqjGi5yom8AIC8Kgdtw4oNIXAB/gDYMDctmfMEv452FRUhT06cWPgcmSsbZiEPYhbFiQtCWTg==}@@ -1387,8 +1393,8 @@ packages:cpu: [arm64]os: [darwin]- '@next/[email protected]':- resolution: {integrity: sha512-2DR6kY/OGcokbnCsjHpNeQblqCZ85/1j6njYSkzRdpLn5At7OkSdmk7WyAmB9G0k25+VgqVZ/u356OSoQZ3z0g==}+ '@next/[email protected]':+ resolution: {integrity: sha512-WRJERLuH+O3oYB4yZNVahSVFmtxRNjNF1I1c34tYMoJb0Pve+7/RaLAJJizyYiFhjYNGHRAE1Ri2Fd23zgDqhg==}engines: {node: '>= 10'}cpu: [arm64]os: [darwin]@@ -1399,8 +1405,8 @@ packages:cpu: [x64]os: [darwin]- '@next/[email protected]':- resolution: {integrity: sha512-ro/fdqaZWL6k1S/5CLv1I0DaZfDVJkWNaUU3un8Lg6m0YENWlDulmIWzV96Iou2wEYyEsZq51mwV8+XQXqMp3w==}+ '@next/[email protected]':+ resolution: {integrity: sha512-XHdzH/yBc55lu78k/XwtuFR/ZXUTcflpRXcsu0nKmF45U96jt1tsOZhVrn5YH+paw66zOANpOnFQ9i6/j+UYvw==}engines: {node: '>= 10'}cpu: [x64]os: [darwin]@@ -1411,8 +1417,8 @@ packages:cpu: [arm64]os: [linux]- '@next/[email protected]':- resolution: {integrity: sha512-covwwtZYhlbRWK2HlYX9835qXum4xYZ3E2Mra1mdQ+0ICGoMiw1+nVAn4d9Bo7R3JqSmK1grMq/va+0cdh7bJA==}+ '@next/[email protected]':+ resolution: {integrity: sha512-VZ3sYL2LXB8znNGcjhocikEkag/8xiLgnvQts41tq6i+wql63SMS1Q6N8RVXHw5pEUjiof+II3HkDd7GFcgkzw==}engines: {node: '>= 10'}cpu: [arm64]os: [linux]@@ -1423,8 +1429,8 @@ packages:cpu: [arm64]os: [linux]- '@next/[email protected]':- resolution: {integrity: sha512-KQkMEillvlW5Qk5mtGA/3Yz0/tzpNlSw6/3/ttsV1lNtMuOHcGii3zVeXZyi4EJmmLDKYcTcByV2wVsOhDt/zg==}+ '@next/[email protected]':+ resolution: {integrity: sha512-h6Y1fLU4RWAp1HPNJWDYBQ+e3G7sLckyBXhmH9ajn8l/RSMnhbuPBV/fXmy3muMcVwoJdHL+UtzRzs0nXOf9SA==}engines: {node: '>= 10'}cpu: [arm64]os: [linux]@@ -1435,8 +1441,8 @@ packages:cpu: [x64]os: [linux]- '@next/[email protected]':- resolution: {integrity: sha512-uRBo6THWei0chz+Y5j37qzx+BtoDRFIkDzZjlpCItBRXyMPIg079eIkOCl3aqr2tkxL4HFyJ4GHDes7W8HuAUg==}+ '@next/[email protected]':+ resolution: {integrity: sha512-jJ8HRiF3N8Zw6hGlytCj5BiHyG/K+fnTKVDEKvUCyiQ/0r5tgwO7OgaRiOjjRoIx2vwLR+Rz8hQoPrnmFbJdfw==}engines: {node: '>= 10'}cpu: [x64]os: [linux]@@ -1447,8 +1453,8 @@ packages:cpu: [x64]os: [linux]- '@next/[email protected]':- resolution: {integrity: sha512-+uxFlPuCNx/T9PdMClOqeE8USKzj8tVz37KflT3Kdbx/LOlZBRI2yxuIcmx1mPNK8DwSOMNCr4ureSet7eyC0w==}+ '@next/[email protected]':+ resolution: {integrity: sha512-HrUcTr4N+RgiiGn3jjeT6Oo208UT/7BuTr7K0mdKRBtTbT4v9zJqCDKO97DUqqoBK1qyzP1RwvrWTvU6EPh/Cw==}engines: {node: '>= 10'}cpu: [x64]os: [linux]@@ -1459,8 +1465,8 @@ packages:cpu: [arm64]os: [win32]- '@next/[email protected]':- resolution: {integrity: sha512-LLTKmaI5cfD8dVzh5Vt7+OMo+AIOClEdIU/TSKbXXT2iScUTSxOGoBhfuv+FU8R9MLmrkIL1e2fBMkEEjYAtPQ==}+ '@next/[email protected]':+ resolution: {integrity: sha512-SxorONgi6K7ZUysMtRF3mIeHC5aA3IQLmKFQzU0OuhuUYwpOBc1ypaLJLP5Bf3M9k53KUUUj4vTPwzGvl/NwlQ==}engines: {node: '>= 10'}cpu: [arm64]os: [win32]@@ -1471,8 +1477,8 @@ packages:cpu: [x64]os: [win32]- '@next/[email protected]':- resolution: {integrity: sha512-aW5B8wOPioJ4mBdMDXkt5f3j8pUr9W8AnlX0Df35uRWNT1Y6RIybxjnSUe+PhM+M1bwgyY8PHLmXZC6zT1o5tA==}+ '@next/[email protected]':+ resolution: {integrity: sha512-4QZG6F8enl9/S2+yIiOiju0iCTFd93d8VC1q9LZS4p/Xuk81W2QDjCFeoogmrWWkAD59z8ZxepBQap2dKS5ruw==}engines: {node: '>= 10'}cpu: [x64]os: [win32]@@ -1497,6 +1503,11 @@ packages:resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}engines: {node: '>=14'}+ '@prisma/[email protected]':+ resolution: {integrity: sha512-T0c+oQsP0F47cTsoKPSEtPRmeuhFaCPcMFDev6N1QTnQZi+COkAiO6NKmblf1MM8D9ltYhs1PRsYBzPWB6QKwg==}+ peerDependencies:+ pg: ^8.11.3+'@prisma/[email protected]':resolution: {integrity: sha512-5II+vbyzv4si6Yunwgkj0qT/iY0zyspttoDrL3R4BYgLdp42/d2C8xdi9vqkrYtKt9H32oFIukvyw3Koz5JoDg==}engines: {node: '>=18.18'}@@ -1515,6 +1526,9 @@ packages:'@prisma/[email protected]':resolution: {integrity: sha512-4muBSSUwJJ9BYth5N8tqts8JtiLT8QI/RSAzEogwEfpbYGFo9mYsInsVo8dqXdPO2+Rm5OG5q0qWDDE3nyUbVg==}+ '@prisma/[email protected]':+ resolution: {integrity: sha512-5+CzN/41gBsRmA3ekbVy1TXnSImSPBtMlxWAttVH6tg94bv4zGGRmyk5tUCdT83nl0hG1Sq2oMXR7ml6aqILvw==}+'@prisma/engines-version@6.8.0-43.2060c79ba17c6bb9f5823312b6f6b7f4a845738e':resolution: {integrity: sha512-Rkik9lMyHpFNGaLpPF3H5q5TQTkm/aE7DsGM5m92FZTvWQsvmi6Va8On3pWvqLHOt5aPUvFb/FeZTmphI4CPiQ==}@@ -1538,26 +1552,26 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-CRheGyyM8afPJvDHLXn/mmGG/WAr/z2LReK3DlPdxVKcsOn7g3NIRxAcAIAJQlDLdOiu1SXHiZe6uu2jPhHrxA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-c8Ipp7EoFXlPKpOUJne6JlG823KwtqMyFsTpU0LS0DE9IEfnAIKanc5X+kChNmooKHq4V8QNyUxTf8WyBKU9+Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-E49qcbBRgofXYfWbli50bepWVNtQBq7qewL9XsX7nHkwPPUe1IRwJOnWZqYMgwwhUBOXfnsR6/TssiXqZsrJdw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-iPlSR225CSOit+57SrDfEF3lDuQvjRBYj1HFyGsLk91HfV3vDRgkKiou8uhOHk+B3afGJRwot8/Sr9MvNOfeQg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-S931yi8jJ6CgUQJk+h/PEl+V0n1dUYr9n6nKXmZeU3940to4DauqwvmD9sg67hFHJ0QGroHT/s29yIfa5MfQcg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-RXVECPB3gP5SZvfKwlqLKCWEFzJh6AcDQQSRkArlyLyHRAHHcniKO3hW90pRWKmEUSVUAZdoCA6XkRL3dXGYXw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-b9c76DBSYTdacSogbsvjkdZomTo5yhBNMmR5ufO544HQ718Ry8q8JmVbtmF/+dkZN7KGnBQCltzGLzXH0Vc0Zg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-5OHrrihjCNBRB93KysXfHZBLUSGh43fC3DTfH9LWDxfpo38//VkaDXZezA0zg+a43D3kTq6tOSNgHq3sUk/Q5Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1568,221 +1582,221 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-3DcYxEWBrcuHSBq0OqCs6GySuy6eOue8/ngC31j/8aMXR+O4mGpXi0wo3rSQGFmGq/4Ri986cI2iGwZOkzpMHg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-zGEptdwSCcLS/Z+LARmCyv4ptLIYtLIXHtgFSDAaF5ssY0whMOT0yAmOJz4T4ldnaWbBsLIz9O3PbUzNy83L2A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-nCLFSQjOR3r3tB1AURtZKSZhi2euBMw0QxsIjnMVF73BQOfwfHMrIFctNULbL070gEnXofzeBd3ykJQpnsGH+Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-RvIEz2JK6Ndi0VhhNPYzfHbvq6rj7o2SwhhrcN5cKPC0lGgTXgHJheTq2kMu7ctO/C+Yx/3d0LQC/fOnbKH8zA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-gDc+bM0EaY3BuIW8IJu/ARJV78bRpOaHp+B08EW4N2qJvc7Bs+EmGLnxMrB6Ny+YxNxsYdQRA/FqiytVYOEk8w==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-VoVLqTSttvHE1h8nrF2L7r1SDN0VCv5UtIlYqUxK4Gk/5Z7Pboo7aY2OAhgpycm9ZUfWio/VVAtj6oMoWHjxQw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-hVP/TvjUnPgckg4qibc/TDH54O+BzW95hxApxBw1INyViRm95PxdCQDqBdQ/ZW7Gv6J2aUBCGihX7kINPf70ow==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-X4KKf0OPHIje+68I0GRDkIcg+qsrBEQskl72aX7GQy6oNBta3ZTxQJrK2HTYdBDJnr1ADQdxYi+pZ5zPYDjODA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-YrazXoIzVq48soJpVMb2Iq/CB+lglwfKLsml5UfpE0MGlJJ/jWtIZtodqQ8ree1YguMNTvtESazTlMo7ZLsasQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-swO7U2G1Qhelj08RUiPQ8OEwDWDGj7DgWBmMyU2HjVEihR9wlvwsJTvzmxNQvJJT0l1bxQ/tM4RWxdUycUYy7A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-Sjb+UQxG58/paOZXsVKiqLautV4FyILr3tLxMG4Q04QOUzatqlz91APt7RsVMdizk6bVB7Lg74AEypHbXVzhDQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-kW8TE4MLiTZJWnXSH+/6HeEtCOP20S+3m0BpToOzZhlpETSWJj6WcTRrM9ygt86v+lD4Vb92aQPdB75NVCbSAg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-rR5uZUMSY4xLHmpK/I8bP1V6vUNHFo33gTvrvNUsAKKqvMfa7R2nu5A6v97dr5g6tVH6xzpdkPsOJCWh90H2cw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-E9M/kPYvF1fBZpkRXsKqMhvBVEyTY7vmkHeXLJo6tInKQOjYyYs0VeWlnGnxBjQIAH7J7ZKAORfTFQQHyhoueQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-N1bDsJfmnyDesayK0Ii6UPH6JWiF6Wz8WSveQ2y5004XHoIWn5LpWmOqnRedvyw4Yedw33schlvrY7ENEwMdpg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-d7Cic5OGBqI/OMUuHlPrPn6udSvjdpurrrwbnSYzrGlVhDmKLUdrLTtBL8O1MPzluAyW52azqJXSpsjwh288KA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-/tJB7xnSruORJ8tlFHja4SfL8/EW5v4cBLiyD5z48m7IdG33jXR8Cv4Pi5uQqs8zKdnpqZ1wDG3GQxNDwZavpg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-znYb6S97yS36nw0liNFYFPmMyhhiUGvhtSXvkPEEU+bxw94O6jbLNwyJKrlUUSNDW3XINasIIY7EhC66QMbSFw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-RHURMo063qbbA8WXCJxGL+5xmSx6yW7Z/V2jycrVcZFOYqj2EgU953aVjpaT/FSyH8/AEioU9oE64YmiEfWUUA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-tdcKDtzQcvT5U7mBbasiV/uHfwQmkYszyjKUZWigO54YNoz5Zp3RFfS14Mv6NAft2cse8Bj9oEyf8HMUT8KEZA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-Fim0FLfY05kcpIILdOtqcw58c3sksvmVY8kICSwKCuSek4wYfwJdU28p/sRptw4adJhqN8Cbssvkf/J8zL2GgA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-1j00soQ2W0nTgzaaIsGFdMF/5aN60AEdCJPhmXGZiuWdWzMxObN9LQ9vdzYPTjTqyqMdSaSp9DZKs5I26Xovpw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-ntLrlgqkmZupbbjekz3fE/n3eQH2vhncx8gUp0+N+GttKWevx7jos11JUBjnJwb1RSOPgRUFcrluOqBp0VgcfQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-BWyZXBT4P17b9C9HfOIT2glDFMH9nUCfQF7vZ5FEeXNBudH/8OcSbzyBUG4Dg3XPtkOem5LP59ocaizkl32Tvg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-Ht9D+xkI2Aysn+JNiHE+UZT4FUOGPF7Lfrmp7xdJCA/tEqqF3xW/pAh+UCNOnnWmH8jTYnUg3bCp4G6GQUxKCQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-ZJIj/BKf66q52idy24ErzX77vDGuyQn4neWtu51RRSk4npI3pJqEPsdkPCdo2dlBCo/Uc1pfuLGg2hY3N/ni9Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-mcmHijInDZZY3W9r0SeRuXsHW8Km9rBWKB3eoBz+PVuyJYMuabhQ2mUB5xTbqbnV++Srr7j/59g+Lbw5gAN4lw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-1U5ce6cqg1qGbK4M4R6vwrhUrKXuUzReZwHaTrXxEY22IMxKDXIZL8G7pFpcKix2XKqjLZWf+g8ngGuNhtQ2QQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-ujq7+XIP7OXHu7m2NObvHsl41B/oIBAYI0D+hsxEQo3+x6Q/OUxp9EX2sX4d7TBWvchFmhr6jJdER0QMmeSO/A==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-LScn5bRlBrv7yt2y06Ul3vNo8BOYHwZXjk47XCJTdt/QWhuU15oG0sRjJ1OIWgZ96jtW7u6YZ1PQtwX55gl7Dw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-bW3D7KcnQIF77F3zDRMIGQ6e5e1wHTNUtbKJLE423u1Dhc7K2x0pksir0gLGwElhiBW544lY1jv3kFLOeKa6ng==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-6fIIr7KqJyS6+7FzRUT3TJozcImJG38kkPtzEpwhmPzWNDWEu307BOjIMw0AHs+m1pT7wspCzg3KOTppw8S4eg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-6+yNF9ZrZ4YJ60Oxy2gKI4/xy6WUv1iePDCFJkgpNVuOEYi8W8czff8ctXu/RPB25OJx5v2sCw9VirRogTo2zA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-nbBmx30tW53Vlbq3BbMxHGbHa7vGE9ItacI+1XAdH2UZDLtdZA5J6U9YC6lokKQCv+aEVO6Zl9YG4yp57YwnGw==}- '@react-aria/[email protected]':- resolution: {integrity: sha512-D0C4CM/QaxhCo2pLWNP+nfgnAeaSZWOdPMo9pnH/toRsoeTbnD6xO1hLhYsOx5ge+hrzjQvthjUrsjPB1AM/BQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-iLioNOnHhltIq7JtLkeSXA1bFt3rUdUwnc8j20LXlzhDgH/56Xi1sxOCzaGo33mDPT16ANJG4IolVzg0+tnb2g==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-FgmB/+cTE/sz+wTpTSmj9hFXw4nzfMUJGvXIePnF6f5Gx6J/U7aLEvNk7sXCp76apOu8k7ccma1nCsEvj74x7w==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-IYI0Z2pwMvIe8r/3G3PHhM4G/KRiW1ssFCBZdCjBbSpl6/EkmrHiyeaBYG0j8Ux8tmRmXiMVjxLdDlCJQDH7mQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-UvhPlRwVmbNEBBqfgL41P10H1jL4C7P2hWqsVw72tZQJl5k5ujeOzRWk8mkmg+D4FCZvv4iSPJhmyEP8HkgsWg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-iQuXWn6BGneSBZrRURkntfivY9noUiq/JLs9KjtaSm9V0X4THevB9xXQLL0qLJ+n5YHOM6skRyoCRaweYY5IhA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-wepzwNLkgem6kVlLm6yk7zNIMAt0KPy8vAWlxdfpXWD/hBI30ULl71gL/BxRa5EYG1GMvlOwNti3whzy9lm3eQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-lWerY4caK2+AXzdPhUqAov3Di2mSfIKdaEEj+99iXeH85zzs2cbWZRvvCwwVGQ0GprypxETz1jb1Wq/55xDALw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-uSQBVY64k+CCey82U67KyWnjAfuuHF0fG6y76kIB8GHI8tGfd1NkXo4ioaxiY0SS+BYGqwqJYYMUzQMpOBTN1A==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-lpMVrZlSo1Dulo67COCNrcRkJ+lRrC2PI3iRoOIlqw1Ljz4KFoSGyRudg/MLJ/YrQ+6zmNdz5ytdeThrZwHpPQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-o10G8RUuHnAGZYzkc5PQw7mj4LMZqmGkoihDeHF2NDa9h44Ce5oeCPwRvCKYbumZDOyDY15ZIZhTUzjHt2w6fA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-kxML2cuI4/5AlSSzOAwXVXoouvrICxGdWbs0ze0IHaGkw6p3oKa5By6I6tT0+8/Kxy6ZFeCL+l/PU6K/ysAdAA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-WnAvU9ct8+Asb8FFhGw6bggBmRaPe9qZPgYacenmRItwN+7UVTwEBVB9umO2bN3PLGm3CKgop10znd6ATiAbJA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-HLHT2xc6USM/SbqFYz2gbREq7IcWfO+845ao/GCxy6Rx8eGD3OV09jgd+JlcSNJb2WiTpKhkSeX3wf7VgzPw2g==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-2v8QmcPsZzlOjc/zsLbMcKeMKZoa+FZboxfjq4koUXtuaLhgopENChkfPLaXEGxqsejANs4dAoqiOiwwrGAaLQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-r/XU5PJY/V8LTklaiO7n3BDG9gVg/Dp3p7IwgGCYUbLuF9+8yMh858teOEJr3FYKLPr/nZLZQE08oJuADkCLEw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-nHUksgjg92iHgseH9L+krk9rX19xGJLTDeobKBX7eoAXQMqQjefu+oDwT0VYdI/qqNURNELE/KPZIVLC4PB81w==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-YIdCYe1yXXfbZ0snUMWrQpOxtJO0+eHHp3+PSqZ/dyvLqMlTlYnOv2j5lc36sN0r1YWfN8OEpxzK3jHdD4M6yA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-5ZKVQ/5I2+fw8WyVCQLGjQKsMKlTIieLPf8NvdC24a+pmiUluyUuqfPYdI8s6lcnjG0gbOzZB+jKvDRQbIvMPQ==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-T9hJpO6lfg6zHRbs5CZD0eZrWIIjN6LY+EC6X5pQJbJeq6HqviVSQx25q98K430S/EGwHRltY5Bwy+XwlMZfdA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-GONrMMz9zsx0ySbUTebWdqRjAuu6EEW+lLf3qUzcqkIYR8QZVTS8RLPt7FmGHKCTDIaBs8D2yv9puIfKAo1QAA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-ciRfI0ya89pm4R+2RE7vLhu5OjdsAQfzghVI5Eh5AHpwjajMJ41O4Vkyt2ci5KTcjwg80CFftAWmF02w2hKR5Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-dVKaRgrSU2utxCd4kqAA8BPrC1PVI1eiJ8gvlVbg25LbwK4dg1WPXQUK+80TbrJc9mOEooPiJvzw59IoQLMNRg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-Ko1e9GeQiiEXeR3IyPT8STS1Pw4k/1OBs9LqI3WKlHFwH5M8q3DbbaMOgekD41/CPVBKmCcqFM7K7Wu9kFrT2A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-lQDE/c9uTfBSDOjaZUJS8xP2jCKVk4zjQeIlCH90xaLhHDgbpCdns3xvFpJJujfj3nI4Ll9K7A+ONUBDCASOuw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-2P5thfjfPy/np18e5wD4WPt8ydNXhij1jwA8oehxZTFqlgVMGXzcWKxTb4RtJrLFsqPO7RUQTiY8QJk0M4Vy2g==}engines: {node: '>= 12'}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-tFdJmcHaLgW23cS2R713vcJdVbsjDTRk8OLdG/sMziPBY3C00/exuSIb57xTS7KrE0hBYfnLJQTcmDNqdM8+9Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-6Ue6GXBGMPc5uNwu6A4XHOEK5n/3OmgW/kgCmFVi2dh4QqkASSdadaizS/2uENWfgKTlEpd0Wy3PSfpubL+hCg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-hs3akyNMeeAPIfa+YKMxJyupSjywW5OGzJtOw/Z0j6pV8KXSeMEXNYkSuJY+m5Q1mdunoiiogs0kE3B0r2izQA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-zhqrt6Uk66wrgaIHrPUv3nguVMGMnPtqUmp0K2gibhNucN0iJ6zILoaq8vMmFH+9PmUqoiPJXq18czs2CluT6Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-TYfwaRrI0mQMefmoHeTKXdczpb53qpPr+3nnveGl+BocG94wmjIqK6kncboVbPdykgQCIAMd2d9GFpK01+zXrA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-aXY83zqLStlf/v8vP2OvlrLsujCNWGqfL3hMVDF1PNqRJGllMejzkzbZNf4fUQDTX+e2zNDv6SH4IRJ4k9sKlw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-OkLyFYTFVUYB339eugw2r6vIcrWq47O15x4sKNkDUo6YBx9ci9tdoib4DlzwuiiKVr/vmw1WMow6VK4zOtuLng==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-oTEDqOejjltr64ADpgMA3eB/G4bJ2Y9TlQwW33l6XWAjtKKZScBhGrf9l10NTQphZf4QxMnucIHo8IV2eKSmjg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-p/Z0fyE0CnzIrnCf42gxeSCNYon7//XkcbPwUS4U9dz2VLk2GnEn9NZXPYgTp+08ebQEn0pB1QIchX79yFEguw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-dcQQKVgH/zv3wExcmpH7yMA2d4oPO3JF9L1HdwNvPHScnfbr404ZVEKjrIlxEvzq7V5yKky5q8171jmp+YOPyw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-7HWTKIVwS1JFC8//BQbRtGFaAdq4SljvI3yI5amLr90CyVM0sugTtcSX9a8BPnp1j9ao+6bmOi/wrV48mze1PA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-oH1WZfwdaryiggqxu1r1Jq1/fF8n9AVD3euamkJmXq5/t9IJUYLzct4w54QqjQ0KhtbHp+7n55QvvhZ9cW3XEg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-S6ShToNR6TukRJh8qDdyl9b2Bcsx43eurUB5USANn4ycPov8+bIxQnxiknjssZx7jD8vX4jruuNh7BjFbNsGFw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-RwWyFiM+dBsiulT1ziGdG5+cy/F/7hFVb1Ddyc90HNLqRuX2sAX3ysm0YmiiNpnHwGQR/kPd1ulTSqQ+ps9wiQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1793,32 +1807,38 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-8JHRqffH5vUw7og6mlCRzb4h95/R5RpOxGFfEGw7aami14XMo6tZg7wMgwDUAEiVqNerRWYaw+tk7nCUQXo1Sg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-YGLDOATMla9Y7Yk2P8qK3zcTrxQClf2ZLS8Wj14RY4le/r6F2rGJqkGhVFPyoNAtwsRr4bzD7CGERe4NUAPrqQ==}+ peerDependencies:+ react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1+ react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1++ '@react-aria/[email protected]':+ resolution: {integrity: sha512-WwooDvXb64mGwZUZQj4tYcJEFSXLIxDywT97K9U4fLUhrNcQ8KdxdhPjyPOEXxscPfdJDyKKckhRiKl91UoKsg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-kdA0CCUD8luCrXZFo0rX1c0LI8jovYMuWsPiI5OpmiEKGA5HaVFFW/H9t/XSYdVc/JO08zbeZ/WacTusKeOT3Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-GBg01P04fLY16ZHLYcP9nLGis2MGQSpiP8rMG0t5jqddJdx+v8IL28f9mcHw+NSRgZm28NHQThTkH31SUxXppQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-jSOrZimCuT1iKNVlhjIxDkAhgF7HSp3pqyT6qjg/ZoA0wfqCi/okmrMPiWSAKBnkgX93N8GYTLT3CIEO6WZe9Q==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-yXMFVJ73rbQ/yYE/49n5Uidjw7kh192WNN9PNQGV0Xoc7EJUlSOxqhnpHmYTyO0EotJ8fdM1fMH8durHjUSI8g==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-Z5+Zr54HCBqycIzZuHohS25dOJ7p8sdNDjAYvW33Uq8nudTvSC5JmV/5kZVN11j5kVYXa7maRnFQlDx941sygw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-vV+XM45ZfTy0PAkAiPvkCm0tQGY1F7ur4p8KbkCznG7/hfJ+fVx1aJ1F4UmvDowmTmSMAk9JQtH9b2qNkMtn9Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-aria/[email protected]':- resolution: {integrity: sha512-D37GHtAcxCck8BtCiGTNDniGqtldJuN0cRlW1PJ684zM4CdmkSPqKbt5IUKUfqheS9Vt7HxYsj1VREDW+0kaGA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-vhGhALs/PGdTs/7GD2hsy7CF1LBF9QlL57HkRSu8kfiuiA7rqRTqYg6q723OvaFsspj3DCxP2MLQhvvZSWe7Ng==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -1855,152 +1875,152 @@ packages:peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-pTPRmPRD/0JeKhCRvXhVIH/yBimtIHnZGUxH12dcTl3MLxjXQDTn6/LWK0s4rzJcjsC+EzGUCVBBXgESb7PUlw==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-IGSbTgCMiGYisQ+CwH31wek10UWvNZ1LVwhr0ZNkhDIRtj+p+FuLNtBnmT1CxTFe2Y4empAxyxNA0QSjQrOtvQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-eGl0GP/F/nUrA33gDCYikyXK+Yer7sFOx8T4EU2AF4E8n1VQIRiVNaxDg7Ar6L3CMKor01urppFHFJsBUnSgyw==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-jt3Kzbk6heUMtAlCbUwnrEBknnzFhPBFMEZ00vff7VyhDXup7DJcJRxreloHepARZLIhLhC5QPyO5GS4YOHlvw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-H+47fRkwYX2/BdSA+NLTzbR+8QclZXyBgC7tHH3dzljyxNimhrMDnbmk520nvGCebNf3nuxtFHq9iVTLpazSVA==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-5SIb+6nF9cyu+WXqZ6io56BtdOu8FjSQQaaLCCpfAC6fc6zHRk8by0WreRmvJ5/Kn8oq2FNJtCNRvluM0Z01UA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-yi1MQAbYuAYKu0AtMO+mWQWlWk6OzGMa9j4PGtQN2PI5Uv1NylWOvdquxbUJ4GUAuSYNopYG8Ci9MZMwtito8w==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-KBpnXt31hCgdYq1a7PxUspK990/V5hPO4LqJ1K89p7r2t4OF66IBW5FmOS7KY6p1bGOoZgbk9m5w+yUeQq4wmw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-27SkClMqbMAKuVnmXhYzYisbLfzV7MO/DEiqWO4/3l+PZ+whL7Wi/Ek7Wqlfluid/y4pN4EkHCKNt4HJ2mhORQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-XOfG90MQPfPCNjl2KJOKuFFzx2ULlwnJ/QXl9zCQUtUBOExbFRHldj5E4NPcH14AVeYZX6DBn4GTS9ocOVbE7Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-7LYPxVbWB6tvmLYKO19H5G5YtXV6eKCSXisOUiL9fVnOcGOPDK5z310sj9TP5vaX7zVPtwy0lDBUrZuRfhvQIQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-hKEvHCM/nHM6FFJz3gT6Ms85H+qNhXfHDYP/TU7XiDoeVHzUpj2Yc3xGsIty6/K2k7jrblUj+LuKmdvidd9mug==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-ad3IOrRppy/F8FZpznGacsaWWHdzUGZ4vpymD+y6TYeQ+RQvS9PLA5Z1TanH9iqLZgkf6bvVggJFg/hhDh2hmg==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-KvOUFz/o+hNIb7oCli6nxBdDurbGjRjye6U99GEYAx6timXOjiIJvtKQyqCLRowGYtCS6GH41yM6DhJ2MlMF8w==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-RE4hYnDYgsd5bi01z/hZHShRGKxW++xCA6PCufxtipc1sxZGUF4Sb1tTSIxOjh1dq5iDVdrAQAS6en0weaGgLA==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-Rh+y+XAUNwyFvvzBS/MtFvdWHC38mXI99S6mdNe3e5Og8IZxLBDtvwBCzrT30YzYqN40yd3alm9xLzpYXsvYYA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-YkvkehpsSeGZPH7S7EYyLchSxZPhzShdf9Zjh6UAsM7mAcxjRsChMqsf6zuM+l0jgMo40Ka1mvwDYegz92Qkyg==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-H0zWOjjoocM+8r5rJ2x0B66NXZd2+7lF1zhomoMoR5+57DA5hWZTY0tht21DKjNoFk4f96Ythh0jRLziQbSkBw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-XPR5gi5LfrPdhxZzdIlJDz/B5cBf63l4q6/AzNqVWFKgd0QqY5LvWJftXkklaIUpKSJkIKQb8dphuZXDtkWNqg==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-2HjFcZx1MyQXoPqcBGALwWWmgFVUk2TuKVIQxCbRq7fPyWXIl6VHcakCLurdtYC2Iks7zizvz0Idv48MQ38DWg==}- '@react-stately/[email protected]':- resolution: {integrity: sha512-A6GOaZ9oEIo5/XOE+JT9Z8OBt0osIOfes4EcIxGS1C9ght/Smg0gNcIJ2/Wle8qmro4RoJcza2yJ+EglVOuE0w==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-wOs0SVXFgNr1aIdywiNH1MhxrFlN5YxBr1k9y3Z7lX+pc/MGRJFTgfDDw5JDxvwLH9joJ9ciniCdWep9L/TqcQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-P0vfK5B1NW8glYD6QMrR2X/7UMXx2J8v48QIQV6KgLZjFbyXhzRb+MY0BoIy4tUfJL0yQU2GKbKKVSUIQxbv0g==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-/YurYfPARtgsgS5f8rklB7ZQu6MWLdpfTHuwOELEUZ4L52S2gGA5VfLxDnAsHHnu5XHFI3ScuYLAvjWN0rgs/Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-1czYPaWsEi/ecSOMBiMmH82iTeAIez/72HQjvP0i5CK2ZqLV0M1/Z10lesJHdOE+ay2EkE2qEqbHJnCdCqzkpA==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-W2aa60I3qCI24HzZaFsS/eV1aCL0YI3IOlYm9PgsbELP82y3n7YRnwVreUv30KVdpn0VviLZn2xdWSeZlyqi9A==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-XPGvdPidOV4hnpmaUNc4C/1jX7ZhBwmAI9p6bEXDA3du3XrWess6MWcaQvPxXbrZ6ZX8/OyOC2wp7ixJoJRGyA==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-RiqYyxPYAF3YRBEin8/WHC8/hvpZ/fG1Tx3h1W4aXU5zTIBuy0DrjRKePwP90oCiDpztgRXePLlzhgWeKvJEow==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-sqYcSBuTEtCebZuByUou2aZzwlnrrOlrvmGwFNJy49N3LXXXPENCcCERuWa8TE9eBevIVTQorBZlID6rFG+wdQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-Y+PqHBaQToo6ooCB4i4RoNfRiHbd4iozmLWePBrF4d/zBzJ9p+/5O6XIWFxLw4O128Tg3tSMGuwrxfecPDYHzA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-E56RuRRdu/lzd8e5aEifP4n8CL/as0sZqIQFSyMv/ZUIIGeksqy+zykzo01skaHKY8u2NixrVHPVDtvPcRuooA==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-FWbbL4E3+5uctPGVtDwHzeNXgyFw0D3glOJhgW1QHPn3qIswusn0z/NjFSuCVOSpri8BZYIrTPUQHpRJPnjgRw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-+Ve/TBlUNg3otVC4ZfCq1a8q8FwC7xNebWkVOCGviTqiYodPCGqBwR9Z1xonuFLF/HuQYqALHHTOZtxceU+nVQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-bkGYU4NPC/LgX9OGHLG8hpf9QDoazlb6fKfD+b5o7GtOdctBqCR287T/IBOQyvHqpySqrQ8XlyaGxJPGIcCiZw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-q7UKcVYY7rqpxKfYRzvKVEqFhxElDFX2c+xliZQtjXuSexhxRb2xjEh+bDkhzbXzrJkrBT6VmE/rSYPurC3xTw==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-Y7xizUWJ0YJ8pEtqMeKOibX21B5dk56fHgMHXYLeUEm43y5muWQft2YvP0/n4mlkP2Isbk96kPbv7/ez3Gi+lA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-RC3QTEPVNUbgtuqzpwPUfbV9UkUC1j4XkHoynWDbMt0bE0tPe2Picnl0/r/kq6MO527idV6Ur4zuOF4x9a97LQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-JNvsnvK6A1057hQREHabRYAAtwj2vl20oqGBvl1IleKlFe3KInV9WBY5l6zR3RXrnCPHVvJuzGe2R7+g142Mnw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-saZo67CreQZPdmqvz9+P6N4kjohpwdVncH98qBi0Q2FvxGAMnpJQgx97rtfDvnSziST5Yx1JnMI4kSSndbtFwg==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-HvbL9iMGwbev0FR6PzivhjKEcXADgcJC/IzUkLqPfg4KKMuYhM/XvbJjWXn/QpD3/XT+A5+r5ExUHu7wiDP93w==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-Fw6nnG+VKMsncsY4SNxGYOhnHojVFzFv+Uhy6P39QBp6AXtSaRKMg2VR4MPxQ7XgOjHh5ZuSvCY1RwocweqjwQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-TLyjodgFHn5fynQnRmZ5YX1HRY0KC7XBW0Nf2+q9mWk4gUxYm7RVXyYZvMIG1iKqinPYtySPRHdNzyXq9P9sxQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-6SdG0VJZLMRIBnPjqkbIsdyQcW9zJ5Br716cl/7kLT9owiIwMJiAdjdYHab5+8ShWzU2D8Ae+LdQk8ZxIiIjkg==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-XnHSHbXeHiE5J7nsXQvlXaKaNn1Z4jO1aQyiZsolK1NXW6VMKVeAgZUBG45k7xQW06aRbjREMmiIz02mW8fajQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-SqE5A/Ve5H2ApnAblMGBMGRzY7cgdQmNPzXB8tGVc38NsC/STmMkq9m54gAl8dBVNbLzzd6HJBe9lqz5keYIhQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-PwE5pCplLSDckvgmNLVaHyQyX04A62kxdouFh1dVHeGEPfOYsO9WhvyisLxbH7X8Dbveheq/tSTelYDi6LXEJA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-lNpby7zUVdAeqo3mjGdPBxppEskOLyqR82LWBtP8Xg4olnjA5RmDFOuoJkIFttDX689zamjN3OE+Ra6WWgJczg==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-FujQCHppXyeHs2v5FESekxodsBJ5T0k1f7sm0ViNYqgrnE5XwqX8Y4/tdr0fqGF6S+BBllH+Q9yKWipDc6OM8g==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-9W2+evz+EARrjkR1QPLlOL5lcNpVo6PjMAIygRSaCPJ6ftQAZ6B+7xTFGPFabWh83gwXQDUgoSwC3/vosvxZaQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-W4a6xcsFt/E+aHmR2eZK+/p7Y5rdyXSCQ5gKSnbck+S3lijEWAyV45Mv8v95CQqu0bQijj6sy2Js1szq10HVwg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-JbKoXhkJ5P5nCrNXChMos3yNqkIeGXPDEMS/dfkHlsjQYxJfylRm4j/nWoDXxxkUmfkvXcNEMofMn9iO1+H0DQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-BSvuTDVFzIKxpNg9Slf+RdGpva7kBO8xYaec2TW9m6Ag9AOmiDwUzzDAO0DRsc7ArSaLLFaQ/pdmmT6TxAUQIA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-HxNTqn9nMBuGbEVeeuZyhrzNbyW7sgwk+8o0mN/BrMrk7E/UBhyL2SUxXnAUQftpTjX+29hmx1sPhIprIDzR3Q==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-/zbl7YxneGDGGzdMPSEYUKsnVRGgvsr80ZjQYBHL82N4tzvtkRwmzvzN9ipAtza+0jmeftt3N+YSyxvizVbeKA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-sMqBRKAAZMiXJwlzAFpkXqUaGlNBfKnL8usAiKdoeGcLLJt2Ni9gPoPOLBJSPqLOAFCgLWtr5IYjdhel9aXRzQ==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-VpWAh36tbMHJ1CtglPQ81KPdpCfqFz9yAC6nQuL1x6Tmbs9vNEKloGILMI9/4qLzC+3nhCVJj6hN+xqS5/cMTg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-O76ip4InfTTzAJrg8OaZxKU4vvjMDOpfA/PGNOytiXwBbkct2ZeZwaimJ8Bt9W1bj5VsZ81/o/tW4BacbdDOMA==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-cWvjGAocvy4abO9zbr6PW6taHgF24Mwy/LbQ4TC4Aq3tKdKDntxyD+sh7AkSRfJRT2ccMVaHVv2+FfHThd3PKQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-stately/[email protected]':- resolution: {integrity: sha512-y2jefrW0ffJpv0685IEKId6/wy0kgD/bxYuny9r9Z3utvcjjFl9fX9cBKsXII7ZxPiu0CP+wA6HQ53GU3BqCsw==}+ '@react-stately/[email protected]':+ resolution: {integrity: sha512-ZjhsmsNqKY4HrTuT9ySh8lNmYHGgFX24CVVQ3hMr8dTzO9DRR89BMrmenoVtMj7NkonWF8lUFyYlVlsijs2p4w==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -2010,138 +2030,138 @@ packages:peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-x94KEZaLIeHt9lqAkuaOopX5+rqCTMSHsciThUsBHK7QT64zrw6x2G1WKQ4zB4h52RGF5b+3sFXeR4bgX2sVLQ==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-SbLjrKKupzCLbqHZIQYtQvtsXN53NPxOYyug6QfC4d7DcW1Q9wJ546fxb10Y83ftAJMMUHTatI6SenJVoqyUdA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-z87stl4llWTi4C5qhUK1PKcEsG59uF/ZQpkRhMzX0KfgXobJY6yiIrry2xrpnlTPIVST6K1+kARhhSDOZ8zhLw==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-QLoSCX8E7NFIdkVMa65TPieve0rKeltfcIxiMtrphjfNn+83L0IHMcbhjf4r4W19c/zqGbw3E53Hx8mNukoTUw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-a/wGT9vZewPNL72Xni8T/gv4IS2w6iRtryqMF425OL+kaCQrxJYlkDxb74bQs9+k9ZYabrxJgz9vFcFnY7S9gw==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-Bp6fZo52fZdUjYbtJXcaLQ0jWEOeSoyZVwNyN5G6BmPyLP5nHxMPF+R1MPFR0fdpSI4/Sk78gWzoTuU5eOVQLw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-fU3Q1Nw+zbXKm68ba8V7cQzpiX0rIiAUKrBTl2BK97QiTlGBDvMCf4TfEuaNoGbJq+gx+X3n/3yr6c3IAb0ZIg==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-9y8zeGWT2xZ38/YC/rNd05pPV8W8vmqFygCpZFaa6dJeOsMgPU+rq+Ifh1G+34D/qGoZXQBzeCSCAKSNPaL7uw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-72uZ0B3EcaC2DGOpnhwHSVxcvQ3UDNSVR2gVx7PgUCGlEjhnn9i0UErIP8ZzV2RsAvjK6MrGs7ZCwZtl+LxCcg==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-ZbbgzAWK56RMMZzRGhTAB9Fz9PGnj6ctc6VMqOyumCOF9NKkYgI0E2ssTY/iOXBazZvhhhGahbGl+kjmgWvS6g==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-wqHBF0YDkrp4Ylyxpd3xhnDECe5eao27bsu+4AvjlVKtaxaoppNq2MwSzkuSSS/GEUXT6K9DDjrGFcp07ad5gA==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-BOvlyoVtmQJLYtNt4w6RvRORqK4eawW48CcQIR93BU5YFcAGhpcvpjhTZXknSXumabpo1/XQKX4NOuXpfUZrAQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-+wv57fVd6Y/+KnHNEmVzfrQtWs85Ga1Xb63AIkBk+E294aMqFYqRg0dQds6V/qrP758TWnXUrhKza1zMbjHalw==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-w3JIXZLLZ15zjrAjlnflmCXkNDmIelcaChhmslTVWCf0lUpgu1cUC4WAaS71rOgU03SCcrtQ0K9TsYfhnhhL7Q==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-g18CzT5xmiX/numpS6MrOGEGln8Xp9rr+zO70Dg+jM4GBOjXZp3BeclYQr9uisxGaj2uFLnORv9gNMMKxLNF6A==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-+FIyFnoKIGNL20zG8Sye7rrRxmt5HoeaCaHhDCTtNtv8CZEhm3Z+kNd4gylgWAxZRhDtBRWko+ADqfN5gQrgKg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-EZ6jZDa9FbLmqvukrLoUp3LUEVE0ZnBB5H6MHhE+QmjYRAvtWljx70xOqnn7sHweuS4+O1kDt1Ec1X5DU+U+BA==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-Ryw9QDLpHi0xsNe+eucgpADeaRSmsd7+SBsL15soEXJ50K/EoPtQOkm6fE4lhfqAX8or12UF9FBcBLULmfCVNQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-NwfydUbPc1zVi/Rp7+oRN2+vE1xMokc2J+nr0VcHwFGt1bR1psakHu45Pk/t763BDvPr/A3xIHc1rk3eWEhxJw==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-VZAKO3XISc/3+a+DZ+hUx2NB/buOe2Ui2nISutv25foeXX4+YpWj5lXS74lJUCuVsSz6D6yoWvEajeUCYrNOxg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-IZDSc10AuVKe7V8Te+3q8d220oANE4N43iljQe3yHg7GZOfH/51bv8FPUukreLs1t2fgtGeNAzG71Ep+j/jXIw==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-CtCexoupcaFHJdVPRUpJ83uxK1U0bd9x9DhwRFMqqfPHufICkQkETIw2KIeZXRvMUMi2CSG/81XXy6K0K1MtNw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-26Lp0Gou502VJLDSrIpMg7LQuVHznxzyuSY/zzyNX9eopukXvHn682u90fwDqgmZz7dzxUOWtuwDea+bp/UjtA==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-WiCihJJpVWVEUxxZjhTbnG3Zq3q38XylKnvNelkVHbF+Y3+SXWN0Yyhk43J642G/d87lw1t60Tor0k96eaz4vw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-wkyWzIqaCbUYiD7YXr8YvdimB1bxQHqgj6uE4MKzryCbVqb4L8fRUM0V6AHkQS1TxBYNkNn1h4g7XNd5Vmyf3Q==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-TVQFGttaNCcIvy1MKavb9ZihJmng46uUtVF9oTG/VI/C4YEdzekteI6iSsXbjv5ZAvOKQR+S25IWCbK2W0YCjQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-Jhd873zc/Bx/86NB9nasMUWc013VnURVtMYbbkuRWiFr/ZoEvZzO1uoSIXf+Sob4xpiVhT/ltvJZTK4t4B9lTg==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-soimx+MAngG5MjQplJNB9erPh+P3Er764PqGA75L6FFmf2KhgzMniSVAqyVOpZu7G3qK4O+ihMAYXf6pQMBkSg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-D66Bop7M3JKzBV2vsECsVYfPrx8eRIx4/K2KLo/XjwMA7C34+Ou07f/bnD1TQQ/wr6XwiFxZTi6JsKDwnST+9Q==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-cI0Grj+iW5840gV80t7aXt7FZPbxMZufjuAop5taHe6RlHuLuODfz5n3kyu/NPHabruF26mVEu0BfIrwZyy+VQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-ppDfezvVYOJDHLZmTSmIXajxAo30l2a1jjy4G65uBYy8J8kTZU7mcfQql5Pii1TwybcNMsayf2WtPItiWmJnOA==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-Aj9jIFwALk9LiOV/s3rVie+vr5qWfaJp/6aGOuc2StSNDTHvj1urSAr3T0bT8wDlkrqnlS4JjEGE40ypfOkbAA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-wvhFz6vdlfKBtnzKvD/89N+0PF3yPQ+IVFRQvZ2TBrP7nF+ZA2pNLcZVcEYbKjHzmvEZRGu//ePC9hRJD9K30w==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-+4v++AP2xxYxjrTkIXlWWGUhPPIEBzyg76EW0SHKnD4pXxKigcIXEzRbxy62SMidTVdi7jh3tuicIP8OQxJ4cA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-l4uzlxmGGuR8IkWrMYdKj1sc3Pgo/LdfEGuIgK+d8kjPu0AZcnSgp5Oz035bCosZUabY6dEWxQHIoAH2zN7YZA==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-hLOu2CXxzxQqkEkXSM71jEJMnU5HvSzwQ+DbJISDjgfgAKvZZHMQX94Fht2Vj+402OdI77esl3pJ1tlSLyV5VQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-XQRQyJLNC9uLyCq+97eiqeQuM6+dCMrHu6aH6KSVt1Xh6HMmdx/TdSf6JrMkN+1xSxcW3lDE2iSf3jXDT87gag==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-Uua7TYKR1QcJE2F4SAewxuxt8k8gd52zul2q5oMe5azsm2uoAtV/qpNHc7dfPAR97UgbrE/aNMlX57PEubiuLg==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-qo+9JS1kfMxuibmSmMp0faGKbeVftYnSk1f7Rh5PKi4tzMe3C0A9IAr27hUOfWeJMBOdetaoTpYmoXW6+CgW3g==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-R7zwck353RV60gZimZ8pDKaj50aEtGzU8gk0jC3aBkfzSUKFJ6jq1DJdqyVQSwXdmPDd9iuketeIUIpEO2teoA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-KtM+cDf2CXoUX439rfEhbnEdAgFZX20UP2A35ypNIawR7/PFFPjQDWyA2EnClCcW/dLWJDEPX2U8+EJff8xqmQ==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-COIazDAx1ncDg046cTJ8SFYsX8aS3lB/08LDnbkH/SkdYrFPWDlXMrO/sUam8j1WWM+PJ+4d1mj7tODIKNiFog==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-uNhNLhVrt/2teXBOJSoZXyXg308A72qe1HOmlGdJcnh8iXA35y5ZHzeK1P6ZOJ37Aeh7bYGm3/UdURmFgSlW7w==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-kOQLrENLpQzmu6TfavdW1yfEc8VPitT4ZNMKOK0h7x3LskEWjptxcZ4IBowEpqHwk0eMbI9lRE/3tsShGUoLwQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-PJbZHwlE98OSuLzI6b1ei6Qa+FaiwlCRH3tOTdx/wPSdqmD3mRWEn7E9ftM6FC8hnxl/LrGLszQMT62yEQp5vQ==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-6Zz7i+L9k8zw2c3nO8XErxuIy7JVDptz1NTZMiUeyDtLmQnvEKnKPKNjo2j+C/OngtJqAPowC3xRvMXbSAcYqA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-kn+OsEWJfUSSb4N4J0yl+tqx5grDpcaWcu2J8hA62hQCr/Leuj946ScYaKA9a/p0MAaOAaeCWx/Zcss6F8gJIQ==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-fLPRXrZoplAGMjqxHVLMt7lB0qsiu1WHZmhKtroCEhTYwnLQKL84XFH4GV1sQgQ1GIShl3BUqWzrawU5tEaQkw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-VLgh9YLQdS4FQSk0sGTNHEVN2jeC0fZvOqEFHaEDgDyDgVOukxYuHjqVIx2IavYu1yNBrGO2b6P4M6dF+hcgwQ==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-z6AWq243EahGuT4PhIpJXZbFez6XhFWb4KwhSB2CqzHkG5bJJSgKYzIcNuBCLDxO7Qg25I+VpFJxGj+aqKFbzQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-dMm0cGLG5bkJYvt6lqXIty5HXTZjuIpa9I8jAIYua//J8tESAOE9BA285Zl43kx7cZGtgrHKHVFjITDLNUrNhA==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-72tt2GJSyVFPPqZLrlfWqVn5KRnWzXsXCZ3IDawcGunl4pu+2E24jd0CWN9kOi0ETO65flj2sljeytxKytXnlA==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- '@react-types/[email protected]':- resolution: {integrity: sha512-yjySKA1uzJAbio+xGv03DUoWIajteqtsXMd4Y3AJEdBFqSYhXbyrgAxw0oJDgRAgRxY4Rx5Hrhvbt/z7Di94QQ==}+ '@react-types/[email protected]':+ resolution: {integrity: sha512-/eG8hiW0D4vaCqGDa4ttb+Jnbiz6nUr5+f+LRgz3AnIkdjS9eOhpn6vXMX4hkNgcN5FGfA4Uu1C1QdM6W97Kfw==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -2565,8 +2585,8 @@ packages:resolution: {integrity: sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@umami/[email protected]':- resolution: {integrity: sha512-i7HPpkoyE2DJdTVFVbK+aDF5pVYNanNhZBanqptzw69wkt0I9CuG2aVoeLbGH19/j0Pbk7Mfvmw3uDrkGS2Zyw==}+ '@umami/[email protected]':+ resolution: {integrity: sha512-AAhtYdmLwVZ4i5lzcr5mylc5IQIirlxEL0bMRktlFHbX73wiBrTnk2RrYjmRhCe2KVRkCw2EF8ORXQ7GFrfAOg==}'@umami/[email protected]':resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==}@@ -3003,8 +3023,8 @@ packages:resolution: {integrity: sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==}- resolution: {integrity: sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==}+ resolution: {integrity: sha512-cOuvmUVtKrtEaoKiO0rSc29jcjwMwX5tOHDy4MgVFEWiUXj4uBMJkwI8MDySkgXidpMiHUcviogAvFi4pA2hDQ==}resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}@@ -5129,8 +5149,8 @@ packages:sass:optional: true- resolution: {integrity: sha512-CA3BatMyHkxZ48sgOCLdVHjFU36N7TF1HhqAHLFOkV6buwZnvMI84Cug8xD56B9mCuKrqXnLn94417GrZ/jjCQ==}+ resolution: {integrity: sha512-JqNj29hHNmCLtNvd090SyRbXJiivQ+58XjCcrC50Crb5g5u2zi7Y2YivbsEfzk6AtVI80akdOQbaMZwWB1Hthw==}engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}hasBin: truepeerDependencies:@@ -5352,6 +5372,40 @@ packages:resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}+ resolution: {integrity: sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg==}++ resolution: {integrity: sha512-P2DEBKuvh5RClafLngkAuGe9OUlFV7ebu8w1kmaaOgPcpJd1RIFh7otETfI6hAR8YupOLFTY7nuvvIn7PLciUQ==}++ resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}+ engines: {node: '>=4.0.0'}++ resolution: {integrity: sha512-DzZ26On4sQ0KmqnO34muPcmKbhrjmyiO4lCCR0VwEd7MjmiKf5NTg/6+apUEu0NF7ESa37CGzFxH513CoUmWnA==}+ peerDependencies:+ pg: '>=8.0'++ resolution: {integrity: sha512-IpdytjudNuLv8nhlHs/UrVBhU0e78J0oIS/0AVdTbWxSOkFUVdsHC/NrorO6nXsQNDTT1kzDSOMJubBQviX18Q==}++ resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}+ engines: {node: '>=4'}++ resolution: {integrity: sha512-7SKfdvP8CTNXjMUzfcVTaI+TDzBEeaUnVwiVGZQD1Hh33Kpev7liQba9uLd4CfN8r9mCVsD0JIpq03+Unpz+kg==}+ engines: {node: '>= 8.0.0'}+ peerDependencies:+ pg-native: '>=3.0.1'+ peerDependenciesMeta:+ pg-native:+ optional: true++ resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}+resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}@@ -5811,6 +5865,26 @@ packages:resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}engines: {node: ^10 || ^12 || >=14}+ resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}+ engines: {node: '>=4'}++ resolution: {integrity: sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==}+ engines: {node: '>=12'}++ resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}+ engines: {node: '>=0.10.0'}++ resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}+ engines: {node: '>=0.10.0'}++ resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}@@ -5897,8 +5971,8 @@ packages:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1- resolution: {integrity: sha512-pxZusRI1jCBIvJkORJnhAXey/5U/VJa1whCeP6ETzRKepJiXLRPjJerHHJw+3Q6kAJXADL9qds5xdq4nvmyLRA==}+ resolution: {integrity: sha512-jg4aUQrsBTwgKitXlyLvEVSigzn79jNpgDP+mrrDIX8emzr+BBXx1x6WSVHDAESep72Xcp+zr9PbLmBCk3/nzQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -5926,6 +6000,12 @@ packages:peerDependencies:react: ^16.8.0 || ^17 || ^18 || ^19+ resolution: {integrity: sha512-RbEks3+cbvTP84l/VXGUZ+JMrKOS8ykQCRYdm5aYsxnDquL0vspsyNhGRO7pcH6hsZqWlPOjLye7rJqdtdAmlg==}+ engines: {node: '>=18.0.0'}+ peerDependencies:+ react: ^16.8.0 || ^17 || ^18 || ^19+resolution: {integrity: sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==}peerDependencies:@@ -5965,8 +6045,8 @@ packages:react: ^16.8.0 || 17.xreact-dom: ^16.8.0 || 17.x- resolution: {integrity: sha512-zS06DsDhH44z7bsOkMHJ0gnjuLO3UWZ33l7JOgFscrv1qa33IG9fn707sI7GAJdLgDiWXJbeFvXdix2jR1fU1w==}+ resolution: {integrity: sha512-/8JC3Tmj7G8fHn47F88c6t5kFNhQAufwqjEKxYeNi7TPz9UL+35BeoH1poMmDHJsPz8qM/z4sWMzaW5AwYK8lQ==}peerDependencies:react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1@@ -6316,6 +6396,10 @@ packages:resolution: {integrity: sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==}+ resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}+ engines: {node: '>= 10.x'}+resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}@@ -6863,6 +6947,10 @@ packages:resolution: {integrity: sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==}engines: {node: '>=8.3'}+ resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}+ engines: {node: '>=0.4'}+resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}engines: {node: '>=10'}@@ -7806,20 +7894,20 @@ snapshots:'@img/[email protected]':optional: true- '@internationalized/[email protected]':+ '@internationalized/[email protected]':dependencies:'@swc/helpers': 0.5.17- '@internationalized/[email protected]':+ '@internationalized/[email protected]':dependencies:'@swc/helpers': 0.5.17intl-messageformat: 10.7.16- '@internationalized/[email protected]':+ '@internationalized/[email protected]':dependencies:'@swc/helpers': 0.5.17- '@internationalized/[email protected]':+ '@internationalized/[email protected]':dependencies:'@swc/helpers': 0.5.17@@ -8044,7 +8132,7 @@ snapshots:'@next/[email protected]': {}- '@next/[email protected]': {}+ '@next/[email protected]': {}'@next/[email protected]':dependencies:@@ -8053,49 +8141,49 @@ snapshots:'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@next/[email protected]':optional: true- '@next/[email protected]':+ '@next/[email protected]':optional: true'@nodelib/[email protected]':@@ -8115,6 +8203,12 @@ snapshots:'@pkgjs/[email protected]':optional: true+ '@prisma/[email protected]([email protected])':+ dependencies:+ '@prisma/driver-adapter-utils': 6.8.2+ pg: 8.16.0+ postgres-array: 3.0.4+optionalDependencies:prisma: 6.8.2([email protected])@@ -8126,6 +8220,10 @@ snapshots:'@prisma/[email protected]': {}+ '@prisma/[email protected]':+ dependencies:+ '@prisma/debug': 6.8.2+'@prisma/engines-version@6.8.0-43.2060c79ba17c6bb9f5823312b6f6b7f4a845738e': {}'@prisma/[email protected]':@@ -8151,632 +8249,643 @@ snapshots:dependencies:'@react-stately/autocomplete': 3.0.0-beta.1([email protected])- '@react-stately/combobox': 3.10.5([email protected])+ '@react-stately/combobox': 3.10.6([email protected])'@react-types/autocomplete': 3.0.0-alpha.31([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/breadcrumbs': 3.7.13([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/breadcrumbs': 3.7.14([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/toggle': 3.8.4([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/toggle': 3.8.5([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@internationalized/date': 3.8.1- '@react-aria/live-announcer': 3.4.2- '@react-stately/calendar': 3.8.1([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/calendar': 3.7.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@internationalized/date': 3.8.2+ '@react-aria/live-announcer': 3.4.3+ '@react-stately/calendar': 3.8.2([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/calendar': 3.7.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-stately/checkbox': 3.6.14([email protected])- '@react-stately/form': 3.1.4([email protected])- '@react-stately/toggle': 3.8.4([email protected])- '@react-types/checkbox': 3.9.4([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/checkbox': 3.6.15([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/toggle': 3.8.5([email protected])+ '@react-types/checkbox': 3.9.5([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-aria/ssr': 3.9.8([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-aria/ssr': 3.9.9([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])use-sync-external-store: 1.5.0([email protected])- dependencies:- '@react-stately/color': 3.8.5([email protected])- '@react-stately/form': 3.1.4([email protected])- '@react-types/color': 3.0.5([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/color': 3.8.6([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-types/color': 3.0.6([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-aria/live-announcer': 3.4.2- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/combobox': 3.10.5([email protected])- '@react-stately/form': 3.1.4([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/combobox': 3.13.5([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-aria/live-announcer': 3.4.3+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/combobox': 3.10.6([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/combobox': 3.13.6([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@internationalized/date': 3.8.1- '@internationalized/number': 3.6.2- '@internationalized/string': 3.2.6- '@react-stately/datepicker': 3.14.1([email protected])- '@react-stately/form': 3.1.4([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/calendar': 3.7.1([email protected])- '@react-types/datepicker': 3.12.1([email protected])- '@react-types/dialog': 3.5.18([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@internationalized/date': 3.8.2+ '@internationalized/number': 3.6.3+ '@internationalized/string': 3.2.7+ '@react-stately/datepicker': 3.14.2([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/calendar': 3.7.2([email protected])+ '@react-types/datepicker': 3.12.2([email protected])+ '@react-types/dialog': 3.5.19([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/dialog': 3.5.18([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/dialog': 3.5.19([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-aria/ssr': 3.9.8([email protected])- '@react-stately/disclosure': 3.0.4([email protected])- '@react-types/button': 3.12.1([email protected])+ '@react-aria/ssr': 3.9.9([email protected])+ '@react-stately/disclosure': 3.0.5([email protected])+ '@react-types/button': 3.12.2([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@internationalized/string': 3.2.6- '@react-aria/live-announcer': 3.4.2- '@react-stately/dnd': 3.5.4([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@internationalized/string': 3.2.7+ '@react-aria/live-announcer': 3.4.3+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/dnd': 3.6.0([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17clsx: 2.1.1react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/form': 3.1.4([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-aria/live-announcer': 3.4.2- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/grid': 3.11.2([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-types/checkbox': 3.9.4([email protected])- '@react-types/grid': 3.3.2([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-aria/live-announcer': 3.4.3+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/grid': 3.11.3([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-types/checkbox': 3.9.5([email protected])+ '@react-types/grid': 3.3.3([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/list': 3.12.2([email protected])- '@react-stately/tree': 3.8.10([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/list': 3.12.3([email protected])+ '@react-stately/tree': 3.9.0([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@internationalized/date': 3.8.1- '@internationalized/message': 3.1.7- '@internationalized/number': 3.6.2- '@internationalized/string': 3.2.6- '@react-aria/ssr': 3.9.8([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@internationalized/date': 3.8.2+ '@internationalized/message': 3.1.8+ '@internationalized/number': 3.6.3+ '@internationalized/string': 3.2.7+ '@react-aria/ssr': 3.9.9([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-aria/ssr': 3.9.8([email protected])- '@react-stately/flags': 3.1.1- '@react-types/shared': 3.29.1([email protected])+ '@react-aria/ssr': 3.9.9([email protected])+ '@react-stately/flags': 3.1.2+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])use-sync-external-store: 1.5.0([email protected])dependencies:- '@react-types/link': 3.6.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/link': 3.6.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/list': 3.12.2([email protected])- '@react-types/listbox': 3.7.0([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/list': 3.12.3([email protected])+ '@react-types/listbox': 3.7.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- '@react-aria/[email protected]':+ '@react-aria/[email protected]':dependencies:'@swc/helpers': 0.5.17- dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/menu': 3.9.4([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-stately/tree': 3.8.10([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/menu': 3.10.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/menu': 3.9.5([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-stately/tree': 3.9.0([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/menu': 3.10.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/meter': 3.4.9([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/meter': 3.4.10([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-stately/form': 3.1.4([email protected])- '@react-stately/numberfield': 3.9.12([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/numberfield': 3.8.11([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/numberfield': 3.9.13([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/numberfield': 3.8.12([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-aria/ssr': 3.9.8([email protected])- '@react-stately/overlays': 3.6.16([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/overlays': 3.8.15([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-aria/ssr': 3.9.9([email protected])+ '@react-stately/overlays': 3.6.17([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/overlays': 3.8.16([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/progress': 3.5.12([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/progress': 3.5.13([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-stately/radio': 3.10.13([email protected])- '@react-types/radio': 3.8.9([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/radio': 3.10.14([email protected])+ '@react-types/radio': 3.8.10([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/searchfield': 3.5.12([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/searchfield': 3.6.2([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/searchfield': 3.5.13([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/searchfield': 3.6.3([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-stately/select': 3.6.13([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/select': 3.9.12([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/select': 3.6.14([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/select': 3.9.13([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/selection': 3.20.2([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/slider': 3.6.4([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/slider': 3.7.11([email protected])+ '@react-stately/slider': 3.6.5([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/slider': 3.7.12([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-aria/live-announcer': 3.4.2- '@react-types/button': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-aria/live-announcer': 3.4.3+ '@react-types/button': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- '@react-aria/[email protected]([email protected])':+ '@react-aria/[email protected]([email protected])':dependencies:'@swc/helpers': 0.5.17react: 19.1.0dependencies:- '@react-stately/toggle': 3.8.4([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/switch': 3.5.11([email protected])+ '@react-stately/toggle': 3.8.5([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/switch': 3.5.12([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-aria/live-announcer': 3.4.2- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/flags': 3.1.1- '@react-stately/table': 3.14.2([email protected])- '@react-types/checkbox': 3.9.4([email protected])- '@react-types/grid': 3.3.2([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/table': 3.13.0([email protected])+ dependencies:+ '@react-aria/live-announcer': 3.4.3+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/flags': 3.1.2+ '@react-stately/table': 3.14.3([email protected])+ '@react-types/checkbox': 3.9.5([email protected])+ '@react-types/grid': 3.3.3([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/table': 3.13.1([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/tabs': 3.8.2([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/tabs': 3.3.15([email protected])+ '@react-stately/tabs': 3.8.3([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/tabs': 3.3.16([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- dependencies:- '@react-stately/list': 3.12.2([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/list': 3.12.3([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/form': 3.1.4([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/textfield': 3.12.2([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/textfield': 3.12.3([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/toast': 3.1.0([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/toast': 3.1.1([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/toggle': 3.8.4([email protected])- '@react-types/checkbox': 3.9.4([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/toggle': 3.8.5([email protected])+ '@react-types/checkbox': 3.9.5([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/tooltip': 3.5.4([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/tooltip': 3.4.17([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-stately/tree': 3.8.10([email protected])- '@react-types/button': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/tooltip': 3.5.5([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/tooltip': 3.4.18([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-aria/ssr': 3.9.8([email protected])- '@react-stately/flags': 3.1.1- '@react-stately/utils': 3.10.6([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/tree': 3.9.0([email protected])+ '@react-types/button': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@swc/helpers': 0.5.17+ react: 19.1.0+ react-dom: 19.1.0([email protected])++ dependencies:+ '@react-aria/ssr': 3.9.9([email protected])+ '@react-stately/flags': 3.1.2+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17clsx: 2.1.1react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])@@ -8815,412 +8924,412 @@ snapshots:'@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/utils': 3.10.6([email protected])+ '@react-stately/utils': 3.10.7([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@internationalized/date': 3.8.1- '@react-stately/utils': 3.10.6([email protected])- '@react-types/calendar': 3.7.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@internationalized/date': 3.8.2+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/calendar': 3.7.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/form': 3.1.4([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/checkbox': 3.9.4([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/checkbox': 3.9.5([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@internationalized/number': 3.6.2- '@internationalized/string': 3.2.6- '@react-stately/form': 3.1.4([email protected])- '@react-stately/numberfield': 3.9.12([email protected])- '@react-stately/slider': 3.6.4([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/color': 3.0.5([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@internationalized/number': 3.6.3+ '@internationalized/string': 3.2.7+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/numberfield': 3.9.13([email protected])+ '@react-stately/slider': 3.6.5([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/color': 3.0.6([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/form': 3.1.4([email protected])- '@react-stately/list': 3.12.2([email protected])- '@react-stately/overlays': 3.6.16([email protected])- '@react-stately/select': 3.6.13([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/combobox': 3.13.5([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/list': 3.12.3([email protected])+ '@react-stately/overlays': 3.6.17([email protected])+ '@react-stately/select': 3.6.14([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/combobox': 3.13.6([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@internationalized/date': 3.8.1- '@internationalized/string': 3.2.6- '@react-stately/form': 3.1.4([email protected])- '@react-stately/overlays': 3.6.16([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/datepicker': 3.12.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@internationalized/date': 3.8.2+ '@internationalized/string': 3.2.7+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/overlays': 3.6.17([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/datepicker': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/utils': 3.10.6([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/selection': 3.20.2([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]':+ '@react-stately/[email protected]':dependencies:'@swc/helpers': 0.5.17- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-types/grid': 3.3.2([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-types/grid': 3.3.3([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/table': 3.14.2([email protected])- '@react-types/grid': 3.3.2([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/table': 3.13.0([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/table': 3.14.3([email protected])+ '@react-types/grid': 3.3.3([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/table': 3.13.1([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/overlays': 3.6.16([email protected])- '@react-types/menu': 3.10.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/overlays': 3.6.17([email protected])+ '@react-types/menu': 3.10.2([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@internationalized/number': 3.6.2- '@react-stately/form': 3.1.4([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/numberfield': 3.8.11([email protected])+ '@internationalized/number': 3.6.3+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/numberfield': 3.8.12([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/utils': 3.10.6([email protected])- '@react-types/overlays': 3.8.15([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/overlays': 3.8.16([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/form': 3.1.4([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/radio': 3.8.9([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/radio': 3.8.10([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/utils': 3.10.6([email protected])- '@react-types/searchfield': 3.6.2([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/searchfield': 3.6.3([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/form': 3.1.4([email protected])- '@react-stately/list': 3.12.2([email protected])- '@react-stately/overlays': 3.6.16([email protected])- '@react-types/select': 3.9.12([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/list': 3.12.3([email protected])+ '@react-stately/overlays': 3.6.17([email protected])+ '@react-types/select': 3.9.13([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/utils': 3.10.6([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/slider': 3.7.11([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/slider': 3.7.12([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/flags': 3.1.1- '@react-stately/grid': 3.11.2([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/grid': 3.3.2([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/table': 3.13.0([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/flags': 3.1.2+ '@react-stately/grid': 3.11.3([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/grid': 3.3.3([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/table': 3.13.1([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/list': 3.12.2([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/tabs': 3.3.15([email protected])+ '@react-stately/list': 3.12.3([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/tabs': 3.3.16([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:'@swc/helpers': 0.5.17react: 19.1.0use-sync-external-store: 1.5.0([email protected])- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/utils': 3.10.6([email protected])- '@react-types/checkbox': 3.9.4([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/checkbox': 3.9.5([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/overlays': 3.6.16([email protected])- '@react-types/tooltip': 3.4.17([email protected])+ '@react-stately/overlays': 3.6.17([email protected])+ '@react-types/tooltip': 3.4.18([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0- '@react-stately/[email protected]([email protected])':+ '@react-stately/[email protected]([email protected])':dependencies:'@swc/helpers': 0.5.17react: 19.1.0dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])'@swc/helpers': 0.5.17react: 19.1.0react-dom: 19.1.0([email protected])'@react-types/[email protected]([email protected])':dependencies:- '@react-types/combobox': 3.13.5([email protected])- '@react-types/searchfield': 3.6.2([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/combobox': 3.13.6([email protected])+ '@react-types/searchfield': 3.6.3([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/link': 3.6.1([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/link': 3.6.2([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@internationalized/date': 3.8.1- '@react-types/shared': 3.29.1([email protected])+ '@internationalized/date': 3.8.2+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])- '@react-types/slider': 3.7.11([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/slider': 3.7.12([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@internationalized/date': 3.8.1- '@react-types/calendar': 3.7.1([email protected])- '@react-types/overlays': 3.8.15([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@internationalized/date': 3.8.2+ '@react-types/calendar': 3.7.2([email protected])+ '@react-types/overlays': 3.8.16([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/overlays': 3.8.15([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/overlays': 3.8.16([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/overlays': 3.8.15([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/overlays': 3.8.16([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/progress': 3.5.12([email protected])+ '@react-types/progress': 3.5.13([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])- '@react-types/textfield': 3.12.2([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/textfield': 3.12.3([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/grid': 3.3.2([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/grid': 3.3.3([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/shared': 3.29.1([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0- '@react-types/[email protected]([email protected])':+ '@react-types/[email protected]([email protected])':dependencies:- '@react-types/overlays': 3.8.15([email protected])- '@react-types/shared': 3.29.1([email protected])+ '@react-types/overlays': 3.8.16([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0'@redis/[email protected](@redis/[email protected])':@@ -9696,21 +9805,21 @@ snapshots:'@typescript-eslint/types': 8.32.1eslint-visitor-keys: 4.2.0- '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))':+ '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))':dependencies:'@fontsource/jetbrains-mono': 5.2.5- '@internationalized/date': 3.8.1+ '@internationalized/date': 3.8.2classnames: 2.5.1glob: 10.4.5highlight.js: 11.11.1lucide-react: 0.511.0([email protected])react: 19.1.0react-dom: 19.1.0([email protected])- react-hook-form: 7.56.4([email protected])+ react-hook-form: 7.57.0([email protected])react-icons: 5.5.0([email protected])thenby: 1.3.4zustand: 5.0.5(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))@@ -10207,7 +10316,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}@@ -12749,26 +12858,26 @@ snapshots:- '@babel/core'- babel-plugin-macros- [email protected](@babel/[email protected])([email protected]([email protected]))([email protected]):+ [email protected](@babel/[email protected])([email protected]([email protected]))([email protected]):dependencies:- '@next/env': 15.3.2+ '@next/env': 15.3.3'@swc/counter': 0.1.3'@swc/helpers': 0.5.15busboy: 1.6.0- caniuse-lite: 1.0.30001720+ caniuse-lite: 1.0.30001721postcss: 8.4.31react: 19.1.0react-dom: 19.1.0([email protected])styled-jsx: 5.1.6(@babel/[email protected])([email protected])optionalDependencies:- '@next/swc-darwin-arm64': 15.3.2- '@next/swc-darwin-x64': 15.3.2- '@next/swc-linux-arm64-gnu': 15.3.2- '@next/swc-linux-arm64-musl': 15.3.2- '@next/swc-linux-x64-gnu': 15.3.2- '@next/swc-linux-x64-musl': 15.3.2- '@next/swc-win32-arm64-msvc': 15.3.2- '@next/swc-win32-x64-msvc': 15.3.2+ '@next/swc-darwin-arm64': 15.3.3+ '@next/swc-darwin-x64': 15.3.3+ '@next/swc-linux-arm64-gnu': 15.3.3+ '@next/swc-linux-arm64-musl': 15.3.3+ '@next/swc-linux-x64-gnu': 15.3.3+ '@next/swc-linux-x64-musl': 15.3.3+ '@next/swc-win32-arm64-msvc': 15.3.3+ '@next/swc-win32-x64-msvc': 15.3.3sharp: 0.34.2transitivePeerDependencies:- '@babel/core'@@ -12986,6 +13095,41 @@ snapshots:+ optional: true++ [email protected]: {}++ [email protected]: {}++ dependencies:+ pg: 8.16.0++ [email protected]: {}++ dependencies:+ pg-int8: 1.0.1+ postgres-array: 2.0.0+ postgres-bytea: 1.0.0+ postgres-date: 1.0.7+ postgres-interval: 1.2.0++ dependencies:+ pg-connection-string: 2.9.0+ pg-pool: 3.10.0([email protected])+ pg-protocol: 1.10.0+ pg-types: 2.2.0+ pgpass: 1.0.5+ optionalDependencies:+ pg-cloudflare: 1.2.5++ dependencies:+ split2: 4.2.0+@@ -13431,6 +13575,18 @@ snapshots:picocolors: 1.1.1source-map-js: 1.2.1+ [email protected]: {}++ [email protected]: {}++ [email protected]: {}++ [email protected]: {}++ dependencies:+ xtend: 4.0.2+@@ -13498,81 +13654,81 @@ snapshots:dependencies:- '@internationalized/date': 3.8.1- '@internationalized/string': 3.2.6+ '@internationalized/date': 3.8.2+ '@internationalized/string': 3.2.7- '@react-aria/live-announcer': 3.4.2- '@react-aria/ssr': 3.9.8([email protected])+ '@react-aria/live-announcer': 3.4.3+ '@react-aria/ssr': 3.9.9([email protected])'@react-stately/autocomplete': 3.0.0-beta.1([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-stately/table': 3.14.2([email protected])- '@react-stately/utils': 3.10.6([email protected])- '@react-types/form': 3.7.12([email protected])- '@react-types/grid': 3.3.2([email protected])- '@react-types/shared': 3.29.1([email protected])- '@react-types/table': 3.13.0([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-stately/table': 3.14.3([email protected])+ '@react-stately/utils': 3.10.7([email protected])+ '@react-types/form': 3.7.13([email protected])+ '@react-types/grid': 3.3.3([email protected])+ '@react-types/shared': 3.30.0([email protected])+ '@react-types/table': 3.13.1([email protected])'@swc/helpers': 0.5.17client-only: 0.0.1react: 19.1.0react-dom: 19.1.0([email protected])- react-stately: 3.38.0([email protected])+ react-stately: 3.39.0([email protected])use-sync-external-store: 1.5.0([email protected])- dependencies:- '@internationalized/string': 3.2.6- '@react-aria/ssr': 3.9.8([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@internationalized/string': 3.2.7+ '@react-aria/ssr': 3.9.9([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0react-dom: 19.1.0([email protected])@@ -13600,6 +13756,10 @@ snapshots:dependencies:react: 19.1.0+ dependencies:+ react: 19.1.0+dependencies:react: 19.1.0@@ -13643,34 +13803,34 @@ snapshots:react-dom: 19.1.0([email protected])topojson-client: 3.1.0- dependencies:- '@react-stately/calendar': 3.8.1([email protected])- '@react-stately/checkbox': 3.6.14([email protected])- '@react-stately/collections': 3.12.4([email protected])- '@react-stately/color': 3.8.5([email protected])- '@react-stately/combobox': 3.10.5([email protected])- '@react-stately/data': 3.13.0([email protected])- '@react-stately/datepicker': 3.14.1([email protected])- '@react-stately/disclosure': 3.0.4([email protected])- '@react-stately/dnd': 3.5.4([email protected])- '@react-stately/form': 3.1.4([email protected])- '@react-stately/list': 3.12.2([email protected])- '@react-stately/menu': 3.9.4([email protected])- '@react-stately/numberfield': 3.9.12([email protected])- '@react-stately/overlays': 3.6.16([email protected])- '@react-stately/radio': 3.10.13([email protected])- '@react-stately/searchfield': 3.5.12([email protected])- '@react-stately/select': 3.6.13([email protected])- '@react-stately/selection': 3.20.2([email protected])- '@react-stately/slider': 3.6.4([email protected])- '@react-stately/table': 3.14.2([email protected])- '@react-stately/tabs': 3.8.2([email protected])- '@react-stately/toast': 3.1.0([email protected])- '@react-stately/toggle': 3.8.4([email protected])- '@react-stately/tooltip': 3.5.4([email protected])- '@react-stately/tree': 3.8.10([email protected])- '@react-types/shared': 3.29.1([email protected])+ dependencies:+ '@react-stately/calendar': 3.8.2([email protected])+ '@react-stately/checkbox': 3.6.15([email protected])+ '@react-stately/collections': 3.12.5([email protected])+ '@react-stately/color': 3.8.6([email protected])+ '@react-stately/combobox': 3.10.6([email protected])+ '@react-stately/data': 3.13.1([email protected])+ '@react-stately/datepicker': 3.14.2([email protected])+ '@react-stately/disclosure': 3.0.5([email protected])+ '@react-stately/dnd': 3.6.0([email protected])+ '@react-stately/form': 3.1.5([email protected])+ '@react-stately/list': 3.12.3([email protected])+ '@react-stately/menu': 3.9.5([email protected])+ '@react-stately/numberfield': 3.9.13([email protected])+ '@react-stately/overlays': 3.6.17([email protected])+ '@react-stately/radio': 3.10.14([email protected])+ '@react-stately/searchfield': 3.5.13([email protected])+ '@react-stately/select': 3.6.14([email protected])+ '@react-stately/selection': 3.20.3([email protected])+ '@react-stately/slider': 3.6.5([email protected])+ '@react-stately/table': 3.14.3([email protected])+ '@react-stately/tabs': 3.8.3([email protected])+ '@react-stately/toast': 3.1.1([email protected])+ '@react-stately/toggle': 3.8.5([email protected])+ '@react-stately/tooltip': 3.5.5([email protected])+ '@react-stately/tree': 3.9.0([email protected])+ '@react-types/shared': 3.30.0([email protected])react: 19.1.0@@ -14103,6 +14263,8 @@ snapshots:+ [email protected]: {}+@@ -14760,6 +14922,8 @@ snapshots:sort-keys: 4.2.0write-file-atomic: 3.0.3+ [email protected]: {}+diff --git a/src/app/(main)/reports/funnel/FunnelChart.module.css b/src/app/(main)/reports/funnel/FunnelChart.module.cssdeleted file mode 100644index 7972d5736..000000000--- a/src/app/(main)/reports/funnel/FunnelChart.module.css+++ /dev/null@@ -1,105 +0,0 @@-.chart {- display: grid;-}--.num {- display: flex;- align-items: center;- justify-content: center;- border-radius: 100%;- width: 50px;- height: 50px;- font-size: 16px;- font-weight: 700;- color: var(--base800);- background: var(--base100);- z-index: 1;-}--.step {- display: grid;- grid-template-columns: max-content 1fr;- column-gap: 30px;- position: relative;- padding-bottom: 60px;-}--.step::before {- content: '';- position: absolute;- top: 0;- left: 25px;- bottom: 0;- width: 2px;- background-color: var(--base100);-}--.step:last-child::before {- display: none;-}--.card {- display: grid;- gap: 20px;- margin-top: 14px;-}--.header {- display: flex;- flex-direction: column;- gap: 20px;-}--.bar {- display: flex;- align-items: center;- justify-content: flex-end;- background: var(--base900);- height: 30px;- border-radius: 5px;- overflow: hidden;- position: relative;-}--.label {- color: var(--base600);- font-weight: 700;- text-transform: uppercase;-}--.track {- background-color: var(--base100);- border-radius: 5px;-}--.info {- text-transform: lowercase;-}--.item {- font-size: 20px;- color: var(--base900);- font-weight: 700;-}--.metric {- color: var(--base700);- display: flex;- justify-content: space-between;- gap: 10px;- margin: 10px 0;- text-transform: lowercase;-}--.visitors {- color: var(--base900);- font-size: 24px;- font-weight: 900;- margin-right: 10px;-}--.percent {- font-size: 20px;- font-weight: 700;- align-self: flex-end;-}diff --git a/src/app/(main)/reports/funnel/FunnelChart.tsx b/src/app/(main)/reports/funnel/FunnelChart.tsxdeleted file mode 100644index fb335f0b8..000000000--- a/src/app/(main)/reports/funnel/FunnelChart.tsx+++ /dev/null@@ -1,52 +0,0 @@-import classNames from 'classnames';-import { useMessages, useReport } from '@/components/hooks';-import { formatLongNumber } from '@/lib/format';-import styles from './FunnelChart.module.css';--export interface FunnelChartProps {- className?: string;- isLoading?: boolean;-}--export function FunnelChart({ className }: FunnelChartProps) {- const { report } = useReport();- const { formatMessage, labels } = useMessages();-- const { data } = report || {};-- return (- <div className={classNames(styles.chart, className)}>- {data?.map(({ type, value, visitors, dropped, dropoff, remaining }, index: number) => {- return (- <div key={index} className={styles.step}>- <div className={styles.num}>{index + 1}</div>- <div className={styles.card}>- <div className={styles.header}>- <span className={styles.label}>- {formatMessage(type === 'url' ? labels.viewedPage : labels.triggeredEvent)}- </span>- <span className={styles.item}>{value}</span>- </div>- <div className={styles.metric}>- <div>- <span className={styles.visitors}>{formatLongNumber(visitors)}</span>- {formatMessage(labels.visitors)}- </div>- <div className={styles.percent}>{(remaining * 100).toFixed(2)}%</div>- </div>- <div className={styles.track}>- <div className={styles.bar} style={{ width: `${remaining * 100}%` }}></div>- </div>- {dropoff > 0 && (- <div className={styles.info}>- <b>{formatLongNumber(dropped)}</b> {formatMessage(labels.visitorsDroppedOff)} (- {(dropoff * 100).toFixed(2)}%)- </div>- )}- </div>- </div>- );- })}- </div>- );-}diff --git a/src/app/(main)/reports/funnel/FunnelParameters.module.css b/src/app/(main)/reports/funnel/FunnelParameters.module.cssdeleted file mode 100644index 0f27d515f..000000000--- a/src/app/(main)/reports/funnel/FunnelParameters.module.css+++ /dev/null@@ -1,12 +0,0 @@-.item {- display: flex;- align-items: center;- gap: 10px;- width: 100%;-}--.value {- display: flex;- align-self: center;- gap: 20px;-}diff --git a/src/app/(main)/reports/funnel/FunnelParameters.tsx b/src/app/(main)/reports/funnel/FunnelParameters.tsxdeleted file mode 100644index 30eed76f1..000000000--- a/src/app/(main)/reports/funnel/FunnelParameters.tsx+++ /dev/null@@ -1,117 +0,0 @@-import { useMessages, useReport } from '@/components/hooks';-import {- Icon,- Form,- FormButtons,- FormField,- DialogTrigger,- Popover,- FormSubmitButton,- TextField,- Button,-} from '@umami/react-zen';-import { Eye, Bolt, Plus } from '@/components/icons';-import { FunnelStepAddForm } from './FunnelStepAddForm';-import { BaseParameters } from '../[reportId]/BaseParameters';-import { ParameterList } from '../[reportId]/ParameterList';-import styles from './FunnelParameters.module.css';--export function FunnelParameters() {- const { report, runReport, updateReport, isRunning } = useReport();- const { formatMessage, labels } = useMessages();-- const { id, parameters } = report || {};- const { websiteId, dateRange, steps } = parameters || {};- const queryDisabled = !websiteId || !dateRange || steps?.length < 2;-- const handleSubmit = (data: any, e: any) => {- e.stopPropagation();- e.preventDefault();-- if (!queryDisabled) {- runReport(data);- }- };-- const handleAddStep = (step: { type: string; value: string }) => {- updateReport({ parameters: { steps: parameters.steps.concat(step) } });- };-- const handleUpdateStep = (- close: () => void,- index: number,- step: { type: string; value: string },- ) => {- const steps = [...parameters.steps];- steps[index] = step;- updateReport({ parameters: { steps } });- close();- };-- const handleRemoveStep = (index: number) => {- const steps = [...parameters.steps];- delete steps[index];- updateReport({ parameters: { steps: steps.filter(n => n) } });- };-- const AddStepButton = () => {- return (- <DialogTrigger>- <Button>- <Icon>- <Plus />- </Icon>- </Button>- <Popover placement="start">- <FunnelStepAddForm onChange={handleAddStep} />- </Popover>- </DialogTrigger>- );- };-- return (- <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>- <BaseParameters allowWebsiteSelect={!id} />- <FormField- label={formatMessage(labels.window)}- name="window"- rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/ }}- >- <TextField autoComplete="off" />- </FormField>- <FormField name="steps" label={formatMessage(labels.steps)}>- <ParameterList>- {steps.map((step: { type: string; value: string }, index: number) => {- return (- <DialogTrigger key={index}>- <ParameterList.Item- icon={step.type === 'url' ? <Eye /> : <Bolt />}- onRemove={() => handleRemoveStep(index)}- >- <div className={styles.value}>- <div>{step.value}</div>- </div>- </ParameterList.Item>- <Popover placement="start">- {({ close }: any) => (- <FunnelStepAddForm- type={step.type}- value={step.value}- onChange={handleUpdateStep.bind(null, close, index)}- />- )}- </Popover>- </DialogTrigger>- );- })}- </ParameterList>- <AddStepButton />- </FormField>- <FormButtons>- <FormSubmitButton variant="primary" isDisabled={queryDisabled} isLoading={isRunning}>- {formatMessage(labels.runQuery)}- </FormSubmitButton>- </FormButtons>- </Form>- );-}diff --git a/src/app/(main)/reports/funnel/FunnelReport.module.css b/src/app/(main)/reports/funnel/FunnelReport.module.cssdeleted file mode 100644index aed66b74e..000000000--- a/src/app/(main)/reports/funnel/FunnelReport.module.css+++ /dev/null@@ -1,10 +0,0 @@-.filters {- display: flex;- flex-direction: column;- justify-content: space-between;- border: 1px solid var(--base400);- border-radius: var(--border-radius);- line-height: 32px;- padding: 10px;- overflow: hidden;-}diff --git a/src/app/(main)/reports/funnel/FunnelReport.tsx b/src/app/(main)/reports/funnel/FunnelReport.tsxdeleted file mode 100644index 884815139..000000000--- a/src/app/(main)/reports/funnel/FunnelReport.tsx+++ /dev/null@@ -1,27 +0,0 @@-import { FunnelChart } from './FunnelChart';-import { FunnelParameters } from './FunnelParameters';-import { Report } from '../[reportId]/Report';-import { ReportHeader } from '../[reportId]/ReportHeader';-import { ReportMenu } from '../[reportId]/ReportMenu';-import { ReportBody } from '../[reportId]/ReportBody';-import { Funnel } from '@/components/icons';-import { REPORT_TYPES } from '@/lib/constants';--const defaultParameters = {- type: REPORT_TYPES.funnel,- parameters: { window: 60, steps: [] },-};--export function FunnelReport({ reportId }: { reportId?: string }) {- return (- <Report reportId={reportId} defaultParameters={defaultParameters}>- <ReportHeader icon={<Funnel />} />- <ReportMenu>- <FunnelParameters />- </ReportMenu>- <ReportBody>- <FunnelChart />- </ReportBody>- </Report>- );-}diff --git a/src/app/(main)/reports/funnel/FunnelReportPage.tsx b/src/app/(main)/reports/funnel/FunnelReportPage.tsxdeleted file mode 100644index 13c81ce4a..000000000--- a/src/app/(main)/reports/funnel/FunnelReportPage.tsx+++ /dev/null@@ -1,6 +0,0 @@-'use client';-import { FunnelReport } from './FunnelReport';--export function FunnelReportPage() {- return <FunnelReport />;-}diff --git a/src/app/(main)/reports/funnel/FunnelStepAddForm.module.css b/src/app/(main)/reports/funnel/FunnelStepAddForm.module.cssdeleted file mode 100644index a254ff088..000000000--- a/src/app/(main)/reports/funnel/FunnelStepAddForm.module.css+++ /dev/null@@ -1,7 +0,0 @@-.dropdown {- width: 140px;-}--.input {- width: 200px;-}diff --git a/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx b/src/app/(main)/reports/funnel/FunnelStepAddForm.tsxdeleted file mode 100644index ddd315b6a..000000000--- a/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx+++ /dev/null@@ -1,81 +0,0 @@-import { useState } from 'react';-import { useMessages } from '@/components/hooks';-import {- Button,- Column,- Row,- TextField,- Label,- Select,- ListItem,- FormButtons,-} from '@umami/react-zen';-import styles from './FunnelStepAddForm.module.css';--export interface FunnelStepAddFormProps {- type?: string;- value?: string;- onChange?: (step: { type: string; value: string }) => void;-}--export function FunnelStepAddForm({- type: defaultType = 'url',- value: defaultValue = '',- onChange,-}: FunnelStepAddFormProps) {- const [type, setType] = useState(defaultType);- const [value, setValue] = useState(defaultValue);- const { formatMessage, labels } = useMessages();- const items = [- { id: 'url', label: formatMessage(labels.url), value: 'url' },- { id: 'event', label: formatMessage(labels.event), value: 'event' },- ];- const isDisabled = !type || !value;-- const handleSave = () => {- onChange({ type, value });- setValue('');- };-- const handleChange = e => {- setValue(e.target.value);- };-- const handleKeyDown = e => {- if (e.key === 'Enter') {- e.stopPropagation();- handleSave();- }- };-- return (- <Column gap="3">- <Label>{formatMessage(defaultValue ? labels.update : labels.add)}</Label>- <Row gap="3">- <Select- className={styles.dropdown}- items={items}- value={type}- onChange={(value: any) => setType(value)}- >- {({ value, label }: any) => {- return <ListItem key={value}>{label}</ListItem>;- }}- </Select>- <TextField- className={styles.input}- value={value}- onChange={handleChange}- autoFocus={true}- autoComplete="off"- onKeyDown={handleKeyDown}- />- </Row>- <FormButtons>- <Button variant="primary" onPress={handleSave} isDisabled={isDisabled}>- {formatMessage(defaultValue ? labels.update : labels.add)}- </Button>- </FormButtons>- </Column>- );-}diff --git a/src/app/(main)/reports/funnel/page.tsx b/src/app/(main)/reports/funnel/page.tsxdeleted file mode 100644index 7e475e5e1..000000000--- a/src/app/(main)/reports/funnel/page.tsx+++ /dev/null@@ -1,10 +0,0 @@-import { FunnelReportPage } from './FunnelReportPage';-import { Metadata } from 'next';--export default function () {- return <FunnelReportPage />;-}--export const metadata: Metadata = {- title: 'Funnel Report',-};diff --git a/src/app/(main)/reports/goals/GoalsAddForm.module.css b/src/app/(main)/reports/goals/GoalsAddForm.module.cssdeleted file mode 100644index a254ff088..000000000--- a/src/app/(main)/reports/goals/GoalsAddForm.module.css+++ /dev/null@@ -1,7 +0,0 @@-.dropdown {- width: 140px;-}--.input {- width: 200px;-}diff --git a/src/app/(main)/reports/goals/GoalsAddForm.tsx b/src/app/(main)/reports/goals/GoalsAddForm.tsxdeleted file mode 100644index 78513be3b..000000000--- a/src/app/(main)/reports/goals/GoalsAddForm.tsx+++ /dev/null@@ -1,141 +0,0 @@-import { useMessages } from '@/components/hooks';-import { useState } from 'react';-import {- Button,- Row,- Column,- Select,- Label,- ListItem,- TextField,- FormButtons,-} from '@umami/react-zen';-import styles from './GoalsAddForm.module.css';--export function GoalsAddForm({- type: defaultType = 'url',- value: defaultValue = '',- property: defaultProperty = '',- operator: defaultAggregae = null,- goal: defaultGoal = 10,- onChange,-}: {- type?: string;- value?: string;- operator?: string;- property?: string;- goal?: number;- onChange?: (step: {- type: string;- value: string;- goal: number;- operator?: string;- property?: string;- }) => void;-}) {- const [type, setType] = useState(defaultType);- const [value, setValue] = useState(defaultValue);- const [operator, setOperator] = useState(defaultAggregae);- const [property, setProperty] = useState(defaultProperty);- const [goal, setGoal] = useState(defaultGoal);- const { formatMessage, labels } = useMessages();- const items = [- { label: formatMessage(labels.url), value: 'url' },- { label: formatMessage(labels.event), value: 'event' },- { label: formatMessage(labels.eventData), value: 'event-data' },- ];- const operators = [- { label: formatMessage(labels.count), value: 'count' },- { label: formatMessage(labels.average), value: 'average' },- { label: formatMessage(labels.sum), value: 'sum' },- ];- const isDisabled = !type || !value;-- const handleSave = () => {- onChange(- type === 'event-data' ? { type, value, goal, operator, property } : { type, value, goal },- );- setValue('');- setProperty('');- setGoal(10);- };-- const handleChange = (e, set) => {- set(e.target.value);- };-- const handleKeyDown = e => {- if (e.key === 'Enter') {- e.stopPropagation();- handleSave();- }- };-- return (- <Column gap="3">- <Label>{formatMessage(defaultValue ? labels.update : labels.add)}</Label>- <Row gap="3">- <Select- className={styles.dropdown}- items={items}- value={type}- onChange={(value: any) => setType(value)}- >- {({ value, label }: any) => {- return <ListItem key={value}>{label}</ListItem>;- }}- </Select>- <TextField- className={styles.input}- value={value}- onChange={e => handleChange(e, setValue)}- autoFocus={true}- autoComplete="off"- onKeyDown={handleKeyDown}- />- </Row>- {type === 'event-data' && (- <Column>- <Label>label={formatMessage(labels.property)}</Label>- <Row gap="3">- <Select- className={styles.dropdown}- items={operators}- value={operator}- onChange={(value: any) => setOperator(value)}- >- {({ value, label }: any) => {- return <ListItem key={value}>{label}</ListItem>;- }}- </Select>- <TextField- className={styles.input}- value={property}- onChange={e => handleChange(e, setProperty)}- autoFocus={true}- autoComplete="off"- onKeyDown={handleKeyDown}- />- </Row>- </Column>- )}- <Column>- <Label>{formatMessage(labels.goal)}</Label>- <Row gap="3">- <TextField- className={styles.input}- value={goal?.toString()}- onChange={e => handleChange(e, setGoal)}- autoComplete="off"- onKeyDown={handleKeyDown}- />- </Row>- </Column>- <FormButtons>- <Button variant="primary" onPress={handleSave} isDisabled={isDisabled}>- {formatMessage(defaultValue ? labels.update : labels.add)}- </Button>- </FormButtons>- </Column>- );-}diff --git a/src/app/(main)/reports/goals/GoalsChart.module.css b/src/app/(main)/reports/goals/GoalsChart.module.cssdeleted file mode 100644index 799f5fddc..000000000--- a/src/app/(main)/reports/goals/GoalsChart.module.css+++ /dev/null@@ -1,95 +0,0 @@-.chart {- display: grid;- gap: 30px;-}--.goal {- padding-bottom: 40px;- border-bottom: 1px solid var(--base400);-}--.goal:last-child {- border: 0;-}--.card {- display: grid;- gap: 20px;- margin-top: 14px;-}--.header {- display: flex;- flex-direction: column;- gap: 20px;-}--.label {- color: var(--base600);- font-weight: 700;- text-transform: uppercase;-}--.item {- font-size: 20px;- color: var(--base900);- font-weight: 700;-}--.metric {- color: var(--base700);- display: flex;- justify-content: space-between;- gap: 10px;- margin: 10px 0;- text-transform: lowercase;-}--.value {- color: var(--base900);- font-size: 24px;- font-weight: 900;- margin-right: 10px;-}--.percent {- font-size: 20px;- font-weight: 700;- align-self: flex-end;-}--.total {- color: var(--base700);-}--.bar {- display: flex;- align-items: center;- justify-content: flex-end;- background: var(--base900);- height: 10px;- border-radius: 5px;- overflow: hidden;- position: relative;-}--.bar.level1 {- background: var(--red800);-}-.bar.level2 {- background: var(--orange200);-}-.bar.level3 {- background: var(--orange400);-}-.bar.level4 {- background: var(--orange600);-}-.bar.level5 {- background: var(--green600);-}--.track {- background-color: var(--base100);- border-radius: 5px;-}diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsxdeleted file mode 100644index b69bf5e1b..000000000--- a/src/app/(main)/reports/goals/GoalsChart.tsx+++ /dev/null@@ -1,70 +0,0 @@-import classNames from 'classnames';-import { useMessages, useReport } from '@/components/hooks';-import { formatLongNumber } from '@/lib/format';-import styles from './GoalsChart.module.css';--export function GoalsChart({ className }: { className?: string; isLoading?: boolean }) {- const { report } = useReport();- const { formatMessage, labels } = useMessages();-- const { data } = report || {};-- const getLabel = type => {- let label = '';- switch (type) {- case 'url':- label = labels.viewedPage;- break;- case 'event':- label = labels.triggeredEvent;- break;- default:- label = labels.collectedData;- break;- }-- return label;- };-- return (- <div className={classNames(styles.chart, className)}>- {data?.map(({ type, value, goal, result, property, operator }, index: number) => {- const percent = result > goal ? 100 : (result / goal) * 100;-- return (- <div key={index} className={styles.goal}>- <div className={styles.card}>- <div className={styles.header}>- <span className={styles.label}>{formatMessage(getLabel(type))}</span>- <span className={styles.item}>{`${value}${- type === 'event-data' ? `:(${operator}):${property}` : ''- }`}</span>- </div>- <div className={styles.track}>- <div- className={classNames(- classNames(styles.bar, {- [styles.level1]: percent <= 20,- [styles.level2]: percent > 20 && percent <= 40,- [styles.level3]: percent > 40 && percent <= 60,- [styles.level4]: percent > 60 && percent <= 80,- [styles.level5]: percent > 80,- }),- )}- style={{ width: `${percent}%` }}- ></div>- </div>- <div className={styles.metric}>- <div className={styles.value}>- {formatLongNumber(result)}- <span className={styles.total}> / {formatLongNumber(goal)}</span>- </div>- <div className={styles.percent}>{((result / goal) * 100).toFixed(2)}%</div>- </div>- </div>- </div>- );- })}- </div>- );-}diff --git a/src/app/(main)/reports/goals/GoalsParameters.module.css b/src/app/(main)/reports/goals/GoalsParameters.module.cssdeleted file mode 100644index cd72f524e..000000000--- a/src/app/(main)/reports/goals/GoalsParameters.module.css+++ /dev/null@@ -1,25 +0,0 @@-.value {- width: 100%;- margin-bottom: 8px;- font-weight: 600;-}--.eventData {- color: var(--orange900);- background-color: var(--orange100);- font-size: 12px;- font-weight: 900;- padding: 2px 8px;- border-radius: 5px;- width: fit-content;-}--.goal {- color: var(--blue900);- background-color: var(--blue100);- font-size: 12px;- font-weight: 900;- padding: 2px 8px;- border-radius: 5px;- width: fit-content;-}diff --git a/src/app/(main)/reports/goals/GoalsParameters.tsx b/src/app/(main)/reports/goals/GoalsParameters.tsxdeleted file mode 100644index 2e7dfacce..000000000--- a/src/app/(main)/reports/goals/GoalsParameters.tsx+++ /dev/null@@ -1,131 +0,0 @@-import { useMessages, useReport } from '@/components/hooks';-import { Plus, Eye, Bolt } from '@/components/icons';-import { formatNumber } from '@/lib/format';-import {- Button,- Form,- FormButtons,- FormField,- Icon,- Popover,- MenuTrigger,- FormSubmitButton,- Column,-} from '@umami/react-zen';-import { BaseParameters } from '../[reportId]/BaseParameters';-import { ParameterList } from '../[reportId]/ParameterList';-import { GoalsAddForm } from './GoalsAddForm';-import styles from './GoalsParameters.module.css';--export function GoalsParameters() {- const { report, runReport, updateReport, isRunning } = useReport();- const { formatMessage, labels } = useMessages();-- const { id, parameters } = report || {};- const { websiteId, dateRange, goals } = parameters || {};- const queryDisabled = !websiteId || !dateRange || goals?.length < 1;-- const handleSubmit = (data: any, e: any) => {- e.stopPropagation();- e.preventDefault();-- if (!queryDisabled) {- runReport(data);- }- };-- const handleAddGoals = (goal: { type: string; value: string }) => {- updateReport({ parameters: { goals: parameters.goals.concat(goal) } });- };-- const handleUpdateGoals = (- close: () => void,- index: number,- goal: { type: string; value: string },- ) => {- const goals = [...parameters.goals];- goals[index] = goal;- updateReport({ parameters: { goals } });- close();- };-- const handleRemoveGoals = (index: number) => {- const goals = [...parameters.goals];- delete goals[index];- updateReport({ parameters: { goals: goals.filter(n => n) } });- };-- const AddGoalsButton = () => {- return (- <MenuTrigger>- <Button>- <Icon>- <Plus />- </Icon>- </Button>- <Popover placement="start">- <GoalsAddForm onChange={handleAddGoals} />- </Popover>- </MenuTrigger>- );- };-- return (- <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>- <BaseParameters allowWebsiteSelect={!id} />- <AddGoalsButton />- <FormField name="goal" label={formatMessage(labels.goals)}>- <ParameterList>- {goals.map(- (- goal: {- type: string;- value: string;- goal: number;- operator?: string;- property?: string;- },- index: number,- ) => {- return (- <MenuTrigger key={index}>- <ParameterList.Item- icon={goal.type === 'url' ? <Eye /> : <Bolt />}- onRemove={() => handleRemoveGoals(index)}- >- <Column>- <div className={styles.value}>{goal.value}</div>- {goal.type === 'event-data' && (- <div className={styles.eventData}>- {formatMessage(labels[goal.operator])}: {goal.property}- </div>- )}- <div className={styles.goal}>- {formatMessage(labels.goal)}: {formatNumber(goal.goal)}- </div>- </Column>- </ParameterList.Item>- <Popover placement="start">- <GoalsAddForm- type={goal.type}- value={goal.value}- goal={goal.goal}- operator={goal.operator}- property={goal.property}- onChange={handleUpdateGoals.bind(null, () => {}, index)}- />- </Popover>- </MenuTrigger>- );- },- )}- </ParameterList>- </FormField>- <FormButtons>- <FormSubmitButton variant="primary" isDisabled={queryDisabled} isLoading={isRunning}>- {formatMessage(labels.runQuery)}- </FormSubmitButton>- </FormButtons>- </Form>- );-}diff --git a/src/app/(main)/reports/goals/GoalsReport.module.css b/src/app/(main)/reports/goals/GoalsReport.module.cssdeleted file mode 100644index aed66b74e..000000000--- a/src/app/(main)/reports/goals/GoalsReport.module.css+++ /dev/null@@ -1,10 +0,0 @@-.filters {- display: flex;- flex-direction: column;- justify-content: space-between;- border: 1px solid var(--base400);- border-radius: var(--border-radius);- line-height: 32px;- padding: 10px;- overflow: hidden;-}diff --git a/src/app/(main)/reports/goals/GoalsReport.tsx b/src/app/(main)/reports/goals/GoalsReport.tsxdeleted file mode 100644index e23e4ad11..000000000--- a/src/app/(main)/reports/goals/GoalsReport.tsx+++ /dev/null@@ -1,27 +0,0 @@-import { GoalsChart } from './GoalsChart';-import { GoalsParameters } from './GoalsParameters';-import { Report } from '../[reportId]/Report';-import { ReportHeader } from '../[reportId]/ReportHeader';-import { ReportMenu } from '../[reportId]/ReportMenu';-import { ReportBody } from '../[reportId]/ReportBody';-import { Target } from '@/components/icons';-import { REPORT_TYPES } from '@/lib/constants';--const defaultParameters = {- type: REPORT_TYPES.goals,- parameters: { goals: [] },-};--export function GoalsReport({ reportId }: { reportId?: string }) {- return (- <Report reportId={reportId} defaultParameters={defaultParameters}>- <ReportHeader icon={<Target />} />- <ReportMenu>- <GoalsParameters />- </ReportMenu>- <ReportBody>- <GoalsChart />- </ReportBody>- </Report>- );-}diff --git a/src/app/(main)/reports/goals/GoalsReportPage.tsx b/src/app/(main)/reports/goals/GoalsReportPage.tsxdeleted file mode 100644index 7cd576792..000000000--- a/src/app/(main)/reports/goals/GoalsReportPage.tsx+++ /dev/null@@ -1,6 +0,0 @@-'use client';-import { GoalsReport } from './GoalsReport';--export function GoalsReportPage() {- return <GoalsReport />;-}diff --git a/src/app/(main)/reports/goals/page.tsx b/src/app/(main)/reports/goals/page.tsxdeleted file mode 100644index 0f18f5d20..000000000--- a/src/app/(main)/reports/goals/page.tsx+++ /dev/null@@ -1,10 +0,0 @@-import { GoalsReportPage } from './GoalsReportPage';-import { Metadata } from 'next';--export default function () {- return <GoalsReportPage />;-}--export const metadata: Metadata = {- title: 'Goals Report',-};diff --git a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsxindex 694dc1111..0b844c077 100644--- a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx@@ -1,4 +1,4 @@-import { TextArea } from '@umami/react-zen';+import { TextField } from '@umami/react-zen';import { useMessages, useConfig } from '@/components/hooks';const SCRIPT_NAME = 'script.js';@@ -21,7 +21,7 @@ export function TrackingCode({ websiteId, hostUrl }: { websiteId: string; hostUrreturn (<><p>{formatMessage(messages.trackingCode)}</p>- <TextArea rows={4} value={code} isReadOnly allowCopy />+ <TextField value={code} isReadOnly allowCopy asTextArea /></>);}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsxindex 97cfc5da4..489270234 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx@@ -59,7 +59,7 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {},{id: 'funnel',- label: formatMessage(labels.funnel),+ label: formatMessage(labels.funnels),icon: <Funnel />,path: '/funnels',},diff --git a/src/app/(main)/websites/[websiteId]/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/funnels/Funnel.tsxnew file mode 100644index 000000000..a5f6baded--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/funnels/Funnel.tsx@@ -0,0 +1,117 @@+import { Grid, Column, Row, Text, Icon, ProgressBar, Dialog } from '@umami/react-zen';+import { useMessages, useResultQuery } from '@/components/hooks';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { File, Lightning, User } from '@/components/icons';+import { formatLongNumber } from '@/lib/format';+import { ReportEditButton } from '@/components/input/ReportEditButton';+import { FunnelEditForm } from './FunnelEditForm';+import { ChangeLabel } from '@/components/metrics/ChangeLabel';++type FunnelResult = {+ type: string;+ value: string;+ visitors: number;+ previous: number;+ dropped: number;+ droppoff: number;+ remaining: number;+};++export function Funnel({ id, name, type, parameters, websiteId, startDate, endDate }) {+ const { formatMessage, labels } = useMessages();+ const { data, error, isLoading } = useResultQuery<any>(type, {+ websiteId,+ dateRange: {+ startDate,+ endDate,+ },+ parameters,+ });++ return (+ <LoadingPanel isEmpty={!data} isLoading={isLoading} error={error}>+ <Grid gap>+ <Grid columns="1fr auto" gap>+ <Column gap>+ <Row>+ <Text size="4" weight="bold">+ {name}+ </Text>+ </Row>+ </Column>+ <Column>+ <ReportEditButton id={id} name={name} type={type}>+ {({ close }) => {+ return (+ <Dialog title={formatMessage(labels.funnel)} variant="modal">+ <FunnelEditForm id={id} websiteId={websiteId} onClose={close} />+ </Dialog>+ );+ }}+ </ReportEditButton>+ </Column>+ </Grid>+ {data?.map(+ (+ { type, value, visitors, previous, dropped, remaining }: FunnelResult,+ index: number,+ ) => {+ const isPage = type === 'page';+ return (+ <Grid key={index} columns="auto 1fr" gap="6">+ <Column>+ <Row+ borderRadius="full"+ backgroundColor="2"+ width="40px"+ height="40px"+ justifyContent="center"+ alignItems="center"+ >+ <Text weight="bold" size="4">+ {index + 1}+ </Text>+ </Row>+ </Column>+ <Column gap>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Text color="muted">+ {formatMessage(isPage ? labels.viewedPage : labels.triggeredEvent)}+ </Text>+ <Text color="muted">{formatMessage(labels.conversionRate)}</Text>+ </Row>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Row alignItems="center" gap>+ <Icon>{type === 'page' ? <File /> : <Lightning />}</Icon>+ <Text>{value}</Text>+ </Row>+ <Row alignItems="center" gap>+ {index > 0 && (+ <ChangeLabel value={-dropped}>{formatLongNumber(dropped)}</ChangeLabel>+ )}+ <Icon>+ <User />+ </Icon>+ <Text title={visitors.toString()}>{formatLongNumber(visitors)}</Text>+ </Row>+ </Row>+ <Row alignItems="center" gap="6">+ <ProgressBar+ value={visitors || 0}+ minValue={0}+ maxValue={previous || 1}+ style={{ width: '100%' }}+ />+ <Text weight="bold" size="7">+ {Math.round(remaining * 100)}%+ </Text>+ </Row>+ </Column>+ </Grid>+ );+ },+ )}+ </Grid>+ </LoadingPanel>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/funnels/FunnelAddButton.tsx b/src/app/(main)/websites/[websiteId]/funnels/FunnelAddButton.tsxnew file mode 100644index 000000000..7e776737e--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/funnels/FunnelAddButton.tsx@@ -0,0 +1,28 @@+import { Button, DialogTrigger, Dialog, Icon, Text, Modal } from '@umami/react-zen';+import { useMessages } from '@/components/hooks';+import { FunnelEditForm } from './FunnelEditForm';+import { Plus } from '@/components/icons';++export function FunnelAddButton({ websiteId }: { websiteId: string }) {+ const { formatMessage, labels } = useMessages();++ return (+ <DialogTrigger>+ <Button variant="primary">+ <Icon>+ <Plus />+ </Icon>+ <Text>{formatMessage(labels.funnel)}</Text>+ </Button>+ <Modal>+ <Dialog+ variant="modal"+ title={formatMessage(labels.funnel)}+ style={{ minHeight: 375, minWidth: 600 }}+ >+ {({ close }) => <FunnelEditForm websiteId={websiteId} onClose={close} />}+ </Dialog>+ </Modal>+ </DialogTrigger>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/funnels/FunnelEditForm.tsxnew file mode 100644index 000000000..8c83b26f8--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/funnels/FunnelEditForm.tsx@@ -0,0 +1,158 @@+import {+ Form,+ FormField,+ FormFieldArray,+ TextField,+ Grid,+ FormController,+ FormButtons,+ FormSubmitButton,+ Button,+ RadioGroup,+ Radio,+ Text,+ Icon,+ Row,+ Loading,+} from '@umami/react-zen';+import { useApi, useMessages, useModified, useReportQuery } from '@/components/hooks';+import { File, Lightning, Close, Plus } from '@/components/icons';++const FUNNEL_STEPS_MAX = 8;++export function FunnelEditForm({+ id,+ websiteId,+ onSave,+ onClose,+}: {+ id?: string;+ websiteId: string;+ onSave?: () => void;+ onClose?: () => void;+}) {+ const { formatMessage, labels } = useMessages();+ const { touch } = useModified();+ const { post, useMutation } = useApi();+ const { data } = useReportQuery(id);+ const { mutate, error, isPending } = useMutation({+ mutationFn: (params: any) => post(`/reports${id ? `/${id}` : ''}`, params),+ });++ const handleSubmit = async ({ name, ...parameters }) => {+ mutate(+ { ...data, id, name, type: 'funnel', websiteId, parameters },+ {+ onSuccess: async () => {+ touch('reports:funnel');+ onSave?.();+ onClose?.();+ },+ },+ );+ };++ if (id && !data) {+ return <Loading position="page" />;+ }++ const defaultValues = {+ name: data?.name || '',+ window: data?.parameters?.window || 60,+ steps: data?.parameters?.steps || [{ type: 'page', value: '/' }],+ };++ return (+ <Form onSubmit={handleSubmit} error={error?.message} defaultValues={defaultValues}>+ <FormField+ name="name"+ label={formatMessage(labels.name)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField autoFocus />+ </FormField>+ <FormField+ name="window"+ label={formatMessage(labels.window)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField />+ </FormField>+ <FormFieldArray name="steps" label={formatMessage(labels.steps)}>+ {({ fields, append, remove, control }) => {+ return (+ <Grid gap>+ {fields.map((field: { id: string; type: string; value: string }, index: number) => {+ return (+ <Row key={field.id} alignItems="center" justifyContent="space-between" gap>+ <FormController control={control} name={`steps.${index}.type`}>+ {({ field }) => {+ return (+ <RadioGroup+ orientation="horizontal"+ variant="box"+ value={field.value}+ onChange={field.onChange}+ >+ <Grid columns="1fr 1fr" flexGrow={1} gap>+ <Radio id="page" value="page">+ <Icon>+ <File />+ </Icon>+ <Text>{formatMessage(labels.page)}</Text>+ </Radio>+ <Radio id="event" value="event">+ <Icon>+ <Lightning />+ </Icon>+ <Text>{formatMessage(labels.event)}</Text>+ </Radio>+ </Grid>+ </RadioGroup>+ );+ }}+ </FormController>+ <FormController control={control} name={`steps.${index}.value`}>+ {({ field }) => {+ return (+ <TextField+ value={field.value}+ onChange={field.onChange}+ defaultValue={field.value}+ style={{ flexGrow: 1 }}+ />+ );+ }}+ </FormController>+ <Button variant="quiet" onPress={() => remove(index)}>+ <Icon size="sm">+ <Close />+ </Icon>+ </Button>+ </Row>+ );+ })}+ <Row>+ <Button+ onPress={() => append({ type: 'page', value: '/' })}+ isDisabled={fields.length >= FUNNEL_STEPS_MAX}+ >+ <Icon>+ <Plus />+ </Icon>+ <Text>{formatMessage(labels.add)}</Text>+ </Button>+ </Row>+ </Grid>+ );+ }}+ </FormFieldArray>+ <FormButtons>+ <Button onPress={onClose} isDisabled={isPending}>+ {formatMessage(labels.cancel)}+ </Button>+ <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>+ </FormButtons>+ </Form>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/funnels/FunnelsPage.tsx b/src/app/(main)/websites/[websiteId]/funnels/FunnelsPage.tsxnew file mode 100644index 000000000..b68fd608a--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/funnels/FunnelsPage.tsx@@ -0,0 +1,38 @@+'use client';+import { Grid, Loading } from '@umami/react-zen';+import { SectionHeader } from '@/components/common/SectionHeader';+import { Funnel } from './Funnel';+import { FunnelAddButton } from './FunnelAddButton';+import { WebsiteControls } from '../WebsiteControls';+import { useDateRange, useReportsQuery } from '@/components/hooks';+import { LoadingPanel } from '@/components/common/LoadingPanel';+import { Panel } from '@/components/common/Panel';++export function FunnelsPage({ websiteId }: { websiteId: string }) {+ const { result } = useReportsQuery({ websiteId, type: 'funnel' });+ const {+ dateRange: { startDate, endDate },+ } = useDateRange(websiteId);++ if (!result) {+ return <Loading position="page" />;+ }++ return (+ <>+ <WebsiteControls websiteId={websiteId} />+ <LoadingPanel isEmpty={!result?.data} isLoading={!result}>+ <SectionHeader>+ <FunnelAddButton websiteId={websiteId} />+ </SectionHeader>+ <Grid gap>+ {result?.data?.map((report: any) => (+ <Panel key={report.id}>+ <Funnel {...report} startDate={startDate} endDate={endDate} />+ </Panel>+ ))}+ </Grid>+ </LoadingPanel>+ </>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/funnels/page.tsx b/src/app/(main)/websites/[websiteId]/funnels/page.tsxnew file mode 100644index 000000000..0209b8062--- /dev/null+++ b/src/app/(main)/websites/[websiteId]/funnels/page.tsx@@ -0,0 +1,12 @@+import { Metadata } from 'next';+import { FunnelsPage } from './FunnelsPage';++export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {+ const { websiteId } = await params;++ return <FunnelsPage websiteId={websiteId} />;+}++export const metadata: Metadata = {+ title: 'Funnels',+};diff --git a/src/app/(main)/websites/[websiteId]/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/goals/Goal.tsxindex bfa35a24b..3037ffdb8 100644--- a/src/app/(main)/websites/[websiteId]/goals/Goal.tsx+++ b/src/app/(main)/websites/[websiteId]/goals/Goal.tsx@@ -1,26 +1,10 @@-import { useState } from 'react';-import {- Grid,- Row,- Column,- Text,- Icon,- Button,- MenuTrigger,- Menu,- MenuItem,- Popover,- ProgressBar,- Dialog,- Modal,- AlertDialog,-} from '@umami/react-zen';+import { Grid, Row, Column, Text, Icon, ProgressBar, Dialog } from '@umami/react-zen';+import { ReportEditButton } from '@/components/input/ReportEditButton';import { useMessages, useResultQuery } from '@/components/hooks';-import { Edit, More, Trash, File, Lightning, User } from '@/components/icons';+import { File, Lightning, User } from '@/components/icons';import { LoadingPanel } from '@/components/common/LoadingPanel';import { formatLongNumber } from '@/lib/format';-import { GoalAddForm } from '@/app/(main)/websites/[websiteId]/goals/GoalAddForm';-import { useDeleteQuery } from '@/components/hooks/queries/useDeleteQuery';+import { GoalEditForm } from './GoalEditForm';export interface GoalProps {id: string;@@ -41,12 +25,12 @@ export type GoalData = { num: number; total: number };export function Goal({ id, name, type, parameters, websiteId, startDate, endDate }: GoalProps) {const { formatMessage, labels } = useMessages();const { data, error, isLoading } = useResultQuery<GoalData>(type, {- ...parameters,websiteId,dateRange: {startDate,endDate,},+ parameters,});const isPage = parameters?.type === 'page';@@ -62,7 +46,19 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate</Row></Column><Column>- <ActionsButton id={id} name={name} websiteId={websiteId} />+ <ReportEditButton id={id} name={name} type={type}>+ {({ close }) => {+ return (+ <Dialog+ title={formatMessage(labels.goal)}+ variant="modal"+ style={{ minHeight: 375, minWidth: 400 }}+ >+ <GoalEditForm id={id} websiteId={websiteId} onClose={close} />+ </Dialog>+ );+ }}+ </ReportEditButton></Column></Grid><Row alignItems="center" justifyContent="space-between" gap>@@ -85,7 +81,7 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate)} / ${formatLongNumber(data?.total)}`}</Text></Row></Row>- <Row alignItems="center" gap>+ <Row alignItems="center" gap="6"><ProgressBarvalue={data?.num || 0}minValue={0}@@ -100,88 +96,3 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate</LoadingPanel>);}--const ActionsButton = ({- id,- name,- websiteId,-}: {- id: string;- name: string;- websiteId: string;-}) => {- const { formatMessage, labels, messages } = useMessages();- const [showEdit, setShowEdit] = useState(false);- const [showDelete, setShowDelete] = useState(false);- const { mutate, touch } = useDeleteQuery(`/reports/${id}`);-- const handleAction = (id: any) => {- if (id === 'edit') {- setShowEdit(true);- } else if (id === 'delete') {- setShowDelete(true);- }- };-- const handleClose = () => {- setShowEdit(false);- setShowDelete(false);- };-- const handleDelete = async () => {- mutate(null, {- onSuccess: async () => {- touch(`goals`);- setShowDelete(false);- },- });- };-- return (- <>- <MenuTrigger>- <Button variant="quiet">- <Icon>- <More />- </Icon>- </Button>- <Popover placement="bottom">- <Menu onAction={handleAction}>- <MenuItem id="edit">- <Icon>- <Edit />- </Icon>- <Text>{formatMessage(labels.edit)}</Text>- </MenuItem>- <MenuItem id="delete">- <Icon>- <Trash />- </Icon>- <Text>{formatMessage(labels.delete)}</Text>- </MenuItem>- </Menu>- </Popover>- </MenuTrigger>- <Modal isOpen={showEdit || showDelete} isDismissable={true}>- {showEdit && (- <Dialog- title={formatMessage(labels.goal)}- variant="modal"- style={{ minHeight: 375, minWidth: 400 }}- >- <GoalAddForm id={id} websiteId={websiteId} onClose={handleClose} />- </Dialog>- )}- {showDelete && (- <AlertDialog- title={formatMessage(labels.delete)}- onConfirm={handleDelete}- onCancel={handleClose}- >- {formatMessage(messages.confirmDelete, { target: name })}- </AlertDialog>- )}- </Modal>- </>- );-};diff --git a/src/app/(main)/websites/[websiteId]/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/goals/GoalAddButton.tsxindex 0407147f1..cdd7d34a4 100644--- a/src/app/(main)/websites/[websiteId]/goals/GoalAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/goals/GoalAddButton.tsx@@ -1,6 +1,6 @@import { Button, DialogTrigger, Dialog, Icon, Text, Modal } from '@umami/react-zen';import { useMessages } from '@/components/hooks';-import { GoalAddForm } from './GoalAddForm';+import { GoalEditForm } from './GoalEditForm';import { Plus } from '@/components/icons';export function GoalAddButton({ websiteId }: { websiteId: string }) {@@ -12,15 +12,15 @@ export function GoalAddButton({ websiteId }: { websiteId: string }) {<Icon><Plus /></Icon>- <Text>{formatMessage(labels.addGoal)}</Text>+ <Text>{formatMessage(labels.goal)}</Text></Button><Modal><Dialogvariant="modal"- title={formatMessage(labels.addGoal)}+ title={formatMessage(labels.goal)}style={{ minHeight: 375, minWidth: 400 }}>- {({ close }) => <GoalAddForm websiteId={websiteId} onClose={close} />}+ {({ close }) => <GoalEditForm websiteId={websiteId} onClose={close} />}</Dialog></Modal></DialogTrigger>diff --git a/src/app/(main)/websites/[websiteId]/goals/GoalAddForm.tsx b/src/app/(main)/websites/[websiteId]/goals/GoalEditForm.tsxsimilarity index 78%rename from src/app/(main)/websites/[websiteId]/goals/GoalAddForm.tsxrename to src/app/(main)/websites/[websiteId]/goals/GoalEditForm.tsxindex dd1a2e9c6..b42545de1 100644--- a/src/app/(main)/websites/[websiteId]/goals/GoalAddForm.tsx+++ b/src/app/(main)/websites/[websiteId]/goals/GoalEditForm.tsx@@ -10,17 +10,12 @@ import {Radio,Text,Icon,+ Loading,} from '@umami/react-zen';import { useApi, useMessages, useModified, useReportQuery } from '@/components/hooks';import { File, Lightning } from '@/components/icons';-const defaultValues = {- name: '',- type: 'page',- value: '',-};--export function GoalAddForm({+export function GoalEditForm({id,websiteId,onSave,@@ -36,36 +31,46 @@ export function GoalAddForm({const { post, useMutation } = useApi();const { data } = useReportQuery(id);const { mutate, error, isPending } = useMutation({- mutationFn: (params: any) => post(`/websites/${websiteId}/goals`, params),+ mutationFn: (params: any) => post(`/reports${id ? `/${id}` : ''}`, params),});- const handleSubmit = async (data: any) => {+ const handleSubmit = async ({ name, ...parameters }) => {mutate(- { id, ...data },+ { ...data, id, name, type: 'goal', websiteId, parameters },{onSuccess: async () => {+ if (id) touch(`report:${id}`);+ touch('reports:goal');onSave?.();onClose?.();- touch('goals');},},);};if (id && !data) {- return null;+ return <Loading position="page" />;}+ const defaultValues = {+ name: data?.name || '',+ type: data?.parameters?.type || 'page',+ value: data?.parameters?.value || '',+ };+return (- <Form- onSubmit={handleSubmit}- error={error?.message}- defaultValues={data?.parameters || defaultValues}- >+ <Form onSubmit={handleSubmit} error={error?.message} defaultValues={defaultValues}>{({ watch }) => {const watchType = watch('type');return (<>+ <FormField+ name="name"+ label={formatMessage(labels.name)}+ rules={{ required: formatMessage(labels.required) }}+ >+ <TextField />+ </FormField><FormFieldname="type"label={formatMessage(labels.type)}@@ -88,13 +93,6 @@ export function GoalAddForm({</Grid></RadioGroup></FormField>- <FormField- name="name"- label={formatMessage(labels.name)}- rules={{ required: formatMessage(labels.required) }}- >- <TextField />- </FormField><FormFieldname="value"label={formatMessage(watchType === 'event' ? labels.eventName : labels.path)}@@ -106,7 +104,7 @@ export function GoalAddForm({<Button onPress={onClose} isDisabled={isPending}>{formatMessage(labels.cancel)}</Button>- <FormSubmitButton>{formatMessage(id ? labels.save : labels.add)}</FormSubmitButton>+ <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton></FormButtons></>);diff --git a/src/app/(main)/websites/[websiteId]/goals/GoalsPage.tsx b/src/app/(main)/websites/[websiteId]/goals/GoalsPage.tsxindex 2d644ef2b..b97c0e700 100644--- a/src/app/(main)/websites/[websiteId]/goals/GoalsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/goals/GoalsPage.tsx@@ -4,12 +4,12 @@ import { SectionHeader } from '@/components/common/SectionHeader';import { Goal } from './Goal';import { GoalAddButton } from './GoalAddButton';import { WebsiteControls } from '../WebsiteControls';-import { useDateRange, useGoalsQuery } from '@/components/hooks';+import { useDateRange, useReportsQuery } from '@/components/hooks';import { LoadingPanel } from '@/components/common/LoadingPanel';import { Panel } from '@/components/common/Panel';export function GoalsPage({ websiteId }: { websiteId: string }) {- const { result } = useGoalsQuery({ websiteId });+ const { result } = useReportsQuery({ websiteId, type: 'goal' });const {dateRange: { startDate, endDate },} = useDateRange(websiteId);@@ -26,9 +26,9 @@ export function GoalsPage({ websiteId }: { websiteId: string }) {<GoalAddButton websiteId={websiteId} /></SectionHeader><Grid columns="1fr 1fr" gap>- {result?.data?.map((goal: any) => (- <Panel key={goal.id}>- <Goal {...goal} reportId={goal.id} startDate={startDate} endDate={endDate} />+ {result?.data?.map((report: any) => (+ <Panel key={report.id}>+ <Goal {...report} reportId={report.id} startDate={startDate} endDate={endDate} /></Panel>))}</Grid>diff --git a/src/app/api/reports/[reportId]/route.ts b/src/app/api/reports/[reportId]/route.tsindex ba90ee082..7107bc282 100644--- a/src/app/api/reports/[reportId]/route.ts+++ b/src/app/api/reports/[reportId]/route.ts@@ -1,9 +1,8 @@-import { z } from 'zod';import { parseRequest } from '@/lib/request';import { deleteReport, getReport, updateReport } from '@/queries';import { canDeleteReport, canUpdateReport, canViewReport } from '@/lib/auth';import { unauthorized, json, notFound, ok } from '@/lib/response';-import { reportTypeParam } from '@/lib/schema';+import { reportSchema } from '@/lib/schema';export async function GET(request: Request, { params }: { params: Promise<{ reportId: string }> }) {const { auth, error } = await parseRequest(request);@@ -20,8 +19,6 @@ export async function GET(request: Request, { params }: { params: Promise<{ reporeturn unauthorized();}- report.parameters = JSON.parse(report.parameters);-return json(report);}@@ -29,15 +26,7 @@ export async function POST(request: Request,{ params }: { params: Promise<{ reportId: string }> },) {- const schema = z.object({- websiteId: z.string().uuid(),- type: reportTypeParam,- name: z.string().max(200),- description: z.string().max(500),- parameters: z.object({}).passthrough(),- });-- const { auth, body, error } = await parseRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, reportSchema);if (error) {return error();@@ -62,8 +51,8 @@ export async function POST(type,name,description,- parameters: JSON.stringify(parameters),- } as any);+ parameters,+ });return json(result);}diff --git a/src/app/api/reports/funnel/route.ts b/src/app/api/reports/funnel/route.tsindex 6033c6333..7c50b8aa3 100644--- a/src/app/api/reports/funnel/route.ts+++ b/src/app/api/reports/funnel/route.ts@@ -1,25 +1,11 @@-import { z } from 'zod';import { canViewWebsite } from '@/lib/auth';import { unauthorized, json } from '@/lib/response';import { parseRequest } from '@/lib/request';import { getFunnel } from '@/queries';-import { reportParms } from '@/lib/schema';+import { reportResultSchema } from '@/lib/schema';export async function POST(request: Request) {- const schema = z.object({- ...reportParms,- window: z.coerce.number().positive(),- steps: z- .array(- z.object({- type: z.string(),- value: z.string(),- }),- )- .min(2),- });-- const { auth, body, error } = await parseRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, reportResultSchema);if (error) {return error();@@ -27,9 +13,8 @@ export async function POST(request: Request) {const {websiteId,- steps,- window,dateRange: { startDate, endDate },+ parameters: { steps, window },} = body;if (!(await canViewWebsite(auth, websiteId))) {diff --git a/src/app/api/reports/goal/route.ts b/src/app/api/reports/goal/route.tsnew file mode 100644index 000000000..bbf0f2294--- /dev/null+++ b/src/app/api/reports/goal/route.ts@@ -0,0 +1,34 @@+import { canViewWebsite } from '@/lib/auth';+import { unauthorized, json } from '@/lib/response';+import { parseRequest } from '@/lib/request';+import { getGoal } from '@/queries/sql/reports/getGoal';+import { reportResultSchema } from '@/lib/schema';++export async function POST(request: Request) {+ const { auth, body, error } = await parseRequest(request, reportResultSchema);++ if (error) {+ return error();+ }++ const {+ websiteId,+ dateRange: { startDate, endDate },+ parameters: { type, value, property, operator },+ } = body;++ if (!(await canViewWebsite(auth, websiteId))) {+ return unauthorized();+ }++ const data = await getGoal(websiteId, {+ type,+ value,+ property,+ operator,+ startDate: new Date(startDate),+ endDate: new Date(endDate),+ });++ return json(data);+}diff --git a/src/app/api/reports/goals/route.ts b/src/app/api/reports/goals/route.tsdeleted file mode 100644index b75e15251..000000000--- a/src/app/api/reports/goals/route.ts+++ /dev/null@@ -1,57 +0,0 @@-import { z } from 'zod';-import { canViewWebsite } from '@/lib/auth';-import { unauthorized, json } from '@/lib/response';-import { parseRequest } from '@/lib/request';-import { getGoal } from '@/queries/sql/reports/getGoal';-import { filterParams, reportParms } from '@/lib/schema';--export async function POST(request: Request) {- const schema = z- .object({- ...reportParms,- ...filterParams,- type: z.enum(['page', 'event']),- value: z.string(),- operator: z- .string()- .regex(/count|sum|average/)- .optional(),- property: z.string().optional(),- })- .refine(data => {- if (data['type'] === 'event' && data['property']) {- return data['operator'] && data['property'];- }- return true;- });-- const { auth, body, error } = await parseRequest(request, schema);-- if (error) {- return error();- }-- const {- websiteId,- type,- value,- property,- operator,- dateRange: { startDate, endDate },- } = body;-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const data = await getGoal(websiteId, {- type,- value,- property,- operator,- startDate: new Date(startDate),- endDate: new Date(endDate),- });-- return json(data);-}diff --git a/src/app/api/reports/route.ts b/src/app/api/reports/route.tsindex e50c57bc2..c68c083ee 100644--- a/src/app/api/reports/route.ts+++ b/src/app/api/reports/route.ts@@ -1,15 +1,15 @@import { z } from 'zod';import { uuid } from '@/lib/crypto';-import { pagingParams, reportTypeParam } from '@/lib/schema';+import { pagingParams, reportSchema } from '@/lib/schema';import { parseRequest } from '@/lib/request';-import { canViewTeam, canViewWebsite, canUpdateWebsite } from '@/lib/auth';+import { canViewWebsite, canUpdateWebsite } from '@/lib/auth';import { unauthorized, json } from '@/lib/response';import { getReports, createReport } from '@/queries';export async function GET(request: Request) {const schema = z.object({websiteId: z.string().uuid().optional(),- teamId: z.string().uuid().optional(),+ type: z.string().optional(),...pagingParams,});@@ -19,53 +19,24 @@ export async function GET(request: Request) {return error();}- const { page, search, pageSize, websiteId, teamId } = query;- const userId = auth.user.id;+ const { page, search, pageSize, websiteId, type } = query;const filters = {page,pageSize,search,};- if (- (websiteId && !(await canViewWebsite(auth, websiteId))) ||- (teamId && !(await canViewTeam(auth, teamId)))- ) {+ if (websiteId && !(await canViewWebsite(auth, websiteId))) {return unauthorized();}const data = await getReports({where: {- OR: [- ...(websiteId ? [{ websiteId }] : []),- ...(teamId- ? [- {- website: {- deletedAt: null,- teamId,- },- },- ]- : []),- ...(userId && !websiteId && !teamId- ? [- {- website: {- deletedAt: null,- userId,- },- },- ]- : []),- ],- },- include: {+ websiteId,+ type,website: {- select: {- domain: true,- },+ deletedAt: null,},},},@@ -76,15 +47,7 @@ export async function GET(request: Request) {}export async function POST(request: Request) {- const schema = z.object({- websiteId: z.string().uuid(),- name: z.string().max(200),- type: reportTypeParam,- description: z.string().max(500),- parameters: z.object({}).passthrough(),- });-- const { auth, body, error } = await parseRequest(request, schema);+ const { auth, body, error } = await parseRequest(request, reportSchema);if (error) {return error();@@ -102,9 +65,9 @@ export async function POST(request: Request) {websiteId,type,name,- description,- parameters: JSON.stringify(parameters),- } as any);+ description: description || '',+ parameters,+ });return json(result);}diff --git a/src/app/api/websites/[websiteId]/goals/route.ts b/src/app/api/websites/[websiteId]/goals/route.tsdeleted file mode 100644index d353e8b7b..000000000--- a/src/app/api/websites/[websiteId]/goals/route.ts+++ /dev/null@@ -1,94 +0,0 @@-import { z } from 'zod';-import { canViewWebsite } from '@/lib/auth';-import { unauthorized, json, ok } from '@/lib/response';-import { parseRequest } from '@/lib/request';-import { getReports, createReport, updateReport } from '@/queries';-import { uuid } from '@/lib/crypto';--export async function GET(- request: Request,- { params }: { params: Promise<{ websiteId: string }> },-) {- const { auth, query, error } = await parseRequest(request);-- if (error) {- return error();- }-- const { websiteId } = await params;- const { page, search, pageSize } = query;- const filters = {- page,- pageSize,- search,- };-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const data = await getReports(- {- where: {- websiteId,- type: 'goals',- },- },- filters,- ).then(result => {- result.data = result.data.map(report => {- report.parameters = JSON.parse(report.parameters);-- return report;- });-- return result;- });-- return json(data);-}--export async function POST(- request: Request,- { params }: { params: Promise<{ websiteId: string }> },-) {- const schema = z.object({- id: z.string().uuid().optional(),- name: z.string(),- type: z.enum(['page', 'event']),- value: z.string(),- });-- const { auth, body, error } = await parseRequest(request, schema);-- if (error) {- return error();- }-- const { websiteId } = await params;-- if (!(await canViewWebsite(auth, websiteId))) {- return unauthorized();- }-- const { id, name, type, value } = body;-- if (id) {- await updateReport(id, {- name,- parameters: JSON.stringify({ name, type, value }),- });- } else {- await createReport({- id: uuid(),- userId: auth.user.id,- websiteId,- type: 'goals',- name,- description: '',- parameters: JSON.stringify({ name, type, value }),- });- }-- return ok();-}diff --git a/src/app/api/websites/[websiteId]/reports/route.ts b/src/app/api/websites/[websiteId]/reports/route.tsindex c6941f537..88455685e 100644--- a/src/app/api/websites/[websiteId]/reports/route.ts+++ b/src/app/api/websites/[websiteId]/reports/route.ts@@ -1,15 +1,17 @@import { z } from 'zod';import { canViewWebsite } from '@/lib/auth';-import { getWebsiteReports } from '@/queries';-import { pagingParams } from '@/lib/schema';+import { getReports } from '@/queries';+import { filterParams, pagingParams } from '@/lib/schema';import { parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string }> },+ filters: { type: string },) {const schema = z.object({+ ...filterParams,...pagingParams,});@@ -26,11 +28,19 @@ export async function GET(return unauthorized();}- const data = await getWebsiteReports(websiteId, {- page: +page,- pageSize: +pageSize,- search,- });+ const data = await getReports(+ {+ where: {+ websiteId,+ type: filters.type,+ },+ },+ {+ page,+ pageSize,+ search,+ },+ );return json(data);}diff --git a/src/components/hooks/queries/useGoalQuery.ts b/src/components/hooks/queries/useGoalQuery.tsindex 6018074bb..5a65b9861 100644--- a/src/components/hooks/queries/useGoalQuery.ts+++ b/src/components/hooks/queries/useGoalQuery.ts@@ -9,9 +9,8 @@ export function useGoalQuery(return usePagedQuery({queryKey: ['goal', { websiteId, reportId, ...params }],- queryFn: (data: any) => {+ queryFn: () => {return post(`/reports/goals`, {- ...data,...params,});},diff --git a/src/components/hooks/queries/useGoalsQuery.ts b/src/components/hooks/queries/useGoalsQuery.tsindex cf6d0511c..307353da1 100644--- a/src/components/hooks/queries/useGoalsQuery.ts+++ b/src/components/hooks/queries/useGoalsQuery.ts@@ -11,9 +11,8 @@ export function useGoalsQuery(return usePagedQuery({queryKey: ['goals', { websiteId, modified, ...params }],- queryFn: (data: any) => {+ queryFn: () => {return get(`/websites/${websiteId}/goals`, {- ...data,...params,});},diff --git a/src/components/hooks/queries/useReportQuery.ts b/src/components/hooks/queries/useReportQuery.tsindex c544491ab..6973e2d34 100644--- a/src/components/hooks/queries/useReportQuery.ts+++ b/src/components/hooks/queries/useReportQuery.ts@@ -7,10 +7,8 @@ export function useReportQuery(reportId: string) {return useQuery({queryKey: ['report', { reportId, modified }],- queryFn: (data: any) => {- return get(`/reports/${reportId}`, {- ...data,- });+ queryFn: () => {+ return get(`/reports/${reportId}`);},enabled: !!reportId,});diff --git a/src/components/hooks/queries/useReportsQuery.ts b/src/components/hooks/queries/useReportsQuery.tsindex 5754fd1e6..002f6f9bd 100644--- a/src/components/hooks/queries/useReportsQuery.ts+++ b/src/components/hooks/queries/useReportsQuery.ts@@ -2,14 +2,13 @@ import { useApi } from '../useApi';import { usePagedQuery } from '../usePagedQuery';import { useModified } from '../useModified';-export function useReportsQuery({ websiteId, teamId }: { websiteId?: string; teamId?: string }) {- const { modified } = useModified(`reports`);+export function useReportsQuery({ websiteId, type }: { websiteId: string; type?: string }) {+ const { modified } = useModified(`reports:${type}`);const { get } = useApi();return usePagedQuery({- queryKey: ['reports', { websiteId, teamId, modified }],- queryFn: (params: any) => {- return get('/reports', { websiteId, teamId, ...params });- },+ queryKey: ['reports', { websiteId, type, modified }],+ queryFn: async () => get('/reports', { websiteId, type }),+ enabled: !!websiteId && !!type,});}diff --git a/src/components/hooks/queries/useResultQuery.ts b/src/components/hooks/queries/useResultQuery.tsindex a67ff7a87..3ca6e23a3 100644--- a/src/components/hooks/queries/useResultQuery.ts+++ b/src/components/hooks/queries/useResultQuery.ts@@ -10,7 +10,7 @@ export function useResultQuery<T>(return useQuery<T>({queryKey: ['reports', type, params],- queryFn: () => post(`/reports/${type}`, params),+ queryFn: () => post(`/reports/${type}`, { type, ...params }),enabled: !!type,...options,});diff --git a/src/components/hooks/queries/useWebsiteSessionsQuery.ts b/src/components/hooks/queries/useWebsiteSessionsQuery.tsindex f0684a2d2..0a24a1b51 100644--- a/src/components/hooks/queries/useWebsiteSessionsQuery.ts+++ b/src/components/hooks/queries/useWebsiteSessionsQuery.ts@@ -13,9 +13,8 @@ export function useWebsiteSessionsQuery(return usePagedQuery({queryKey: ['sessions', { websiteId, modified, ...params, ...filters }],- queryFn: (data: any) => {+ queryFn: () => {return get(`/websites/${websiteId}/sessions`, {- ...data,...params,...filters,pageSize: 20,diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.tsindex 545f0fbb9..f9cd51105 100644--- a/src/components/hooks/queries/useWebsites.ts+++ b/src/components/hooks/queries/useWebsites.ts@@ -13,9 +13,8 @@ export function useWebsites(return usePagedQuery({queryKey: ['websites', { userId, teamId, modified, ...params }],- queryFn: (data: any) => {+ queryFn: () => {return get(teamId ? `/teams/${teamId}/websites` : `/users/${userId || user.id}/websites`, {- ...data,...params,});},diff --git a/src/components/input/ReportEditButton.tsx b/src/components/input/ReportEditButton.tsxnew file mode 100644index 000000000..b13bf90bb--- /dev/null+++ b/src/components/input/ReportEditButton.tsx@@ -0,0 +1,100 @@+import { ReactNode, useState } from 'react';+import { useMessages } from '@/components/hooks';+import { useDeleteQuery } from '@/components/hooks/queries/useDeleteQuery';+import {+ AlertDialog,+ Button,+ Icon,+ Menu,+ MenuItem,+ MenuTrigger,+ Modal,+ Popover,+ Text,+ Row,+} from '@umami/react-zen';+import { Edit, More, Trash } from '@/components/icons';++export function ReportEditButton({+ id,+ name,+ type,+ children,+ onDelete,+}: {+ id: string;+ name: string;+ type: string;+ onDelete?: () => void;+ children: ({ close }: { close: () => void }) => ReactNode;+}) {+ const { formatMessage, labels, messages } = useMessages();+ const [showEdit, setShowEdit] = useState(false);+ const [showDelete, setShowDelete] = useState(false);+ const { mutate, touch } = useDeleteQuery(`/reports/${id}`);++ const handleAction = (id: any) => {+ if (id === 'edit') {+ setShowEdit(true);+ } else if (id === 'delete') {+ setShowDelete(true);+ }+ };++ const handleClose = () => {+ setShowEdit(false);+ setShowDelete(false);+ };++ const handleDelete = async () => {+ mutate(null, {+ onSuccess: async () => {+ touch(`reports:${type}`);+ setShowDelete(false);+ onDelete?.();+ },+ });+ };++ return (+ <>+ <MenuTrigger>+ <Button variant="quiet">+ <Icon>+ <More />+ </Icon>+ </Button>+ <Popover placement="bottom">+ <Menu onAction={handleAction}>+ <MenuItem id="edit">+ <Icon>+ <Edit />+ </Icon>+ <Text>{formatMessage(labels.edit)}</Text>+ </MenuItem>+ <MenuItem id="delete">+ <Icon>+ <Trash />+ </Icon>+ <Text>{formatMessage(labels.delete)}</Text>+ </MenuItem>+ </Menu>+ </Popover>+ </MenuTrigger>+ <Modal isOpen={showEdit || showDelete} isDismissable={true}>+ {showEdit && children({ close: handleClose })}+ {showDelete && (+ <AlertDialog+ title={formatMessage(labels.delete)}+ onConfirm={handleDelete}+ onCancel={handleClose}+ >+ <Row gap="1">+ {formatMessage(messages.confirmDelete, { target: <b key={name}>{name}</b> })}+ </Row>+ </AlertDialog>+ )}+ </Modal>+ </>+ );+}diff --git a/src/components/messages.ts b/src/components/messages.tsindex 81cbc0473..d2e9c2d00 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -277,7 +277,6 @@ export const labels = defineMessages({addStep: { id: 'label.add-step', defaultMessage: 'Add step' },goal: { id: 'label.goal', defaultMessage: 'Goal' },goals: { id: 'label.goals', defaultMessage: 'Goals' },- addGoal: { id: 'label.add-goal', defaultMessage: 'Add Goal' },goalsDescription: {id: 'label.goals-description',defaultMessage: 'Track your goals for pageviews and events.',diff --git a/src/components/metrics/ChangeLabel.module.css b/src/components/metrics/ChangeLabel.module.cssindex 96ad0ce40..fb3112def 100644--- a/src/components/metrics/ChangeLabel.module.css+++ b/src/components/metrics/ChangeLabel.module.css@@ -11,12 +11,12 @@.positive {color: var(--success-color);- background: color-mix(in srgb, var(--success-color), var(--background-color) 85%);+ background: color-mix(in srgb, var(--success-color), var(--background-color) 95%);}.negative {color: var(--danger-color);- background: color-mix(in srgb, var(--danger-color), var(--background-color) 85%);+ background: color-mix(in srgb, var(--danger-color), var(--background-color) 95%);}.neutral {diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsxindex 3a849cf6c..5bccdaf2d 100644--- a/src/components/metrics/ChangeLabel.tsx+++ b/src/components/metrics/ChangeLabel.tsx@@ -1,16 +1,16 @@import classNames from 'classnames';import { Icon, Text } from '@umami/react-zen';-import { ReactNode } from 'react';+import { HTMLAttributes, ReactNode } from 'react';import { Arrow } from '@/components/icons';import styles from './ChangeLabel.module.css';export function ChangeLabel({value,size,- title,reverseColors,className,children,+ ...props}: {value: number;size?: 'xs' | 'sm' | 'md' | 'lg';@@ -19,7 +19,7 @@ export function ChangeLabel({showPercentage?: boolean;className?: string;children?: ReactNode;-}) {+} & HTMLAttributes<HTMLDivElement>) {const positive = value >= 0;const negative = value < 0;const neutral = value === 0 || isNaN(value);@@ -27,12 +27,12 @@ export function ChangeLabel({return (<div+ {...props}className={classNames(styles.label, className, {[styles.positive]: good,[styles.negative]: !good,[styles.neutral]: neutral,})}- title={title}>{!neutral && (<Icon rotate={positive ? -90 : 90} size={size}>diff --git a/src/declaration.d.ts b/src/declaration.d.tsindex d8165bb2b..8c1820bb9 100644--- a/src/declaration.d.ts+++ b/src/declaration.d.ts@@ -1,6 +1,7 @@declare module 'bcryptjs';declare module 'chartjs-adapter-date-fns';declare module 'cors';+declare module 'date-fns-tz';declare module 'debug';declare module 'fs-extra';declare module 'jsonwebtoken';diff --git a/src/lib/constants.ts b/src/lib/constants.tsindex c6b9ad4b7..f3513a5ce 100644--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@ -111,8 +111,8 @@ export const DATA_TYPES = {export const REPORT_TYPES = {funnel: 'funnel',- goals: 'goals',- insights: 'insights',+ goals: 'goal',+ insights: 'insight',retention: 'retention',utm: 'utm',journey: 'journey',diff --git a/src/lib/schema.ts b/src/lib/schema.tsindex 788bef19e..5edf7a463 100644--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@ -56,10 +56,10 @@ export const urlOrPathParam = z.string().refine(export const reportTypeParam = z.enum(['funnel',- 'insights',+ 'insight','retention','utm',- 'goals',+ 'goal','journey','revenue','attribution',@@ -76,3 +76,58 @@ export const reportParms = {value: z.string().optional(),}),};++export const goalReportSchema = z.object({+ type: z.literal('goal'),+ parameters: z+ .object({+ type: z.string(),+ value: z.string(),+ operator: z.enum(['count', 'sum', 'average']).optional(),+ property: z.string().optional(),+ })+ .refine(data => {+ if (data['type'] === 'event' && data['property']) {+ return data['operator'] && data['property'];+ }+ return true;+ }),+});++export const funnelReportSchema = z.object({+ type: z.literal('funnel'),+ parameters: z.object({+ window: z.coerce.number().positive(),+ steps: z+ .array(+ z.object({+ type: z.enum(['page', 'event']),+ value: z.string(),+ }),+ )+ .min(2)+ .max(8),+ }),+});++export const reportBaseSchema = z.object({+ websiteId: z.string().uuid(),+ type: reportTypeParam,+ name: z.string().max(200),+ description: z.string().max(500).optional(),+});++export const reportTypeSchema = z.discriminatedUnion('type', [+ goalReportSchema,+ funnelReportSchema,+]);++export const reportSchema = z.intersection(reportBaseSchema, reportTypeSchema);++export const reportResultSchema = z.intersection(+ z.object({+ ...reportParms,+ ...filterParams,+ }),+ reportTypeSchema,+);diff --git a/src/queries/prisma/report.ts b/src/queries/prisma/report.tsindex 07b9d5714..7e097e427 100644--- a/src/queries/prisma/report.ts+++ b/src/queries/prisma/report.ts@@ -88,10 +88,7 @@ export async function createReport(data: Prisma.ReportUncheckedCreateInput): Proreturn prisma.client.report.create({ data });}-export async function updateReport(- reportId: string,- data: Prisma.ReportUpdateInput,-): Promise<Report> {+export async function updateReport(reportId: string, data: any): Promise<Report> {return prisma.client.report.update({ where: { id: reportId }, data });}diff --git a/src/queries/sql/reports/getFunnel.ts b/src/queries/sql/reports/getFunnel.tsindex 70b51a9d5..d256bd08f 100644--- a/src/queries/sql/reports/getFunnel.ts+++ b/src/queries/sql/reports/getFunnel.ts@@ -2,36 +2,14 @@ import clickhouse from '@/lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';import prisma from '@/lib/prisma';-const formatResults = (steps: { type: string; value: string }[]) => (results: unknown) => {- return steps.map((step: { type: string; value: string }, i: number) => {- const visitors = Number(results[i]?.count) || 0;- const previous = Number(results[i - 1]?.count) || 0;- const dropped = previous > 0 ? previous - visitors : 0;- const dropoff = 1 - visitors / previous;- const remaining = visitors / Number(results[0].count);-- return {- ...step,- visitors,- previous,- dropped,- dropoff,- remaining,- };- });-};+export interface FunnelCriteria {+ windowMinutes: number;+ startDate: Date;+ endDate: Date;+ steps: { type: string; value: string }[];+}-export async function getFunnel(- ...args: [- websiteId: string,- criteria: {- windowMinutes: number;- startDate: Date;- endDate: Date;- steps: { type: string; value: string }[];- },- ]-) {+export async function getFunnel(...args: [websiteId: string, criteria: FunnelCriteria]) {return runQuery({[PRISMA]: () => relationalQuery(...args),[CLICKHOUSE]: () => clickhouseQuery(...args),@@ -40,12 +18,7 @@ export async function getFunnel(async function relationalQuery(websiteId: string,- criteria: {- windowMinutes: number;- startDate: Date;- endDate: Date;- steps: { type: string; value: string }[];- },+ criteria: FunnelCriteria,): Promise<{value: string;@@ -70,7 +43,7 @@ async function relationalQuery((pv, cv, i) => {const levelNumber = i + 1;const startSum = i > 0 ? 'union ' : '';- const isURL = cv.type === 'url';+ const isURL = cv.type === 'page';const column = isURL ? 'url_path' : 'event_name';let operator = '=';@@ -139,12 +112,7 @@ async function relationalQuery(async function clickhouseQuery(websiteId: string,- criteria: {- windowMinutes: number;- startDate: Date;- endDate: Date;- steps: { type: string; value: string }[];- },+ criteria: FunnelCriteria,): Promise<{value: string;@@ -174,7 +142,7 @@ async function clickhouseQuery(const levelNumber = i + 1;const startSum = i > 0 ? 'union all ' : '';const startFilter = i > 0 ? 'or' : '';- const isURL = cv.type === 'url';+ const isURL = cv.type === 'page';const column = isURL ? 'url_path' : 'event_name';let operator = '=';@@ -248,3 +216,22 @@ async function clickhouseQuery(},).then(formatResults(steps));}++const formatResults = (steps: { type: string; value: string }[]) => (results: unknown) => {+ return steps.map((step: { type: string; value: string }, i: number) => {+ const visitors = Number(results[i]?.count) || 0;+ const previous = Number(results[i - 1]?.count) || 0;+ const dropped = previous > 0 ? previous - visitors : 0;+ const dropoff = 1 - visitors / previous;+ const remaining = visitors / Number(results[0].count);++ return {+ ...step,+ visitors,+ previous,+ dropped,+ dropoff,+ remaining,+ };+ });+};diff --git a/src/styles/global.css b/src/styles/global.cssindex 37b16c335..837a196ee 100644--- a/src/styles/global.css+++ b/src/styles/global.css@@ -15,6 +15,11 @@ a:hover {text-decoration: none;}+:where(svg) {+ width: 1rem;+ height: 1rem;+}+::-webkit-scrollbar {width: 15px;background: transparent;