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
Cohort selection.
Mike Caobab4f8ebcca5
diff --git a/package.json b/package.jsonindex f492ac875..edaf6c2e1 100644--- a/package.json+++ b/package.json@@ -74,15 +74,15 @@"@date-fns/utc": "^1.2.0","@dicebear/collection": "^9.2.3","@dicebear/core": "^9.2.3",- "@fontsource/inter": "^4.5.15",+ "@fontsource/inter": "^5.2.6","@hello-pangea/dnd": "^17.0.0","@prisma/adapter-pg": "^6.15.0","@prisma/client": "^6.15.0","@prisma/extension-read-replicas": "^0.4.1",- "@react-spring/web": "^9.7.3",+ "@react-spring/web": "^10.0.1","@svgr/cli": "^8.1.0","@tanstack/react-query": "^5.85.5",- "@umami/react-zen": "^0.169.0",+ "@umami/react-zen": "^0.171.0","@umami/redis-client": "^0.27.0","bcryptjs": "^3.0.2","chalk": "^5.6.0",@@ -97,10 +97,10 @@"debug": "^4.3.4","del": "^6.0.0","detect-browser": "^5.2.0",- "dotenv": "^10.0.0",+ "dotenv": "^17.2.1","eslint-plugin-promise": "^6.1.1",- "fs-extra": "^10.0.1",- "immer": "^9.0.12",+ "fs-extra": "^11.3.1",+ "immer": "^10.1.1","ipaddr.js": "^2.0.1","is-ci": "^3.0.1","is-docker": "^3.0.0",@@ -109,8 +109,8 @@"jsonwebtoken": "^9.0.2","jszip": "^3.10.1","kafkajs": "^2.1.0",- "lucide-react": "^0.540.0",- "maxmind": "^4.3.28",+ "lucide-react": "^0.542.0",+ "maxmind": "^5.0.0","md5": "^2.3.0","next": "15.5.2","node-fetch": "^3.2.8",@@ -131,7 +131,7 @@"serialize-error": "^12.0.0","thenby": "^1.3.4","uuid": "^11.1.0",- "zod": "^3.25.76",+ "zod": "^4.1.5","zustand": "^5.0.8"},"devDependencies": {@@ -143,15 +143,15 @@"@rollup/plugin-node-resolve": "^15.2.0","@rollup/plugin-replace": "^5.0.2","@rollup/plugin-terser": "^0.4.4",- "@types/jest": "^29.5.14",- "@types/node": "^22.18.0",+ "@types/jest": "^30.0.0",+ "@types/node": "^24.3.0","@types/react": "^19.1.12","@types/react-dom": "^19.1.8","@types/react-window": "^1.8.8","@typescript-eslint/eslint-plugin": "^8.41.0","@typescript-eslint/parser": "^8.41.0","babel-plugin-react-compiler": "19.1.0-rc.2",- "cross-env": "^7.0.3",+ "cross-env": "^10.0.0","cypress": "^13.6.6","esbuild": "^0.25.8","eslint": "^8.33.0",@@ -164,9 +164,9 @@"eslint-plugin-jest": "^27.9.0","eslint-plugin-prettier": "^5.5.3","extract-react-intl-messages": "^4.1.1",- "husky": "^8.0.3",+ "husky": "^9.1.7","jest": "^29.7.0",- "lint-staged": "^14.0.1",+ "lint-staged": "^16.1.5","postcss": "^8.5.6","postcss-flexbugs-fixes": "^5.0.2","postcss-import": "^15.1.0",@@ -187,6 +187,6 @@"tar": "^6.1.2","ts-jest": "^29.4.0","ts-node": "^10.9.1",- "typescript": "^5.5.3"+ "typescript": "^5.9.2"}}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1ae26edaa..b9950fbb7 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -21,8 +21,8 @@ importers:specifier: ^9.2.3version: 9.2.4'@fontsource/inter':- specifier: ^4.5.15- version: 4.5.15+ specifier: ^5.2.6+ version: 5.2.6'@hello-pangea/dnd':specifier: ^17.0.0@@ -36,8 +36,8 @@ importers:specifier: ^0.4.1'@react-spring/web':- specifier: ^9.7.3+ specifier: ^10.0.1'@svgr/cli':specifier: ^8.1.0version: 8.1.0([email protected])@@ -45,8 +45,8 @@ importers:specifier: ^5.85.5version: 5.85.5([email protected])'@umami/react-zen':- specifier: ^0.169.0- version: 0.169.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))+ specifier: ^0.171.0+ version: 0.171.0(@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))'@umami/redis-client':specifier: ^0.27.0version: 0.27.0@@ -90,17 +90,17 @@ importers:specifier: ^5.2.0version: 5.3.0dotenv:- specifier: ^10.0.0- version: 10.0.0+ specifier: ^17.2.1+ version: 17.2.1eslint-plugin-promise:specifier: ^6.1.1version: 6.6.0([email protected])fs-extra:- specifier: ^10.0.1- version: 10.1.0+ specifier: ^11.3.1+ version: 11.3.1immer:- specifier: ^9.0.12- version: 9.0.21+ specifier: ^10.1.1+ version: 10.1.1ipaddr.js:specifier: ^2.0.1version: 2.2.0@@ -126,11 +126,11 @@ importers:specifier: ^2.1.0version: 2.2.4lucide-react:- specifier: ^0.540.0- version: 0.540.0([email protected])+ specifier: ^0.542.0+ version: 0.542.0([email protected])maxmind:- specifier: ^4.3.28- version: 4.3.29+ specifier: ^5.0.0+ version: 5.0.0md5:specifier: ^2.3.0version: 2.3.0@@ -192,15 +192,15 @@ importers:specifier: ^11.1.0version: 11.1.0zod:- specifier: ^3.25.76- version: 3.25.76+ specifier: ^4.1.5+ version: 4.1.5zustand:specifier: ^5.0.8- version: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))+ version: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))devDependencies:'@formatjs/cli':specifier: ^4.2.29- version: 4.8.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ version: 4.8.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))'@netlify/plugin-nextjs':specifier: ^5.12.1version: 5.12.1@@ -223,11 +223,11 @@ importers:specifier: ^0.4.4version: 0.4.4([email protected])'@types/jest':- specifier: ^29.5.14- version: 29.5.14+ specifier: ^30.0.0+ version: 30.0.0'@types/node':- specifier: ^22.18.0- version: 22.18.0+ specifier: ^24.3.0+ version: 24.3.0'@types/react':specifier: ^19.1.12version: 19.1.12@@ -247,8 +247,8 @@ importers:specifier: 19.1.0-rc.2version: 19.1.0-rc.2cross-env:- specifier: ^7.0.3- version: 7.0.3+ specifier: ^10.0.0+ version: 10.0.0cypress:specifier: ^13.6.6version: 13.17.0@@ -278,22 +278,22 @@ importers:version: 2.32.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])eslint-plugin-jest:specifier: ^27.9.0- version: 27.9.0(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])+ version: 27.9.0(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])eslint-plugin-prettier:specifier: ^5.5.3extract-react-intl-messages:specifier: ^4.1.1- version: 4.1.1([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ version: 4.1.1([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))husky:- specifier: ^8.0.3- version: 8.0.3+ specifier: ^9.1.7+ version: 9.1.7jest:specifier: ^29.7.0- version: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ version: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))lint-staged:- specifier: ^14.0.1- version: 14.0.1([email protected])+ specifier: ^16.1.5+ version: 16.1.5postcss:specifier: ^8.5.6version: 8.5.6@@ -332,7 +332,7 @@ importers:version: 6.1.2([email protected])rollup-plugin-postcss:specifier: ^4.0.2stylelint:specifier: ^15.10.1version: 15.11.0([email protected])@@ -350,12 +350,12 @@ importers:version: 6.2.1ts-jest:specifier: ^29.4.0- version: 29.4.1(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])+ version: 29.4.1(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])ts-node:specifier: ^10.9.1- version: 10.9.2(@types/[email protected])([email protected])+ version: 10.9.2(@types/[email protected])([email protected])typescript:- specifier: ^5.5.3+ specifier: ^5.9.2version: 5.9.2packages:@@ -870,6 +870,9 @@ packages:'@emnapi/[email protected]':resolution: {integrity: sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==}+ '@epic-web/[email protected]':+ resolution: {integrity: sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==}+'@esbuild/[email protected]':resolution: {integrity: sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==}engines: {node: '>=18'}@@ -1044,8 +1047,8 @@ packages:resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- '@fontsource/[email protected]':- resolution: {integrity: sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==}+ '@fontsource/[email protected]':+ resolution: {integrity: sha512-CZs9S1CrjD0jPwsNy9W6j0BhsmRSQrgwlTNkgQXTsAeDRM42LBRLo3eo9gCzfH4GvV7zpyf78Ozfl773826csw==}'@fontsource/[email protected]':resolution: {integrity: sha512-nz//dBr99hXZmHp10wgNI00qThWImkzRR5PQjvRM+rpmuHO5rYBJCqPPWufidCvmkkryXx/GOP/lgqsM3R3Org==}@@ -1300,6 +1303,10 @@ packages:node-notifier:optional: true+ '@jest/[email protected]':+ resolution: {integrity: sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+'@jest/[email protected]':resolution: {integrity: sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -1308,6 +1315,10 @@ packages:resolution: {integrity: sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ '@jest/[email protected]':+ resolution: {integrity: sha512-5YUHr27fpJ64dnvtu+tt11ewATynrHkGYD+uSFgRr8V2eFJis/vEXgToyLwccIwqBihVfz9jwio+Zr1ab1Zihw==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+'@jest/[email protected]':resolution: {integrity: sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -1316,10 +1327,18 @@ packages:resolution: {integrity: sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ '@jest/[email protected]':+ resolution: {integrity: sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+'@jest/[email protected]':resolution: {integrity: sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ '@jest/[email protected]':+ resolution: {integrity: sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+'@jest/[email protected]':resolution: {integrity: sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -1333,6 +1352,10 @@ packages:resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ '@jest/[email protected]':+ resolution: {integrity: sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+'@jest/[email protected]':resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -1353,6 +1376,10 @@ packages:resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ '@jest/[email protected]':+ resolution: {integrity: sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+'@jridgewell/[email protected]':resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}@@ -1543,8 +1570,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- '@react-aria/[email protected]':- resolution: {integrity: sha512-3lt3TGfjadJsN+illC23hgfeQ/VqF04mxczoU+3znOZ+vTx9zov/YfUysAsaxc8hyjr65iydz+CEbyg4+i0y3A==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-PNyqlaM19A+lKX9hwqkKTXvWDilCKaRH2RdrB/C5AfmGi3bh/IKsu66c8ohgadXB2AIdJB36EOOm3hNh8G9DqQ==}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@@ -1555,8 +1582,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- '@react-aria/[email protected]':- resolution: {integrity: sha512-GtxB0oTwkSz/GiKMPN0lU4h/r+Cr04FFUonZU5s03YmDTtgVjTSjFPmsd7pkbt3qq0aEiQASx/vWdAkKLWjRHA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-fiodaeMSTiC4qKNwnCLbNykyvfcxuz/PiU/pBNhWYd4lUrX1TauBQb0++o5/K6OHt8iB+A7/LSHRbPtyOSWE9g==}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@@ -1567,8 +1594,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- '@react-aria/[email protected]':- resolution: {integrity: sha512-SdaN7GXv3OLpg8sBUgkPf+bygByqjhJdJ4O7+lm+CBDlYrDcC5CMmy/hshE1CC/eZUwC2Tthf2q32wUtKo3fpA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-xaIUV0zPtUTLIBoE7qlGFPfRTfyDJT78fDzawYq6FwZcjgrl8X408UDCUaKk6xSJRh9UjNn78hil1WDYTLFNWA==}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@@ -1636,8 +1663,8 @@ packages:'@react-aria/[email protected]':resolution: {integrity: sha512-PTTBIjNRnrdJOIRTDGNifY2d//kA7GUAwRFJNOEwSNG4FW+Bq9awqLiflw0JkpyB0VNIwou6lqKPHZVLsGWOXA==}- '@react-aria/[email protected]':- resolution: {integrity: sha512-hRYFdOOj3fYyoh/tJGxY1CWY80geNb3BT3DMNHgGBVMvnZ0E6k3WoQH+QZkVnwSnNIQAIPQFcYWPyZeE+ElEhA==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-WzDLW2MotL0L5/LEwc5oGgISf2ODuw4FnRpF0Zk+J4tKFfC88odvKz848ubBvThRXuXEvL0BHY+WqtM+j9fn3g==}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@@ -1654,8 +1681,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- '@react-aria/[email protected]':- resolution: {integrity: sha512-OmMcwrbBMcv4KWNAPxvMZw02Wcw+z3e5dOS+MOb4AfY4bOJUvw+9hB13cfECs5lNXjV/UHT+5w2WBs32jmTwTg==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-Yz92XNPnbrTnxrvNrY/fXJ3iWaYNrj0q24ddvZNNKDcWak0S1/mQeUwNb+PwS2AryhFU5VQqKz5rNsM96TKmPQ==}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@@ -1678,8 +1705,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- '@react-aria/[email protected]':- resolution: {integrity: sha512-grUFr5SJ9P8z/BVhnkBoyA74/uLTgNpa2UcR8ASfWrszJKzCGsqmJZo1TCtCVO8cQBxhlDIpuTmV4a7Dmpiekw==}+ '@react-aria/[email protected]':+ resolution: {integrity: sha512-MwsOJ6FfPxzrLP6spnYg2SUeGKNm4m5vyH6GebecLxTO1ee7/YyTNP1xkrQTqPMP9xx6uqhzFLFuCym2b6ripA==}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@@ -1798,27 +1825,54 @@ 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-spring/[email protected]':+ resolution: {integrity: sha512-BGL3hA66Y8Qm3KmRZUlfG/mFbDPYajgil2/jOP0VXf2+o2WPVmcDps/eEgdDqgf5Pv9eBbyj7LschLMuSjlW3Q==}+ peerDependencies:+ react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+'@react-spring/[email protected]':resolution: {integrity: sha512-Tqrwz7pIlsSDITzxoLS3n/v/YCUHQdOIKtOJf4yL6kYVSDTSmVK1LI1Q3M/uu2Sx4X3pIWF3xLUhlsA6SPNTNg==}peerDependencies:react: ^16.8.0 || ^17.0.0 || ^18.0.0+ '@react-spring/[email protected]':+ resolution: {integrity: sha512-KaMMsN1qHuVTsFpg/5ajAVye7OEqhYbCq0g4aKM9bnSZlDBBYpO7Uf+9eixyXN8YEbF+YXaYj9eoWDs+npZ+sA==}+ peerDependencies:+ react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+'@react-spring/[email protected]':resolution: {integrity: sha512-rmEqcxRcu7dWh7MnCcMXLvrf6/SDlSokLaLTxiPlAYi11nN3B5oiCUAblO72o+9z/87j2uzxa2Inm8UbLjXA+w==}peerDependencies:react: ^16.8.0 || ^17.0.0 || ^18.0.0+ '@react-spring/[email protected]':+ resolution: {integrity: sha512-UrzG/d6Is+9i0aCAjsjWRqIlFFiC4lFqFHrH63zK935z2YDU95TOFio4VKGISJ5SG0xq4ULy7c1V3KU+XvL+Yg==}+'@react-spring/[email protected]':resolution: {integrity: sha512-5ZenDQMC48wjUzPAm1EtwQ5Ot3bLIAwwqP2w2owG5KoNdNHpEJV263nGhCeKKmuA3vG2zLLOdu3or6kuDjA6Aw==}+ '@react-spring/[email protected]':+ resolution: {integrity: sha512-KR2tmjDShPruI/GGPfAZOOLvDgkhFseabjvxzZFFggJMPkyICLjO0J6mCIoGtdJSuHywZyc4Mmlgi+C88lS00g==}+ peerDependencies:+ react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+'@react-spring/[email protected]':resolution: {integrity: sha512-wdtoJrhUeeyD/PP/zo+np2s1Z820Ohr/BbuVYv+3dVLW7WctoiN7std8rISoYoHpUXtbkpesSKuPIw/6U1w1Pw==}peerDependencies:react: ^16.8.0 || ^17.0.0 || ^18.0.0+ '@react-spring/[email protected]':+ resolution: {integrity: sha512-Fk1wYVAKL+ZTYK+4YFDpHf3Slsy59pfFFvnnTfRjQQFGlyIo4VejPtDs3CbDiuBjM135YztRyZjIH2VbycB+ZQ==}+'@react-spring/[email protected]':resolution: {integrity: sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==}+ '@react-spring/[email protected]':+ resolution: {integrity: sha512-FgQk02OqFrYyJBTTnBTWAU0WPzkHkKXauc6aeexcvATvLapUxwnfGuLlsLYF8BYjEVfkivPT04ziAue6zyRBtQ==}+ peerDependencies:+ react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+ react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0+'@react-spring/[email protected]':resolution: {integrity: sha512-lmvqGwpe+CSttsWNZVr+Dg62adtKhauGwLyGE/RRyZ8AAMLgb9x3NDMA5RMElXo+IMyTkPp7nxTB8ZQlmhb6JQ==}peerDependencies:@@ -2221,6 +2275,9 @@ packages:'@sinclair/[email protected]':resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}+ '@sinclair/[email protected]':+ resolution: {integrity: sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==}+'@sinonjs/[email protected]':resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}@@ -2392,8 +2449,8 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}- '@types/[email protected]':- resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==}'@types/[email protected]':resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}@@ -2415,8 +2472,8 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}- '@types/[email protected]':- resolution: {integrity: sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==}'@types/[email protected]':resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}@@ -2549,8 +2606,8 @@ packages:resolution: {integrity: sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}- '@umami/[email protected]':- resolution: {integrity: sha512-yVW/ITKiLFrIHXPTJFMIsMY7mLFg9HPgWRygDrdzNkTfCiS+Q1laZvAFkA16h0+Q5DtbMMa1Cwtgj8q/GXTWRg==}+ '@umami/[email protected]':+ resolution: {integrity: sha512-FlVgvJBZHTQRAJyWFy6cQrf/jo0Qx62SBqUAeZA8Ly1lYrRublJZ1J0JS/qsM6BLEbOWTBQenuN52jmAOMBYYw==}'@umami/[email protected]':resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==}@@ -2719,9 +2776,9 @@ packages:resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}engines: {node: '>=8'}- resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==}- engines: {node: '>=12'}+ resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}+ engines: {node: '>=18'}resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}@@ -3022,10 +3079,6 @@ packages:resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}engines: {node: '>=10'}- resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}- engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}-resolution: {integrity: sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ==}engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}@@ -3084,9 +3137,9 @@ packages:resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}engines: {node: '>=8'}- resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}+ engines: {node: '>=18'}resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}@@ -3096,9 +3149,9 @@ packages:resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}engines: {node: '>=8'}- resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}+ engines: {node: '>=18'}resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}@@ -3155,9 +3208,9 @@ packages:resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}engines: {node: '>= 0.8'}- resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}- engines: {node: '>=16'}+ resolution: {integrity: sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==}+ engines: {node: '>=20'}resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}@@ -3228,9 +3281,9 @@ packages:resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}- resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}- engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}+ resolution: {integrity: sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==}+ engines: {node: '>=20'}hasBin: true@@ -3432,15 +3485,6 @@ packages:supports-color:optional: true- resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}- engines: {node: '>=6.0'}- peerDependencies:- supports-color: '*'- peerDependenciesMeta:- supports-color:- optional: true-resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}engines: {node: '>=6.0'}@@ -3567,14 +3611,14 @@ packages:resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}- resolution: {integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==}- engines: {node: '>=10'}-resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}engines: {node: '>=12'}+ resolution: {integrity: sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==}+ engines: {node: '>=12'}+resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}engines: {node: '>= 0.4'}@@ -3598,6 +3642,9 @@ packages:resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}engines: {node: '>=12'}+ resolution: {integrity: sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==}+resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}@@ -3622,6 +3669,10 @@ packages:resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}engines: {node: '>=0.12'}+ resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}@@ -3885,10 +3936,6 @@ packages:resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}engines: {node: '>=10'}- resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==}- engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}-resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}engines: {node: '>=4'}@@ -3901,6 +3948,10 @@ packages:resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-OKe7cdic4qbfWd/CcgwJvvCrNX2KWfuMZee9AfJHL1gTYmvqjBjZG1a2NwfhspBzxzlXwsN75WWpKTYfsJpBxg==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==}@@ -4031,6 +4082,10 @@ packages:resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}engines: {node: '>=12'}+ resolution: {integrity: sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==}+ engines: {node: '>=14.14'}+resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}engines: {node: '>=6 <7 || >=8'}@@ -4076,6 +4131,10 @@ packages:resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}engines: {node: 6.* || 8.* || >= 10.*}+ resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}engines: {node: '>= 0.4'}@@ -4258,13 +4317,9 @@ packages:resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}engines: {node: '>=10.17.0'}- resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}- engines: {node: '>=14.18.0'}-- resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}- engines: {node: '>=14'}+ resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}+ engines: {node: '>=18'}hasBin: true@@ -4290,8 +4345,8 @@ packages:resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}- resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}+ resolution: {integrity: sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==}resolution: {integrity: sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==}@@ -4431,6 +4486,10 @@ packages:resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}engines: {node: '>=12'}+ resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}engines: {node: '>=6'}@@ -4513,10 +4572,6 @@ packages:resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}engines: {node: '>=8'}- resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}-resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==}engines: {node: '>= 0.4'}@@ -4633,6 +4688,10 @@ packages:resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-LUU2Gx8EhYxpdzTR6BmjL1ifgOAQJQELTHOiPv9KITaKjZvJ9Jmgigx01tuZ49id37LorpGc9dPBPlXTboXScw==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -4661,14 +4720,26 @@ packages:resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-SuH2QVemK48BNTqReti6FtjsMPFsSOD/ZzRxU1TttR7RiRsRSe78d03bb4Cx6D4bQC/80Q8U4VnaaAH9FlbZ9w==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-HizKDGG98cYkWmaLUHChq4iN+oCENohQLb7Z5guBPumYs+/etonmNFlg1Ps6yN9LTPyZn+M+b/9BbnHx3WTMDg==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}engines: {node: '>=6'}@@ -4682,6 +4753,10 @@ packages:resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -4706,6 +4781,10 @@ packages:resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -4872,12 +4951,16 @@ packages:resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}engines: {node: '>=10'}+ resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}+ engines: {node: '>=14'}+resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}- resolution: {integrity: sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==}- engines: {node: ^16.14.0 || >=18.0.0}+ resolution: {integrity: sha512-uAeQQwByI6dfV7wpt/gVqg+jAPaSp8WwOA8kKC/dv1qw14oGpnpAisY65ibGHUGDUv0rYaZ8CAJZ/1U8hUvC2A==}+ engines: {node: '>=20.17'}hasBin: true@@ -4889,14 +4972,9 @@ packages:enquirer:optional: true- resolution: {integrity: sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==}- engines: {node: '>=16.0.0'}- peerDependencies:- enquirer: '>= 2.3.0 < 3'- peerDependenciesMeta:- enquirer:- optional: true+ resolution: {integrity: sha512-VVd7cS6W+vLJu2wmq4QmfVj14Iep7cz4r/OWNk36Aq5ZOY7G8/BfCrQFexcwB1OIxB3yERiePfE/REBjEFulag==}+ engines: {node: '>=20.0.0'}resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}@@ -4972,9 +5050,9 @@ packages:resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}engines: {node: '>=10'}- resolution: {integrity: sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}+ engines: {node: '>=18'}resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}@@ -5002,8 +5080,8 @@ packages:peerDependencies:react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0- resolution: {integrity: sha512-armkCAqQvO62EIX4Hq7hqX/q11WSZu0Jd23cnnqx0/49yIxGXyL/zyZfBxNN9YDx0ensPTb4L+DjTh3yQXUxtQ==}+ resolution: {integrity: sha512-w3hD8/SQB7+lzU2r4VdFyzzOzKnUjTZIF/MQJGSSvni7Llewni4vuViRppfRAa2guOsY5k4jZyxw/i9DQHv+dw==}peerDependencies:react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0@@ -5039,8 +5117,8 @@ packages:resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}- resolution: {integrity: sha512-Vxx0rh7omBekjZnsDxpw35SrGGM3Uy7NoIKWzZlvh3UcjihGaySR8n+YSQ8YBseCvhEn+yehA98rZkTDW+uhPw==}+ resolution: {integrity: sha512-ndhnbeQWKuiBU17BJ6cybUnvcyvNXaK+1VM5n9/I7+TIqAYFLDvX1DSoVfE1hgvZfudvAU9Ts1CW5sxYq/M8dA==}engines: {node: '>=12', npm: '>=6'}@@ -5086,10 +5164,6 @@ packages:resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}engines: {node: '>= 8'}- resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}- engines: {node: '>=8.6'}-resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}engines: {node: '>=8.6'}@@ -5106,9 +5180,9 @@ packages:resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}engines: {node: '>=6'}- resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}- engines: {node: '>=12'}+ resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}+ engines: {node: '>=18'}resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}@@ -5157,16 +5231,17 @@ packages:engines: {node: '>=10'}hasBin: true- resolution: {integrity: sha512-DXO4L9W+08T+A7h5+xdT32l7IMot8z7WOH+7C1Maol571PnktQ8un7Ni4CyPFp4H+vht/FDA5/tpjRvWMFQDMw==}+ resolution: {integrity: sha512-dyAyMR+cRykZd1mw5altC9f4vKpCsuywPwo8l/L5fKqDay2zmqT0mF/BvUoXnQiqGn+nceO914rkPKJoyFnGxA==}engines: {node: '>=10', npm: '>=6'}- resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}-resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}+ resolution: {integrity: sha512-21t+ozMQDAL/UGgQVBbZ/xXvNO10++ZPuTmKRO8k9V3AClVRht49ahtDjfY8l1q6nSHOrE5ASfthzH3ol6R/hg==}+ engines: {node: '>=20.17'}+resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}@@ -5256,10 +5331,6 @@ packages:resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}engines: {node: '>=8'}- resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}-resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}@@ -5310,9 +5381,9 @@ packages:resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}engines: {node: '>=6'}- resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}- engines: {node: '>=12'}+ resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}+ engines: {node: '>=18'}resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}@@ -5398,10 +5469,6 @@ packages:resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}engines: {node: '>=8'}- resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}- engines: {node: '>=12'}-resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}@@ -5971,6 +6038,10 @@ packages:resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}+ resolution: {integrity: sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==}+ engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}+resolution: {integrity: sha512-E6RCgOt+kUVtjtZgLQDBJ6md2tDItLJNExwI0XJeBc1FKL+Vwb+ovxXxuok9r8oBgsOXBA33fGDuE/0qDdCWqQ==}engines: {node: '>=18.18'}@@ -6045,8 +6116,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-5ju/DpKmuhq/0fH5h5F5Tdo41QA5KFtfLu4aj3mVZelmmhdbzBAXrrHVN28UllwgMZK/eNfrWc7H43iRJmZPAw==}+ resolution: {integrity: sha512-/PmZGiw+Ya/YtzXmiLW4ALD4SMuDnbwhMaVh33VCduTl8vVujIUzUTIi5g4C+YHLDs/Z4edsN3aQsPMqFfg1xA==}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@@ -6233,9 +6304,9 @@ packages:resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}engines: {node: '>=8'}- resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}+ engines: {node: '>=18'}resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}@@ -6434,6 +6505,10 @@ packages:resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}engines: {node: '>=12'}+ resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==}@@ -6516,6 +6591,10 @@ packages:resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}engines: {node: '>=12'}+ resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}engines: {node: '>= 0.4'}@@ -6566,10 +6645,6 @@ packages:resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}engines: {node: '>=6'}- resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}- engines: {node: '>=12'}-resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}engines: {node: '>=8'}@@ -6899,8 +6974,8 @@ packages:resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}+ resolution: {integrity: sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==}resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}@@ -7024,6 +7099,10 @@ packages:resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}engines: {node: '>=12'}+ resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}@@ -7060,9 +7139,10 @@ packages:resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}engines: {node: '>= 6'}- resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}- engines: {node: '>= 14'}+ resolution: {integrity: sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==}+ engines: {node: '>= 14.6'}+ hasBin: trueresolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}@@ -7091,8 +7171,8 @@ packages:resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}engines: {node: '>=10'}- resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}+ resolution: {integrity: sha512-rcUUZqlLJgBC33IT3PNMgsCq6TzLQEG/Ei/KTCU0PedSWRMAXoOUN+4t/0H+Q8bdnLPdqUYnvboJT0bn/229qg==}resolution: {integrity: sha512-gyPKpIaxY9XcO2vSMrLbiER7QMAMGOQZVRdJ6Zi782jkbzZygq5GI9nG8g+sMgitRtndwaBSl7uiqC49o1SSiw==}@@ -7620,6 +7700,8 @@ snapshots:tslib: 2.8.1optional: true+ '@epic-web/[email protected]': {}+'@esbuild/[email protected]':optional: true@@ -7721,14 +7803,14 @@ snapshots:'@eslint/[email protected]': {}- '@fontsource/[email protected]': {}+ '@fontsource/[email protected]': {}'@fontsource/[email protected]': {}- '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':+ '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:'@formatjs/icu-messageformat-parser': 2.1.0- '@formatjs/ts-transformer': 3.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ '@formatjs/ts-transformer': 3.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))'@types/estree': 0.0.50'@types/fs-extra': 9.0.13'@types/json-stable-stringify': 1.2.0@@ -7815,15 +7897,15 @@ snapshots:optionalDependencies:typescript: 5.9.2- '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':+ '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:intl-messageformat-parser: 6.1.2tslib: 2.8.1typescript: 4.9.5optionalDependencies:- ts-jest: 29.4.1(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])+ ts-jest: 29.4.1(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])- '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':+ '@formatjs/[email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))':dependencies:'@formatjs/icu-messageformat-parser': 2.1.0'@types/node': 14.18.63@@ -7831,7 +7913,7 @@ snapshots:tslib: 2.8.1typescript: 4.9.5optionalDependencies:- ts-jest: 29.4.1(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])+ ts-jest: 29.4.1(@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])'@hello-pangea/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:@@ -7990,27 +8072,27 @@ snapshots:'@jest/[email protected]':dependencies:'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0chalk: 4.1.2jest-message-util: 29.7.0jest-util: 29.7.0slash: 3.0.0dependencies:'@jest/console': 29.7.0'@jest/reporters': 29.7.0'@jest/test-result': 29.7.0'@jest/transform': 29.7.0'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0ansi-escapes: 4.3.2chalk: 4.1.2ci-info: 3.9.0exit: 0.1.2graceful-fs: 4.2.11jest-changed-files: 29.7.0- jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))jest-haste-map: 29.7.0jest-message-util: 29.7.0jest-regex-util: 29.6.3@@ -8031,17 +8113,23 @@ snapshots:- supports-color- ts-node+ '@jest/[email protected]': {}+'@jest/[email protected]':dependencies:'@jest/fake-timers': 29.7.0'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0jest-mock: 29.7.0'@jest/[email protected]':dependencies:jest-get-type: 29.6.3+ '@jest/[email protected]':+ dependencies:+ '@jest/get-type': 30.1.0+'@jest/[email protected]':dependencies:expect: 29.7.0@@ -8053,11 +8141,13 @@ snapshots:dependencies:'@jest/types': 29.6.3'@sinonjs/fake-timers': 10.3.0- '@types/node': 22.18.0+ '@types/node': 24.3.0jest-message-util: 29.7.0jest-mock: 29.7.0jest-util: 29.7.0+ '@jest/[email protected]': {}+'@jest/[email protected]':dependencies:'@jest/environment': 29.7.0@@ -8067,6 +8157,11 @@ snapshots:transitivePeerDependencies:- supports-color+ '@jest/[email protected]':+ dependencies:+ '@types/node': 24.3.0+ jest-regex-util: 30.0.1+'@jest/[email protected]':dependencies:'@bcoe/v8-coverage': 0.2.3@@ -8075,7 +8170,7 @@ snapshots:'@jest/transform': 29.7.0'@jest/types': 29.6.3'@jridgewell/trace-mapping': 0.3.30- '@types/node': 22.18.0+ '@types/node': 24.3.0chalk: 4.1.2collect-v8-coverage: 1.0.2exit: 0.1.2@@ -8100,6 +8195,10 @@ snapshots:dependencies:'@sinclair/typebox': 0.27.8+ '@jest/[email protected]':+ dependencies:+ '@sinclair/typebox': 0.34.40+'@jest/[email protected]':dependencies:'@jridgewell/trace-mapping': 0.3.30@@ -8145,7 +8244,17 @@ snapshots:'@jest/schemas': 29.6.3'@types/istanbul-lib-coverage': 2.0.6'@types/istanbul-reports': 3.0.4- '@types/node': 22.18.0+ '@types/node': 24.3.0+ '@types/yargs': 17.0.33+ chalk: 4.1.2++ '@jest/[email protected]':+ dependencies:+ '@jest/pattern': 30.0.1+ '@jest/schemas': 30.0.5+ '@types/istanbul-lib-coverage': 2.0.6+ '@types/istanbul-reports': 3.0.4+ '@types/node': 24.3.0'@types/yargs': 17.0.33chalk: 4.1.2@@ -8286,7 +8395,7 @@ snapshots:dependencies:@@ -8386,14 +8495,14 @@ snapshots:react: 19.1.1react-dom: 19.1.1([email protected])dependencies:'@react-aria/live-announcer': 3.4.4@@ -8430,10 +8539,10 @@ snapshots:react: 19.1.1react-dom: 19.1.1([email protected])dependencies:'@react-types/dialog': 3.5.21([email protected])'@react-types/shared': 3.32.0([email protected])@@ -8451,13 +8560,13 @@ snapshots:react: 19.1.1react-dom: 19.1.1([email protected])dependencies:'@internationalized/string': 3.2.7'@react-aria/live-announcer': 3.4.4'@react-stately/collections': 3.12.7([email protected])'@react-stately/dnd': 3.7.0([email protected])@@ -8588,12 +8697,12 @@ snapshots:dependencies:'@swc/helpers': 0.5.17dependencies:'@react-stately/collections': 3.12.7([email protected])@@ -8632,7 +8741,7 @@ snapshots:react: 19.1.1react-dom: 19.1.1([email protected])dependencies:@@ -8687,14 +8796,14 @@ snapshots:react: 19.1.1react-dom: 19.1.1([email protected])dependencies:@@ -8926,12 +9035,25 @@ snapshots:react: 19.1.1react-dom: 19.1.1([email protected])+ '@react-spring/[email protected]([email protected])':+ dependencies:+ '@react-spring/shared': 10.0.1([email protected])+ '@react-spring/types': 10.0.1+ react: 19.1.1+'@react-spring/[email protected]([email protected])':dependencies:'@react-spring/shared': 9.7.5([email protected])'@react-spring/types': 9.7.5react: 19.1.1+ '@react-spring/[email protected]([email protected])':+ dependencies:+ '@react-spring/animated': 10.0.1([email protected])+ '@react-spring/shared': 10.0.1([email protected])+ '@react-spring/types': 10.0.1+ react: 19.1.1+'@react-spring/[email protected]([email protected])':dependencies:'@react-spring/animated': 9.7.5([email protected])@@ -8939,16 +9061,35 @@ snapshots:'@react-spring/types': 9.7.5react: 19.1.1+ '@react-spring/[email protected]': {}+'@react-spring/[email protected]': {}+ '@react-spring/[email protected]([email protected])':+ dependencies:+ '@react-spring/rafz': 10.0.1+ '@react-spring/types': 10.0.1+ react: 19.1.1+'@react-spring/[email protected]([email protected])':dependencies:'@react-spring/rafz': 9.7.5'@react-spring/types': 9.7.5react: 19.1.1+ '@react-spring/[email protected]': {}+'@react-spring/[email protected]': {}+ dependencies:+ '@react-spring/animated': 10.0.1([email protected])+ '@react-spring/core': 10.0.1([email protected])+ '@react-spring/shared': 10.0.1([email protected])+ '@react-spring/types': 10.0.1+ react: 19.1.1+ react-dom: 19.1.1([email protected])+dependencies:'@react-spring/animated': 9.7.5([email protected])@@ -9454,6 +9595,8 @@ snapshots:'@sinclair/[email protected]': {}+ '@sinclair/[email protected]': {}+'@sinonjs/[email protected]':dependencies:type-detect: 4.0.8@@ -9622,20 +9765,20 @@ snapshots:'@types/[email protected]':dependencies:- '@types/node': 22.18.0+ '@types/node': 24.3.0'@types/[email protected]':dependencies:- '@types/node': 22.18.0+ '@types/node': 24.3.0'@types/[email protected]':dependencies:'@types/minimatch': 6.0.0- '@types/node': 22.18.0+ '@types/node': 24.3.0'@types/[email protected]':dependencies:- '@types/node': 22.18.0+ '@types/node': 24.3.0'@types/[email protected](@types/[email protected])':dependencies:@@ -9652,10 +9795,10 @@ snapshots:dependencies:'@types/istanbul-lib-report': 3.0.3- '@types/[email protected]':+ '@types/[email protected]':dependencies:- expect: 29.7.0- pretty-format: 29.7.0+ expect: 30.1.1+ pretty-format: 30.0.5'@types/[email protected]': {}@@ -9673,9 +9816,9 @@ snapshots:'@types/[email protected]': {}- '@types/[email protected]':+ '@types/[email protected]':dependencies:- undici-types: 6.21.0+ undici-types: 7.10.0'@types/[email protected]': {}@@ -9715,7 +9858,7 @@ snapshots:'@types/[email protected]':dependencies:- '@types/node': 22.18.0+ '@types/node': 24.3.0optional: true'@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])':@@ -9852,7 +9995,7 @@ snapshots:'@typescript-eslint/types': 8.41.0eslint-visitor-keys: 4.2.1- '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))':+ '@umami/[email protected](@babel/[email protected])(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))':dependencies:'@fontsource/jetbrains-mono': 5.2.6'@internationalized/date': 3.9.0@@ -9869,7 +10012,7 @@ snapshots:react-hook-form: 7.62.0([email protected])react-icons: 5.5.0([email protected])thenby: 1.3.4- zustand: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))+ zustand: 5.0.8(@types/[email protected])([email protected])([email protected])([email protected]([email protected]))transitivePeerDependencies:- '@babel/core'- '@opentelemetry/api'@@ -10042,9 +10185,9 @@ snapshots:dependencies:type-fest: 0.21.3dependencies:- type-fest: 1.4.0+ environment: 1.1.0@@ -10226,12 +10369,12 @@ snapshots:dependencies:'@babel/types': 7.28.2- [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):+ [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):dependencies:'@babel/core': 7.28.3'@babel/helper-plugin-utils': 7.27.1'@babel/types': 7.28.2- '@formatjs/ts-transformer': 2.13.0([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ '@formatjs/ts-transformer': 2.13.0([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))'@types/babel__core': 7.20.5'@types/fs-extra': 9.0.13'@types/schema-utils': 2.4.0@@ -10403,8 +10546,6 @@ snapshots:ansi-styles: 4.3.0supports-color: 7.2.0- [email protected]: {}-@@ -10446,9 +10587,9 @@ snapshots:dependencies:restore-cursor: 3.1.0dependencies:- restore-cursor: 4.0.0+ restore-cursor: 5.1.0dependencies:@@ -10461,10 +10602,10 @@ snapshots:slice-ansi: 3.0.0string-width: 4.2.3dependencies:slice-ansi: 5.0.0- string-width: 5.1.2+ string-width: 7.2.0@@ -10516,7 +10657,7 @@ snapshots:dependencies:delayed-stream: 1.0.0- [email protected]: {}+ [email protected]: {}@@ -10562,13 +10703,13 @@ snapshots:optionalDependencies:typescript: 5.9.2- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@jest/types': 29.6.3chalk: 4.1.2exit: 0.1.2graceful-fs: 4.2.11- jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))jest-util: 29.7.0prompts: 2.4.2transitivePeerDependencies:@@ -10579,8 +10720,9 @@ snapshots:dependencies:+ '@epic-web/invariant': 1.0.0cross-spawn: 7.0.6@@ -10858,10 +11000,6 @@ snapshots:optionalDependencies:supports-color: 8.1.1- dependencies:- ms: 2.1.2-dependencies:ms: 2.1.3@@ -10980,10 +11118,10 @@ snapshots:no-case: 3.0.4tslib: 2.8.1- [email protected]: {}-+ [email protected]: {}+dependencies:call-bind-apply-helpers: 1.0.2@@ -11010,6 +11148,8 @@ snapshots:+ [email protected]: {}+@@ -11029,6 +11169,8 @@ snapshots:+ [email protected]: {}+dependencies:is-arrayish: 0.2.1@@ -11275,13 +11417,13 @@ snapshots:- eslint-import-resolver-webpack- supports-color- [email protected](@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]):+ [email protected](@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]):dependencies:'@typescript-eslint/utils': 5.62.0([email protected])([email protected])eslint: 8.57.1optionalDependencies:'@typescript-eslint/eslint-plugin': 8.41.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])- jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))transitivePeerDependencies:- supports-color- typescript@@ -11457,18 +11599,6 @@ snapshots:signal-exit: 3.0.7strip-final-newline: 2.0.0- dependencies:- cross-spawn: 7.0.6- get-stream: 6.0.1- human-signals: 4.3.1- is-stream: 3.0.0- merge-stream: 2.0.0- npm-run-path: 5.3.0- onetime: 6.0.0- signal-exit: 3.0.7- strip-final-newline: 3.0.0-dependencies:pify: 2.3.0@@ -11483,14 +11613,23 @@ snapshots:jest-message-util: 29.7.0jest-util: 29.7.0+ dependencies:+ '@jest/expect-utils': 30.1.1+ '@jest/get-type': 30.1.0+ jest-matcher-utils: 30.1.1+ jest-message-util: 30.1.0+ jest-mock: 30.0.5+ jest-util: 30.0.5+- [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):+ [email protected]([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected])):dependencies:'@babel/core': 7.28.3- babel-plugin-react-intl: 7.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))+ babel-plugin-react-intl: 7.9.4([email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]))flat: 5.0.2glob: 7.2.3js-yaml: 3.14.1@@ -11632,6 +11771,12 @@ snapshots:jsonfile: 6.2.0universalify: 2.0.1+ dependencies:+ graceful-fs: 4.2.11+ jsonfile: 6.2.0+ universalify: 2.0.1+dependencies:graceful-fs: 4.2.11@@ -11677,6 +11822,8 @@ snapshots:+ [email protected]: {}+dependencies:call-bind-apply-helpers: 1.0.2@@ -11888,9 +12035,7 @@ snapshots:- [email protected]: {}-- [email protected]: {}+ [email protected]: {}@@ -11906,7 +12051,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}dependencies:@@ -12038,6 +12183,10 @@ snapshots:+ dependencies:+ get-east-asian-width: 1.3.0+@@ -12102,8 +12251,6 @@ snapshots:- [email protected]: {}-dependencies:call-bound: 1.0.4@@ -12218,7 +12365,7 @@ snapshots:'@jest/expect': 29.7.0'@jest/test-result': 29.7.0'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0chalk: 4.1.2co: 4.6.0dedent: 1.6.0@@ -12238,16 +12385,16 @@ snapshots:- babel-plugin-macros- supports-color- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@jest/test-result': 29.7.0'@jest/types': 29.6.3chalk: 4.1.2- create-jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ create-jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))exit: 0.1.2import-local: 3.2.0- jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-config: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))jest-util: 29.7.0jest-validate: 29.7.0yargs: 17.7.2@@ -12257,7 +12404,7 @@ snapshots:- supports-color- ts-node- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@babel/core': 7.28.3'@jest/test-sequencer': 29.7.0@@ -12282,8 +12429,8 @@ snapshots:slash: 3.0.0strip-json-comments: 3.1.1optionalDependencies:- '@types/node': 22.18.0- ts-node: 10.9.2(@types/[email protected])([email protected])+ '@types/node': 24.3.0+ ts-node: 10.9.2(@types/[email protected])([email protected])transitivePeerDependencies:- babel-plugin-macros- supports-color@@ -12295,6 +12442,13 @@ snapshots:jest-get-type: 29.6.3pretty-format: 29.7.0+ dependencies:+ '@jest/diff-sequences': 30.0.1+ '@jest/get-type': 30.1.0+ chalk: 4.1.2+ pretty-format: 30.0.5+dependencies:detect-newline: 3.1.0@@ -12312,7 +12466,7 @@ snapshots:'@jest/environment': 29.7.0'@jest/fake-timers': 29.7.0'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0jest-mock: 29.7.0jest-util: 29.7.0@@ -12322,7 +12476,7 @@ snapshots:dependencies:'@jest/types': 29.6.3'@types/graceful-fs': 4.1.9- '@types/node': 22.18.0+ '@types/node': 24.3.0anymatch: 3.1.3fb-watchman: 2.0.2graceful-fs: 4.2.11@@ -12346,6 +12500,13 @@ snapshots:jest-get-type: 29.6.3pretty-format: 29.7.0+ dependencies:+ '@jest/get-type': 30.1.0+ chalk: 4.1.2+ jest-diff: 30.1.1+ pretty-format: 30.0.5+dependencies:'@babel/code-frame': 7.27.1@@ -12358,18 +12519,38 @@ snapshots:slash: 3.0.0stack-utils: 2.0.6+ dependencies:+ '@babel/code-frame': 7.27.1+ '@jest/types': 30.0.5+ '@types/stack-utils': 2.0.3+ chalk: 4.1.2+ graceful-fs: 4.2.11+ micromatch: 4.0.8+ pretty-format: 30.0.5+ slash: 3.0.0+ stack-utils: 2.0.6+dependencies:'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0jest-util: 29.7.0+ dependencies:+ '@jest/types': 30.0.5+ '@types/node': 24.3.0+ jest-util: 30.0.5+optionalDependencies:jest-resolve: 29.7.0+ [email protected]: {}+dependencies:jest-regex-util: 29.6.3@@ -12396,7 +12577,7 @@ snapshots:'@jest/test-result': 29.7.0'@jest/transform': 29.7.0'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0chalk: 4.1.2emittery: 0.13.1graceful-fs: 4.2.11@@ -12424,7 +12605,7 @@ snapshots:'@jest/test-result': 29.7.0'@jest/transform': 29.7.0'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0chalk: 4.1.2cjs-module-lexer: 1.4.3collect-v8-coverage: 1.0.2@@ -12470,12 +12651,21 @@ snapshots:dependencies:'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0chalk: 4.1.2ci-info: 3.9.0graceful-fs: 4.2.11picomatch: 2.3.1+ dependencies:+ '@jest/types': 30.0.5+ '@types/node': 24.3.0+ chalk: 4.1.2+ ci-info: 4.3.0+ graceful-fs: 4.2.11+ picomatch: 4.0.3+dependencies:'@jest/types': 29.6.3@@ -12489,7 +12679,7 @@ snapshots:dependencies:'@jest/test-result': 29.7.0'@jest/types': 29.6.3- '@types/node': 22.18.0+ '@types/node': 24.3.0ansi-escapes: 4.3.2chalk: 4.1.2emittery: 0.13.1@@ -12498,17 +12688,17 @@ snapshots:dependencies:- '@types/node': 22.18.0+ '@types/node': 24.3.0jest-util: 29.7.0merge-stream: 2.0.0supports-color: 8.1.1- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])):dependencies:'@jest/types': 29.6.3import-local: 3.2.0- jest-cli: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest-cli: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))transitivePeerDependencies:- '@types/node'- babel-plugin-macros@@ -12659,22 +12849,23 @@ snapshots:+ [email protected]: {}+dependencies:- chalk: 5.3.0- commander: 11.0.0- debug: 4.3.4- execa: 7.2.0- lilconfig: 2.1.0- listr2: 6.6.1([email protected])- micromatch: 4.0.5+ chalk: 5.6.0+ commander: 14.0.0+ debug: 4.4.1([email protected])+ lilconfig: 3.1.3+ listr2: 9.0.2+ micromatch: 4.0.8+ nano-spawn: 1.0.2pidtree: 0.6.0string-argv: 0.3.2- yaml: 2.3.1+ yaml: 2.8.1transitivePeerDependencies:- - enquirer- supports-color@@ -12690,16 +12881,14 @@ snapshots:optionalDependencies:enquirer: 2.4.1dependencies:- cli-truncate: 3.1.0+ cli-truncate: 4.0.0colorette: 2.0.20eventemitter3: 5.0.1- log-update: 5.0.1+ log-update: 6.1.0rfdc: 1.4.1- wrap-ansi: 8.1.0- optionalDependencies:- enquirer: 2.4.1+ wrap-ansi: 9.0.0dependencies:@@ -12767,13 +12956,13 @@ snapshots:slice-ansi: 4.0.0wrap-ansi: 6.2.0dependencies:- ansi-escapes: 5.0.0- cli-cursor: 4.0.0- slice-ansi: 5.0.0+ ansi-escapes: 7.0.0+ cli-cursor: 5.0.0+ slice-ansi: 7.1.0strip-ansi: 7.1.0- wrap-ansi: 8.1.0+ wrap-ansi: 9.0.0dependencies:@@ -12802,7 +12991,7 @@ snapshots:dependencies:react: 19.1.1dependencies:react: 19.1.1@@ -12832,9 +13021,9 @@ snapshots:dependencies:- mmdb-lib: 2.2.1+ mmdb-lib: 3.0.1tiny-lru: 11.3.4@@ -12894,11 +13083,6 @@ snapshots:- dependencies:- braces: 3.0.3- picomatch: 2.3.1-dependencies:braces: 3.0.3@@ -12912,7 +13096,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}@@ -12955,12 +13139,12 @@ snapshots:- [email protected]: {}-- [email protected]: {}+ [email protected]: {}+ [email protected]: {}+@@ -13050,10 +13234,6 @@ snapshots:dependencies:path-key: 3.1.1- dependencies:- path-key: 4.0.0-dependencies:boolbase: 1.0.0@@ -13118,9 +13298,9 @@ snapshots:dependencies:mimic-fn: 2.1.0dependencies:- mimic-fn: 4.0.0+ mimic-function: 5.0.1dependencies:@@ -13202,8 +13382,6 @@ snapshots:- [email protected]: {}-@@ -13426,13 +13604,13 @@ snapshots:postcss: 8.5.6postcss-value-parser: 4.2.0- [email protected]([email protected])([email protected](@types/[email protected])([email protected])):+ [email protected]([email protected])([email protected](@types/[email protected])([email protected])):dependencies:lilconfig: 2.1.0yaml: 1.10.2optionalDependencies:postcss: 8.5.6- ts-node: 10.9.2(@types/[email protected])([email protected])+ ts-node: 10.9.2(@types/[email protected])([email protected])dependencies:@@ -13741,6 +13919,12 @@ snapshots:ansi-styles: 5.2.0react-is: 18.3.1+ dependencies:+ '@jest/schemas': 30.0.5+ ansi-styles: 5.2.0+ react-is: 18.3.1+dependencies:'@prisma/config': 6.15.0@@ -13807,11 +13991,11 @@ snapshots:'@internationalized/string': 3.2.7'@react-aria/live-announcer': 3.4.4'@react-aria/ssr': 3.9.10([email protected])@@ -13829,12 +14013,12 @@ snapshots:'@swc/helpers': 0.5.17client-only: 0.0.1react: 19.1.1react-dom: 19.1.1([email protected])react-stately: 3.41.0([email protected])use-sync-external-store: 1.5.0([email protected])dependencies:'@internationalized/string': 3.2.7@@ -13842,11 +14026,11 @@ snapshots:@@ -13855,14 +14039,14 @@ snapshots:@@ -14114,10 +14298,10 @@ snapshots:onetime: 5.1.2signal-exit: 3.0.7dependencies:- onetime: 5.1.2- signal-exit: 3.0.7+ onetime: 7.0.0+ signal-exit: 4.1.0@@ -14164,7 +14348,7 @@ snapshots:dependencies:rollup: 3.29.5- [email protected]([email protected])([email protected](@types/[email protected])([email protected])):+ [email protected]([email protected])([email protected](@types/[email protected])([email protected])):dependencies:chalk: 4.1.2concat-with-sourcemaps: 1.1.0@@ -14173,7 +14357,7 @@ snapshots:p-queue: 6.6.2pify: 5.0.0postcss: 8.5.6- postcss-load-config: 3.1.4([email protected])([email protected](@types/[email protected])([email protected]))+ postcss-load-config: 3.1.4([email protected])([email protected](@types/[email protected])([email protected]))postcss-modules: 4.3.1([email protected])promise.series: 0.2.0resolve: 1.22.10@@ -14374,6 +14558,11 @@ snapshots:ansi-styles: 6.2.1is-fullwidth-code-point: 4.0.0+ dependencies:+ ansi-styles: 6.2.1+ is-fullwidth-code-point: 5.0.0+@@ -14463,6 +14652,12 @@ snapshots:emoji-regex: 9.2.2strip-ansi: 7.1.0+ dependencies:+ emoji-regex: 10.5.0+ get-east-asian-width: 1.3.0+ strip-ansi: 7.1.0+dependencies:call-bind: 1.0.8@@ -14538,8 +14733,6 @@ snapshots:- [email protected]: {}-dependencies:min-indent: 1.0.1@@ -14768,12 +14961,12 @@ snapshots:dependencies:typescript: 5.9.2- [email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]):+ [email protected](@babel/[email protected])(@jest/[email protected])(@jest/[email protected])([email protected](@babel/[email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected](@types/[email protected])([email protected])))([email protected]):dependencies:bs-logger: 0.2.6fast-json-stable-stringify: 2.1.0handlebars: 4.7.8- jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))+ jest: 29.7.0(@types/[email protected])([email protected](@types/[email protected])([email protected]))json5: 2.2.3lodash.memoize: 4.1.2make-error: 1.3.6@@ -14784,19 +14977,19 @@ snapshots:optionalDependencies:'@babel/core': 7.28.3'@jest/transform': 29.7.0- '@jest/types': 29.6.3+ '@jest/types': 30.0.5babel-jest: 29.7.0(@babel/[email protected])esbuild: 0.25.9- jest-util: 29.7.0+ jest-util: 30.0.5dependencies:'@cspotcode/source-map-support': 0.8.1'@tsconfig/node10': 1.0.11'@tsconfig/node12': 1.0.11'@tsconfig/node14': 1.0.3'@tsconfig/node16': 1.0.4- '@types/node': 22.18.0+ '@types/node': 24.3.0acorn: 8.15.0acorn-walk: 8.3.4arg: 4.1.3@@ -14900,7 +15093,7 @@ snapshots:has-symbols: 1.1.0which-boxed-primitive: 1.1.1- [email protected]: {}+ [email protected]: {}@@ -15064,6 +15257,12 @@ snapshots:string-width: 5.1.2strip-ansi: 7.1.0+ dependencies:+ ansi-styles: 6.2.1+ string-width: 7.2.0+ strip-ansi: 7.1.0+@@ -15102,7 +15301,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}dependencies:@@ -15132,11 +15331,11 @@ snapshots:- [email protected]: {}+ [email protected]: {}- [email protected](@types/[email protected])([email protected])([email protected])([email protected]([email protected])):+ [email protected](@types/[email protected])([email protected])([email protected])([email protected]([email protected])):optionalDependencies:'@types/react': 19.1.12- immer: 9.0.21+ immer: 10.1.1react: 19.1.1use-sync-external-store: 1.5.0([email protected])diff --git a/src/app/(main)/settings/preferences/LanguageSetting.tsx b/src/app/(main)/settings/preferences/LanguageSetting.tsxindex 4ec70d223..9e32196a6 100644--- a/src/app/(main)/settings/preferences/LanguageSetting.tsx+++ b/src/app/(main)/settings/preferences/LanguageSetting.tsx@@ -33,7 +33,7 @@ export function LanguageSetting() {allowSearchonSearch={setSearch}onOpenChange={handleOpen}- listProps={{ style: { maxHeight: '300px' } }}+ listProps={{ style: { maxHeight: 300 } }}>{items.map(item => (<ListItem key={item} id={item}>diff --git a/src/app/(main)/settings/preferences/TimezoneSetting.tsx b/src/app/(main)/settings/preferences/TimezoneSetting.tsxindex 08ffad710..87db54e5d 100644--- a/src/app/(main)/settings/preferences/TimezoneSetting.tsx+++ b/src/app/(main)/settings/preferences/TimezoneSetting.tsx@@ -29,7 +29,7 @@ export function TimezoneSetting() {allowSearch={true}onSearch={setSearch}onOpenChange={handleOpen}- listProps={{ style: { maxHeight: '300px' } }}+ listProps={{ style: { maxHeight: 300 } }}>{items.map((item: any) => (<ListItem key={item} id={item}>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsxindex 41d0bd72b..6e7237a15 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx@@ -7,7 +7,7 @@ import { useDateRange, useMessages } from '@/components/hooks';export function AttributionPage({ websiteId }: { websiteId: string }) {const [model, setModel] = useState('first-click');- const [type, setType] = useState('page');+ const [type, setType] = useState('path');const [step, setStep] = useState('/');const { formatMessage, labels } = useMessages();const {@@ -36,7 +36,7 @@ export function AttributionPage({ websiteId }: { websiteId: string }) {defaultValue={type}onChange={setType}>- <ListItem id="page">{formatMessage(labels.page)}</ListItem>+ <ListItem id="path">{formatMessage(labels.page)}</ListItem><ListItem id="event">{formatMessage(labels.event)}</ListItem></Select></Column>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsxindex 526ad2152..a91b41e9b 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx@@ -56,7 +56,7 @@ export function Funnel({ id, name, type, parameters, websiteId }) {{ type, value, visitors, previous, dropped, dropoff, remaining }: FunnelResult,index: number,) => {- const isPage = type === 'page';+ const isPage = type === 'path';return (<Grid key={index} columns="auto 1fr" gap="6"><Column alignItems="center" position="relative">@@ -92,7 +92,7 @@ export function Funnel({ id, name, type, parameters, websiteId }) {</Row><Row alignItems="center" justifyContent="space-between" gap><Row alignItems="center" gap>- <Icon>{type === 'page' ? <File /> : <Lightning />}</Icon>+ <Icon>{type === 'path' ? <File /> : <Lightning />}</Icon><Text>{value}</Text></Row><Row alignItems="center" gap>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsxindex c1dbde081..7d563b551 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx@@ -55,7 +55,7 @@ export function FunnelEditForm({const defaultValues = {name: data?.name || '',window: data?.parameters?.window || 60,- steps: data?.parameters?.steps || [{ type: 'page', value: '/' }],+ steps: data?.parameters?.steps || [{ type: 'path', value: '/' }],};return (@@ -91,7 +91,7 @@ export function FunnelEditForm({onChange={field.onChange}><Grid columns="1fr 1fr" flexGrow={1} gap>- <Radio id="page" value="page">+ <Radio id="path" value="path"><Icon><File /></Icon>@@ -130,7 +130,7 @@ export function FunnelEditForm({})}<Row><Button- onPress={() => append({ type: 'page', value: '/' })}+ onPress={() => append({ type: 'path', value: '/' })}isDisabled={fields.length >= FUNNEL_STEPS_MAX}><Icon>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsxindex 319419363..9ef5840cf 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/Goal.tsx@@ -30,7 +30,7 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDateendDate,...parameters,});- const isPage = parameters?.type === 'page';+ const isPage = parameters?.type === 'path';return (<LoadingPanel data={data} isLoading={isLoading} isFetching={isFetching} error={error}>@@ -68,7 +68,7 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate</Row><Row alignItems="center" justifyContent="space-between" gap><Row alignItems="center" gap>- <Icon>{parameters.type === 'page' ? <File /> : <Lightning />}</Icon>+ <Icon>{parameters.type === 'path' ? <File /> : <Lightning />}</Icon><Text>{parameters.value}</Text></Row><Row alignItems="center" gap>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsxindex cdd7d34a4..f5fec7b0e 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx@@ -16,9 +16,10 @@ export function GoalAddButton({ websiteId }: { websiteId: string }) {</Button><Modal><Dialog+ aria-label="add goal"variant="modal"title={formatMessage(labels.goal)}- style={{ minHeight: 375, minWidth: 400 }}+ style={{ minWidth: 800, minHeight: 300 }}>{({ close }) => <GoalEditForm websiteId={websiteId} onClose={close} />}</Dialog>diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsxindex f8ff296f0..5556e4d8c 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx@@ -6,14 +6,13 @@ import {FormButtons,FormSubmitButton,Button,- RadioGroup,- Radio,- Text,- Icon,Loading,+ Column,+ Label,} from '@umami/react-zen';import { useMessages, useReportQuery, useUpdateQuery } from '@/components/hooks';-import { File, Lightning } from '@/components/icons';+import { LookupField } from '@/components/input/LookupField';+import { ActionSelect } from '@/components/input/ActionSelect';export function GoalEditForm({id,@@ -27,13 +26,12 @@ export function GoalEditForm({onClose?: () => void;}) {const { formatMessage, labels } = useMessages();-const { data } = useReportQuery(id);const { mutate, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);- const handleSubmit = async ({ name, ...parameters }) => {+ const handleSubmit = async (formData: Record<string, any>) => {mutate(- { ...data, id, name, type: 'goal', websiteId, parameters },+ { ...formData, type: 'goal', websiteId },{onSuccess: async () => {if (id) touch(`report:${id}`);@@ -50,15 +48,15 @@ export function GoalEditForm({}const defaultValues = {- name: data?.name || '',- type: data?.parameters?.type || 'page',- value: data?.parameters?.value || '',+ name: '',+ parameters: { type: 'path', value: '' },};return (- <Form onSubmit={handleSubmit} error={error?.message} defaultValues={defaultValues}>+ <Form onSubmit={handleSubmit} error={error?.message} defaultValues={data || defaultValues}>{({ watch }) => {- const watchType = watch('type');+ const type = watch('parameters.type');+return (<><FormField@@ -68,35 +66,30 @@ export function GoalEditForm({><TextField autoFocus /></FormField>- <FormField- name="type"- label={formatMessage(labels.type)}- rules={{ required: formatMessage(labels.required) }}- >- <RadioGroup orientation="horizontal" variant="box">- <Grid columns="1fr 1fr" flexGrow={1} gap>- <Radio value="page">- <Icon>- <File />- </Icon>- <Text>{formatMessage(labels.page)}</Text>- </Radio>- <Radio value="event">- <Icon>- <Lightning />- </Icon>- <Text>{formatMessage(labels.event)}</Text>- </Radio>- </Grid>- </RadioGroup>- </FormField>- <FormField- name="value"- label={formatMessage(watchType === 'event' ? labels.eventName : labels.path)}- rules={{ required: formatMessage(labels.required) }}- >- <TextField />- </FormField>+ <Column>+ <Label>{formatMessage(labels.action)}</Label>+ <Grid columns="260px 1fr" gap>+ <Column>+ <FormField+ name="parameters.type"+ rules={{ required: formatMessage(labels.required) }}+ >+ <ActionSelect />+ </FormField>+ </Column>+ <Column>+ <FormField+ name="parameters.value"+ rules={{ required: formatMessage(labels.required) }}+ >+ {({ field }) => {+ return <LookupField websiteId={websiteId} type={type} {...field} />;+ }}+ </FormField>+ </Column>+ </Grid>+ </Column>+<FormButtons><Button onPress={onClose} isDisabled={isPending}>{formatMessage(labels.cancel)}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsxindex f86172253..a4a0c1897 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx@@ -1,7 +1,7 @@import { Button, Icon, DialogTrigger, Dialog, Modal, Text } from '@umami/react-zen';import { ListFilter } from '@/components/icons';import { FilterEditForm } from '@/components/input/FilterEditForm';-import { useMessages, useNavigation, useFilters } from '@/components/hooks';+import { useMessages, useNavigation } from '@/components/hooks';import { filtersArrayToObject } from '@/lib/params';export function WebsiteFilterButton({@@ -14,17 +14,12 @@ export function WebsiteFilterButton({showText?: boolean;}) {const { formatMessage, labels } = useMessages();- const {- replaceParams,- router,- query: { segment },- } = useNavigation();- const { filters } = useFilters();+ const { replaceParams, router } = useNavigation();- const handleChange = ({ filters, segment }) => {+ const handleChange = ({ filters, segment, cohort }: any) => {const params = filtersArrayToObject(filters);- const url = replaceParams({ ...params, segment });+ const url = replaceParams({ ...params, segment, cohort });router.push(url);};@@ -40,15 +35,7 @@ export function WebsiteFilterButton({<Modal><Dialog title={formatMessage(labels.filters)} style={{ width: 800, minHeight: 600 }}>{({ close }) => {- return (- <FilterEditForm- websiteId={websiteId}- filters={filters}- segmentId={segment}- onChange={handleChange}- onClose={close}- />- );+ return <FilterEditForm websiteId={websiteId} onChange={handleChange} onClose={close} />;}}</Dialog></Modal>diff --git a/src/app/(main)/websites/[websiteId]/WebsitePage.tsx b/src/app/(main)/websites/[websiteId]/WebsitePage.tsxindex 9b08427dc..4bc109ad1 100644--- a/src/app/(main)/websites/[websiteId]/WebsitePage.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsitePage.tsx@@ -11,7 +11,7 @@ import { WebsiteControls } from './WebsiteControls';export function WebsitePage({ websiteId }: { websiteId: string }) {const {router,- query: { view, compare },+ query: { view },updateParams,} = useNavigation();const handleClose = (close: () => void) => {@@ -30,7 +30,7 @@ export function WebsitePage({ websiteId }: { websiteId: string }) {<WebsiteControls websiteId={websiteId} /><WebsiteMetricsBar websiteId={websiteId} showChange={true} /><Panel minHeight="520px">- <WebsiteChart websiteId={websiteId} compareMode={compare} />+ <WebsiteChart websiteId={websiteId} /></Panel><WebsitePanels websiteId={websiteId} /><Modal isOpen={!!view} onOpenChange={handleOpenChange} isDismissable>diff --git a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsxindex b73586494..c0638b7f6 100644--- a/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsitePanels.tsx@@ -15,7 +15,7 @@ export function WebsitePanels({ websiteId }: { websiteId: string }) {showMore: true,metric: formatMessage(labels.visitors),};- const rowProps = { minHeight: 570 };+ const rowProps = { minHeight: '570px' };return (<Grid gap="3">diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsxindex aa62f1d9b..3f155f64a 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortAddButton.tsx@@ -15,10 +15,7 @@ export function CohortAddButton({ websiteId }: { websiteId: string }) {<Text>{formatMessage(labels.cohort)}</Text></Button><Modal>- <Dialog- title={formatMessage(labels.cohort)}- style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}- >+ <Dialog title={formatMessage(labels.cohort)} style={{ width: 800, minHeight: 300 }}>{({ close }) => {return <CohortEditForm websiteId={websiteId} onClose={close} />;}}diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsxindex 86b3dedc9..d7f80a702 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditButton.tsx@@ -18,10 +18,7 @@ export function CohortEditButton({return (<ActionButton title={formatMessage(labels.edit)} icon={<Edit />}>- <Dialog- title={formatMessage(labels.cohort)}- style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}- >+ <Dialog title={formatMessage(labels.cohort)} style={{ width: 800, minHeight: 300 }}>{({ close }) => {return (<CohortEditFormdiff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsxindex bde75d483..9e491a122 100644--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx@@ -8,23 +8,13 @@ import {Label,Loading,Column,- ComboBox,- Select,- ListItem,Grid,- useDebounce,} from '@umami/react-zen';-import {- useMessages,- useUpdateQuery,- useWebsiteCohortQuery,- useWebsiteValuesQuery,-} from '@/components/hooks';+import { useMessages, useUpdateQuery, useWebsiteCohortQuery } from '@/components/hooks';import { DateFilter } from '@/components/input/DateFilter';import { FieldFilters } from '@/components/input/FieldFilters';-import { SetStateAction, useMemo, useState } from 'react';-import { endOfDay, subMonths } from 'date-fns';-import { Empty } from '@/components/common/Empty';+import { LookupField } from '@/components/input/LookupField';+import { ActionSelect } from '@/components/input/ActionSelect';export function CohortEditForm({cohortId,@@ -40,21 +30,8 @@ export function CohortEditForm({onSave?: () => void;onClose?: () => void;}) {- const [action, setAction] = useState('path');- const [search, setSearch] = useState('');- const searchValue = useDebounce(search, 300);const { data } = useWebsiteCohortQuery(websiteId, cohortId);const { formatMessage, labels, messages } = useMessages();- const startDate = subMonths(endOfDay(new Date()), 6);- const endDate = endOfDay(new Date());-- const { data: searchResults, isLoading } = useWebsiteValuesQuery({- websiteId,- type: action,- search: searchValue,- startDate,- endDate,- });const { mutate, error, isPending, touch, toast } = useUpdateQuery(`/websites/${websiteId}/segments${cohortId ? `/${cohortId}` : ''}`,@@ -63,10 +40,6 @@ export function CohortEditForm({},);- const items: string[] = useMemo(() => {- return searchResults?.map(({ value }) => value) || [];- }, [searchResults]);-const handleSubmit = async (formData: any) => {mutate(formData, {onSuccess: async () => {@@ -78,105 +51,84 @@ export function CohortEditForm({});};- const handleSearch = (value: SetStateAction<string>) => {- setSearch(value);- };-if (cohortId && !data) {return <Loading position="page" />;}+ const defaultValues = {+ parameters: { filters, dateRange: '30day', action: { type: 'path', value: '' } },+ };+return (- <Form- error={error}- onSubmit={handleSubmit}- defaultValues={- data || { parameters: { filters, dateRange: '30day', action: { type: 'path' } } }- }- >- <FormField- name="name"- label={formatMessage(labels.name)}- rules={{ required: formatMessage(labels.required) }}- >- <TextField autoFocus />- </FormField>+ <Form error={error} onSubmit={handleSubmit} defaultValues={data || defaultValues}>+ {({ watch }) => {+ const type = watch('parameters.action.type');- <Column>- <Label>{formatMessage(labels.action)}</Label>- <Grid columns="260px 1fr" gap>- <Column>+ return (+ <><FormField- name="parameters.action.type"+ name="name"+ label={formatMessage(labels.name)}rules={{ required: formatMessage(labels.required) }}>- <Select onSelectionChange={(value: any) => setAction(value)}>- <ListItem id="path">{formatMessage(labels.viewedPage)}</ListItem>- <ListItem id="event">{formatMessage(labels.triggeredEvent)}</ListItem>- </Select>+ <TextField autoFocus /></FormField>- </Column>- <Column>- <FormField- name="parameters.action.value"- rules={{ required: formatMessage(labels.required) }}- >- {({ field }) => {- return (- <ComboBox- aria-label="action"- items={items}- inputValue={field?.value}- onInputChange={value => {- handleSearch(value);- field?.onChange?.(value);- }}- formValue="text"- allowsEmptyCollection- allowsCustomValue- renderEmptyState={() =>- isLoading ? (- <Loading position="center" icon="dots" />- ) : (- <Empty message={formatMessage(messages.noResultsFound)} />- )- }++ <Column>+ <Label>{formatMessage(labels.action)}</Label>+ <Grid columns="260px 1fr" gap>+ <Column>+ <FormField+ name="parameters.action.type"+ rules={{ required: formatMessage(labels.required) }}>- {items.map(item => (- <ListItem key={item} id={item}>- {item}- </ListItem>- ))}- </ComboBox>- );- }}- </FormField>- </Column>- </Grid>- </Column>+ <ActionSelect />+ </FormField>+ </Column>+ <Column>+ <FormField+ name="parameters.action.value"+ rules={{ required: formatMessage(labels.required) }}+ >+ {({ field }) => {+ return <LookupField websiteId={websiteId} type={type} {...field} />;+ }}+ </FormField>+ </Column>+ </Grid>+ </Column>- <Column width="260px">- <Label>{formatMessage(labels.dateRange)}</Label>- <FormField name="parameters.dateRange" rules={{ required: formatMessage(labels.required) }}>- <DateFilter placement="bottom start" />- </FormField>- </Column>+ <Column width="260px">+ <Label>{formatMessage(labels.dateRange)}</Label>+ <FormField+ name="parameters.dateRange"+ rules={{ required: formatMessage(labels.required) }}+ >+ <DateFilter placement="bottom start" />+ </FormField>+ </Column>- <Column>- <Label>{formatMessage(labels.filters)}</Label>- <FormField name="parameters.filters" rules={{ required: formatMessage(labels.required) }}>- <FieldFilters websiteId={websiteId} exclude={['path', 'event']} />- </FormField>- </Column>+ <Column>+ <Label>{formatMessage(labels.filters)}</Label>+ <FormField+ name="parameters.filters"+ rules={{ required: formatMessage(labels.required) }}+ >+ <FieldFilters websiteId={websiteId} exclude={['path', 'event']} />+ </FormField>+ </Column>- <FormButtons>- <Button isDisabled={isPending} onPress={onClose}>- {formatMessage(labels.cancel)}- </Button>- <FormSubmitButton variant="primary" data-test="button-submit" isDisabled={isPending}>- {formatMessage(labels.save)}- </FormSubmitButton>- </FormButtons>+ <FormButtons>+ <Button isDisabled={isPending} onPress={onClose}>+ {formatMessage(labels.cancel)}+ </Button>+ <FormSubmitButton variant="primary" data-test="button-submit" isDisabled={isPending}>+ {formatMessage(labels.save)}+ </FormSubmitButton>+ </FormButtons>+ </>+ );+ }}</Form>);}diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsxindex ef2079486..d27acb3c9 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentAddButton.tsx@@ -15,10 +15,7 @@ export function SegmentAddButton({ websiteId }: { websiteId: string }) {<Text>{formatMessage(labels.segment)}</Text></Button><Modal>- <Dialog- title={formatMessage(labels.segment)}- style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}- >+ <Dialog title={formatMessage(labels.segment)} style={{ width: 800, minHeight: 300 }}>{({ close }) => {return <SegmentEditForm websiteId={websiteId} onClose={close} />;}}diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsxindex 437633984..10622ac20 100644--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditButton.tsx@@ -1,8 +1,8 @@+import { Dialog } from '@umami/react-zen';import { ActionButton } from '@/components/input/ActionButton';import { Edit } from '@/components/icons';-import { Dialog } from '@umami/react-zen';-import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';import { useMessages } from '@/components/hooks';+import { SegmentEditForm } from './SegmentEditForm';import { Filter } from '@/lib/types';export function SegmentEditButton({@@ -18,10 +18,7 @@ export function SegmentEditButton({return (<ActionButton title={formatMessage(labels.edit)} icon={<Edit />}>- <Dialog- title={formatMessage(labels.segment)}- style={{ width: 800, minHeight: 300, maxHeight: '90vh' }}- >+ <Dialog title={formatMessage(labels.segment)} style={{ width: 800, minHeight: 300 }}>{({ close }) => {return (<SegmentEditFormdiff --git a/src/app/api/reports/[reportId]/route.ts b/src/app/api/reports/[reportId]/route.tsindex 5cb7074b1..1c93028cf 100644--- a/src/app/api/reports/[reportId]/route.ts+++ b/src/app/api/reports/[reportId]/route.ts@@ -51,7 +51,7 @@ export async function POST(type,name,description,- parameters: parameters,+ parameters,} as any);return json(result);diff --git a/src/components/input/ActionButton.tsx b/src/components/input/ActionButton.tsxindex ed20fc084..532c81ee8 100644--- a/src/components/input/ActionButton.tsx+++ b/src/components/input/ActionButton.tsx@@ -7,7 +7,7 @@ export function ActionButton({title,children,}: {- onSave?: () => void;+ onClick?: () => void;icon?: ReactNode;title?: string;children?: ReactNode;diff --git a/src/components/input/ActionSelect.tsx b/src/components/input/ActionSelect.tsxnew file mode 100644index 000000000..3de118d21--- /dev/null+++ b/src/components/input/ActionSelect.tsx@@ -0,0 +1,18 @@+import { Select, ListItem } from '@umami/react-zen';+import { useMessages } from '@/components/hooks';++export interface ActionSelectProps {+ value?: string;+ onChange?: (value: string) => void;+}++export function ActionSelect({ value = 'path', onChange }: ActionSelectProps) {+ const { formatMessage, labels } = useMessages();++ return (+ <Select value={value} onChange={onChange}>+ <ListItem id="path">{formatMessage(labels.viewedPage)}</ListItem>+ <ListItem id="event">{formatMessage(labels.triggeredEvent)}</ListItem>+ </Select>+ );+}diff --git a/src/components/input/CurrencySelect.tsx b/src/components/input/CurrencySelect.tsxindex 631ab21b5..be0cec7d1 100644--- a/src/components/input/CurrencySelect.tsx+++ b/src/components/input/CurrencySelect.tsx@@ -14,7 +14,7 @@ export function CurrencySelect({ value, onChange }) {value={value}defaultValue={value}onChange={onChange}- listProps={{ style: { maxHeight: '300px' } }}+ listProps={{ style: { maxHeight: 300 } }}onSearch={setSearch}allowSearch>diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsxindex 52524c1ad..971baab26 100644--- a/src/components/input/FilterBar.tsx+++ b/src/components/input/FilterBar.tsx@@ -30,8 +30,8 @@ export function FilterBar({ websiteId }: { websiteId: string }) {query: { segment, cohort },} = useNavigation();const { filters, operatorLabels } = useFilters();- const { data, isLoading } = useWebsiteSegmentQuery(websiteId, segment);- const canSave = filters.length > 0 && !segment && !cohort;+ const { data, isLoading } = useWebsiteSegmentQuery(websiteId, segment || cohort);+ const canSaveSegment = filters.length > 0 && !segment && !cohort;const handleCloseFilter = (param: string) => {router.push(updateParams({ [param]: undefined }));@@ -41,11 +41,11 @@ export function FilterBar({ websiteId }: { websiteId: string }) {router.push(replaceParams());};- const handleSegmentRemove = () => {- router.push(updateParams({ segment: undefined }));+ const handleSegmentRemove = (type: string) => {+ router.push(updateParams({ [type]: undefined }));};- if (!filters.length && !segment) {+ if (!filters.length && !segment && !cohort) {return null;}@@ -58,7 +58,16 @@ export function FilterBar({ websiteId }: { websiteId: string }) {label={formatMessage(labels.segment)}value={data?.name || segment}operator={operatorLabels.eq}- onRemove={handleSegmentRemove}+ onRemove={() => handleSegmentRemove('segment')}+ />+ )}+ {cohort && !isLoading && (+ <FilterItem+ name="cohort"+ label={formatMessage(labels.cohort)}+ value={data?.name || cohort}+ operator={operatorLabels.eq}+ onRemove={() => handleSegmentRemove('cohort')}/>)}{filters.map(filter => {@@ -79,7 +88,7 @@ export function FilterBar({ websiteId }: { websiteId: string }) {</Row><Row alignItems="center"><DialogTrigger>- {canSave && (+ {canSaveSegment && (<TooltipTrigger delay={0}><Button variant="zero"><Icon>diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsxindex b21c5d550..585787dca 100644--- a/src/components/input/FilterEditForm.tsx+++ b/src/components/input/FilterEditForm.tsx@@ -1,40 +1,43 @@import { useState } from 'react';import { Column, Tabs, TabList, Tab, TabPanel, Row, Button } from '@umami/react-zen';-import { useMessages } from '@/components/hooks';+import { useFilters, useMessages, useNavigation } from '@/components/hooks';import { FieldFilters } from '@/components/input/FieldFilters';import { SegmentFilters } from '@/components/input/SegmentFilters';export interface FilterEditFormProps {websiteId?: string;- filters: any[];- segmentId?: string;- onChange?: (params: { filters: any[]; segment: any }) => void;+ onChange?: (params: { filters: any[]; segment?: string; cohort?: string }) => void;onClose?: () => void;}-export function FilterEditForm({- websiteId,- filters = [],- segmentId,- onChange,- onClose,-}: FilterEditFormProps) {+export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormProps) {+ const {+ query: { segment, cohort },+ } = useNavigation();+ const { filters } = useFilters();const { formatMessage, labels } = useMessages();const [currentFilters, setCurrentFilters] = useState(filters);- const [currentSegment, setCurrentSegment] = useState(segmentId);+ const [currentSegment, setCurrentSegment] = useState(segment);+ const [currentCohort, setCurrentCohort] = useState(cohort);const handleReset = () => {setCurrentFilters([]);- setCurrentSegment(null);+ setCurrentSegment(undefined);+ setCurrentCohort(undefined);};const handleSave = () => {- onChange?.({ filters: currentFilters.filter(f => f.value), segment: currentSegment });+ onChange?.({+ filters: currentFilters.filter(f => f.value),+ segment: currentSegment,+ cohort: currentCohort,+ });onClose?.();};- const handleSegmentChange = (id: string) => {- setCurrentSegment(id);+ const handleSegmentChange = (id: string, type: string) => {+ setCurrentSegment(type === 'segment' ? id : undefined);+ setCurrentCohort(type === 'cohort' ? id : undefined);};return (@@ -43,6 +46,7 @@ export function FilterEditForm({<TabList><Tab id="fields">{formatMessage(labels.fields)}</Tab><Tab id="segments">{formatMessage(labels.segments)}</Tab>+ <Tab id="cohorts">{formatMessage(labels.cohorts)}</Tab></TabList><TabPanel id="fields"><FieldFilters websiteId={websiteId} value={currentFilters} onChange={setCurrentFilters} />@@ -51,7 +55,15 @@ export function FilterEditForm({<SegmentFilterswebsiteId={websiteId}segmentId={currentSegment}- onSave={handleSegmentChange}+ onChange={handleSegmentChange}+ />+ </TabPanel>+ <TabPanel id="cohorts" style={{ height: 400 }}>+ <SegmentFilters+ type="cohort"+ websiteId={websiteId}+ segmentId={currentCohort}+ onChange={handleSegmentChange}/></TabPanel></Tabs>diff --git a/src/components/input/LookupField.tsx b/src/components/input/LookupField.tsxnew file mode 100644index 000000000..841ab866f--- /dev/null+++ b/src/components/input/LookupField.tsx@@ -0,0 +1,65 @@+import { SetStateAction, useMemo, useState } from 'react';+import { endOfDay, subMonths } from 'date-fns';+import { ComboBox, ListItem, Loading, useDebounce, ComboBoxProps } from '@umami/react-zen';+import { Empty } from '@/components/common/Empty';+import { useMessages, useWebsiteValuesQuery } from '@/components/hooks';++export interface LookupFieldProps extends ComboBoxProps {+ websiteId: string;+ type: string;+ value: string;+ onChange: (value: string) => void;+}++export function LookupField({ websiteId, type, value, onChange, ...props }: LookupFieldProps) {+ const { formatMessage, messages } = useMessages();+ const [search, setSearch] = useState(value);+ const searchValue = useDebounce(search, 300);+ const startDate = subMonths(endOfDay(new Date()), 6);+ const endDate = endOfDay(new Date());++ const { data, isLoading } = useWebsiteValuesQuery({+ websiteId,+ type,+ search: searchValue,+ startDate,+ endDate,+ });++ const items: string[] = useMemo(() => {+ return data?.map(({ value }) => value) || [];+ }, [data]);++ const handleSearch = (value: SetStateAction<string>) => {+ setSearch(value);+ };++ return (+ <ComboBox+ aria-label="LookupField"+ {...props}+ items={items}+ inputValue={value}+ onInputChange={value => {+ handleSearch(value);+ onChange?.(value);+ }}+ formValue="text"+ allowsEmptyCollection+ allowsCustomValue+ renderEmptyState={() =>+ isLoading ? (+ <Loading position="center" icon="dots" />+ ) : (+ <Empty message={formatMessage(messages.noResultsFound)} />+ )+ }+ >+ {items.map(item => (+ <ListItem key={item} id={item}>+ {item}+ </ListItem>+ ))}+ </ComboBox>+ );+}diff --git a/src/components/input/SegmentFilters.tsx b/src/components/input/SegmentFilters.tsxindex 1406d7a30..63d64795f 100644--- a/src/components/input/SegmentFilters.tsx+++ b/src/components/input/SegmentFilters.tsx@@ -5,14 +5,20 @@ import { LoadingPanel } from '@/components/common/LoadingPanel';export interface SegmentFiltersProps {websiteId: string;segmentId: string;- onSave?: (data: any) => void;+ type?: string;+ onChange?: (id: string, type: string) => void;}-export function SegmentFilters({ websiteId, segmentId, onSave }: SegmentFiltersProps) {- const { data, isLoading, isFetching } = useWebsiteSegmentsQuery(websiteId, { type: 'segment' });+export function SegmentFilters({+ websiteId,+ segmentId,+ type = 'segment',+ onChange,+}: SegmentFiltersProps) {+ const { data, isLoading, isFetching } = useWebsiteSegmentsQuery(websiteId, { type });const handleChange = (id: string) => {- onSave?.(id);+ onChange?.(id, type);};return (diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsxindex fcf8e7b8f..fa363eec9 100644--- a/src/components/metrics/MetricsTable.tsx+++ b/src/components/metrics/MetricsTable.tsx@@ -68,7 +68,13 @@ export function MetricsTable({};return (- <LoadingPanel data={data} isFetching={isFetching} isLoading={isLoading} error={error}>+ <LoadingPanel+ data={data}+ isFetching={isFetching}+ isLoading={isLoading}+ error={error}+ minHeight="380px"+ >{data && <ListTable {...props} data={filteredData} renderLabel={renderLabel} />}{showMore && limit && (<Row justifyContent="center">diff --git a/src/lib/schema.ts b/src/lib/schema.tsindex 6cd08c2ba..d3051be13 100644--- a/src/lib/schema.ts+++ b/src/lib/schema.ts@@ -101,57 +101,6 @@ export const reportTypeParam = z.enum(['utm',]);-export const dateRangeSchema = z.object({ ...dateRangeParams }).superRefine((data, ctx) => {- const hasTimestamps = data.startAt !== undefined && data.endAt !== undefined;- const hasDates = data.startDate !== undefined && data.endDate !== undefined;-- if (!hasTimestamps && !hasDates) {- ctx.addIssue({- code: z.ZodIssueCode.custom,- message: 'You must provide either startAt & endAt or startDate & endDate.',- });- }-- if (hasTimestamps && hasDates) {- ctx.addIssue({- code: z.ZodIssueCode.custom,- message: 'Provide either startAt & endAt or startDate & endDate, not both.',- });- }-- if (data.startAt !== undefined && data.endAt === undefined) {- ctx.addIssue({- code: z.ZodIssueCode.custom,- message: 'If you provide startAt, you must also provide endAt.',- path: ['endAt'],- });- }-- if (data.endAt !== undefined && data.startAt === undefined) {- ctx.addIssue({- code: z.ZodIssueCode.custom,- message: 'If you provide endAt, you must also provide startAt.',- path: ['startAt'],- });- }-- if (data.startDate !== undefined && data.endDate === undefined) {- ctx.addIssue({- code: z.ZodIssueCode.custom,- message: 'If you provide startDate, you must also provide endDate.',- path: ['endDate'],- });- }-- if (data.endDate !== undefined && data.startDate === undefined) {- ctx.addIssue({- code: z.ZodIssueCode.custom,- message: 'If you provide endDate, you must also provide startDate.',- path: ['startDate'],- });- }-});-export const goalReportSchema = z.object({type: z.literal('goal'),parameters: z@@ -180,7 +129,7 @@ export const funnelReportSchema = z.object({steps: z.array(z.object({- type: z.enum(['page', 'event']),+ type: z.enum(['path', 'event']),value: z.string(),}),)@@ -233,7 +182,7 @@ export const attributionReportSchema = z.object({startDate: z.coerce.date(),endDate: z.coerce.date(),model: z.enum(['first-click', 'last-click']),- type: z.enum(['page', 'event']),+ type: z.enum(['path', 'event']),step: z.string(),currency: z.string().optional(),}),@@ -253,6 +202,7 @@ export const reportBaseSchema = z.object({type: reportTypeParam,name: z.string().max(200),description: z.string().max(500).optional(),+ parameters: z.object({}).passthrough(),});export const reportTypeSchema = z.discriminatedUnion('type', [@@ -266,7 +216,7 @@ export const reportTypeSchema = z.discriminatedUnion('type', [breakdownReportSchema,]);-export const reportSchema = z.intersection(reportBaseSchema, reportTypeSchema);+export const reportSchema = reportBaseSchema;export const reportResultSchema = z.intersection(z.object({diff --git a/src/queries/sql/reports/getAttribution.ts b/src/queries/sql/reports/getAttribution.tsindex b4df4d11e..3db2ff087 100644--- a/src/queries/sql/reports/getAttribution.ts+++ b/src/queries/sql/reports/getAttribution.ts@@ -40,8 +40,8 @@ async function relationalQuery(): Promise<AttributionResult> {const { model, type, currency } = parameters;const { rawQuery, parseFilters } = prisma;- const eventType = type === 'page' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;- const column = type === 'page' ? 'url_path' : 'event_name';+ const eventType = type === 'path' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;+ const column = type === 'path' ? 'url_path' : 'event_name';const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,...parameters,@@ -266,8 +266,8 @@ async function clickhouseQuery(): Promise<AttributionResult> {const { model, type, currency } = parameters;const { rawQuery, parseFilters } = clickhouse;- const eventType = type === 'page' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;- const column = type === 'page' ? 'url_path' : 'event_name';+ const eventType = type === 'path' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;+ const column = type === 'path' ? 'url_path' : 'event_name';const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,...parameters,diff --git a/src/queries/sql/reports/getFunnel.ts b/src/queries/sql/reports/getFunnel.tsindex 81e2f3bb9..abc0dab31 100644--- a/src/queries/sql/reports/getFunnel.ts+++ b/src/queries/sql/reports/getFunnel.ts@@ -54,7 +54,7 @@ async function relationalQuery((pv, cv, i) => {const levelNumber = i + 1;const startSum = i > 0 ? 'union ' : '';- const isURL = cv.type === 'page';+ const isURL = cv.type === 'path';const column = isURL ? 'url_path' : 'event_name';let operator = '=';@@ -161,7 +161,7 @@ async function clickhouseQuery(const levelNumber = i + 1;const startSum = i > 0 ? 'union all ' : '';const startFilter = i > 0 ? 'or' : '';- const isURL = cv.type === 'page';+ const isURL = cv.type === 'path';const column = isURL ? 'url_path' : 'event_name';let operator = '=';diff --git a/src/queries/sql/reports/getGoal.ts b/src/queries/sql/reports/getGoal.tsindex 3ecce7ac6..b00e362ec 100644--- a/src/queries/sql/reports/getGoal.ts+++ b/src/queries/sql/reports/getGoal.ts@@ -29,8 +29,8 @@ async function relationalQuery() {const { startDate, endDate, type, value } = parameters;const { rawQuery, parseFilters } = prisma;- const eventType = type === 'page' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;- const column = type === 'page' ? 'url_path' : 'event_name';+ const eventType = type === 'path' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;+ const column = type === 'path' ? 'url_path' : 'event_name';const { filterQuery, dateQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({...filters,websiteId,@@ -71,8 +71,8 @@ async function clickhouseQuery() {const { startDate, endDate, type, value } = parameters;const { rawQuery, parseFilters } = clickhouse;- const eventType = type === 'page' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;- const column = type === 'page' ? 'url_path' : 'event_name';+ const eventType = type === 'path' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;+ const column = type === 'path' ? 'url_path' : 'event_name';const { filterQuery, dateQuery, cohortQuery, queryParams } = parseFilters({...filters,websiteId,diff --git a/src/queries/sql/sessions/getWebsiteSessions.ts b/src/queries/sql/sessions/getWebsiteSessions.tsindex c0942b207..2e93a9665 100644--- a/src/queries/sql/sessions/getWebsiteSessions.ts+++ b/src/queries/sql/sessions/getWebsiteSessions.ts@@ -106,7 +106,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {${getDateStringSQL('min(created_at)')} as firstAt,${getDateStringSQL('max(created_at)')} as lastAt,uniq(visit_id) as visits,- sumIf(views, event_type = 1) as views,+ sumIf(1, event_type = 1) as views,lastAt as createdAtfrom website_event${cohortQuery}