From cadcb3a26e2cc71144af4abc083f1f9e569e00cc Mon Sep 17 00:00:00 2001 From: Sabda Yagra Date: Mon, 5 Jan 2026 12:25:10 +0700 Subject: [PATCH] merge main --- .gitlab-ci.yml | 17 +- lighthouse-report.json | 630 --- pnpm-lock.yaml | 8269 ---------------------------------------- 3 files changed, 11 insertions(+), 8905 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3be41b0f..2dbd3bf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,26 @@ stages: - build - deploy - -build-dev: + +build-prod: stage: build when: on_success only: - main - dev-landing-v2 - image: + - prod + image: name: docker:25.0.3-cli services: - name: docker:25.0.3-dind command: ["--insecure-registry=38.47.185.86:8900"] script: - docker logout - - docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN 38.47.185.86:8900 - - docker build -t 38.47.185.86:8900/mediahub/new-mediahub-fe:dev . - - docker push 38.47.185.86:8900/mediahub/new-mediahub-fe:dev + - echo "Username:$DEPLOY_USERNAME" + - echo "Token:$DEPLOY_TOKEN" + - echo "$DEPLOY_TOKEN" | docker login 38.47.185.86:8900 --username "$DEPLOY_USERNAME" --password-stdin + - docker build --no-cache -t 38.47.185.86:8900/mediahub/new-mediahub-fe:prod . + - docker push 38.47.185.86:8900/mediahub/new-mediahub-fe:prod auto-deploy: stage: deploy @@ -26,5 +29,7 @@ auto-deploy: - main - dev-landing-v2 image: curlimages/curl:latest + services: + - docker:dind script: - curl --user admin:$JENKINS_PWD http://38.47.185.86:8080/job/auto-deploy-new-mediahub-fe/build?token=autodeploynewmediahub diff --git a/lighthouse-report.json b/lighthouse-report.json index 56e9d694..c9f89b1f 100644 --- a/lighthouse-report.json +++ b/lighthouse-report.json @@ -257,11 +257,7 @@ "description": "Failed to load resource: the server responded with a status of 401 ()", "sourceLocation": { "type": "source-location", -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "urlProvider": "network", "line": 0, "column": 0 @@ -272,11 +268,7 @@ "description": "Failed to load resource: the server responded with a status of 401 ()", "sourceLocation": { "type": "source-location", -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "urlProvider": "network", "line": 0, "column": 0 @@ -287,11 +279,7 @@ "description": "Failed to load resource: the server responded with a status of 401 ()", "sourceLocation": { "type": "source-location", -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "urlProvider": "network", "line": 0, "column": 0 @@ -302,11 +290,7 @@ "description": "Failed to load resource: the server responded with a status of 401 ()", "sourceLocation": { "type": "source-location", -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/signin", -======= - "url": "https://new.netidhub.com/api/signin", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "urlProvider": "network", "line": 0, "column": 0 @@ -317,11 +301,7 @@ "description": "Failed to load resource: the server responded with a status of 401 ()", "sourceLocation": { "type": "source-location", -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "urlProvider": "network", "line": 0, "column": 0 @@ -332,11 +312,7 @@ "description": "Failed to load resource: the server responded with a status of 403 ()", "sourceLocation": { "type": "source-location", -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/signin", -======= - "url": "https://new.netidhub.com/api/signin", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "urlProvider": "network", "line": 0, "column": 0 @@ -666,11 +642,7 @@ "items": [ { "name": "XSRF-TOKEN", -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0" -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0" ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 } ] } @@ -1322,11 +1294,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 1929.9919999986887, @@ -1343,11 +1311,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 1942.0780000016093, @@ -1398,11 +1362,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2147.427999999374, @@ -1538,11 +1498,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/public/users/roles", -======= - "url": "https://new.netidhub.com/api/public/users/roles", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2184.5289999991655, @@ -1559,11 +1515,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2186.1319999992847, @@ -1580,11 +1532,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2187.6389999985695, @@ -1601,11 +1549,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2189.4030000008643, @@ -1622,11 +1566,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2190.824999999255, @@ -1643,11 +1583,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2192.9059999994934, @@ -1664,11 +1600,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2193.9589999988675, @@ -1685,11 +1617,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllPolda=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllPolda=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2195.09299999848, @@ -1706,11 +1634,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllSatker=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllSatker=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2196.262999996543, @@ -1727,11 +1651,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2197.236999999732, @@ -1748,11 +1668,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2198.1369999982417, @@ -1769,11 +1685,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2199.737999998033, @@ -1790,11 +1702,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/pagination?enablePage=1&page=0&size=100&title=", -======= - "url": "https://new.netidhub.com/api/calendars/pagination?enablePage=1&page=0&size=100&title=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2201.107000000775, @@ -1811,11 +1719,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2202.7319999970496, @@ -1832,11 +1736,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/general/privacy-policy/1", -======= - "url": "https://new.netidhub.com/api/general/privacy-policy/1", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2204.2340000011027, @@ -1853,11 +1753,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/interstitial?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2206.3610000014305, @@ -1908,11 +1804,7 @@ "entity": "iconify.design" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 2425.7709999978542, @@ -1928,11 +1820,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 2435.239999998361, @@ -1948,11 +1836,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 2536.890000000596, @@ -1968,11 +1852,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/public/users/roles", -======= - "url": "https://new.netidhub.com/api/public/users/roles", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2554.2509999983013, @@ -1989,11 +1869,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2555.7069999985397, @@ -2010,11 +1886,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2556.785000000149, @@ -2031,11 +1903,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2557.9619999974966, @@ -2052,11 +1920,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2558.7290000021458, @@ -2073,11 +1937,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2559.957999996841, @@ -2094,11 +1954,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2561.620000001043, @@ -2115,11 +1971,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllPolda=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllPolda=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2563.017000000924, @@ -2136,11 +1988,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllSatker=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllSatker=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2564.4639999978244, @@ -2157,11 +2005,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2565.589999999851, @@ -2178,11 +2022,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2567.2580000013113, @@ -2216,11 +2056,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/pagination?enablePage=1&page=0&size=100&title=", -======= - "url": "https://new.netidhub.com/api/calendars/pagination?enablePage=1&page=0&size=100&title=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2570.287999998778, @@ -2237,11 +2073,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2571.515000000596, @@ -2258,11 +2090,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/general/privacy-policy/1", -======= - "url": "https://new.netidhub.com/api/general/privacy-policy/1", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2573.0940000005066, @@ -2279,11 +2107,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/interstitial?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h2", "rendererStartTime": 2575.140000000596, @@ -2317,11 +2141,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 2652.989999998361, @@ -2385,11 +2205,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 2802.771999999881, @@ -2405,11 +2221,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2866.8110000006855, @@ -2474,11 +2286,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 2985.785000000149, @@ -2560,11 +2368,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3121.5359999984503, @@ -2598,11 +2402,7 @@ "entity": "localhost" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3169.6710000000894, @@ -2619,11 +2419,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3326.467000000179, @@ -2640,11 +2436,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/11", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/11", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3332.115999996662, @@ -2661,11 +2453,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/10", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/10", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3333.0360000021756, @@ -2682,11 +2470,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3386.2919999994338, @@ -2703,11 +2487,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/9", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/9", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3496.207000002265, @@ -2724,11 +2504,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/8", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/8", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "h3", "rendererStartTime": 3497.6839999966323, @@ -2761,11 +2537,7 @@ "entity": "userway.org" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/7", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/7", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 4768.817000001669, @@ -2781,11 +2553,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/6", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/6", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 4769.862999998033, @@ -2801,11 +2569,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/5", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/5", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 4770.764999996871, @@ -2821,11 +2585,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/4", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/4", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 4771.539999999106, @@ -2841,11 +2601,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/3", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/3", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 4772.267000000924, @@ -2861,11 +2617,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/2", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/2", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 4773.139000002295, @@ -2881,11 +2633,7 @@ "entity": "netidhub.com" }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/1", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/1", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "sessionTargetType": "page", "protocol": "", "rendererStartTime": 4774.006999999285, @@ -2937,11 +2685,7 @@ "rtt": 91.41400000000002 }, { -<<<<<<< HEAD "origin": "https://mediahub.polri.go.id", -======= - "origin": "https://new.netidhub.com", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "rtt": 62.82600000000001 }, { @@ -2984,11 +2728,7 @@ ], "items": [ { -<<<<<<< HEAD "origin": "https://mediahub.polri.go.id", -======= - "origin": "https://new.netidhub.com", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "serverResponseTime": 179.918 }, { @@ -3400,363 +3140,231 @@ "type": "subitems", "items": [ { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/10", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/10", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 222605, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/9", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/9", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 205401, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/8", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/8", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 189294, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/11", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/11", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 111800, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 48662, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 29422, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 19985, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 17305, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 11109, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/general/privacy-policy/1", -======= - "url": "https://new.netidhub.com/api/general/privacy-policy/1", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 10110, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllPolda=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllPolda=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 9344, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllSatker=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllSatker=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 8969, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 7176, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllSatker=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllSatker=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 5733, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 5580, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 5055, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/interstitial?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 4316, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/pagination?enablePage=1&page=0&size=100&title=", -======= - "url": "https://new.netidhub.com/api/calendars/pagination?enablePage=1&page=0&size=100&title=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 4223, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 3811, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/interstitial?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 3520, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 3171, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/public/users/roles", -======= - "url": "https://new.netidhub.com/api/public/users/roles", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 1938, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 1168, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 1155, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 760, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllPolda=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllPolda=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 568, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/7", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/7", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 0, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/6", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/6", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 0, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/5", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/5", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 0, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/4", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/4", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 0, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/3", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/3", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 0, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/2", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/2", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 0, "tbtImpact": 0 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/1", -======= - "url": "https://new.netidhub.com/api/calendars/file/viewer/1", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "blockingTime": 0, "transferSize": 0, @@ -6012,7 +5620,6 @@ "totalBytes": 459503 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/10", "totalBytes": 222605 }, @@ -6026,21 +5633,6 @@ }, { "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/11", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/10", - "totalBytes": 222605 - }, - { - "url": "https://new.netidhub.com/api/advertisements/viewer/9", - "totalBytes": 205401 - }, - { - "url": "https://new.netidhub.com/api/advertisements/viewer/8", - "totalBytes": 189294 - }, - { - "url": "https://new.netidhub.com/api/advertisements/viewer/11", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "totalBytes": 111800 }, { @@ -6115,17 +5707,10 @@ "width": 0, "height": 0 }, -<<<<<<< HEAD "snippet": "\"Banner", "nodeLabel": "Banner 10" }, "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/10", -======= - "snippet": "\"Banner", - "nodeLabel": "Banner 10" - }, - "url": "https://new.netidhub.com/api/advertisements/viewer/10", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "requestStartTime": 28457561.421, "totalBytes": 222485, "wastedBytes": 222485, @@ -6145,17 +5730,10 @@ "width": 0, "height": 0 }, -<<<<<<< HEAD "snippet": "\"Banner", "nodeLabel": "Banner 11" }, "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/11", -======= - "snippet": "\"Banner", - "nodeLabel": "Banner 11" - }, - "url": "https://new.netidhub.com/api/advertisements/viewer/11", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "requestStartTime": 28457561.267, "totalBytes": 111800, "wastedBytes": 111800, @@ -6520,17 +6098,10 @@ "width": 0, "height": 0 }, -<<<<<<< HEAD "snippet": "\"Banner", "nodeLabel": "Banner 10" }, "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/10", -======= - "snippet": "\"Banner", - "nodeLabel": "Banner 10" - }, - "url": "https://new.netidhub.com/api/advertisements/viewer/10", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "fromProtocol": true, "isCrossOrigin": true, "totalBytes": 222485, @@ -6551,17 +6122,10 @@ "width": 0, "height": 0 }, -<<<<<<< HEAD "snippet": "\"Banner", "nodeLabel": "Banner 11" }, "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/11", -======= - "snippet": "\"Banner", - "nodeLabel": "Banner 11" - }, - "url": "https://new.netidhub.com/api/advertisements/viewer/11", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "fromProtocol": true, "isCrossOrigin": true, "totalBytes": 111800, @@ -7242,7 +6806,6 @@ "type": "subitems", "items": [ { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0" }, { @@ -7322,87 +6885,6 @@ }, { "url": "https://mediahub.polri.go.id/api/v2/calendars/file/viewer/5" -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0" - }, - { - "url": "https://new.netidhub.com/api/general/privacy-policy/1" - }, - { - "url": "https://new.netidhub.com/api/public/users/roles" - }, - { - "url": "https://new.netidhub.com/api/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=false" - }, - { - "url": "https://new.netidhub.com/api/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=true" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllSatker=true" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllPolda=true" - }, - { - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=true" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllSatker=true" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=" - }, - { - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=false" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false" - }, - { - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=true" - }, - { - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=false" - }, - { - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllPolda=true" - }, - { - "url": "https://new.netidhub.com/api/calendars/pagination?enablePage=1&page=0&size=100&title=" - }, - { - "url": "https://new.netidhub.com/api/advertisements/viewer/11" - }, - { - "url": "https://new.netidhub.com/api/advertisements/viewer/10" - }, - { - "url": "https://new.netidhub.com/api/calendars/file/viewer/6" - }, - { - "url": "https://new.netidhub.com/api/calendars/file/viewer/7" - }, - { - "url": "https://new.netidhub.com/api/csrf" - }, - { - "url": "https://new.netidhub.com/api/calendars/file/viewer/3" - }, - { - "url": "https://new.netidhub.com/api/calendars/file/viewer/5" ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 } ] } @@ -8575,11 +8057,7 @@ ], "items": [ { -<<<<<<< HEAD "origin": "https://mediahub.polri.go.id", -======= - "origin": "https://new.netidhub.com", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "wastedMs": 423.85200000000003 } ] @@ -8692,236 +8170,132 @@ "type": "subitems", "items": [ { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", -======= - "url": "https://new.netidhub.com/api/advertisements/pagination?title=&enablePage=1&sortBy=createdAt&sort=desc&size=4&page=0", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.44199999794363976, "transferSize": 7176 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.31999998539686203, "transferSize": 48662 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.3189999982714653, "transferSize": 17305 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/banner/public?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/banner?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.279999990016222, "transferSize": 3811 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.2550000101327896, "transferSize": 29422 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/users/info", -======= - "url": "https://new.netidhub.com/api/users/info", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.2460000030696392, "transferSize": 760 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/calendars/pagination?enablePage=1&page=0&size=100&title=", -======= - "url": "https://new.netidhub.com/api/calendars/pagination?enablePage=1&page=0&size=100&title=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.23200000450015068, "transferSize": 4223 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.19899999350309372, "transferSize": 19985 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/general/privacy-policy/1", -======= - "url": "https://new.netidhub.com/api/general/privacy-policy/1", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.17999999970197678, "transferSize": 10110 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.17800000309944153, "transferSize": 11109 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/public/users/roles", -======= - "url": "https://new.netidhub.com/api/public/users/roles", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.16200000792741776, "transferSize": 1938 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllPolda=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllPolda=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.12600000202655792, "transferSize": 568 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllPolda=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllPolda=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.1120000034570694, "transferSize": 9344 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllSatker=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=false&isAllSatker=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.11000000312924385, "transferSize": 8969 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=true&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.11000000312924385, "transferSize": 5055 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.10000000149011612, "transferSize": 1168 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=clickCount&size=5&isInt=false&typeId=1&title=&group=&categoryId=&fileFormats=&tags=&startDate=&endDate=&month=&year=", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.08500000089406967, "transferSize": 5580 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/interstitial?group=&isInt=true", -======= - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.07899999618530273, "transferSize": 3520 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllSatker=true", -======= - "url": "https://new.netidhub.com/api/media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=&isInt=true&isAllSatker=true", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.07700000330805779, "transferSize": 5733 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=0&group=&type=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.07199999690055847, "transferSize": 1155 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/media/public/interstitial?group=&isInt=false", -======= - "url": "https://new.netidhub.com/api/media/public/interstitial?group=&isInt=false", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0.06600000336766243, "transferSize": 4316 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/10", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/10", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "transferSize": 222605 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/9", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/9", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "transferSize": 205272 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/8", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/8", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "transferSize": 189897 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/advertisements/viewer/11", -======= - "url": "https://new.netidhub.com/api/advertisements/viewer/11", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "transferSize": 111800 }, { -<<<<<<< HEAD "url": "https://mediahub.polri.go.id/api/v2/csrf", -======= - "url": "https://new.netidhub.com/api/csrf", ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 "mainThreadTime": 0, "transferSize": 3171 } @@ -10078,11 +9452,7 @@ { "name": "netidhub.com", "origins": [ -<<<<<<< HEAD "https://mediahub.polri.go.id" -======= - "https://new.netidhub.com" ->>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815 ], "isUnrecognized": true }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f6f39ea4..6bc89855 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,11 +10,7 @@ importers: dependencies: '@ckeditor/ckeditor5-react': specifier: ^6.2.0 -<<<<<<< HEAD version: 6.3.0(@ckeditor/ckeditor5-core@46.0.0)(@ckeditor/ckeditor5-editor-multi-root@46.0.0)(@ckeditor/ckeditor5-engine@46.0.0)(@ckeditor/ckeditor5-utils@46.0.0)(@ckeditor/ckeditor5-watchdog@46.0.0)(react@18.3.1) -======= - version: 6.3.0(@ckeditor/ckeditor5-core@41.3.1)(@ckeditor/ckeditor5-editor-multi-root@47.1.0)(@ckeditor/ckeditor5-engine@41.3.1)(@ckeditor/ckeditor5-utils@41.3.1)(@ckeditor/ckeditor5-watchdog@41.3.1)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@dnd-kit/core': specifier: ^6.1.0 version: 6.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -32,7 +28,6 @@ importers: version: 1.1.1(emoji-mart@5.6.0)(react@18.3.1) '@fullcalendar/core': specifier: ^6.1.15 -<<<<<<< HEAD version: 6.1.15 '@fullcalendar/daygrid': specifier: ^6.1.15 @@ -145,136 +140,15 @@ importers: '@react-google-maps/api': specifier: ^2.20.3 version: 2.20.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 6.1.19 - '@fullcalendar/daygrid': - specifier: ^6.1.15 - version: 6.1.19(@fullcalendar/core@6.1.19) - '@fullcalendar/interaction': - specifier: ^6.1.15 - version: 6.1.19(@fullcalendar/core@6.1.19) - '@fullcalendar/list': - specifier: ^6.1.15 - version: 6.1.19(@fullcalendar/core@6.1.19) - '@fullcalendar/react': - specifier: ^6.1.15 - version: 6.1.19(@fullcalendar/core@6.1.19)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@fullcalendar/timegrid': - specifier: ^6.1.15 - version: 6.1.19(@fullcalendar/core@6.1.19) - '@hookform/resolvers': - specifier: ^3.9.0 - version: 3.10.0(react-hook-form@7.65.0(react@18.3.1)) - '@iconify/react': - specifier: ^5.0.2 - version: 5.2.1(react@18.3.1) - '@mui/x-charts': - specifier: ^7.25.0 - version: 7.29.1(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-accordion': - specifier: ^1.1.2 - version: 1.2.12(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-alert-dialog': - specifier: ^1.0.5 - version: 1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-aspect-ratio': - specifier: ^1.0.3 - version: 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-avatar': - specifier: ^1.0.4 - version: 1.1.10(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-checkbox': - specifier: ^1.0.4 - version: 1.3.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-collapsible': - specifier: ^1.0.3 - version: 1.1.12(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-context-menu': - specifier: ^2.2.1 - version: 2.2.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-dialog': - specifier: ^1.0.5 - version: 1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-direction': - specifier: ^1.1.0 - version: 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dropdown-menu': - specifier: ^2.0.6 - version: 2.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-hover-card': - specifier: ^1.0.7 - version: 1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-label': - specifier: ^2.1.0 - version: 2.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-menubar': - specifier: ^1.1.1 - version: 1.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-navigation-menu': - specifier: ^1.2.0 - version: 1.2.14(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-popover': - specifier: ^1.0.7 - version: 1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-progress': - specifier: ^1.0.3 - version: 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-radio-group': - specifier: ^1.1.3 - version: 1.3.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-scroll-area': - specifier: ^1.0.5 - version: 1.2.10(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-select': - specifier: ^2.0.0 - version: 2.2.6(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-separator': - specifier: ^1.1.0 - version: 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slider': - specifier: ^1.1.2 - version: 1.3.6(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': - specifier: ^1.1.0 - version: 1.2.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-switch': - specifier: ^1.0.3 - version: 1.2.6(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-tabs': - specifier: ^1.1.0 - version: 1.1.13(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-toast': - specifier: ^1.2.1 - version: 1.2.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-toggle': - specifier: ^1.0.3 - version: 1.1.10(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-toggle-group': - specifier: ^1.0.4 - version: 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-tooltip': - specifier: ^1.0.7 - version: 1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@react-google-maps/api': - specifier: ^2.20.3 - version: 2.20.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@studio-freight/react-lenis': specifier: ^0.0.47 version: 0.0.47(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@tanstack/react-table': specifier: ^8.19.2 -<<<<<<< HEAD version: 8.20.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@tinymce/tinymce-react': specifier: ^6.2.1 version: 6.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 8.21.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@tinymce/tinymce-react': - specifier: ^6.2.1 - version: 6.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/cleave.js': specifier: ^1.4.12 version: 1.4.12 @@ -286,33 +160,21 @@ importers: version: 3.0.6 '@types/next': specifier: ^9.0.0 -<<<<<<< HEAD version: 9.0.0(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/qs': specifier: ^6.9.17 version: 6.9.17 -======= - version: 9.0.0(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@types/qs': - specifier: ^6.9.17 - version: 6.14.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/react-google-recaptcha': specifier: ^2.1.9 version: 2.1.9 '@types/react-html-parser': specifier: ^2.0.6 -<<<<<<< HEAD version: 2.0.6 -======= - version: 2.0.7 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/react-syntax-highlighter': specifier: ^15.5.13 version: 15.5.13 '@types/sanitize-html': specifier: ^2.13.0 -<<<<<<< HEAD version: 2.13.0 '@vercel/analytics': specifier: ^1.3.1 @@ -320,31 +182,15 @@ importers: '@wavesurfer/react': specifier: ^1.0.8 version: 1.0.8(react@18.3.1)(wavesurfer.js@7.8.16) -======= - version: 2.16.0 - '@vercel/analytics': - specifier: ^1.3.1 - version: 1.5.0(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) - '@wavesurfer/react': - specifier: ^1.0.8 - version: 1.0.11(react@18.3.1)(wavesurfer.js@7.11.0) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 apexcharts: specifier: ^4.7.0 version: 4.7.0 axios: specifier: ^1.7.8 -<<<<<<< HEAD version: 1.7.9 chart.js: specifier: ^4.5.0 version: 4.5.0 -======= - version: 1.12.2 - chart.js: - specifier: ^4.5.0 - version: 4.5.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ckeditor5-custom-build: specifier: file:vendor/ckeditor5 version: file:vendor/ckeditor5 @@ -359,11 +205,7 @@ importers: version: 2.1.1 cmdk: specifier: ^1.0.0 -<<<<<<< HEAD version: 1.0.4(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 1.1.1(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 cookie: specifier: ^1.0.2 version: 1.0.2 @@ -375,7 +217,6 @@ importers: version: 3.6.0 dayjs: specifier: ^1.11.11 -<<<<<<< HEAD version: 1.11.13 embla-carousel-autoplay: specifier: ^8.1.3 @@ -386,44 +227,21 @@ importers: framer-motion: specifier: ^11.15.0 version: 11.15.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 1.11.18 - embla-carousel-autoplay: - specifier: ^8.1.3 - version: 8.6.0(embla-carousel@8.6.0) - embla-carousel-react: - specifier: ^8.1.3 - version: 8.6.0(react@18.3.1) - framer-motion: - specifier: ^11.15.0 - version: 11.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 geojson: specifier: ^0.5.0 version: 0.5.0 html-react-parser: specifier: ^5.2.0 -<<<<<<< HEAD version: 5.2.1(@types/react@18.3.18)(react@18.3.1) input-otp: specifier: ^1.2.4 version: 1.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 5.2.7(@types/react@18.3.26)(react@18.3.1) - input-otp: - specifier: ^1.2.4 - version: 1.4.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 jodit-react: specifier: ^4.1.2 version: 4.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) jotai: specifier: ^2.9.3 -<<<<<<< HEAD version: 2.11.0(@types/react@18.3.18)(react@18.3.1) -======= - version: 2.15.0(@babel/core@7.28.4)(@babel/template@7.27.2)(@types/react@18.3.26)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 jquery: specifier: ^3.7.1 version: 3.7.1 @@ -432,11 +250,7 @@ importers: version: 3.0.5 jspdf: specifier: ^3.0.1 -<<<<<<< HEAD version: 3.0.1 -======= - version: 3.0.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 leaflet: specifier: ^1.9.4 version: 1.9.4 @@ -448,23 +262,15 @@ importers: version: 2.30.1 next: specifier: ^14.2.3 -<<<<<<< HEAD version: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) next-intl: specifier: ^3.19.1 version: 3.26.3(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) -======= - version: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - next-intl: - specifier: ^3.19.1 - version: 3.26.5(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 next-themes: specifier: ^0.3.0 version: 0.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) nextra: specifier: ^2.13.4 -<<<<<<< HEAD version: 2.13.4(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) nextra-theme-docs: specifier: ^2.13.4 @@ -472,25 +278,12 @@ importers: qs: specifier: ^6.13.1 version: 6.13.1 -======= - version: 2.13.4(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - nextra-theme-docs: - specifier: ^2.13.4 - version: 2.13.4(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(nextra@2.13.4(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - qs: - specifier: ^6.13.1 - version: 6.14.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: specifier: ^18 version: 18.3.1 react-apexcharts: specifier: ^1.7.0 -<<<<<<< HEAD version: 1.7.0(apexcharts@4.7.0)(react@18.3.1) -======= - version: 1.8.0(apexcharts@4.7.0)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-audio-player: specifier: ^0.17.0 version: 0.17.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -499,21 +292,13 @@ importers: version: 2.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-chartjs-2: specifier: ^5.2.0 -<<<<<<< HEAD version: 5.2.0(chart.js@4.5.0)(react@18.3.1) -======= - version: 5.3.0(chart.js@4.5.1)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-cssfx-loading: specifier: ^2.1.0 version: 2.1.0(csstype@3.1.3)(react@18.3.1) react-datepicker: specifier: ^7.5.0 -<<<<<<< HEAD version: 7.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 7.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-day-picker: specifier: ^8.10.1 version: 8.10.1(date-fns@3.6.0)(react@18.3.1) @@ -522,17 +307,12 @@ importers: version: 18.3.1(react@18.3.1) react-dropzone: specifier: ^14.2.3 -<<<<<<< HEAD version: 14.3.5(react@18.3.1) -======= - version: 14.3.8(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-geocode: specifier: ^0.2.3 version: 0.2.3 react-hook-form: specifier: ^7.52.1 -<<<<<<< HEAD version: 7.54.2(react@18.3.1) react-hot-toast: specifier: ^2.4.1 @@ -540,15 +320,6 @@ importers: react-icons: specifier: ^5.3.0 version: 5.4.0(react@18.3.1) -======= - version: 7.65.0(react@18.3.1) - react-hot-toast: - specifier: ^2.4.1 - version: 2.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react-icons: - specifier: ^5.3.0 - version: 5.5.0(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-leaflet: specifier: ^4.2.1 version: 4.2.1(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -560,23 +331,15 @@ importers: version: 1.8.1(react@18.3.1) react-player: specifier: ^2.16.0 -<<<<<<< HEAD version: 2.16.0(react@18.3.1) react-resizable-panels: specifier: ^2.0.19 version: 2.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 2.16.1(react@18.3.1) - react-resizable-panels: - specifier: ^2.0.19 - version: 2.1.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-responsive: specifier: ^10.0.1 version: 10.0.1(react@18.3.1) react-select: specifier: ^5.8.3 -<<<<<<< HEAD version: 5.9.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-syntax-highlighter: specifier: ^15.5.0 @@ -584,15 +347,6 @@ importers: react-time-picker: specifier: ^7.0.0 version: 7.0.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - version: 5.10.2(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react-syntax-highlighter: - specifier: ^15.5.0 - version: 15.6.6(react@18.3.1) - react-time-picker: - specifier: ^7.0.0 - version: 7.0.0(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 recharts: specifier: ^2.15.3 version: 2.15.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -601,23 +355,15 @@ importers: version: 1.1.2 sanitize-html: specifier: ^2.14.0 -<<<<<<< HEAD version: 2.14.0 shadcn: specifier: ^2.3.0 version: 2.3.0(typescript@5.7.2) -======= - version: 2.17.0 - shadcn: - specifier: ^2.3.0 - version: 2.10.0(@types/node@20.19.23)(typescript@5.9.3) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 sharp: specifier: ^0.33.4 version: 0.33.5 sonner: specifier: ^1.5.0 -<<<<<<< HEAD version: 1.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) sweetalert2: specifier: ^11.10.5 @@ -628,34 +374,15 @@ importers: swiper: specifier: ^11.1.15 version: 11.1.15 -======= - version: 1.7.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - sweetalert2: - specifier: ^11.10.5 - version: 11.26.3 - sweetalert2-react-content: - specifier: ^5.0.7 - version: 5.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sweetalert2@11.26.3) - swiper: - specifier: ^11.1.15 - version: 11.2.10 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tailwind-merge: specifier: ^2.5.5 version: 2.6.0 tailwindcss-animate: specifier: ^1.0.7 -<<<<<<< HEAD version: 1.0.7(tailwindcss@3.4.17) tus-js-client: specifier: ^4.2.3 version: 4.2.3 -======= - version: 1.0.7(tailwindcss@3.4.18) - tus-js-client: - specifier: ^4.2.3 - version: 4.3.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 use-places-autocomplete: specifier: ^4.0.1 version: 4.0.1(react@18.3.1) @@ -664,7 +391,6 @@ importers: version: 13.0.0 vaul: specifier: ^0.9.1 -<<<<<<< HEAD version: 0.9.9(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) wavesurfer.js: specifier: ^7.8.16 @@ -675,25 +401,12 @@ importers: zod: specifier: ^3.23.8 version: 3.24.1 -======= - version: 0.9.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - wavesurfer.js: - specifier: ^7.8.16 - version: 7.11.0 - yup: - specifier: ^1.6.1 - version: 1.7.1 - zod: - specifier: ^3.23.8 - version: 3.25.76 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 devDependencies: '@dnd-kit/utilities': specifier: ^3.2.2 version: 3.2.2(react@18.3.1) '@next/bundle-analyzer': specifier: ^15.0.3 -<<<<<<< HEAD version: 15.1.2 '@testing-library/jest-dom': specifier: ^6.6.3 @@ -710,56 +423,24 @@ importers: '@types/geojson': specifier: ^7946.0.15 version: 7946.0.15 -======= - version: 15.5.6 - '@testing-library/jest-dom': - specifier: ^6.6.3 - version: 6.9.1 - '@testing-library/react': - specifier: ^16.3.0 - version: 16.3.0(@testing-library/dom@10.4.1)(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@testing-library/user-event': - specifier: ^14.6.1 - version: 14.6.1(@testing-library/dom@10.4.1) - '@types/d3-shape': - specifier: ^3.1.6 - version: 3.1.7 - '@types/geojson': - specifier: ^7946.0.15 - version: 7946.0.16 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/jest': specifier: ^30.0.0 version: 30.0.0 '@types/jquery': specifier: ^3.5.32 -<<<<<<< HEAD version: 3.5.32 '@types/leaflet': specifier: ^1.9.12 version: 1.9.15 -======= - version: 3.5.33 - '@types/leaflet': - specifier: ^1.9.12 - version: 1.9.21 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/minimatch': specifier: ^5.1.2 version: 5.1.2 '@types/node': specifier: ^20 -<<<<<<< HEAD version: 20.17.10 '@types/react': specifier: ^18.3.13 version: 18.3.18 -======= - version: 20.19.23 - '@types/react': - specifier: ^18.3.13 - version: 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/react-geocode': specifier: ^0.2.4 version: 0.2.4 @@ -777,7 +458,6 @@ importers: version: 8.57.1 eslint-config-next: specifier: 14.2.3 -<<<<<<< HEAD version: 14.2.3(eslint@8.57.1)(typescript@5.7.2) jest: specifier: ^30.0.4 @@ -799,62 +479,30 @@ packages: '@adobe/css-tools@4.4.3': resolution: {integrity: sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA==} -======= - version: 14.2.3(eslint@8.57.1)(typescript@5.9.3) - jest: - specifier: ^30.0.4 - version: 30.2.0(@types/node@20.19.23)(babel-plugin-macros@3.1.0) - jest-environment-jsdom: - specifier: ^30.0.4 - version: 30.2.0 - postcss: - specifier: ^8 - version: 8.5.6 - tailwindcss: - specifier: ^3.4.1 - version: 3.4.18 - typescript: - specifier: ^5 - version: 5.9.3 - -packages: - - '@adobe/css-tools@4.4.4': - resolution: {integrity: sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@alloc/quick-lru@5.2.0': resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==} engines: {node: '>=10'} -<<<<<<< HEAD '@ampproject/remapping@2.3.0': resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} '@antfu/ni@0.21.12': resolution: {integrity: sha512-2aDL3WUv8hMJb2L3r/PIQWsTLyq7RQr3v9xD16fiz6O8ys1xEyLhhTOv8gxtZvJiTzjTF5pHoArvRdesGL1DMQ==} -======= - '@antfu/ni@23.3.1': - resolution: {integrity: sha512-C90iyzm/jLV7Lomv2UzwWUzRv9WZr1oRsFRKsX5HjQL4EXrbi9H/RtBkjCP+NF+ABZXUKpAa4F1dkoTaea4zHg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hasBin: true '@asamuzakjp/css-color@3.2.0': resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==} -<<<<<<< HEAD '@babel/code-frame@7.26.2': resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} engines: {node: '>=6.9.0'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@babel/code-frame@7.27.1': resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/compat-data@7.26.8': resolution: {integrity: sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==} engines: {node: '>=6.9.0'} @@ -889,35 +537,14 @@ packages: '@babel/helper-compilation-targets@7.26.5': resolution: {integrity: sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==} -======= - '@babel/compat-data@7.28.4': - resolution: {integrity: sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==} - engines: {node: '>=6.9.0'} - - '@babel/core@7.28.4': - resolution: {integrity: sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==} - engines: {node: '>=6.9.0'} - - '@babel/generator@7.28.3': - resolution: {integrity: sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-annotate-as-pure@7.27.3': - resolution: {integrity: sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} '@babel/helper-compilation-targets@7.27.2': resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/helper-create-class-features-plugin@7.25.9': resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==} -======= - '@babel/helper-create-class-features-plugin@7.28.3': - resolution: {integrity: sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -926,35 +553,24 @@ packages: resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/helper-member-expression-to-functions@7.25.9': resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==} engines: {node: '>=6.9.0'} '@babel/helper-module-imports@7.25.9': resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} -======= - '@babel/helper-member-expression-to-functions@7.27.1': - resolution: {integrity: sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} '@babel/helper-module-imports@7.27.1': resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/helper-module-transforms@7.26.0': resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} -======= - '@babel/helper-module-transforms@7.28.3': - resolution: {integrity: sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 -<<<<<<< HEAD '@babel/helper-module-transforms@7.27.3': resolution: {integrity: sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==} engines: {node: '>=6.9.0'} @@ -967,67 +583,46 @@ packages: '@babel/helper-plugin-utils@7.26.5': resolution: {integrity: sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==} -======= - '@babel/helper-optimise-call-expression@7.27.1': - resolution: {integrity: sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} '@babel/helper-plugin-utils@7.27.1': resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/helper-replace-supers@7.26.5': resolution: {integrity: sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==} -======= - '@babel/helper-replace-supers@7.27.1': - resolution: {integrity: sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 -<<<<<<< HEAD '@babel/helper-skip-transparent-expression-wrappers@7.25.9': resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==} engines: {node: '>=6.9.0'} '@babel/helper-string-parser@7.25.9': resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} -======= - '@babel/helper-skip-transparent-expression-wrappers@7.27.1': - resolution: {integrity: sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} '@babel/helper-string-parser@7.27.1': resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/helper-validator-identifier@7.25.9': resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} engines: {node: '>=6.9.0'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@babel/helper-validator-identifier@7.27.1': resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/helper-validator-option@7.25.9': resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} engines: {node: '>=6.9.0'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@babel/helper-validator-option@7.27.1': resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/helpers@7.26.7': resolution: {integrity: sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==} engines: {node: '>=6.9.0'} @@ -1048,14 +643,6 @@ packages: '@babel/parser@7.28.0': resolution: {integrity: sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==} -======= - '@babel/helpers@7.28.4': - resolution: {integrity: sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.28.4': - resolution: {integrity: sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.0.0'} hasBin: true @@ -1144,33 +731,24 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@babel/plugin-syntax-typescript@7.25.9': resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@babel/plugin-syntax-typescript@7.27.1': resolution: {integrity: sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@babel/plugin-transform-typescript@7.26.8': resolution: {integrity: sha512-bME5J9AC8ChwA7aEPJ6zym3w7aObZULHhbNLU0bKUhKsAkylkzUdq+0kdymh9rzi8nlNFl2bmldFBCKNJBUpuw==} -======= - '@babel/plugin-transform-typescript@7.28.0': - resolution: {integrity: sha512-4AEiDEBPIZvLQaWlc9liCavE0xRM0dNca41WtBeM3jgFptfUOSG9z0uteLhq6+3rq+WB6jIvUwKDTpXEHPJ2Vg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@babel/runtime@7.26.0': resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==} engines: {node: '>=6.9.0'} @@ -1185,17 +763,12 @@ packages: '@babel/template@7.26.8': resolution: {integrity: sha512-iNKaX3ZebKIsCvJ+0jd6embf+Aulaa3vNBqZ41kM7iTWjx5qzWKXGHiJUW3+nTpQ18SG11hdF8OAzKrpXkb96Q==} -======= - '@babel/runtime@7.28.4': - resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} '@babel/template@7.27.2': resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/traverse@7.26.4': resolution: {integrity: sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==} engines: {node: '>=6.9.0'} @@ -1218,14 +791,6 @@ packages: '@babel/types@7.28.1': resolution: {integrity: sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==} -======= - '@babel/traverse@7.28.4': - resolution: {integrity: sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==} - engines: {node: '>=6.9.0'} - - '@babel/types@7.28.4': - resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.9.0'} '@bcoe/v8-coverage@0.2.3': @@ -1234,57 +799,33 @@ packages: '@braintree/sanitize-url@6.0.4': resolution: {integrity: sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==} -<<<<<<< HEAD '@ckeditor/ckeditor5-adapter-ckfinder@46.0.0': resolution: {integrity: sha512-Y5OrOyHHgnjA9ferph822U9eJdWqIFbPoRpUTcs/kXWKmQBCvAqPOoGJGAz6O9TCZoGUqjK71eVKV0jSnSo22A==} -======= - '@ckeditor/ckeditor5-adapter-ckfinder@47.1.0': - resolution: {integrity: sha512-h/ClAZBbqz0q5332OPLCQXBOx5EH3GHykJrGAK2+Wtx3CuhzJV+RhgEj3KLMQ2SaAR4DaLKamzCAiR2jIH6Y6Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-alignment@41.3.1': resolution: {integrity: sha512-fGkaJGWyr4biahyy2YiRjVqGy9Uqzm4MjkrqDdq99TLr8bM7PjIFOiRkVwz5MZRbs2V87ynmm46v6B/KQ0g8ew==} -<<<<<<< HEAD '@ckeditor/ckeditor5-alignment@46.0.0': resolution: {integrity: sha512-GNyqLCASALv9hygMfj0lvsl2WAMbOLNcezjjlapYYiZDJSWrxWkYI8Sl+GojjWYyIovwBaGHwJM1IDYKB3mMgw==} -======= - '@ckeditor/ckeditor5-alignment@47.1.0': - resolution: {integrity: sha512-oE6PLT5MRBayw87jOv5DgR0p6TU7mX18MJkaGEz98vuLW3npo1GEdkBtw72+05FwkKr2QCCZUZpg12DTf9Mc/g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-autoformat@41.3.1': resolution: {integrity: sha512-0QklAfIeUxo/gfuGT9rC0WhDuqTbpcfvinkJOH7fcqcu81TB4WqLjI1qfXL9In6uih8c39te2x74yZZ+f/M4iQ==} -<<<<<<< HEAD '@ckeditor/ckeditor5-autoformat@46.0.0': resolution: {integrity: sha512-/PU0QlSKHTemYzELG1cQWn7GQ2AYKb3+pSvM3sTgxYkel00KZcmmh0Nl18nyJrlKqn7xKAqEg8XwjsF17I/fJA==} '@ckeditor/ckeditor5-autosave@46.0.0': resolution: {integrity: sha512-xIaLvCg6ijac41UyPMIfBvS1Gc1u9Y4OcvGln3GCskdFVyjNhHOe4p8yaTavwJ78Dc+59zDIP0rGV8AYWFhyYA==} -======= - '@ckeditor/ckeditor5-autoformat@47.1.0': - resolution: {integrity: sha512-vnP5CNEDriVgFwUVocXyQ++yGrJnkp8V5YCQZv76nZPSed02soL62MRm6M9A4GOAXpEJMe7d5NWom73ieRfcVA==} - - '@ckeditor/ckeditor5-autosave@47.1.0': - resolution: {integrity: sha512-3wjI/RNSgXZhG4RMTwl/LByaZyHLV+cixKN0hRqkjULj/i0H05A4Gu485v62FDwBlil1NhPTfKyrmiM/N/7n8g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-basic-styles@41.3.1': resolution: {integrity: sha512-vr0UR5JdQtHUhXFVF+7yebaQ/iEugmXIH2eC+pC5BNJuBwuFt1Hxt6U6qRh7f7ve4UFBky3MZ84lGuGsheirCA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-basic-styles@46.0.0': resolution: {integrity: sha512-i56SO1n0Xuclhel4Ol362khimK9NQFv4NEcnP058b7JK7JXVDZlyyNHh+J8nTALWokmoLPvj823/2F4yKC8oRQ==} -======= - '@ckeditor/ckeditor5-basic-styles@47.1.0': - resolution: {integrity: sha512-WxiFFKUlisz8B3ymeBFijshDWmqX649TEA+1nxgjXHr0L0UONCJfBExanrRUJND6AwHIh1n2IIAXwXvYMdqZbw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-block-quote@41.3.1': resolution: {integrity: sha512-iRm6MthhcyRbUpPxjjXhLuZpNGGNnUqp8RurN8rSzX3KcBXKHm/vfxOugk06ebF2FFbP0u5aiL3K7fIniuo2pQ==} -<<<<<<< HEAD '@ckeditor/ckeditor5-block-quote@46.0.0': resolution: {integrity: sha512-ASZM3p0wzg2Q4OMsEFhyyi3mN8EUl02LhOxZ41eKa1H2qtAUi+aIFEYNf69raWZ2tqzLfm0z2wTNROzPa3KCJw==} @@ -1296,57 +837,28 @@ packages: '@ckeditor/ckeditor5-ckfinder@46.0.0': resolution: {integrity: sha512-g7bhFrrlEUi/QbRkGbNRKeeZCrXU7DkLkGsMBypb0m/7hFF0M3XivXNxh9MxrBjIbCyLjnCPXZVL3dLcapHUww==} -======= - '@ckeditor/ckeditor5-block-quote@47.1.0': - resolution: {integrity: sha512-h+p/pFm0wNmozhFZcxxh6DmkGQCE3Jpukju0ovxiPnRO49PN+0cUsdbHuKYtJK6jxLfqwjfdHVOn1m+LyRRmkg==} - - '@ckeditor/ckeditor5-bookmark@47.1.0': - resolution: {integrity: sha512-B7Q0IzaN6iA80B3YkXihXo7gRad5TpKyhTI9x3XvbpCDzO+sBNyOEAy6d6CWmlhQsIZ6mn+hUn2q9N4nACybiw==} - - '@ckeditor/ckeditor5-ckbox@47.1.0': - resolution: {integrity: sha512-DgTxePr5fE7yaQCjaSMlKNf5j38NGjywg9//l7XeVvxLmJJgQrN7G7xaX/vl55H2jGZF0LrM4IyS9mbyfUj1bQ==} - - '@ckeditor/ckeditor5-ckfinder@47.1.0': - resolution: {integrity: sha512-eQPgvW+cSA2p5EVyoJv0NIOYorS5DoAxKdcBcxrKc433yuC7fKsZ1awp5aWJOUOfRzGLAa1WYikR7OKvmTjzYg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-clipboard@41.3.1': resolution: {integrity: sha512-6S7tq6FlnHYZmPACeqdf135Jx2bTKHVY8mHQ+CHC8ZZu0XVm62vVeeSLS2IcdtYmHjf4ced1G7suTUBHlfBCLw==} -<<<<<<< HEAD '@ckeditor/ckeditor5-clipboard@46.0.0': resolution: {integrity: sha512-FNXyYk8lZKCdpOOql8rTGnTyW6eRo07i4jTSb0sCOOc/x3iAfhyw0ckHI11hi7U3cYE0fOf8WZvp2fn0NfsPVg==} -======= - '@ckeditor/ckeditor5-clipboard@47.1.0': - resolution: {integrity: sha512-xxF9TuV6pWfos1okaS20CFTQN1CD3lOSyZXIJ/IodznpF7f9GYzhhvyOYXJO5fH6T8F0BbR5P94gon8QnAMivg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-cloud-services@41.3.1': resolution: {integrity: sha512-24JLTt0d2cKkY7rtl2bKxI7MYZjlwqBLoTgePwBC1EtgRJ/2gd1CM1bMwiKJPgJ34NnLtnV8R/W0yuz5RQjJsA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-cloud-services@46.0.0': resolution: {integrity: sha512-ai1OjKmoWmBK/RY5jUXVFAX92szMrK/UcVcu1QHwYBoBNqxoQajsLyzBd+QUg3Z3AdQCpLEJqabgsfizMyrpiA==} -======= - '@ckeditor/ckeditor5-cloud-services@47.1.0': - resolution: {integrity: sha512-yLH1eTxWMrzF16CFdu/RJAwzcGYaKKS+gQfX3aRjIphtkY9ebnS1SbelP12ZXUBp/vcTguSYjUrPUwnstoadew==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-code-block@41.3.1': resolution: {integrity: sha512-T7krLjLoHanjaW5nYClzGf5TPcSb/Y9B1DWcAmLMUFf8y+1MbYYaK95r7iTyafG0B9bIFafxoKRnMJLVmBWQkA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-code-block@46.0.0': resolution: {integrity: sha512-9rJqjpW/RY/kKCYEWMchTaTuGyMnUHspteBumtFOnwJS6PVaA1uJU5FOAPSFevZx9KzJBoXbehxtZWmUjImLMQ==} -======= - '@ckeditor/ckeditor5-code-block@47.1.0': - resolution: {integrity: sha512-FGQD/B5BXHesqgijjBV3wm4tBDNKMjGodsTPjW++NkezgBgzOWdBnl6svpMns+xjtEVFnhkjA9hQt6vbHevJmA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-core@41.3.1': resolution: {integrity: sha512-h+PgPtCpS2vjO3HbKMYtddRPW+B3AJx9qpixmHJnUZMiFCmRjUZjXATjpi3j+kSQISs4L2Yghq+lsAQxyGHb+A==} -<<<<<<< HEAD '@ckeditor/ckeditor5-core@46.0.0': resolution: {integrity: sha512-Mm5bZVE6i2vcmwaCPvXgNGsVZwgQfb7DZhphWMZD7z4yfCJjqiJ+3ph6ZHtByHLcbUhq1Z8mn8Q+23Y/BVXfhg==} @@ -1355,21 +867,10 @@ packages: '@ckeditor/ckeditor5-editor-balloon@46.0.0': resolution: {integrity: sha512-mDkeX4Lu9NG8gWW1hWPQvR2ZJ7JqKXBfkxRgI7D3PrwrfDyzT2XllfQ31ZjvdUwyUUWyJjIV5AkjsjwWerZHdQ==} -======= - '@ckeditor/ckeditor5-core@47.1.0': - resolution: {integrity: sha512-CKE/cxzyAECL9rXMCTiQfNtIwy8x24zSyjQgU44FB59H/eUksw9FYaDdRgNs/PvW/gdW7JdCPiaOI3m28wYmHg==} - - '@ckeditor/ckeditor5-easy-image@47.1.0': - resolution: {integrity: sha512-V/8nSXle8D/XzC6NSmNatcYoZzy7SXOsNFbLgXN+2gOFguhexmgVagBAiHgGCUpZTNTmkQRTI5VpiI5mfAHt+g==} - - '@ckeditor/ckeditor5-editor-balloon@47.1.0': - resolution: {integrity: sha512-M/d8zWQgGbtQPKAyYOBZdEeDBaQXiXmwUIi1rMULL7IGxQDvfHAHB6T7mu3GU39oay0HkM+LGWnz5GZ8oG7HNw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-editor-classic@41.3.1': resolution: {integrity: sha512-DBP2F0A50BpDwnbCfsz0DBp+NVW7xrXp4lH5SJHax8B58Z1uY1rw/N6Wf2O91tzo5obcUSpoj8WlzIsxDYPd+A==} -<<<<<<< HEAD '@ckeditor/ckeditor5-editor-classic@46.0.0': resolution: {integrity: sha512-o0JLR+7KEydjEuHepkaWbi1VGzocxRik7/LiN60jvzeue48YF3ELtD1czRa5eebuAzh3FSL2r3hfbqpagxGlBg==} @@ -1384,83 +885,40 @@ packages: '@ckeditor/ckeditor5-emoji@46.0.0': resolution: {integrity: sha512-XCvkdcujJQeQbYMR6vGzZeOt11+9Q+BbzPh45BAytqzrWN4ngOpJX+BS6ORiZK4f9EsWPgF3kJgJiLVEJhovvw==} -======= - '@ckeditor/ckeditor5-editor-classic@47.1.0': - resolution: {integrity: sha512-x4aegRral5LTV1kURmjnp/tLSE1nttH+MsVkrVLWJd0j2A0qj88BLSccmY71ybFgMcDKlwJD6kVT0ZNKsvRogw==} - - '@ckeditor/ckeditor5-editor-decoupled@47.1.0': - resolution: {integrity: sha512-rqTmzMot1rjCz3cqtQkVRou8RgVFItRXeCNY0Ljg3aLcAaNcbwYSYSeJtQpMoyhasSh3cCUqyG9PRnfNYpzTNQ==} - - '@ckeditor/ckeditor5-editor-inline@47.1.0': - resolution: {integrity: sha512-By4mi4p7oReWx8SAyUtq7cIhF1BH63DABJLbj7kaT3MsFlMXOp4FheZpGEMFJbOt8jKx9Du1EU/PFWlUeNoPLw==} - - '@ckeditor/ckeditor5-editor-multi-root@47.1.0': - resolution: {integrity: sha512-BjAOWtAOg8g1E8WJoRj73RoRpyTb1nLtHU2AgxLlaYubGcXfokVvyPz4VU2cDTUq3Zg6chjPeRw74ybLmI2LBg==} - - '@ckeditor/ckeditor5-emoji@47.1.0': - resolution: {integrity: sha512-8Kicj1md0PfdGtlUxK0kTrLJncYnrhj7OzVqen42ygxiU3PrZrdSApDBg0a8DVb0Skvjb2GhOcBCN7UZptK7LQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-engine@41.3.1': resolution: {integrity: sha512-Me4cnkCrknDH50db/jPczuhgzaxUhHbkh2gv8N8Ypken9ZnOPvMD9W1gCFFTLaxikpPmBQwk3u1BSjOKk3r6kw==} -<<<<<<< HEAD '@ckeditor/ckeditor5-engine@46.0.0': resolution: {integrity: sha512-kuTPDygXaZkILp2A002zDWEZH1gHd6Pw5UfgF+S9f9wEgA0vPLYi/qbeqLkM6D95JQyAfXYPuEkXq6fZdtoZYQ==} -======= - '@ckeditor/ckeditor5-engine@47.1.0': - resolution: {integrity: sha512-uXlD+UKSb6wC5OBzQm5Sn0PYTYNpa4Jccdk61Z6U9h1lAZI4KV4SU12vRL5XG20bI0PIQvBo7Lhy7Va635kiqw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-enter@41.3.1': resolution: {integrity: sha512-iwhvJpfsutqcv/bf8QPMKhMolb7GtShaOT+UIDW3OXjMZaBKZOTyR8OceijwgBmZeillTaXQq9y2e9lbJd46xg==} -<<<<<<< HEAD '@ckeditor/ckeditor5-enter@46.0.0': resolution: {integrity: sha512-SAGbScUrB1nazw7dXaGuT/S02bmYvnz/AMRxDkjRAXPqCNE6AUgdCr6dDmXREigQjsR01jvhvx1PAZwUgiC8IQ==} -======= - '@ckeditor/ckeditor5-enter@47.1.0': - resolution: {integrity: sha512-Vkm4rPCTrimJ3LcdPPXQZc86Wb920kish6ckXTSkoPPAe9Ef2fVlKZYggWrXBI4VZ6tegTepSFpZiMqa1/a00w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-essentials@41.3.1': resolution: {integrity: sha512-Tr8fIhRith4OVg5yYm8UbbRUjuj15AQ27H3AiwOzRMRr+EYCI07ni5quqBwOMlkOQQ2H9U21gS8mYKqkqU5osw==} -<<<<<<< HEAD '@ckeditor/ckeditor5-essentials@46.0.0': resolution: {integrity: sha512-3YuRFelc0f0oerzdrcDvSsMkKDATAB/Z219mjqize0N2RwUA17CCMCbFnGDWZYRekglRQYLTvxd8LCTCmEjQFA==} '@ckeditor/ckeditor5-find-and-replace@46.0.0': resolution: {integrity: sha512-qGw1rOyGVRKQZR7ogNs0XxUb78SkB0xie3LFWZduFAGOaDhC7+DMx91UuO2+lbEaqgGtg1gffNm4Rce//2WdbA==} -======= - '@ckeditor/ckeditor5-essentials@47.1.0': - resolution: {integrity: sha512-lpXxfBQ7GocQ4klO2GTZYSxJFhymI2WwxaKklI+rh729dcxsIsjih1sXwSLM6kqwPbveF/9WgDBy3I6kqzRmqg==} - - '@ckeditor/ckeditor5-find-and-replace@47.1.0': - resolution: {integrity: sha512-H3c69XM7fLdlnt20gdNSU1fMwA+1yYfboFWQ07PlA8M/D9H7ZKUmBlI846flSssFp1kPLGhPDTryun6c7zERPg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-font@41.3.1': resolution: {integrity: sha512-qyxtAHccuqCwmeVsddJBe9h82Nvcps69Q1Xe3a5JuM9QNfREeZHgfT290Z97sdHt4d9MrrSdHc52f9inlwNtwg==} -<<<<<<< HEAD '@ckeditor/ckeditor5-font@46.0.0': resolution: {integrity: sha512-Eynyqqre6p+X5ZxlojOfbWuUh8dZdjSnm+8m/7lEOwh8rgzEA5QJ4k91x5BFCYT/yMCesvKTv8H39qIjs/J0Qg==} '@ckeditor/ckeditor5-fullscreen@46.0.0': resolution: {integrity: sha512-vus25ec9AyGOVcy9ghUTILz8LLctW7dDP2GhUreCX1FEouue8UgvvrfYYLwim1tI7b1deRcg1zIAENHVhjNLiw==} -======= - '@ckeditor/ckeditor5-font@47.1.0': - resolution: {integrity: sha512-QiKlsqbcMAAlVAoxrBBxe062adBfTfTKHBLJ/VbBMBYszYaWNoG5VJKLQbXnKBVGWD07rE7rXa/vnenCvpT8hQ==} - - '@ckeditor/ckeditor5-fullscreen@47.1.0': - resolution: {integrity: sha512-LSC62HAW2cmThX2bJOPXcUrxy3sULGStj5G//PdTuxz1z6WbPbF4xst1ockHmaRJeoJUcdt89Qv7C0WFl3j4lw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-heading@41.3.1': resolution: {integrity: sha512-WFu/zYXHqJ4Q6UI/IM7/WwmXCwKFVBDhuOeYnlRY1vgmFciaVtrbJW/tECBr+2TBVR4lANvmivWMFDLpN0fW+g==} -<<<<<<< HEAD '@ckeditor/ckeditor5-heading@46.0.0': resolution: {integrity: sha512-fIrmsH4xh3d/QpunSZR3RPR+jybEXBibYwd8EF3ClcpmhhtMRul7BponRVb70a4A4bE+35Pq3Dj+HVV1bn6pIg==} @@ -1478,86 +936,40 @@ packages: '@ckeditor/ckeditor5-icons@46.0.0': resolution: {integrity: sha512-WjE4DWF8tnUgFWmvVZswTQnqpWnwSGIZaG1aq11iHFvzK20O7IzJmKzxS6QxOYFeK+I8+sLzbJEDQeZerZb3Kg==} -======= - '@ckeditor/ckeditor5-heading@47.1.0': - resolution: {integrity: sha512-HD+mWG5W5kk5fE2G9TFP/ktiU1CU8sA6mOyO6epd+0nsSwacTynKJkszgTVsd9HeY6wZopdqTHa1Dun/9wsxPA==} - - '@ckeditor/ckeditor5-highlight@47.1.0': - resolution: {integrity: sha512-K5sO/etY+Nh67r3dsXArPWI5UjOGKQdbS4k5AU30m0vCK9IfGO9BLCUzBnxo6JM91lfOhY96yCqg3zaOU/C0wg==} - - '@ckeditor/ckeditor5-horizontal-line@47.1.0': - resolution: {integrity: sha512-ex+g4L0QvteKHtXGJXMu72wjCrMhQw+mEBWLZm20jLeaPf0eSkQ34ilTRFGwZTw/zfgqy69vMTbVV/SIDiYxvg==} - - '@ckeditor/ckeditor5-html-embed@47.1.0': - resolution: {integrity: sha512-HMfnHzSRrpKDealBWtq3cpvRGZuODBssw7f1paQxML2W/pRLd6eSb/Rc9a0O3DB2/NhXq8Bbl9aDv9ungz+SLg==} - - '@ckeditor/ckeditor5-html-support@47.1.0': - resolution: {integrity: sha512-TBnmlJ1JjMO973Q4A/e+UEv99CMhBezUAdLKqQ3+EztivTEeEb6YV+pmli8HPf7n0DI6UbkU0Kj/mdFUNiIzog==} - - '@ckeditor/ckeditor5-icons@47.1.0': - resolution: {integrity: sha512-2tlGXuQrXiQFxb2U+67kzlkl4/4IlDEt6R+sPQnP+QR7wJNXQnK9zk4M2bc30r91/91iuCjx+AIzKerm0VwFJg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-image@41.3.1': resolution: {integrity: sha512-v8lcXET3TDP/yPKhdUCmIcukMQ6GNdTyVAjkTip5JhVKFv8bFWBp5Xn616L6T+8OeQ6DggF9QVGcskmTiGQv7g==} -<<<<<<< HEAD '@ckeditor/ckeditor5-image@46.0.0': resolution: {integrity: sha512-7NbZB1IrH+2/TJQ07RPqf/o+Qg2PFgtOl0lT8/0nSqCUVbaA5qb2hxoSPB+NGJGeSFRlJEjf0QHMSv6xA2wR8A==} -======= - '@ckeditor/ckeditor5-image@47.1.0': - resolution: {integrity: sha512-BoVwiXD/l0yUxUsF9wLajo5p3b7TKamkKP7wAA/dkCUlWYzvzjQKwLwYoknNf3GgHLYuY5n6iRPvYQGvNsn6hg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-indent@41.3.1': resolution: {integrity: sha512-JYXF/Clfw+j06wt1+qo43n+y3fmVKPSaN5NXzw4a5Rce0dMaWctH53X8KP3tIuOfEzW9xPhsTUQBJI8rsc+f9g==} -<<<<<<< HEAD '@ckeditor/ckeditor5-indent@46.0.0': resolution: {integrity: sha512-DGAHxA5NIe4jQ9mnoTpx6EpXKaHFSbqReZBQfZQakW3ypUOjRbpwrQOIEVtRSADaxRM37KcO6oS8duthqqwNDw==} '@ckeditor/ckeditor5-language@46.0.0': resolution: {integrity: sha512-REricrlKECtJy9E7F6uP+xcYweJU/eCiD5+pHCTosw9/x7XdxwLydwtUosmG9fgvZDeWBEH8SWc9RFCDscPcNQ==} -======= - '@ckeditor/ckeditor5-indent@47.1.0': - resolution: {integrity: sha512-iqYlsdOGsTjuJ+xUx0ee8aAVh9sDPishKx1UHJbwetlPyM1kUADvVNONVBHV5YLgT0M7Bk5/MzGwlyQAuVipxg==} - - '@ckeditor/ckeditor5-language@47.1.0': - resolution: {integrity: sha512-nZJlfefKtf0sWvyQdTB361mQMSGSlYj2WbHV3gpabkgkE/ZCbL/Tr5aCJ2ulQo2/ksL2s7nDHFIWu8UUEeVhbw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-link@41.3.1': resolution: {integrity: sha512-tl+vnEWUKP0cK/4g+KkQt1YujklG9aUb2NxkkF0HSo7/0m6JnKf+1LVwY1OP2702FLCJO1vdC09oY0JDXGmkfg==} -<<<<<<< HEAD '@ckeditor/ckeditor5-link@46.0.0': resolution: {integrity: sha512-R3cCGqgO7FOQJu69yubdoBGaRJ/mK1AB5J4NQXOslNg8us5QIbbL8ZPPbmAY3QtK7w59rJ4eeHJbtAhy28RmWA==} -======= - '@ckeditor/ckeditor5-link@47.1.0': - resolution: {integrity: sha512-8XwnVPnp2GaNzcyXEahDYM8Qjh/qkU/R1VyjMh7EKSnlZOdget/jKXltNNwJpX0ofPMcY0CnvqGGF42gM3Tlcg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-list@41.3.1': resolution: {integrity: sha512-X1PDaqNnQUTlqYgTYASirJuityG25hxthrGlnEvqPZIxivbxDcefWxkBlNXvmnHOy/EUES0cEZ2H0GUr6CPz2g==} -<<<<<<< HEAD '@ckeditor/ckeditor5-list@46.0.0': resolution: {integrity: sha512-TsEUVFFT/MsJ8JLzE4YAmDDB9kImOBx7+pATN5jQJzKB2pgAoEihTytnWni45nEcXOKj8rOf3CvXTl5rVJfl2Q==} '@ckeditor/ckeditor5-markdown-gfm@46.0.0': resolution: {integrity: sha512-uDHTS+VrmUY/bZWDQv/9nOOSMnfLOymAmvQ/oTNPlIZQXxprDU1cH221TxOZpvE0u1SHC3Spomt38Ea6yqzGZw==} -======= - '@ckeditor/ckeditor5-list@47.1.0': - resolution: {integrity: sha512-P18ZXzJcAGoA6+nIoXkZ27/Ny80HCcrH36ay1MwSxsuQKO8S894kEZb+QS/HvePsX2tso+bQsWw4WWBzbLfP2g==} - - '@ckeditor/ckeditor5-markdown-gfm@47.1.0': - resolution: {integrity: sha512-oZh2sUX7VvI24ijosvilRqfrRkmUYdDaKdKxDfH8OBKiLnCPOccAhOMVy2LSBY1yvEEIUe2yq79nTC3i0uUkdg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-media-embed@41.3.1': resolution: {integrity: sha512-3yXePmVPR2WmzeT+fj6WotMbEIJ6lYka0aUG02LxZV0oCL5LU8nF1wFIFhk77wrQVlQtjmLVtvaPcSdNIz/+pA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-media-embed@46.0.0': resolution: {integrity: sha512-ZC8JbaWAxGaC7bANYc7ADOKZtHJFHNsftwKWt0xb2mmqox8BpJlEo6o4LYakXcPBI/JgnXawwukDia2KR8Bz+g==} @@ -1569,41 +981,18 @@ packages: '@ckeditor/ckeditor5-page-break@46.0.0': resolution: {integrity: sha512-zhgqdS9CLdJ46PTsMogudKtxyN2SW+aCEFjvXff56j51kvfY9shUfk6I0O8+ChmslWy8v7nM4QAQVTDJC/vSEw==} -======= - '@ckeditor/ckeditor5-media-embed@47.1.0': - resolution: {integrity: sha512-ZbCYrJpEoKnXFLIwTeCqL6au/irByQq4UhElWFECMUchk3ZlJiSbTrVgrMxtzNdYxvlRGkNIizqPlukt4Xf5ig==} - - '@ckeditor/ckeditor5-mention@47.1.0': - resolution: {integrity: sha512-5Bsf9224WU/ORVoOZnWWqaGA06DTs/+VLQvZhu5qmh17zL1o/JpSA0SrS9mQcf2StCW4HhX89MZhFSLb+2oOvQ==} - - '@ckeditor/ckeditor5-minimap@47.1.0': - resolution: {integrity: sha512-fh3f0WTrULjd8rm/VWhVem/VYJgPjf+h+Zrnu8MeX0DHqRsNINdIUHNtYk2wUbIzQSgGtIVktK0LhLlN/XxRTA==} - - '@ckeditor/ckeditor5-page-break@47.1.0': - resolution: {integrity: sha512-PrCugSPny2icLp/ZKx1r6mkgtP1jJmc+kB4w56Dsmgf1ZorWniI53wmemaTDhIgGwnNfO9CjYdSy8Vb4vyB1ZA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-paragraph@41.3.1': resolution: {integrity: sha512-weRPLyO/1Z8PpU9+lET4gYgJ8adDuCjYiREup81URSuS1DDQ8vb3D29xA+4Ov7lwg8BaNAMCpTBdp07GHHzv6w==} -<<<<<<< HEAD '@ckeditor/ckeditor5-paragraph@46.0.0': resolution: {integrity: sha512-3XCJTzFBGv1G6ZS2zQ8QVfX6waBXW08cvFi7F6hhK44OZYllTgW0l9jpR1TnmcC3VokNa4LQrC1fn/J5Hk8fBQ==} -======= - '@ckeditor/ckeditor5-paragraph@47.1.0': - resolution: {integrity: sha512-B1tY1+kEncLFrGoD3YkpJIMNFSQvB4t8SVSei6+upD3YGkyf/VhmtYlnqBLRK2znQTlg76EJJcWlGv9zCJ9edw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-paste-from-office@41.3.1': resolution: {integrity: sha512-bvDNGQXIUVCiAgmIcvnOw461XWAG8lscQrJaZFXNfayJJah73zvDbOJDkv5hm/N/jYaPTsTnSv1jg5xM9XqfCw==} -<<<<<<< HEAD '@ckeditor/ckeditor5-paste-from-office@46.0.0': resolution: {integrity: sha512-8GaHLbcuG26xPiGtp25yoYqB0wy+0IgDZqSW2m6rM3DsMHrFWilufwArp/9wExTBjeKgdbsgv6BP0RFEA1oXcg==} -======= - '@ckeditor/ckeditor5-paste-from-office@47.1.0': - resolution: {integrity: sha512-+96rw8TkId8o/im4zvq2EtdDzHHaP/+29PMcJ5ACmvq32tJgFsLCyo10asEWV+U/SiWUHNKBPgGLJeh/MdzlAw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-react@6.3.0': resolution: {integrity: sha512-yfVc8L+o1U63qljyOJVSV+O+2C2+hOjNAf7Qabi8AF4gvsPib82efVDlmvnNJB4Ka11owysQ5MAHpP8I0c7lIA==} @@ -1616,41 +1005,24 @@ packages: '@ckeditor/ckeditor5-watchdog': '>=41.3.1' react: ^16.13.1 || ^17.0.0 || ^18.0.0 -<<<<<<< HEAD '@ckeditor/ckeditor5-remove-format@46.0.0': resolution: {integrity: sha512-bOSzTlhTk8TAvSt7C+yNrS531y/D2ghoFhyexhBb2JU+TAeNXkuyuTSxFc9luWIZf2AKvWe4hU3yyVDIlXT9Bg==} '@ckeditor/ckeditor5-restricted-editing@46.0.0': resolution: {integrity: sha512-euhQ57RfJFJzRP9SseV4sqWsXY9WRQobCaiW1ENxnwEa4FxmnDiLElR6xZ9jimrG5bN3ldbedjJ79mhKp9VMhA==} -======= - '@ckeditor/ckeditor5-remove-format@47.1.0': - resolution: {integrity: sha512-JShEW29roO0PyQKBCDUS6cACGuYWxnUhCRcBt+DFUhS5t51XPpDXasdYfGfeUJ9DeNL/0iPjKtQxcGUoMa5NtQ==} - - '@ckeditor/ckeditor5-restricted-editing@47.1.0': - resolution: {integrity: sha512-vEBZKc3vkvFKOVfPn56Wl76YPCn73QmkkUMLGN2tf2ntvSoVEmlk+HTWaXYRG8bsbj2JtdijgW3wckCvNRW8ow==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-select-all@41.3.1': resolution: {integrity: sha512-a/LAPO+O9fwHjQ/8s3UNtyrqQRieAnpnPw2IhLlGqOS7nxPKMR2vkb6WnG2LUdO+wYqkCzxUDpBlfVkjkQEI0w==} -<<<<<<< HEAD '@ckeditor/ckeditor5-select-all@46.0.0': resolution: {integrity: sha512-6SvSkYuwZRJuTy/HwQUGh3HpkxkCkEq8Yfew6YWuwulRUgKwMrD4F9R6ZUqDCornTpP+o6p9UrseSFn/3sgxwQ==} '@ckeditor/ckeditor5-show-blocks@46.0.0': resolution: {integrity: sha512-hhOANTwo6XC1Y59/O8q+XAh+dqokhMov6/HLeuZ0uxVCuryDQxXh+C1lU6rjFG9EKW0zUoQPViLkOAbx/Nm4xQ==} -======= - '@ckeditor/ckeditor5-select-all@47.1.0': - resolution: {integrity: sha512-3k7TgWjcx7FFm0t6bS8Uc6YOhqehf815SsmtFN+JISoL9Ojm1yqLEUOOYuYPy0Voed70Mk2HBQvdEnuP9m6X1g==} - - '@ckeditor/ckeditor5-show-blocks@47.1.0': - resolution: {integrity: sha512-8ogD671z7j2DwlOa1W0KX7jcorTHbrLxqLYtiCeJljJv/sfHMtzfXc8PL81eiKDfSZwoNY2k5pwTWPyv30MRAg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-source-editing@41.3.1': resolution: {integrity: sha512-NoFQGZHAIQkJ4W/zJwZmKe5W5zEW72pfaDuX78BpecuUcgg+LWmaGemjOU56Y3o7rUwPoXRONQs3jZM/NuKhSw==} -<<<<<<< HEAD '@ckeditor/ckeditor5-source-editing@46.0.0': resolution: {integrity: sha512-TRIgm1vjSerGfuiOg50/+WNXzDYUonjZLsxvFP3c9EOpTs8vqXjdQP/VeyK4PG3DgbablMsZOZhSi9ci0IO3xQ==} @@ -1659,109 +1031,58 @@ packages: '@ckeditor/ckeditor5-style@46.0.0': resolution: {integrity: sha512-Cm8jHegh4UG+1309qbs/hf7aIYTyqp4/zbBciW8Mcdrct8d2eeIigWPt54sw2PWz3v5ZsUquH4Y4JupiEXsOOw==} -======= - '@ckeditor/ckeditor5-source-editing@47.1.0': - resolution: {integrity: sha512-/UzbN04b3gK4FdY9nS6bdmh1KlkhHTOglCnvKDlx6XvC+E6qW2OzfU7D1b/k7sINSmVRGkt5L2NuZCHeAgX2/Q==} - - '@ckeditor/ckeditor5-special-characters@47.1.0': - resolution: {integrity: sha512-r/FW9Xz589nLcr5pXOyhCPNLQp7XkjR17PgHTgJcQmJuEo396UTvoPz7eBfGkCDMjINmZj1cTNdJSL7/Xpqk5g==} - - '@ckeditor/ckeditor5-style@47.1.0': - resolution: {integrity: sha512-Mt40tqRfgebkbHVXq+8nD19gyIsNgnITiQoT+tFZynSlQieaifDo+9D3Aq70KdrxlHW4Muw5ryYe14Xy7Y+rwA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-table@41.3.1': resolution: {integrity: sha512-Lx2xnWdeuiekXOuRERjvf1I3zhTZwK/IRna9FgTW/ldj6rBH9fVqhY+z/Y/nIpI1LgWee3R0DWZBGXgj1QNFcQ==} -<<<<<<< HEAD '@ckeditor/ckeditor5-table@46.0.0': resolution: {integrity: sha512-N51XBgCWsxrjMJaw9DNuCF9oYhdQgSRhtDsEhY8Q9+VYdtfSxEcjtLpzlUT2/GIwrZKWeFWuJeB3sba/jdfP1w==} -======= - '@ckeditor/ckeditor5-table@47.1.0': - resolution: {integrity: sha512-49g66He4BFzfh/8m23BBhfxk/0FnJnEZ07SiQBWdAMfZSFubTz0/tCm38imf79h4bawUcaLSGP+UJBc6x/gg4w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-theme-lark@41.3.1': resolution: {integrity: sha512-0LXHU6vmlN3aEYFFnNG1teGdC0t6UbcxcwyTW3db4D6vFDAd1S1bBH/Vz9HdUKGWuEmB3IdKj6fgixt2e3qJmA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-theme-lark@46.0.0': resolution: {integrity: sha512-gaztcvUQ6KAbNTB1efkciEWwesJIp9CjIM91nOBj72eR5/xZKM+aTbLdiciVFSgB1Ma1qCU3DvQ1vafACO93qQ==} -======= - '@ckeditor/ckeditor5-theme-lark@47.1.0': - resolution: {integrity: sha512-gUAPApFbsViLKGgwHtCLigBYziFUmXDBa9UFmZUNSTZPWpTz/uxOOhwjrQvGqwAH/0W9pKR5TsxWaE2sJZaJPQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-typing@41.3.1': resolution: {integrity: sha512-4Oeafc3if6fTITOest1ILQ573fnkzE9/tn5eNm3zWnHVYR79mRCYxaha9yUlKVQiqaxZ48EVo2FjHiouXmn9+Q==} -<<<<<<< HEAD '@ckeditor/ckeditor5-typing@46.0.0': resolution: {integrity: sha512-xeFrXEpzo9T/bLaIwHtYDSSPb5KYA2eiYPVWxivw3VEs6gDfHhRz7EZEZ9OhnjNBQYhiyLgKaX+3di72sqrbhA==} -======= - '@ckeditor/ckeditor5-typing@47.1.0': - resolution: {integrity: sha512-teg0UA6AWEMraXAsXYB8372ogIXfFaakOv6Vz8ppIsuKPZfHKJC5ixUd+oUzk03nv3QdtalQAALY8I8dnwl6dQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-ui@41.3.1': resolution: {integrity: sha512-xN7OAiRp7ALKYXUp6Qe/AjkjrhyLuoz9nxq7Jdsnsyb/XXfsXDloMcOuvNRoUgr4gIFHMOoZZxsIn8qegBvcYA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-ui@46.0.0': resolution: {integrity: sha512-VMdUOK42l+b/rHUctXv0WOMbvcqWXM8kglxZ1paAzWBWhhy1cp2Q6VW21w23VSmmwNA110xPKTcKlkC09bniDA==} -======= - '@ckeditor/ckeditor5-ui@47.1.0': - resolution: {integrity: sha512-fV/9LPGZgnWBFQcHq29idZI34OZoO5ej72asf0X+A2rMgdCrHPlVeVwiy6THLRE5CFn9qdramYB27eESxOPi6A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-undo@41.3.1': resolution: {integrity: sha512-PElWTnlIwuQ94mvdhuH7Mno99oocSnOWPMHi9UuWe6+zVgznQwn0f0diBZvX3l5y8hFgK6q/pQ/CCmbvvYnovA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-undo@46.0.0': resolution: {integrity: sha512-MoLU8c/ip7KVByKZT8fVXSP7ZzxwXu4Rxk/T91rHcxR2BLa93fyS3M9v6oXmww9fI9enGVPw2LD+yESXYJMOiQ==} -======= - '@ckeditor/ckeditor5-undo@47.1.0': - resolution: {integrity: sha512-e+GyEZLlx2LhHbaegWri3p1zgX6fjvQH7fzmFG2NZ5h1bgbsCW/+vHv5/r9cwU2/SudJqOeoQRXGQ8PHBp6/ZA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-upload@41.3.1': resolution: {integrity: sha512-ugTgGEgA9qsSl5+qptTmawdfYaONr6b3uTG4byZ76JMdf0qiniZjBF/TtGAVmBkCipcVWFoaZKteiz0fhQMHjA==} -<<<<<<< HEAD '@ckeditor/ckeditor5-upload@46.0.0': resolution: {integrity: sha512-GPRctyLpktYgV00C71R31leUM7rZchEqdvGK+EJfmx8qWkzuKSXLN8HJ9rhjgFf8D49eQm506sH5lek9+HZA0w==} -======= - '@ckeditor/ckeditor5-upload@47.1.0': - resolution: {integrity: sha512-JP6Ao5xbNPoxKv4zWgYbVBA6u8CmOSkvLYp+P3+i4MCcwva4NH/dKwJL+Wqk8XxZ8eavhXNgMGs22Oqq2v18/Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-utils@41.3.1': resolution: {integrity: sha512-jJu9ndn6Y7+ffBYdDCRXX7OnV9Ddgms2HSF1pmhjZN0uoL96XworuUOn8hx3Zs/KBPjJEwbtYWJMjG9aohrgaQ==} -<<<<<<< HEAD '@ckeditor/ckeditor5-utils@46.0.0': resolution: {integrity: sha512-wql+hSp29EMMhQlj0oXHiOOzD4ZTvRrI7801WtFjfiSldmIJAyIiF4zLFiRoB5+pGbt+AQB76VAdqFjz43AkuA==} -======= - '@ckeditor/ckeditor5-utils@47.1.0': - resolution: {integrity: sha512-tx2AHkx8dqVp4YKieGbNmSZy88ekmsMIQyHMD04n6oMFz16a3mmqFCm9WJRpTaNvniGKh6TCxA48Kf2zwn7EmQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-watchdog@41.3.1': resolution: {integrity: sha512-iDwdYxC8euSKxfRq4y5vVOX9GVUbEbC9z6glkXpxa1BogqYh39+fywjt+s4o3Ub3b8FJ/EUYuNc+/vK+CzEg4g==} -<<<<<<< HEAD '@ckeditor/ckeditor5-watchdog@46.0.0': resolution: {integrity: sha512-p6lNeUsuWkJ9lJ/59TkCOUrOhUxcB2NGm3sGsG3qHSB/I6W6jjW3r7ZZah/z3Ysy0ImkHLQX0WlFDlw7E6EnSw==} -======= - '@ckeditor/ckeditor5-watchdog@47.1.0': - resolution: {integrity: sha512-3cK0GKi8Et3dHln1E36Wmk30SzgLd2dgWDGaNUvfygQT9hBeKnWZ//cp/ZlBwbfEwJth/jAlcXUHsFR9T2Uwjw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-widget@41.3.1': resolution: {integrity: sha512-rdBxGS3bxWNhp+yxyBYkcbRV6/mdTDab+konDVhZ/ME1jVZ5cf8OBZcgHUqAxzuWt4XMEdzKINbo1OnSDwApUg==} -<<<<<<< HEAD '@ckeditor/ckeditor5-widget@46.0.0': resolution: {integrity: sha512-NhTtCkkZQNzKHPtUvN5ukOUfwI3rop0Zdo9QxfKFcrSc5B7a9+YLX70lyPzp6loUypy9N9XP4qvvjBUXg64UMw==} @@ -1770,16 +1091,6 @@ packages: '@csstools/color-helpers@5.0.2': resolution: {integrity: sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==} -======= - '@ckeditor/ckeditor5-widget@47.1.0': - resolution: {integrity: sha512-S04Ry1eVMyLV7yyc8bpmAY/7/bmD8FsrV5Gfk3ftL+voJi0+3B1WmptOcpkyiCC5PbbgjNX3f0NPYufEjjPNtQ==} - - '@ckeditor/ckeditor5-word-count@47.1.0': - resolution: {integrity: sha512-e9sx/EUONwbdZFGU6bcJmrLMw18Fugecs3LiMQVVoVrFpMEywPhzzeRZUN6XX70qPXWHkDRQRnNSQXqhJ2lpxg==} - - '@csstools/color-helpers@5.1.0': - resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=18'} '@csstools/css-calc@2.1.4': @@ -1789,13 +1100,8 @@ packages: '@csstools/css-parser-algorithms': ^3.0.5 '@csstools/css-tokenizer': ^3.0.4 -<<<<<<< HEAD '@csstools/css-color-parser@3.0.10': resolution: {integrity: sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==} -======= - '@csstools/css-color-parser@3.1.0': - resolution: {integrity: sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=18'} peerDependencies: '@csstools/css-parser-algorithms': ^3.0.5 @@ -1843,7 +1149,6 @@ packages: peerDependencies: react: '>=16.8.0' -<<<<<<< HEAD '@emnapi/core@1.4.5': resolution: {integrity: sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==} @@ -1855,16 +1160,6 @@ packages: '@emnapi/wasi-threads@1.0.4': resolution: {integrity: sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==} -======= - '@emnapi/core@1.6.0': - resolution: {integrity: sha512-zq/ay+9fNIJJtJiZxdTnXS20PllcYMX3OE23ESc4HK/bdYu3cOWYVhsOhVnXALfU/uqJIxn5NBPd9z4v+SfoSg==} - - '@emnapi/runtime@1.6.0': - resolution: {integrity: sha512-obtUmAHTMjll499P+D9A3axeJFlhdjOWdKUNs/U6QIGT7V5RjcUW1xToAzjvmgTSQhDbYn/NwfTRoJcQ2rNBxA==} - - '@emnapi/wasi-threads@1.1.0': - resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@emoji-mart/data@1.2.1': resolution: {integrity: sha512-no2pQMWiBy6gpBEiqGeU77/bFejDqUTRY7KX+0+iur13op3bqUsXdnwoZs6Xb1zbv0gAj5VvS1PWoUUckSr5Dw==} @@ -1916,24 +1211,14 @@ packages: '@emotion/weak-memoize@0.4.0': resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==} -<<<<<<< HEAD '@eslint-community/eslint-utils@4.4.1': resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} -======= - '@eslint-community/eslint-utils@4.9.0': - resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 -<<<<<<< HEAD '@eslint-community/regexpp@4.12.1': resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} -======= - '@eslint-community/regexpp@4.12.2': - resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} '@eslint/eslintrc@2.1.4': @@ -1948,7 +1233,6 @@ packages: resolution: {integrity: sha512-uN8J8KDjADEavPhNva6tYO9Fj0lWs9z82swF3YXnTxWMBoFLGq3LZ6FLlIldRKEzhOBKnkVfA8UnFJuvGvNxcA==} engines: {node: '>=12.16.1'} -<<<<<<< HEAD '@floating-ui/core@1.6.8': resolution: {integrity: sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==} @@ -1957,21 +1241,10 @@ packages: '@floating-ui/react-dom@2.1.2': resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==} -======= - '@floating-ui/core@1.7.3': - resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==} - - '@floating-ui/dom@1.7.4': - resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==} - - '@floating-ui/react-dom@2.1.6': - resolution: {integrity: sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' -<<<<<<< HEAD '@floating-ui/react@0.26.28': resolution: {integrity: sha512-yORQuuAtVpiRjpMhdc0wJj06b9JFjrYF4qp96j++v2NBpbi6SEGF7donUJ3TMieerQ6qVkAv1tgr7L4r5roTqw==} peerDependencies: @@ -2025,64 +1298,6 @@ packages: resolution: {integrity: sha512-61ORr3A148RtxQ2FNG7JKvacyA/TEVZ7z6I+3E9Oeu3dqTf6M928bFcpehRTIK6zIA6Yifs7BeWHgOE9dFnpbw==} peerDependencies: '@fullcalendar/core': ~6.1.15 -======= - '@floating-ui/react@0.27.16': - resolution: {integrity: sha512-9O8N4SeG2z++TSM8QA/KTeKFBVCNEz/AGS7gWPJf6KFRzmRWixFRnCnkPHRDwSVZW6QPDO6uT0P2SpWNKCc9/g==} - peerDependencies: - react: '>=17.0.0' - react-dom: '>=17.0.0' - - '@floating-ui/utils@0.2.10': - resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} - - '@formatjs/ecma402-abstract@2.3.6': - resolution: {integrity: sha512-HJnTFeRM2kVFVr5gr5kH1XP6K0JcJtE7Lzvtr3FS/so5f1kpsqqqxy5JF+FRaO6H2qmcMfAUIox7AJteieRtVw==} - - '@formatjs/fast-memoize@2.2.7': - resolution: {integrity: sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==} - - '@formatjs/icu-messageformat-parser@2.11.4': - resolution: {integrity: sha512-7kR78cRrPNB4fjGFZg3Rmj5aah8rQj9KPzuLsmcSn4ipLXQvC04keycTI1F7kJYDwIXtT2+7IDEto842CfZBtw==} - - '@formatjs/icu-skeleton-parser@1.8.16': - resolution: {integrity: sha512-H13E9Xl+PxBd8D5/6TVUluSpxGNvFSlN/b3coUp0e0JpuWXXnQDiavIpY3NnvSp4xhEMoXyyBvVfdFX8jglOHQ==} - - '@formatjs/intl-localematcher@0.5.10': - resolution: {integrity: sha512-af3qATX+m4Rnd9+wHcjJ4w2ijq+rAVP3CCinJQvFv1kgSu1W6jypUmvleJxcewdxmutM8dmIRZFxO/IQBZmP2Q==} - - '@formatjs/intl-localematcher@0.6.2': - resolution: {integrity: sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA==} - - '@fullcalendar/core@6.1.19': - resolution: {integrity: sha512-z0aVlO5e4Wah6p6mouM0UEqtRf1MZZPt4mwzEyU6kusaNL+dlWQgAasF2cK23hwT4cmxkEmr4inULXgpyeExdQ==} - - '@fullcalendar/daygrid@6.1.19': - resolution: {integrity: sha512-IAAfnMICnVWPjpT4zi87i3FEw0xxSza0avqY/HedKEz+l5MTBYvCDPOWDATpzXoLut3aACsjktIyw9thvIcRYQ==} - peerDependencies: - '@fullcalendar/core': ~6.1.19 - - '@fullcalendar/interaction@6.1.19': - resolution: {integrity: sha512-GOciy79xe8JMVp+1evAU3ytdwN/7tv35t5i1vFkifiuWcQMLC/JnLg/RA2s4sYmQwoYhTw/p4GLcP0gO5B3X5w==} - peerDependencies: - '@fullcalendar/core': ~6.1.19 - - '@fullcalendar/list@6.1.19': - resolution: {integrity: sha512-knZHpAVF0LbzZpSJSUmLUUzF0XlU/MRGK+Py2s0/mP93bCtno1k2L3XPs/kzh528hSjehwLm89RgKTSfW1P6cA==} - peerDependencies: - '@fullcalendar/core': ~6.1.19 - - '@fullcalendar/react@6.1.19': - resolution: {integrity: sha512-FP78vnyylaL/btZeHig8LQgfHgfwxLaIG6sKbNkzkPkKEACv11UyyBoTSkaavPsHtXvAkcTED1l7TOunAyPEnA==} - peerDependencies: - '@fullcalendar/core': ~6.1.19 - react: ^16.7.0 || ^17 || ^18 || ^19 - react-dom: ^16.7.0 || ^17 || ^18 || ^19 - - '@fullcalendar/timegrid@6.1.19': - resolution: {integrity: sha512-OuzpUueyO9wB5OZ8rs7TWIoqvu4v3yEqdDxZ2VcsMldCpYJRiOe7yHWKr4ap5Tb0fs7Rjbserc/b6Nt7ol6BRg==} - peerDependencies: - '@fullcalendar/core': ~6.1.19 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@googlemaps/js-api-loader@1.16.8': resolution: {integrity: sha512-CROqqwfKotdO6EBjZO/gQGVTbeDps5V7Mt9+8+5Q+jTg5CRMi3Ii/L9PmV3USROrt2uWxtGzJHORmByxyo9pSQ==} @@ -2097,13 +1312,8 @@ packages: react: ^16 || ^17 || ^18 react-dom: ^16 || ^17 || ^18 -<<<<<<< HEAD '@hookform/resolvers@3.9.1': resolution: {integrity: sha512-ud2HqmGBM0P0IABqoskKWI6PEf6ZDDBZkFqe2Vnl+mTHCEHzr3ISjjZyCwTjC/qpL25JC9aIDkloQejvMeq0ug==} -======= - '@hookform/resolvers@3.10.0': - resolution: {integrity: sha512-79Dv+3mDF7i+2ajj7SkypSKHhl1cbln1OGavqrsF7p6mbUv11xpqpacPsGDCTRvCSjEEIez2ef1NveSVL3b0Ag==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react-hook-form: ^7.0.0 @@ -2120,13 +1330,8 @@ packages: resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} deprecated: Use @eslint/object-schema instead -<<<<<<< HEAD '@iconify/react@5.1.0': resolution: {integrity: sha512-vj2wzalywy23DR37AnsogMPIkDa1nKEqITjxpH4z44tiLV869Mh7VyydD4/t0yJLEs9tsxlrPWtXvMOe1Lcd5g==} -======= - '@iconify/react@5.2.1': - resolution: {integrity: sha512-37GDR3fYDZmnmUn9RagyaX+zca24jfVOMY8E1IXTqJuE8pxNtN51KWPQe3VODOWvuUurq7q9uUu3CFrpqj5Iqg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: '>=16' @@ -2238,44 +1443,6 @@ packages: cpu: [x64] os: [win32] -<<<<<<< HEAD -======= - '@inquirer/ansi@1.0.1': - resolution: {integrity: sha512-yqq0aJW/5XPhi5xOAL1xRCpe1eh8UFVgYFpFsjEqmIR8rKLyP+HINvFXwUaxYICflJrVlxnp7lLN6As735kVpw==} - engines: {node: '>=18'} - - '@inquirer/confirm@5.1.19': - resolution: {integrity: sha512-wQNz9cfcxrtEnUyG5PndC8g3gZ7lGDBzmWiXZkX8ot3vfZ+/BLjR8EvyGX4YzQLeVqtAlY/YScZpW7CW8qMoDQ==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/core@10.3.0': - resolution: {integrity: sha512-Uv2aPPPSK5jeCplQmQ9xadnFx2Zhj9b5Dj7bU6ZeCdDNNY11nhYy4btcSdtDguHqCT2h5oNeQTcUNSGGLA7NTA==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/figures@1.0.14': - resolution: {integrity: sha512-DbFgdt+9/OZYFM+19dbpXOSeAstPy884FPy1KjDu4anWwymZeOYhMY1mdFri172htv6mvc/uvIAAi7b7tvjJBQ==} - engines: {node: '>=18'} - - '@inquirer/type@3.0.9': - resolution: {integrity: sha512-QPaNt/nmE2bLGQa9b7wwyRJoLZ7pN6rcyXvzU0YCmivmJyq1BVo94G98tStRWkoD1RgDX5C+dPlhhHzNdu/W/w==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -2288,21 +1455,12 @@ packages: resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} engines: {node: '>=8'} -<<<<<<< HEAD '@jest/console@30.0.5': resolution: {integrity: sha512-xY6b0XiL0Nav3ReresUarwl2oIz1gTnxGbGpho9/rbUWsLH0f1OD/VT84xs8c7VmH7MChnLb0pag6PhZhAdDiA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} '@jest/core@30.0.5': resolution: {integrity: sha512-fKD0OulvRsXF1hmaFgHhVJzczWzA1RXMMo9LTPuFXo9q/alDbME3JIyWYqovWsUBWSoBcsHaGPSLF9rz4l9Qeg==} -======= - '@jest/console@30.2.0': - resolution: {integrity: sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/core@30.2.0': - resolution: {integrity: sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -2314,13 +1472,8 @@ packages: resolution: {integrity: sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} -<<<<<<< HEAD '@jest/environment-jsdom-abstract@30.0.5': resolution: {integrity: sha512-gpWwiVxZunkoglP8DCnT3As9x5O8H6gveAOpvaJd2ATAoSh7ZSSCWbr9LQtUMvr8WD3VjG9YnDhsmkCK5WN1rQ==} -======= - '@jest/environment-jsdom-abstract@30.2.0': - resolution: {integrity: sha512-kazxw2L9IPuZpQ0mEt9lu9Z98SqR74xcagANmMBU16X0lS23yPc0+S6hGLUz8kVRlomZEs/5S/Zlpqwf5yu6OQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: canvas: ^3.0.0 @@ -2329,7 +1482,6 @@ packages: canvas: optional: true -<<<<<<< HEAD '@jest/environment@30.0.5': resolution: {integrity: sha512-aRX7WoaWx1oaOkDQvCWImVQ8XNtdv5sEWgk4gxR6NXb7WBUnL5sRak4WRzIQRZ1VTWPvV4VI4mgGjNL9TeKMYA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -2352,43 +1504,14 @@ packages: '@jest/globals@30.0.5': resolution: {integrity: sha512-7oEJT19WW4oe6HR7oLRvHxwlJk2gev0U9px3ufs8sX9PoD1Eza68KF0/tlN7X0dq/WVsBScXQGgCldA1V9Y/jA==} -======= - '@jest/environment@30.2.0': - resolution: {integrity: sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/expect-utils@30.2.0': - resolution: {integrity: sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/expect@30.2.0': - resolution: {integrity: sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/fake-timers@30.2.0': - resolution: {integrity: sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/get-type@30.1.0': - resolution: {integrity: sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/globals@30.2.0': - resolution: {integrity: sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} '@jest/pattern@30.0.1': resolution: {integrity: sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} -<<<<<<< HEAD '@jest/reporters@30.0.5': resolution: {integrity: sha512-mafft7VBX4jzED1FwGC1o/9QUM2xebzavImZMeqnsklgcyxBto8mV4HzNSzUrryJ+8R9MFOM3HgYuDradWR+4g==} -======= - '@jest/reporters@30.2.0': - resolution: {integrity: sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -2400,20 +1523,14 @@ packages: resolution: {integrity: sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} -<<<<<<< HEAD '@jest/snapshot-utils@30.0.5': resolution: {integrity: sha512-XcCQ5qWHLvi29UUrowgDFvV4t7ETxX91CbDczMnoqXPOIcZOxyNdSjm6kV5XMc8+HkxfRegU/MUmnTbJRzGrUQ==} -======= - '@jest/snapshot-utils@30.2.0': - resolution: {integrity: sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} '@jest/source-map@30.0.1': resolution: {integrity: sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} -<<<<<<< HEAD '@jest/test-result@30.0.5': resolution: {integrity: sha512-wPyztnK0gbDMQAJZ43tdMro+qblDHH1Ru/ylzUo21TBKqt88ZqnKKK2m30LKmLLoKtR2lxdpCC/P3g1vfKcawQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -2436,35 +1553,11 @@ packages: '@jridgewell/gen-mapping@0.3.8': resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==} engines: {node: '>=6.0.0'} -======= - '@jest/test-result@30.2.0': - resolution: {integrity: sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/test-sequencer@30.2.0': - resolution: {integrity: sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/transform@30.2.0': - resolution: {integrity: sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jest/types@30.2.0': - resolution: {integrity: sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - '@jridgewell/gen-mapping@0.3.13': - resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} - - '@jridgewell/remapping@2.3.5': - resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@jridgewell/resolve-uri@3.1.2': resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} -<<<<<<< HEAD '@jridgewell/set-array@1.2.1': resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} engines: {node: '>=6.0.0'} @@ -2477,13 +1570,6 @@ packages: '@jridgewell/trace-mapping@0.3.29': resolution: {integrity: sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==} -======= - '@jridgewell/sourcemap-codec@1.5.5': - resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} - - '@jridgewell/trace-mapping@0.3.31': - resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@kurkle/color@0.3.4': resolution: {integrity: sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==} @@ -2496,36 +1582,16 @@ packages: peerDependencies: react: '>=16' -<<<<<<< HEAD '@mui/core-downloads-tracker@6.4.3': resolution: {integrity: sha512-hlyOzo2ObarllAOeT1ZSAusADE5NZNencUeIvXrdQ1Na+FL1lcznhbxfV5He1KqGiuR8Az3xtCUcYKwMVGFdzg==} '@mui/material@6.4.3': resolution: {integrity: sha512-ubtQjplbWneIEU8Y+4b2VA0CDBlyH5I3AmVFGmsLyDe/bf0ubxav5t11c8Afem6rkSFWPlZA2DilxmGka1xiKQ==} -======= - '@modelcontextprotocol/sdk@1.20.1': - resolution: {integrity: sha512-j/P+yuxXfgxb+mW7OEoRCM3G47zCTDqUPivJo/VzpjbG8I9csTXtOprCf5FfOfHK4whOJny0aHuBEON+kS7CCA==} - engines: {node: '>=18'} - - '@mswjs/interceptors@0.40.0': - resolution: {integrity: sha512-EFd6cVbHsgLa6wa4RljGj6Wk75qoHxUSyc5asLyyPSyuhIcdS2Q3Phw6ImS1q+CkALthJRShiYfKANcQMuMqsQ==} - engines: {node: '>=18'} - - '@mui/core-downloads-tracker@7.3.4': - resolution: {integrity: sha512-BIktMapG3r4iXwIhYNpvk97ZfYWTreBBQTWjQKbNbzI64+ULHfYavQEX2w99aSWHS58DvXESWIgbD9adKcUOBw==} - - '@mui/material@7.3.4': - resolution: {integrity: sha512-gEQL9pbJZZHT7lYJBKQCS723v1MGys2IFc94COXbUIyCTWa+qC77a7hUax4Yjd5ggEm35dk4AyYABpKKWC4MLw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 -<<<<<<< HEAD '@mui/material-pigment-css': ^6.4.3 -======= - '@mui/material-pigment-css': ^7.3.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2539,13 +1605,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@mui/private-theming@6.4.3': resolution: {integrity: sha512-7x9HaNwDCeoERc4BoEWLieuzKzXu5ZrhRnEM6AUcRXUScQLvF1NFkTlP59+IJfTbEMgcGg1wWHApyoqcksrBpQ==} -======= - '@mui/private-theming@7.3.3': - resolution: {integrity: sha512-OJM+9nj5JIyPUvsZ5ZjaeC9PfktmK+W5YaVLToLR8L0lB/DGmv1gcKE43ssNLSvpoW71Hct0necfade6+kW3zQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2554,13 +1615,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@mui/styled-engine@6.4.3': resolution: {integrity: sha512-OC402VfK+ra2+f12Gef8maY7Y9n7B6CZcoQ9u7mIkh/7PKwW/xH81xwX+yW+Ak1zBT3HYcVjh2X82k5cKMFGoQ==} -======= - '@mui/styled-engine@7.3.3': - resolution: {integrity: sha512-CmFxvRJIBCEaWdilhXMw/5wFJ1+FT9f3xt+m2pPXhHPeVIbBg9MnMvNSJjdALvnQJMPw8jLhrUtXmN7QAZV2fw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -2572,13 +1628,8 @@ packages: '@emotion/styled': optional: true -<<<<<<< HEAD '@mui/system@6.4.3': resolution: {integrity: sha512-Q0iDwnH3+xoxQ0pqVbt8hFdzhq1g2XzzR4Y5pVcICTNtoCLJmpJS3vI4y/OIM1FHFmpfmiEC2IRIq7YcZ8nsmg==} -======= - '@mui/system@7.3.3': - resolution: {integrity: sha512-Lqq3emZr5IzRLKaHPuMaLBDVaGvxoh6z7HMWd1RPKawBM5uMRaQ4ImsmmgXWtwJdfZux5eugfDhXJUo2mliS8Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -2593,26 +1644,16 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@mui/types@7.2.21': resolution: {integrity: sha512-6HstngiUxNqLU+/DPqlUJDIPbzUBxIVHb1MmXP0eTWDIROiCR2viugXpEif0PPe2mLqqakPzzRClWAnK+8UJww==} -======= - '@mui/types@7.4.7': - resolution: {integrity: sha512-8vVje9rdEr1rY8oIkYgP+Su5Kwl6ik7O3jQ0wl78JGSmiZhRHV+vkjooGdKD8pbtZbutXFVTWQYshu2b3sG9zw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true -<<<<<<< HEAD '@mui/utils@6.4.3': resolution: {integrity: sha512-jxHRHh3BqVXE9ABxDm+Tc3wlBooYz/4XPa0+4AI+iF38rV1/+btJmSUgG4shDtSWVs/I97aDn5jBCt6SF2Uq2A==} -======= - '@mui/utils@7.3.3': - resolution: {integrity: sha512-kwNAUh7bLZ7mRz9JZ+6qfRnnxbE4Zuc+RzXnhSpRSxjTlSTj7b4JxRLXpG+MVtPVtqks5k/XC8No1Vs3x4Z2gg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2624,24 +1665,14 @@ packages: '@mui/x-charts-vendor@7.20.0': resolution: {integrity: sha512-pzlh7z/7KKs5o0Kk0oPcB+sY0+Dg7Q7RzqQowDQjpy5Slz6qqGsgOB5YUzn0L+2yRmvASc4Pe0914Ao3tMBogg==} -<<<<<<< HEAD '@mui/x-charts@7.26.0': resolution: {integrity: sha512-fla1pbMuyHhbWeDo6j5Vz8FHULdPnqACqQrXeLXo9p5kuJpcT9m28DQ1E3YmQ6xGD9NuaxiZdOaITT9PA2zMFQ==} -======= - '@mui/x-charts@7.29.1': - resolution: {integrity: sha512-5s9PX51HWhpMa+DCDa4RgjtODSaMe+PlTZUqoGIil2vaW/+4ouDLREXvyuVvIF93KfZwrPKAL2SJKSQS4YYB2w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.9.0 '@emotion/styled': ^11.8.1 -<<<<<<< HEAD '@mui/material': ^5.15.14 || ^6.0.0 '@mui/system': ^5.15.14 || ^6.0.0 -======= - '@mui/material': ^5.15.14 || ^6.0.0 || ^7.0.0 - '@mui/system': ^5.15.14 || ^6.0.0 || ^7.0.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: @@ -2650,106 +1681,60 @@ packages: '@emotion/styled': optional: true -<<<<<<< HEAD '@mui/x-internals@7.26.0': resolution: {integrity: sha512-VxTCYQcZ02d3190pdvys2TDg9pgbvewAVakEopiOgReKAUhLdRlgGJHcOA/eAuGLyK1YIo26A6Ow6ZKlSRLwMg==} -======= - '@mui/x-internals@7.29.0': - resolution: {integrity: sha512-+Gk6VTZIFD70XreWvdXBwKd8GZ2FlSCuecQFzm6znwqXg1ZsndavrhG9tkxpxo2fM1Zf7Tk8+HcOO0hCbhTQFA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.0.0'} peerDependencies: react: ^17.0.0 || ^18.0.0 || ^19.0.0 -<<<<<<< HEAD '@napi-rs/simple-git-android-arm-eabi@0.1.19': resolution: {integrity: sha512-XryEH/hadZ4Duk/HS/HC/cA1j0RHmqUGey3MsCf65ZS0VrWMqChXM/xlTPWuY5jfCc/rPubHaqI7DZlbexnX/g==} -======= - '@napi-rs/simple-git-android-arm-eabi@0.1.22': - resolution: {integrity: sha512-JQZdnDNm8o43A5GOzwN/0Tz3CDBQtBUNqzVwEopm32uayjdjxev1Csp1JeaqF3v9djLDIvsSE39ecsN2LhCKKQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm] os: [android] -<<<<<<< HEAD '@napi-rs/simple-git-android-arm64@0.1.19': resolution: {integrity: sha512-ZQ0cPvY6nV9p7zrR9ZPo7hQBkDAcY/CHj3BjYNhykeUCiSNCrhvwX+WEeg5on8M1j4d5jcI/cwVG2FslfiByUg==} -======= - '@napi-rs/simple-git-android-arm64@0.1.22': - resolution: {integrity: sha512-46OZ0SkhnvM+fapWjzg/eqbJvClxynUpWYyYBn4jAj7GQs1/Yyc8431spzDmkA8mL0M7Xo8SmbkzTDE7WwYAfg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [android] -<<<<<<< HEAD '@napi-rs/simple-git-darwin-arm64@0.1.19': resolution: {integrity: sha512-viZB5TYgjA1vH+QluhxZo0WKro3xBA+1xSzYx8mcxUMO5gnAoUMwXn0ZO/6Zy6pai+aGae+cj6XihGnrBRu3Pg==} -======= - '@napi-rs/simple-git-darwin-arm64@0.1.22': - resolution: {integrity: sha512-zH3h0C8Mkn9//MajPI6kHnttywjsBmZ37fhLX/Fiw5XKu84eHA6dRyVtMzoZxj6s+bjNTgaMgMUucxPn9ktxTQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [darwin] -<<<<<<< HEAD '@napi-rs/simple-git-darwin-x64@0.1.19': resolution: {integrity: sha512-6dNkzSNUV5X9rsVYQbpZLyJu4Gtkl2vNJ3abBXHX/Etk0ILG5ZasO3ncznIANZQpqcbn/QPHr49J2QYAXGoKJA==} -======= - '@napi-rs/simple-git-darwin-x64@0.1.22': - resolution: {integrity: sha512-GZN7lRAkGKB6PJxWsoyeYJhh85oOOjVNyl+/uipNX8bR+mFDCqRsCE3rRCFGV9WrZUHXkcuRL2laIRn7lLi3ag==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [darwin] -<<<<<<< HEAD '@napi-rs/simple-git-freebsd-x64@0.1.19': resolution: {integrity: sha512-sB9krVIchzd20FjI2ZZ8FDsTSsXLBdnwJ6CpeVyrhXHnoszfcqxt49ocZHujAS9lMpXq7i2Nv1EXJmCy4KdhwA==} -======= - '@napi-rs/simple-git-freebsd-x64@0.1.22': - resolution: {integrity: sha512-xyqX1C5I0WBrUgZONxHjZH5a4LqQ9oki3SKFAVpercVYAcx3pq6BkZy1YUOP4qx78WxU1CCNfHBN7V+XO7D99A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [freebsd] -<<<<<<< HEAD '@napi-rs/simple-git-linux-arm-gnueabihf@0.1.19': resolution: {integrity: sha512-6HPn09lr9N1n5/XKfP8Np53g4fEXVxOFqNkS6rTH3Rm1lZHdazTRH62RggXLTguZwjcE+MvOLvoTIoR5kAS8+g==} -======= - '@napi-rs/simple-git-linux-arm-gnueabihf@0.1.22': - resolution: {integrity: sha512-4LOtbp9ll93B9fxRvXiUJd1/RM3uafMJE7dGBZGKWBMGM76+BAcCEUv2BY85EfsU/IgopXI6n09TycRfPWOjxA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm] os: [linux] -<<<<<<< HEAD '@napi-rs/simple-git-linux-arm64-gnu@0.1.19': resolution: {integrity: sha512-G0gISckt4cVDp3oh5Z6PV3GHJrJO6Z8bIS+9xA7vTtKdqB1i5y0n3cSFLlzQciLzhr+CajFD27doW4lEyErQ/Q==} -======= - '@napi-rs/simple-git-linux-arm64-gnu@0.1.22': - resolution: {integrity: sha512-GVOjP/JjCzbQ0kSqao7ctC/1sodVtv5VF57rW9BFpo2y6tEYPCqHnkQkTpieuwMNe+TVOhBUC1+wH0d9/knIHg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [linux] -<<<<<<< HEAD '@napi-rs/simple-git-linux-arm64-musl@0.1.19': resolution: {integrity: sha512-OwTRF+H4IZYxmDFRi1IrLMfqbdIpvHeYbJl2X94NVsLVOY+3NUHvEzL3fYaVx5urBaMnIK0DD3wZLbcueWvxbA==} -======= - '@napi-rs/simple-git-linux-arm64-musl@0.1.22': - resolution: {integrity: sha512-MOs7fPyJiU/wqOpKzAOmOpxJ/TZfP4JwmvPad/cXTOWYwwyppMlXFRms3i98EU3HOazI/wMU2Ksfda3+TBluWA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [linux] -<<<<<<< HEAD '@napi-rs/simple-git-linux-powerpc64le-gnu@0.1.19': resolution: {integrity: sha512-p7zuNNVyzpRvkCt2RIGv9FX/WPcPbZ6/FRUgUTZkA2WU33mrbvNqSi4AOqCCl6mBvEd+EOw5NU4lS9ORRJvAEg==} engines: {node: '>= 10'} @@ -2758,194 +1743,100 @@ packages: '@napi-rs/simple-git-linux-s390x-gnu@0.1.19': resolution: {integrity: sha512-6N2vwJUPLiak8GLrS0a3is0gSb0UwI2CHOOqtvQxPmv+JVI8kn3vKiUscsktdDb0wGEPeZ8PvZs0y8UWix7K4g==} -======= - '@napi-rs/simple-git-linux-ppc64-gnu@0.1.22': - resolution: {integrity: sha512-L59dR30VBShRUIZ5/cQHU25upNgKS0AMQ7537J6LCIUEFwwXrKORZKJ8ceR+s3Sr/4jempWVvMdjEpFDE4HYww==} - engines: {node: '>= 10'} - cpu: [ppc64] - os: [linux] - - '@napi-rs/simple-git-linux-s390x-gnu@0.1.22': - resolution: {integrity: sha512-4FHkPlCSIZUGC6HiADffbe6NVoTBMd65pIwcd40IDbtFKOgFMBA+pWRqKiQ21FERGH16Zed7XHJJoY3jpOqtmQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [s390x] os: [linux] -<<<<<<< HEAD '@napi-rs/simple-git-linux-x64-gnu@0.1.19': resolution: {integrity: sha512-61YfeO1J13WK7MalLgP3QlV6of2rWnVw1aqxWkAgy/lGxoOFSJ4Wid6ANVCEZk4tJpPX/XNeneqkUz5xpeb2Cw==} -======= - '@napi-rs/simple-git-linux-x64-gnu@0.1.22': - resolution: {integrity: sha512-Ei1tM5Ho/dwknF3pOzqkNW9Iv8oFzRxE8uOhrITcdlpxRxVrBVptUF6/0WPdvd7R9747D/q61QG/AVyWsWLFKw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [linux] -<<<<<<< HEAD '@napi-rs/simple-git-linux-x64-musl@0.1.19': resolution: {integrity: sha512-cCTWNpMJnN3PrUBItWcs3dQKCydsIasbrS3laMzq8k7OzF93Zrp2LWDTPlLCO9brbBVpBzy2Qk5Xg9uAfe/Ukw==} -======= - '@napi-rs/simple-git-linux-x64-musl@0.1.22': - resolution: {integrity: sha512-zRYxg7it0p3rLyEJYoCoL2PQJNgArVLyNavHW03TFUAYkYi5bxQ/UFNVpgxMaXohr5yu7qCBqeo9j4DWeysalg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [linux] -<<<<<<< HEAD '@napi-rs/simple-git-win32-arm64-msvc@0.1.19': resolution: {integrity: sha512-sWavb1BjeLKKBA+PbTsRSSzVNfb7V/dOpaJvkgR5d2kWFn/AHmCZHSSj/3nyZdYf0BdDC+DIvqk3daAEZ6QMVw==} -======= - '@napi-rs/simple-git-win32-arm64-msvc@0.1.22': - resolution: {integrity: sha512-XGFR1fj+Y9cWACcovV2Ey/R2xQOZKs8t+7KHPerYdJ4PtjVzGznI4c2EBHXtdOIYvkw7tL5rZ7FN1HJKdD5Quw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [win32] -<<<<<<< HEAD '@napi-rs/simple-git-win32-x64-msvc@0.1.19': resolution: {integrity: sha512-FmNuPoK4+qwaSCkp8lm3sJlrxk374enW+zCE5ZksXlZzj/9BDJAULJb5QUJ7o9Y8A/G+d8LkdQLPBE2Jaxe5XA==} -======= - '@napi-rs/simple-git-win32-ia32-msvc@0.1.22': - resolution: {integrity: sha512-Gqr9Y0gs6hcNBA1IXBpoqTFnnIoHuZGhrYqaZzEvGMLrTrpbXrXVEtX3DAAD2RLc1b87CPcJ49a7sre3PU3Rfw==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - - '@napi-rs/simple-git-win32-x64-msvc@0.1.22': - resolution: {integrity: sha512-hQjcreHmUcpw4UrtkOron1/TQObfe484lxiXFLLUj7aWnnnOVs1mnXq5/Bo9+3NYZldFpFRJPdPBeHCisXkKJg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [win32] -<<<<<<< HEAD '@napi-rs/simple-git@0.1.19': resolution: {integrity: sha512-jMxvwzkKzd3cXo2EB9GM2ic0eYo2rP/BS6gJt6HnWbsDO1O8GSD4k7o2Cpr2YERtMpGF/MGcDfsfj2EbQPtrXw==} -======= - '@napi-rs/simple-git@0.1.22': - resolution: {integrity: sha512-bMVoAKhpjTOPHkW/lprDPwv5aD4R4C3Irt8vn+SKA9wudLe9COLxOhurrKRsxmZccUbWXRF7vukNeGUAj5P8kA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} '@napi-rs/wasm-runtime@0.2.12': resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==} -<<<<<<< HEAD '@next/bundle-analyzer@15.1.2': resolution: {integrity: sha512-LuQkM4HSipn+kP8ChckPYL+w0qzx331QfSYY3lU5cutf7Gvk069sK+wH4GfVRdFq+DXSaCiy5IPzAcuXq6G+7g==} '@next/env@14.2.3': resolution: {integrity: sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==} -======= - '@next/bundle-analyzer@15.5.6': - resolution: {integrity: sha512-IHeyk2s9/fVDAGDLNbBkCSG8XBabhuMajiaJggjsg4GyFIswh78DzLo5Nl5th8QTs3U/teYeczvfeV9w1Tx3qA==} - - '@next/env@14.2.33': - resolution: {integrity: sha512-CgVHNZ1fRIlxkLhIX22flAZI/HmpDaZ8vwyJ/B0SDPTBuLZ1PJ+DWMjCHhqnExfmSQzA/PbZi8OAc7PAq2w9IA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@next/eslint-plugin-next@14.2.3': resolution: {integrity: sha512-L3oDricIIjgj1AVnRdRor21gI7mShlSwU/1ZGHmqM3LzHhXXhdkrfeNY5zif25Bi5Dd7fiJHsbhoZCHfXYvlAw==} -<<<<<<< HEAD '@next/swc-darwin-arm64@14.2.3': resolution: {integrity: sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==} -======= - '@next/swc-darwin-arm64@14.2.33': - resolution: {integrity: sha512-HqYnb6pxlsshoSTubdXKu15g3iivcbsMXg4bYpjL2iS/V6aQot+iyF4BUc2qA/J/n55YtvE4PHMKWBKGCF/+wA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [darwin] -<<<<<<< HEAD '@next/swc-darwin-x64@14.2.3': resolution: {integrity: sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==} -======= - '@next/swc-darwin-x64@14.2.33': - resolution: {integrity: sha512-8HGBeAE5rX3jzKvF593XTTFg3gxeU4f+UWnswa6JPhzaR6+zblO5+fjltJWIZc4aUalqTclvN2QtTC37LxvZAA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [darwin] -<<<<<<< HEAD '@next/swc-linux-arm64-gnu@14.2.3': resolution: {integrity: sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==} -======= - '@next/swc-linux-arm64-gnu@14.2.33': - resolution: {integrity: sha512-JXMBka6lNNmqbkvcTtaX8Gu5by9547bukHQvPoLe9VRBx1gHwzf5tdt4AaezW85HAB3pikcvyqBToRTDA4DeLw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [linux] -<<<<<<< HEAD '@next/swc-linux-arm64-musl@14.2.3': resolution: {integrity: sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==} -======= - '@next/swc-linux-arm64-musl@14.2.33': - resolution: {integrity: sha512-Bm+QulsAItD/x6Ih8wGIMfRJy4G73tu1HJsrccPW6AfqdZd0Sfm5Imhgkgq2+kly065rYMnCOxTBvmvFY1BKfg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [linux] -<<<<<<< HEAD '@next/swc-linux-x64-gnu@14.2.3': resolution: {integrity: sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==} -======= - '@next/swc-linux-x64-gnu@14.2.33': - resolution: {integrity: sha512-FnFn+ZBgsVMbGDsTqo8zsnRzydvsGV8vfiWwUo1LD8FTmPTdV+otGSWKc4LJec0oSexFnCYVO4hX8P8qQKaSlg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [linux] -<<<<<<< HEAD '@next/swc-linux-x64-musl@14.2.3': resolution: {integrity: sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==} -======= - '@next/swc-linux-x64-musl@14.2.33': - resolution: {integrity: sha512-345tsIWMzoXaQndUTDv1qypDRiebFxGYx9pYkhwY4hBRaOLt8UGfiWKr9FSSHs25dFIf8ZqIFaPdy5MljdoawA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [linux] -<<<<<<< HEAD '@next/swc-win32-arm64-msvc@14.2.3': resolution: {integrity: sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==} -======= - '@next/swc-win32-arm64-msvc@14.2.33': - resolution: {integrity: sha512-nscpt0G6UCTkrT2ppnJnFsYbPDQwmum4GNXYTeoTIdsmMydSKFz9Iny2jpaRupTb+Wl298+Rh82WKzt9LCcqSQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [arm64] os: [win32] -<<<<<<< HEAD '@next/swc-win32-ia32-msvc@14.2.3': resolution: {integrity: sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==} -======= - '@next/swc-win32-ia32-msvc@14.2.33': - resolution: {integrity: sha512-pc9LpGNKhJ0dXQhZ5QMmYxtARwwmWLpeocFmVG5Z0DzWq5Uf0izcI8tLc+qOpqxO1PWqZ5A7J1blrUIKrIFc7Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [ia32] os: [win32] -<<<<<<< HEAD '@next/swc-win32-x64-msvc@14.2.3': resolution: {integrity: sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==} -======= - '@next/swc-win32-x64-msvc@14.2.33': - resolution: {integrity: sha512-nOjfZMy8B94MdisuzZo9/57xuFVLHJaDj5e/xrduJp9CV2/HrfxTRH2fbyLe+K9QT41WBLUd4iXX3R7jBp0EUg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -2966,18 +1857,6 @@ packages: resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==} engines: {node: '>=12.4.0'} -<<<<<<< HEAD -======= - '@open-draft/deferred-promise@2.2.0': - resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} - - '@open-draft/logger@0.3.0': - resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==} - - '@open-draft/until@2.1.0': - resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -2986,18 +1865,12 @@ packages: resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} -<<<<<<< HEAD '@polka/url@1.0.0-next.28': resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==} -======= - '@polka/url@1.0.0-next.29': - resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@popperjs/core@2.11.8': resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} -<<<<<<< HEAD '@radix-ui/number@1.1.0': resolution: {integrity: sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==} @@ -3006,16 +1879,6 @@ packages: '@radix-ui/react-accordion@1.2.2': resolution: {integrity: sha512-b1oh54x4DMCdGsB4/7ahiSrViXxaBwRPotiZNnYXjLha9vfuURSAZErki6qjDoSIV0eXx5v57XnTGVtGwnfp2g==} -======= - '@radix-ui/number@1.1.1': - resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==} - - '@radix-ui/primitive@1.1.3': - resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==} - - '@radix-ui/react-accordion@1.2.12': - resolution: {integrity: sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3027,13 +1890,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-alert-dialog@1.1.4': resolution: {integrity: sha512-A6Kh23qZDLy3PSU4bh2UJZznOrUdHImIXqF8YtUa6CN73f8EOO9XlXSCd9IHyPvIquTaa/kwaSWzZTtUvgXVGw==} -======= - '@radix-ui/react-alert-dialog@1.1.15': - resolution: {integrity: sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3045,13 +1903,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-arrow@1.1.1': resolution: {integrity: sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w==} -======= - '@radix-ui/react-arrow@1.1.7': - resolution: {integrity: sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3063,13 +1916,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-aspect-ratio@1.1.1': resolution: {integrity: sha512-kNU4FIpcFMBLkOUcgeIteH06/8JLBcYY6Le1iKenDGCYNYFX3TQqCZjzkOsz37h7r94/99GTb7YhEr98ZBJibw==} -======= - '@radix-ui/react-aspect-ratio@1.1.7': - resolution: {integrity: sha512-Yq6lvO9HQyPwev1onK1daHCHqXVLzPhSVjmsNjCa2Zcxy2f7uJD2itDtxknv6FzAKCwD1qQkeVDmX/cev13n/g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3081,13 +1929,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-avatar@1.1.2': resolution: {integrity: sha512-GaC7bXQZ5VgZvVvsJ5mu/AEbjYLnhhkoidOboC50Z6FFlLA03wG2ianUoH+zgDQ31/9gCF59bE4+2bBgTyMiig==} -======= - '@radix-ui/react-avatar@1.1.10': - resolution: {integrity: sha512-V8piFfWapM5OmNCXTzVQY+E1rDa53zY+MQ4Y7356v4fFz6vqCyUtIz2rUD44ZEdwg78/jKmMJHj07+C/Z/rcog==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3099,13 +1942,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-checkbox@1.1.3': resolution: {integrity: sha512-HD7/ocp8f1B3e6OHygH0n7ZKjONkhciy1Nh0yuBgObqThc3oyx+vuMfFHKAknXRHHWVE9XvXStxJFyjUmB8PIw==} -======= - '@radix-ui/react-checkbox@1.3.3': - resolution: {integrity: sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3117,13 +1955,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-collapsible@1.1.2': resolution: {integrity: sha512-PliMB63vxz7vggcyq0IxNYk8vGDrLXVWw4+W4B8YnwI1s18x7YZYqlG9PLX7XxAJUi0g2DxP4XKJMFHh/iVh9A==} -======= - '@radix-ui/react-collapsible@1.1.12': - resolution: {integrity: sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3135,13 +1968,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-collection@1.1.1': resolution: {integrity: sha512-LwT3pSho9Dljg+wY2KN2mrrh6y3qELfftINERIzBUO9e0N+t0oMTyn3k9iv+ZqgrwGkRnLpNJrsMv9BZlt2yuA==} -======= - '@radix-ui/react-collection@1.1.7': - resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3153,13 +1981,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-compose-refs@1.1.1': resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==} -======= - '@radix-ui/react-compose-refs@1.1.2': - resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3167,13 +1990,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-context-menu@2.2.4': resolution: {integrity: sha512-ap4wdGwK52rJxGkwukU1NrnEodsUFQIooANKu+ey7d6raQ2biTcEf8za1zr0mgFHieevRTB2nK4dJeN8pTAZGQ==} -======= - '@radix-ui/react-context-menu@2.2.16': - resolution: {integrity: sha512-O8morBEW+HsVG28gYDZPTrT9UUovQUlJue5YO836tiTJhuIWBm/zQHc7j388sHWtdH/xUZurK9olD2+pcqx5ww==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3185,13 +2003,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-context@1.1.1': resolution: {integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==} -======= - '@radix-ui/react-context@1.1.2': - resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3199,13 +2012,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-dialog@1.1.4': resolution: {integrity: sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==} -======= - '@radix-ui/react-dialog@1.1.15': - resolution: {integrity: sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3217,13 +2025,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-direction@1.1.0': resolution: {integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==} -======= - '@radix-ui/react-direction@1.1.1': - resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3231,13 +2034,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-dismissable-layer@1.1.3': resolution: {integrity: sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==} -======= - '@radix-ui/react-dismissable-layer@1.1.11': - resolution: {integrity: sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3249,13 +2047,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-dropdown-menu@2.1.4': resolution: {integrity: sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==} -======= - '@radix-ui/react-dropdown-menu@2.1.16': - resolution: {integrity: sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3267,13 +2060,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-focus-guards@1.1.1': resolution: {integrity: sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==} -======= - '@radix-ui/react-focus-guards@1.1.3': - resolution: {integrity: sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3281,13 +2069,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-focus-scope@1.1.1': resolution: {integrity: sha512-01omzJAYRxXdG2/he/+xy+c8a8gCydoQ1yOxnWNcRhrrBW5W+RQJ22EK1SaO8tb3WoUsuEw7mJjBozPzihDFjA==} -======= - '@radix-ui/react-focus-scope@1.1.7': - resolution: {integrity: sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3299,13 +2082,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-hover-card@1.1.4': resolution: {integrity: sha512-QSUUnRA3PQ2UhvoCv3eYvMnCAgGQW+sTu86QPuNb+ZMi+ZENd6UWpiXbcWDQ4AEaKF9KKpCHBeaJz9Rw6lRlaQ==} -======= - '@radix-ui/react-hover-card@1.1.15': - resolution: {integrity: sha512-qgTkjNT1CfKMoP0rcasmlH2r1DAiYicWsDsufxl940sT2wHNEWWv6FMWIQXWhVdmC1d/HYfbhQx60KYyAtKxjg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3317,13 +2095,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-id@1.1.0': resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==} -======= - '@radix-ui/react-id@1.1.1': - resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3331,13 +2104,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-label@2.1.1': resolution: {integrity: sha512-UUw5E4e/2+4kFMH7+YxORXGWggtY6sM8WIwh5RZchhLuUg2H1hc98Py+pr8HMz6rdaYrK2t296ZEjYLOCO5uUw==} -======= - '@radix-ui/react-label@2.1.7': - resolution: {integrity: sha512-YT1GqPSL8kJn20djelMX7/cTRp/Y9w5IZHvfxQTVHrOqa2yMl7i/UfMqKRU5V7mEyKTrUVgJXhNQPVCG8PBLoQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3349,13 +2117,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-menu@2.1.4': resolution: {integrity: sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==} -======= - '@radix-ui/react-menu@2.1.16': - resolution: {integrity: sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3367,13 +2130,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-menubar@1.1.4': resolution: {integrity: sha512-+KMpi7VAZuB46+1LD7a30zb5IxyzLgC8m8j42gk3N4TUCcViNQdX8FhoH1HDvYiA8quuqcek4R4bYpPn/SY1GA==} -======= - '@radix-ui/react-menubar@1.1.16': - resolution: {integrity: sha512-EB1FktTz5xRRi2Er974AUQZWg2yVBb1yjip38/lgwtCVRd3a+maUoGHN/xs9Yv8SY8QwbSEb+YrxGadVWbEutA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3385,13 +2143,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-navigation-menu@1.2.3': resolution: {integrity: sha512-IQWAsQ7dsLIYDrn0WqPU+cdM7MONTv9nqrLVYoie3BPiabSfUVDe6Fr+oEt0Cofsr9ONDcDe9xhmJbL1Uq1yKg==} -======= - '@radix-ui/react-navigation-menu@1.2.14': - resolution: {integrity: sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3403,13 +2156,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-popover@1.1.4': resolution: {integrity: sha512-aUACAkXx8LaFymDma+HQVji7WhvEhpFJ7+qPz17Nf4lLZqtreGOFRiNQWQmhzp7kEWg9cOyyQJpdIMUMPc/CPw==} -======= - '@radix-ui/react-popover@1.1.15': - resolution: {integrity: sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3421,13 +2169,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-popper@1.2.1': resolution: {integrity: sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw==} -======= - '@radix-ui/react-popper@1.2.8': - resolution: {integrity: sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3439,13 +2182,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-portal@1.1.3': resolution: {integrity: sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw==} -======= - '@radix-ui/react-portal@1.1.9': - resolution: {integrity: sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3457,13 +2195,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-presence@1.1.2': resolution: {integrity: sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==} -======= - '@radix-ui/react-presence@1.1.5': - resolution: {integrity: sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3475,13 +2208,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-primitive@2.0.1': resolution: {integrity: sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==} -======= - '@radix-ui/react-primitive@2.1.3': - resolution: {integrity: sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3493,13 +2221,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-progress@1.1.1': resolution: {integrity: sha512-6diOawA84f/eMxFHcWut0aE1C2kyE9dOyCTQOMRR2C/qPiXz/X0SaiA/RLbapQaXUCmy0/hLMf9meSccD1N0pA==} -======= - '@radix-ui/react-progress@1.1.7': - resolution: {integrity: sha512-vPdg/tF6YC/ynuBIJlk1mm7Le0VgW6ub6J2UWnTQ7/D23KXcPI1qy+0vBkgKgd38RCMJavBXpB83HPNFMTb0Fg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3511,13 +2234,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-radio-group@1.2.2': resolution: {integrity: sha512-E0MLLGfOP0l8P/NxgVzfXJ8w3Ch8cdO6UDzJfDChu4EJDy+/WdO5LqpdY8PYnCErkmZH3gZhDL1K7kQ41fAHuQ==} -======= - '@radix-ui/react-radio-group@1.3.8': - resolution: {integrity: sha512-VBKYIYImA5zsxACdisNQ3BjCBfmbGH3kQlnFVqlWU4tXwjy7cGX8ta80BcrO+WJXIn5iBylEH3K6ZTlee//lgQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3529,13 +2247,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-roving-focus@1.1.1': resolution: {integrity: sha512-QE1RoxPGJ/Nm8Qmk0PxP8ojmoaS67i0s7hVssS7KuI2FQoc/uzVlZsqKfQvxPE6D8hICCPHJ4D88zNhT3OOmkw==} -======= - '@radix-ui/react-roving-focus@1.1.11': - resolution: {integrity: sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3547,13 +2260,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-scroll-area@1.2.2': resolution: {integrity: sha512-EFI1N/S3YxZEW/lJ/H1jY3njlvTd8tBmgKEn4GHi51+aMm94i6NmAJstsm5cu3yJwYqYc93gpCPm21FeAbFk6g==} -======= - '@radix-ui/react-scroll-area@1.2.10': - resolution: {integrity: sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3565,13 +2273,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-select@2.1.4': resolution: {integrity: sha512-pOkb2u8KgO47j/h7AylCj7dJsm69BXcjkrvTqMptFqsE2i0p8lHkfgneXKjAgPzBMivnoMyt8o4KiV4wYzDdyQ==} -======= - '@radix-ui/react-select@2.2.6': - resolution: {integrity: sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3583,13 +2286,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-separator@1.1.1': resolution: {integrity: sha512-RRiNRSrD8iUiXriq/Y5n4/3iE8HzqgLHsusUSg5jVpU2+3tqcUFPJXHDymwEypunc2sWxDUS3UC+rkZRlHedsw==} -======= - '@radix-ui/react-separator@1.1.7': - resolution: {integrity: sha512-0HEb8R9E8A+jZjvmFCy/J4xhbXy3TV+9XSnGJ3KvTtjlIUy/YQ/p6UYZvi7YbeoeXdyU9+Y3scizK6hkY37baA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3601,13 +2299,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-slider@1.2.2': resolution: {integrity: sha512-sNlU06ii1/ZcbHf8I9En54ZPW0Vil/yPVg4vQMcFNjrIx51jsHbFl1HYHQvCIWJSr1q0ZmA+iIs/ZTv8h7HHSA==} -======= - '@radix-ui/react-slider@1.3.6': - resolution: {integrity: sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3619,13 +2312,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-slot@1.1.1': resolution: {integrity: sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==} -======= - '@radix-ui/react-slot@1.2.3': - resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3633,13 +2321,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-switch@1.1.2': resolution: {integrity: sha512-zGukiWHjEdBCRyXvKR6iXAQG6qXm2esuAD6kDOi9Cn+1X6ev3ASo4+CsYaD6Fov9r/AQFekqnD/7+V0Cs6/98g==} -======= - '@radix-ui/react-switch@1.2.6': - resolution: {integrity: sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3651,13 +2334,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-tabs@1.1.2': resolution: {integrity: sha512-9u/tQJMcC2aGq7KXpGivMm1mgq7oRJKXphDwdypPd/j21j/2znamPU8WkXgnhUaTrSFNIt8XhOyCAupg8/GbwQ==} -======= - '@radix-ui/react-tabs@1.1.13': - resolution: {integrity: sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3669,13 +2347,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-toast@1.2.4': resolution: {integrity: sha512-Sch9idFJHJTMH9YNpxxESqABcAFweJG4tKv+0zo0m5XBvUSL8FM5xKcJLFLXononpePs8IclyX1KieL5SDUNgA==} -======= - '@radix-ui/react-toast@1.2.15': - resolution: {integrity: sha512-3OSz3TacUWy4WtOXV38DggwxoqJK4+eDkNMl5Z/MJZaoUPaP4/9lf81xXMe1I2ReTAptverZUpbPY4wWwWyL5g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3687,13 +2360,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-toggle-group@1.1.1': resolution: {integrity: sha512-OgDLZEA30Ylyz8YSXvnGqIHtERqnUt1KUYTKdw/y8u7Ci6zGiJfXc02jahmcSNK3YcErqioj/9flWC9S1ihfwg==} -======= - '@radix-ui/react-toggle-group@1.1.11': - resolution: {integrity: sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3705,13 +2373,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-toggle@1.1.1': resolution: {integrity: sha512-i77tcgObYr743IonC1hrsnnPmszDRn8p+EGUsUt+5a/JFn28fxaM88Py6V2mc8J5kELMWishI0rLnuGLFD/nnQ==} -======= - '@radix-ui/react-toggle@1.1.10': - resolution: {integrity: sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3723,13 +2386,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-tooltip@1.1.6': resolution: {integrity: sha512-TLB5D8QLExS1uDn7+wH/bjEmRurNMTzNrtq7IjaS4kjion9NtzsTGkvR5+i7yc9q01Pi2KMM2cN3f8UG4IvvXA==} -======= - '@radix-ui/react-tooltip@1.2.8': - resolution: {integrity: sha512-tY7sVt1yL9ozIxvmbtN5qtmH2krXcBCfjEiCgKGLqunJHvgvZG2Pcl2oQ3kbcZARb1BGEHdkLzcYGO8ynVlieg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3741,13 +2399,8 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/react-use-callback-ref@1.1.0': resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==} -======= - '@radix-ui/react-use-callback-ref@1.1.1': - resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3755,13 +2408,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-use-controllable-state@1.1.0': resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==} -======= - '@radix-ui/react-use-controllable-state@1.2.2': - resolution: {integrity: sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3769,13 +2417,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-use-escape-keydown@1.1.0': resolution: {integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==} -======= - '@radix-ui/react-use-effect-event@0.0.2': - resolution: {integrity: sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3783,13 +2426,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-use-layout-effect@1.1.0': resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==} -======= - '@radix-ui/react-use-escape-keydown@1.1.1': - resolution: {integrity: sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3797,13 +2435,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-use-previous@1.1.0': resolution: {integrity: sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==} -======= - '@radix-ui/react-use-is-hydrated@0.1.0': - resolution: {integrity: sha512-U+UORVEq+cTnRIaostJv9AGdV3G6Y+zbVd+12e18jQ5A3c0xL03IhnHuiU4UV69wolOQp5GfR58NW/EgdQhwOA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3811,13 +2444,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-use-rect@1.1.0': resolution: {integrity: sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==} -======= - '@radix-ui/react-use-layout-effect@1.1.1': - resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3825,13 +2453,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-use-size@1.1.0': resolution: {integrity: sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==} -======= - '@radix-ui/react-use-previous@1.1.1': - resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -3839,31 +2462,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD '@radix-ui/react-visually-hidden@1.1.1': resolution: {integrity: sha512-vVfA2IZ9q/J+gEamvj761Oq1FpWgCDaNOOIfbPVp2MVPLEomUr5+Vf7kJGwQ24YxZSlQVar7Bes8kyTo5Dshpg==} -======= - '@radix-ui/react-use-rect@1.1.1': - resolution: {integrity: sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-use-size@1.1.1': - resolution: {integrity: sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - peerDependenciesMeta: - '@types/react': - optional: true - - '@radix-ui/react-visually-hidden@1.2.3': - resolution: {integrity: sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' '@types/react-dom': '*' @@ -3875,19 +2475,11 @@ packages: '@types/react-dom': optional: true -<<<<<<< HEAD '@radix-ui/rect@1.1.0': resolution: {integrity: sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==} '@react-google-maps/api@2.20.4': resolution: {integrity: sha512-lxXO8fSI4gsU7PAabW/Po9RWATKfR2nawm1Q5TJE9g9DATOk4VrXYqo0zRCGca6/aeRCKgXueBs6ZK6lNI+zGQ==} -======= - '@radix-ui/rect@1.1.1': - resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==} - - '@react-google-maps/api@2.20.7': - resolution: {integrity: sha512-ys7uri3V6gjhYZUI43srHzSKDC6/jiKTwHNlwXFTvjeaJE3M3OaYBt9FZKvJs8qnOhL6i6nD1BKJoi1KrnkCkg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^16.8 || ^17 || ^18 || ^19 react-dom: ^16.8 || ^17 || ^18 || ^19 @@ -3935,19 +2527,11 @@ packages: '@rtsao/scc@1.1.0': resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==} -<<<<<<< HEAD '@rushstack/eslint-patch@1.10.4': resolution: {integrity: sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==} '@sinclair/typebox@0.34.38': resolution: {integrity: sha512-HpkxMmc2XmZKhvaKIZZThlHmx1L0I/V1hWK1NubtlFnr6ZqdiOpV72TKudZUNQjZNsyDBay72qFEhEvb+bcwcA==} -======= - '@rushstack/eslint-patch@1.14.0': - resolution: {integrity: sha512-WJFej426qe4RWOm9MMtP4V3CV4AucXolQty+GRgAWLgQXmpCuwzs7hEpxxhSc/znXUSxum9d/P/32MW0FlAAlA==} - - '@sinclair/typebox@0.34.41': - resolution: {integrity: sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@sinonjs/commons@3.0.1': resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==} @@ -3957,40 +2541,24 @@ packages: '@studio-freight/hamo@0.6.33': resolution: {integrity: sha512-U3Nvw5wDvB/jps2/ZbGL2TFL+CcZvJF/tkjL7S7ajuzDi9T5VkqCguws6tuWHttZ74Z6DfXxV1b8F1EB30AyJg==} -<<<<<<< HEAD deprecated: Please use @darkroom.engineering/hamo instead -======= - deprecated: 'The ''@studio-freight/hamo'' package has been renamed to ''hamo''. Please update your dependencies: npm install hamo and visit the documentation: https://www.npmjs.com/package/hamo' ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 '@studio-freight/lenis@1.0.42': resolution: {integrity: sha512-HJAGf2DeM+BTvKzHv752z6Z7zy6bA643nZM7W88Ft9tnw2GsJSp6iJ+3cekjyMIWH+cloL2U9X82dKXgdU8kPg==} -<<<<<<< HEAD deprecated: '''@studio-freight/lenis'' has been renamed to just ''lenis'', run ''npx @darkroom.engineering/codemods'' to update your dependecies accordingly.' '@studio-freight/react-lenis@0.0.47': resolution: {integrity: sha512-h+IAqiyiNo8mRo/CA3/sHCqX2IV0tTLyzZRWsdRaLPtM2aBaRqK0+ISYWTUmktQfcf3qvp4hsn0Oeyt9uXwLTQ==} -======= - deprecated: 'The ''@studio-freight/lenis'' package has been renamed to ''lenis''. Please update your dependencies: npm install lenis and visit the documentation: https://www.npmjs.com/package/lenis' - - '@studio-freight/react-lenis@0.0.47': - resolution: {integrity: sha512-h+IAqiyiNo8mRo/CA3/sHCqX2IV0tTLyzZRWsdRaLPtM2aBaRqK0+ISYWTUmktQfcf3qvp4hsn0Oeyt9uXwLTQ==} - deprecated: 'The ''@studio-freight/react-lenis'' package has been renamed to ''lenis''. Please update your dependencies: npm install lenis and visit the documentation: https://www.npmjs.com/package/lenis' ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^17 || ^18 react-dom: ^17 || ^18 '@studio-freight/tempus@0.0.38': resolution: {integrity: sha512-AO1O2fEmfUqWGjEofmPNMQRlwgZ96eB5OFsVJjeH8/RKd1/Yf4zbPnXO+r2TD4aueA6X9JRCJU2GUprI9+m8uQ==} -<<<<<<< HEAD deprecated: Please use @darkroom.engineering/tempus instead -======= - deprecated: 'The ''@studio-freight/tempus'' package has been renamed to ''tempus''. Please update your dependencies: npm install tempus and visit the documentation: https://www.npmjs.com/package/tempus' ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@svgdotjs/svg.draggable.js@3.0.6': resolution: {integrity: sha512-7iJFm9lL3C40HQcqzEfezK2l+dW2CpoVY3b77KQGqc8GXWa6LhhmX5Ckv7alQfUXBuZbjpICZ+Dvq1czlGx7gA==} @@ -4001,13 +2569,8 @@ packages: resolution: {integrity: sha512-/69XMRCDoam2HgC4ldHIaDgeQf1ViHIsa0Ld4uWgiXtZ+E24DWHe/9Ib6kbNiZ7WRIdlVokUDR1Fg0kjIpkfbw==} engines: {node: '>= 0.8.0'} -<<<<<<< HEAD '@svgdotjs/svg.js@3.2.4': resolution: {integrity: sha512-BjJ/7vWNowlX3Z8O4ywT58DqbNRyYlkk6Yz/D13aB7hGmfQTvGX4Tkgtm/ApYlu9M7lCQi15xUEidqMUmdMYwg==} -======= - '@svgdotjs/svg.js@3.2.5': - resolution: {integrity: sha512-/VNHWYhNu+BS7ktbYoVGrCmsXDh+chFMaONMwGNdIBcFHrWqk2jY8fNyr3DLdtQUIalvkPfM554ZSFa3dm3nxQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@svgdotjs/svg.resize.js@2.0.5': resolution: {integrity: sha512-4heRW4B1QrJeENfi7326lUPYBCevj78FJs8kfeDxn5st0IYPIRXoTtOSYvTzFWgaWWXd3YCDE6ao4fmv91RthA==} @@ -4028,30 +2591,19 @@ packages: '@swc/helpers@0.5.5': resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==} -<<<<<<< HEAD '@tanstack/react-table@8.20.6': resolution: {integrity: sha512-w0jluT718MrOKthRcr2xsjqzx+oEM7B7s/XXyfs19ll++hlId3fjTm+B2zrR3ijpANpkzBAr15j1XGVOMxpggQ==} -======= - '@tanstack/react-table@8.21.3': - resolution: {integrity: sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=12'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' -<<<<<<< HEAD '@tanstack/react-virtual@3.11.2': resolution: {integrity: sha512-OuFzMXPF4+xZgx8UzJha0AieuMihhhaWG0tCqpp6tDzlFwOmNBPYMuLOtMJ1Tr4pXLHmgjcWhG6RlknY2oNTdQ==} -======= - '@tanstack/react-virtual@3.13.12': - resolution: {integrity: sha512-Gd13QdxPSukP8ZrkbgS2RwoZseTTbQPLnQEn7HY/rqtM+8Zt95f7xKC7N0EsKs7aoz0WzZ+fditZux+F8EzYxA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 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 -<<<<<<< HEAD '@tanstack/table-core@8.20.5': resolution: {integrity: sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==} engines: {node: '>=12'} @@ -4065,21 +2617,6 @@ packages: '@testing-library/jest-dom@6.6.3': resolution: {integrity: sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==} -======= - '@tanstack/table-core@8.21.3': - resolution: {integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==} - engines: {node: '>=12'} - - '@tanstack/virtual-core@3.13.12': - resolution: {integrity: sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==} - - '@testing-library/dom@10.4.1': - resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==} - engines: {node: '>=18'} - - '@testing-library/jest-dom@6.9.1': - resolution: {integrity: sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14', npm: '>=6', yarn: '>=1'} '@testing-library/react@16.3.0': @@ -4111,21 +2648,12 @@ packages: '@theguild/remark-npm2yarn@0.2.1': resolution: {integrity: sha512-jUTFWwDxtLEFtGZh/TW/w30ySaDJ8atKWH8dq2/IiQF61dPrGfETpl0WxD0VdBfuLOeU14/kop466oBSRO/5CA==} -<<<<<<< HEAD '@tinymce/tinymce-react@6.2.1': resolution: {integrity: sha512-P/xWz3sNeJ2kXykxBkxM+4vEUYFlqWuJFifcJTmIwqHODJc17eZWvtNapzqGD+mUjXglf3VePu7ojRV1kdK22A==} peerDependencies: react: ^19.0.0 || ^18.0.0 || ^17.0.1 || ^16.7.0 react-dom: ^19.0.0 || ^18.0.0 || ^17.0.1 || ^16.7.0 tinymce: ^7.0.0 || ^6.0.0 || ^5.5.1 -======= - '@tinymce/tinymce-react@6.3.0': - resolution: {integrity: sha512-E++xnn0XzDzpKr40jno2Kj7umfAE6XfINZULEBBeNjTMvbACWzA6CjiR6V8eTDc9yVmdVhIPqVzV4PqD5TZ/4g==} - peerDependencies: - react: ^19.0.0 || ^18.0.0 || ^17.0.1 || ^16.7.0 - react-dom: ^19.0.0 || ^18.0.0 || ^17.0.1 || ^16.7.0 - tinymce: ^8.0.0 || ^7.0.0 || ^6.0.0 || ^5.5.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependenciesMeta: tinymce: optional: true @@ -4133,13 +2661,8 @@ packages: '@ts-morph/common@0.19.0': resolution: {integrity: sha512-Unz/WHmd4pGax91rdIKWi51wnVUW11QttMEPpBiBgIewnc9UQIX7UDLxr5vRlqeByXCwhkF6VabSsI0raWcyAQ==} -<<<<<<< HEAD '@tybys/wasm-util@0.10.0': resolution: {integrity: sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==} -======= - '@tybys/wasm-util@0.10.1': - resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/acorn@4.0.6': resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==} @@ -4156,13 +2679,8 @@ packages: '@types/babel__template@7.4.4': resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==} -<<<<<<< HEAD '@types/babel__traverse@7.20.7': resolution: {integrity: sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==} -======= - '@types/babel__traverse@7.28.0': - resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/cleave.js@1.4.12': resolution: {integrity: sha512-d+TDoy5wsWfG/lTLNV4CCziGzJovbX5RCrYzrfG2iB5F6yvrzeTtGEgoXW3/7oRj0H6gAzLxuvwmgNEx4Og4QA==} @@ -4176,13 +2694,8 @@ packages: '@types/crypto-js@4.2.2': resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==} -<<<<<<< HEAD '@types/d3-array@3.2.1': resolution: {integrity: sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==} -======= - '@types/d3-array@3.2.2': - resolution: {integrity: sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/d3-color@3.1.3': resolution: {integrity: sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==} @@ -4196,30 +2709,17 @@ packages: '@types/d3-interpolate@3.0.4': resolution: {integrity: sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==} -<<<<<<< HEAD '@types/d3-path@3.1.0': resolution: {integrity: sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==} -======= - '@types/d3-path@3.1.1': - resolution: {integrity: sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/d3-scale-chromatic@3.1.0': resolution: {integrity: sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==} -<<<<<<< HEAD '@types/d3-scale@4.0.8': resolution: {integrity: sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==} '@types/d3-shape@3.1.6': resolution: {integrity: sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==} -======= - '@types/d3-scale@4.0.9': - resolution: {integrity: sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==} - - '@types/d3-shape@3.1.7': - resolution: {integrity: sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/d3-time@3.0.4': resolution: {integrity: sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==} @@ -4233,19 +2733,12 @@ packages: '@types/domhandler@2.4.5': resolution: {integrity: sha512-lANhC2grmFG1gBac/8sDAKdIXx+TzAdkJIAjEOSMA+qW3297ybACEbacJnG15aNYfrzDO6fdcoouokqAKsy6aQ==} -<<<<<<< HEAD '@types/domutils@1.7.8': resolution: {integrity: sha512-iZGboDV79ibrO3D625p9yD+VgmMDnyJocdIRJvu9Xz66R8SHfOY/XNgdjY5SFoFiLgILceVfSLt7IUhlk1Vhhg==} -======= - '@types/domutils@2.1.0': - resolution: {integrity: sha512-5oQOJFsEXmVRW2gcpNrBrv1bj+FVge2Zwd5iDqxan5tu9/EKxaufqpR8lIY5sGIZJRhD5jgTM0iBmzjdpeQutQ==} - deprecated: This is a stub types definition. domutils provides its own type definitions, so you do not need this installed. ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/estree-jsx@1.0.5': resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==} -<<<<<<< HEAD '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} @@ -4254,13 +2747,6 @@ packages: '@types/geojson@7946.0.15': resolution: {integrity: sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==} -======= - '@types/estree@1.0.8': - resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} - - '@types/geojson@7946.0.16': - resolution: {integrity: sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/google.maps@3.58.1': resolution: {integrity: sha512-X9QTSvGJ0nCfMzYOnaVs/k6/4L+7F5uCS+4iUmkLEls6J9S/Phv+m/i3mDeyc49ZBgwab3EFO1HEoBY7k98EGQ==} @@ -4286,13 +2772,8 @@ packages: '@types/jest@30.0.0': resolution: {integrity: sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==} -<<<<<<< HEAD '@types/jquery@3.5.32': resolution: {integrity: sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==} -======= - '@types/jquery@3.5.33': - resolution: {integrity: sha512-SeyVJXlCZpEki5F0ghuYe+L+PprQta6nRZqhONt9F13dWBtR/ftoaIbdRQ7cis7womE+X2LKhsDdDtkkDhJS6g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/js-cookie@3.0.6': resolution: {integrity: sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==} @@ -4309,13 +2790,8 @@ packages: '@types/katex@0.16.7': resolution: {integrity: sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==} -<<<<<<< HEAD '@types/leaflet@1.9.15': resolution: {integrity: sha512-7UuggAuAs+mva66gtf2OTB1nEhzU/9JED93TIaOEgvFMvG/dIGQaukHE7izHo1Zd+Ko1L4ETUw7TBc8yUxevpg==} -======= - '@types/leaflet@1.9.21': - resolution: {integrity: sha512-TbAd9DaPGSnzp6QvtYngntMZgcRk+igFELwR2N99XZn7RXUdKgsXMR+28bUO0rPsWp8MIu/f47luLIQuSLYv/w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/mdast@3.0.15': resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==} @@ -4329,45 +2805,24 @@ packages: '@types/minimatch@5.1.2': resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} -<<<<<<< HEAD '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} -======= - '@types/ms@2.1.0': - resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/next@9.0.0': resolution: {integrity: sha512-gnBXM8rP1mnCgT1uE2z8SnpFTKRWReJlhbZLZkOLq/CH1ifvTNwjIVtXvsywTy1dwVklf+y/MB0Eh6FOa94yrg==} deprecated: This is a stub types definition. next provides its own type definitions, so you do not need this installed. -<<<<<<< HEAD '@types/node@20.17.10': resolution: {integrity: sha512-/jrvh5h6NXhEauFFexRin69nA0uHJ5gwk4iDivp/DeoEua3uwCUto6PC86IpRITBOs4+6i2I56K5x5b6WYGXHA==} -======= - '@types/node@20.19.23': - resolution: {integrity: sha512-yIdlVVVHXpmqRhtyovZAcSy0MiPcYWGkoO4CGe/+jpP0hmNuihm4XhHbADpK++MsiLHP5MVlv+bcgdF99kSiFQ==} - - '@types/pako@2.0.4': - resolution: {integrity: sha512-VWDCbrLeVXJM9fihYodcLiIv0ku+AlOa/TQ1SvYOaBuyrSKgEcro95LJyIsJ4vSo6BXIxOKxiJAat04CmST9Fw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/parse-json@4.0.2': resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} -<<<<<<< HEAD '@types/prop-types@15.7.14': resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} '@types/qs@6.9.17': resolution: {integrity: sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==} -======= - '@types/prop-types@15.7.15': - resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==} - - '@types/qs@6.14.0': - resolution: {integrity: sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/raf@3.4.3': resolution: {integrity: sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==} @@ -4378,13 +2833,8 @@ packages: '@types/react-google-recaptcha@2.1.9': resolution: {integrity: sha512-nT31LrBDuoSZJN4QuwtQSF3O89FVHC4jLhM+NtKEmVF5R1e8OY0Jo4//x2Yapn2aNHguwgX5doAq8Zo+Ehd0ug==} -<<<<<<< HEAD '@types/react-html-parser@2.0.6': resolution: {integrity: sha512-xqo8u7iqr5eOIulM1BFAlpoBgdhVleLcDHySy8/k7Le9wgdRgZY1UdKtEcdlc2jMS8cqEx8+U4Mz/e5Ves66Fg==} -======= - '@types/react-html-parser@2.0.7': - resolution: {integrity: sha512-1OeS8GG+sVYlLlhMIT/smA7L2AAAxJCHtUxu66UjIuE68m8eB+XM71Kpzn49b5BRb6MRm/UrmzGUNBP1oTY7QA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/react-syntax-highlighter@15.5.13': resolution: {integrity: sha512-uLGJ87j6Sz8UaBAooU0T6lWJ0dBmjZgN1PZTrj05TNql2/XpC6+4HhMT5syIdFUUt+FASfCeLLv4kBygNU+8qA==} @@ -4394,40 +2844,21 @@ packages: peerDependencies: '@types/react': '*' -<<<<<<< HEAD '@types/react@18.3.18': resolution: {integrity: sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==} -======= - '@types/react@18.3.26': - resolution: {integrity: sha512-RFA/bURkcKzx/X9oumPG9Vp3D3JUgus/d0b67KB0t5S/raciymilkOa66olh78MUI92QLbEJevO7rvqU/kjwKA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/rtl-detect@1.0.3': resolution: {integrity: sha512-qpstuHivwg/HoXxRrBo5/r/OVx5M2SkqJpVu2haasdLctt+jMGHWjqdbI0LL7Rk2wRmN/UHdHK4JZg9RUMcvKA==} -<<<<<<< HEAD '@types/sanitize-html@2.13.0': resolution: {integrity: sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==} '@types/sizzle@2.3.9': resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==} -======= - '@types/sanitize-html@2.16.0': - resolution: {integrity: sha512-l6rX1MUXje5ztPT0cAFtUayXF06DqPhRyfVXareEN5gGCFaP/iwsxIyKODr9XDhfxPpN6vXUFNfo5kZMXCxBtw==} - - '@types/sizzle@2.3.10': - resolution: {integrity: sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/stack-utils@2.0.3': resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==} -<<<<<<< HEAD -======= - '@types/statuses@2.0.6': - resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/tough-cookie@4.0.5': resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} @@ -4477,12 +2908,9 @@ packages: resolution: {integrity: sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==} engines: {node: ^16.0.0 || >=18.0.0} -<<<<<<< HEAD '@ungap/structured-clone@1.2.1': resolution: {integrity: sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ungap/structured-clone@1.3.0': resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==} @@ -4581,13 +3009,8 @@ packages: cpu: [x64] os: [win32] -<<<<<<< HEAD '@vercel/analytics@1.4.1': resolution: {integrity: sha512-ekpL4ReX2TH3LnrRZTUKjHHNpNy9S1I7QmS+g/RQXoSUQ8ienzosuX7T9djZ/s8zPhBx1mpHP/Rw5875N+zQIQ==} -======= - '@vercel/analytics@1.5.0': - resolution: {integrity: sha512-MYsBzfPki4gthY5HnYN7jgInhAZ7Ac1cYDoRWFomwGHWEX7odTEzbtg9kf/QSo7XEsEAqlQugA6gJ2WS2DEa3g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@remix-run/react': ^2 '@sveltejs/kit': ^1 || ^2 @@ -4612,19 +3035,11 @@ packages: vue-router: optional: true -<<<<<<< HEAD '@wavesurfer/react@1.0.8': resolution: {integrity: sha512-YowJcynQTTC1oWBWlxr7IkZn9QlYfvOC2rYqOvVA2DwBh+nMEoZca7718disoFNnnX7/NzTKqZd/VuWI5RbhMQ==} peerDependencies: react: ^19.0.0 wavesurfer.js: '>=7.8.11' -======= - '@wavesurfer/react@1.0.11': - resolution: {integrity: sha512-DRpaA3MRTKy4Jby12xvoHASa+w31FZtxaqanXcJjfqNqfamkKi8VJfRnz+Uub9LkpdgoAc3g5SuZF75lEcGgzQ==} - peerDependencies: - react: ^18.2.0 || ^19.0.0 - wavesurfer.js: '>=7.7.14' ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@wojtekmaj/date-utils@1.5.1': resolution: {integrity: sha512-+i7+JmNiE/3c9FKxzWFi2IjRJ+KzZl1QPu6QNrsgaa2MuBgXvUy4gA1TVzf/JMdIIloB76xSKikTWuyYAIVLww==} @@ -4632,13 +3047,6 @@ packages: '@yr/monotone-cubic-spline@1.0.3': resolution: {integrity: sha512-FQXkOta0XBSUPHndIKON2Y9JeQz5ZeMqLYZVVK93FliNBFm7LNMIZmY6FrMEB9XPcDbE2bekMbZD6kzDkxwYjA==} -<<<<<<< HEAD -======= - accepts@2.0.0: - resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==} - engines: {node: '>= 0.6'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 acorn-jsx@5.3.2: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -4648,7 +3056,6 @@ packages: resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==} engines: {node: '>=0.4.0'} -<<<<<<< HEAD acorn@8.14.0: resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} engines: {node: '>=0.4.0'} @@ -4656,15 +3063,6 @@ packages: agent-base@7.1.3: resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==} -======= - acorn@8.15.0: - resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} - engines: {node: '>=0.4.0'} - hasBin: true - - agent-base@7.1.4: - resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 14'} ajv@6.12.6: @@ -4678,21 +3076,12 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} -<<<<<<< HEAD ansi-regex@6.1.0: resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} engines: {node: '>=12'} ansi-sequence-parser@1.1.1: resolution: {integrity: sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==} -======= - ansi-regex@6.2.2: - resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==} - engines: {node: '>=12'} - - ansi-sequence-parser@1.1.3: - resolution: {integrity: sha512-+fksAx9eG3Ab6LDnLs3ZqZa8KVJ/jYnX+D4Qe1azX+LFGFAXqynCQLOdLpNYN/l9e7l6hMWwZbrnctqr6eSQSw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} @@ -4706,13 +3095,8 @@ packages: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} -<<<<<<< HEAD ansi-styles@6.2.1: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} -======= - ansi-styles@6.2.3: - resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=12'} any-promise@1.3.0: @@ -4740,13 +3124,8 @@ packages: argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} -<<<<<<< HEAD aria-hidden@1.2.4: resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==} -======= - aria-hidden@1.2.6: - resolution: {integrity: sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=10'} aria-query@5.3.0: @@ -4760,13 +3139,8 @@ packages: resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==} engines: {node: '>= 0.4'} -<<<<<<< HEAD array-includes@3.1.8: resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==} -======= - array-includes@3.1.9: - resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} array-union@2.1.0: @@ -4777,13 +3151,8 @@ packages: resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==} engines: {node: '>= 0.4'} -<<<<<<< HEAD array.prototype.findlastindex@1.2.5: resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==} -======= - array.prototype.findlastindex@1.2.6: - resolution: {integrity: sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} array.prototype.flat@1.3.3: @@ -4813,7 +3182,6 @@ packages: resolution: {integrity: sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==} hasBin: true -<<<<<<< HEAD asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} @@ -4822,51 +3190,29 @@ packages: engines: {node: '>= 4.5.0'} hasBin: true -======= - async-function@1.0.0: - resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==} - engines: {node: '>= 0.4'} - - asynckit@0.4.0: - resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 attr-accept@2.2.5: resolution: {integrity: sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ==} engines: {node: '>=4'} -<<<<<<< HEAD autobind-decorator@2.4.0: resolution: {integrity: sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw==} engines: {node: '>=8.10', npm: '>=6.4.1'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 available-typed-arrays@1.0.7: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} -<<<<<<< HEAD axe-core@4.10.2: resolution: {integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==} engines: {node: '>=4'} axios@1.7.9: resolution: {integrity: sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==} -======= - axe-core@4.11.0: - resolution: {integrity: sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==} - engines: {node: '>=4'} - - axios@1.12.2: - resolution: {integrity: sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 axobject-query@4.1.0: resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==} engines: {node: '>= 0.4'} -<<<<<<< HEAD babel-jest@30.0.5: resolution: {integrity: sha512-mRijnKimhGDMsizTvBTWotwNpzrkHr+VvZUQBof2AufXKB8NXrL1W69TG20EvOz7aevx6FTJIaBuBkYxS8zolg==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -4879,27 +3225,12 @@ packages: babel-plugin-jest-hoist@30.0.1: resolution: {integrity: sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==} -======= - babel-jest@30.2.0: - resolution: {integrity: sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - peerDependencies: - '@babel/core': ^7.11.0 || ^8.0.0-0 - - babel-plugin-istanbul@7.0.1: - resolution: {integrity: sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==} - engines: {node: '>=12'} - - babel-plugin-jest-hoist@30.2.0: - resolution: {integrity: sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} babel-plugin-macros@3.1.0: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} -<<<<<<< HEAD babel-preset-current-node-syntax@1.1.0: resolution: {integrity: sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==} peerDependencies: @@ -4910,18 +3241,6 @@ packages: engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: '@babel/core': ^7.11.0 -======= - babel-preset-current-node-syntax@1.2.0: - resolution: {integrity: sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==} - peerDependencies: - '@babel/core': ^7.0.0 || ^8.0.0-0 - - babel-preset-jest@30.2.0: - resolution: {integrity: sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - peerDependencies: - '@babel/core': ^7.11.0 || ^8.0.0-beta.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 bail@2.0.2: resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==} @@ -4936,13 +3255,6 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} -<<<<<<< HEAD -======= - baseline-browser-mapping@2.8.19: - resolution: {integrity: sha512-zoKGUdu6vb2jd3YOq0nnhEDQVbPcHhco3UImJrv5dSkvxTc2pl2WjOPsjZXDwPDSl5eghIMuY3R6J9NDKF3KcQ==} - hasBin: true - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 binary-extensions@2.3.0: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} @@ -4953,49 +3265,29 @@ packages: blurhash@2.0.5: resolution: {integrity: sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w==} -<<<<<<< HEAD brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} brace-expansion@2.0.1: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} -======= - body-parser@2.2.0: - resolution: {integrity: sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==} - engines: {node: '>=18'} - - brace-expansion@1.1.12: - resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==} - - brace-expansion@2.0.2: - resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} -<<<<<<< HEAD browserslist@4.24.4: resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==} -======= - browserslist@4.27.0: - resolution: {integrity: sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} -<<<<<<< HEAD btoa@1.2.1: resolution: {integrity: sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==} engines: {node: '>= 0.4.0'} hasBin: true -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -5006,30 +3298,16 @@ packages: resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} -<<<<<<< HEAD call-bind-apply-helpers@1.0.1: resolution: {integrity: sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==} -======= - bytes@3.1.2: - resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} - engines: {node: '>= 0.8'} - - call-bind-apply-helpers@1.0.2: - resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} call-bind@1.0.8: resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==} engines: {node: '>= 0.4'} -<<<<<<< HEAD call-bound@1.0.3: resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==} -======= - call-bound@1.0.4: - resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} callsites@3.1.0: @@ -5048,13 +3326,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} -<<<<<<< HEAD caniuse-lite@1.0.30001690: resolution: {integrity: sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==} -======= - caniuse-lite@1.0.30001751: - resolution: {integrity: sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 canvg@3.0.11: resolution: {integrity: sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==} @@ -5067,24 +3340,16 @@ packages: resolution: {integrity: sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==} engines: {node: '>=4'} -<<<<<<< HEAD chalk@3.0.0: resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==} engines: {node: '>=8'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} -<<<<<<< HEAD chalk@5.4.1: resolution: {integrity: sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==} -======= - chalk@5.6.2: - resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} char-regex@1.0.2: @@ -5112,26 +3377,16 @@ packages: character-reference-invalid@2.0.1: resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==} -<<<<<<< HEAD chart.js@4.5.0: resolution: {integrity: sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==} -======= - chart.js@4.5.1: - resolution: {integrity: sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {pnpm: '>=8'} chokidar@3.6.0: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} -<<<<<<< HEAD ci-info@4.3.0: resolution: {integrity: sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==} -======= - ci-info@4.3.1: - resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=8'} cjs-module-lexer@2.1.0: @@ -5143,13 +3398,8 @@ packages: ckeditor5@41.3.1: resolution: {integrity: sha512-pBK1YZV9Sy4R53XG70TEeLFOvTFC7tg8AmS6d6zizegtwkH8seblkcERkykcNuvmfzZ/2h9JbafJ4kisZOwiUQ==} -<<<<<<< HEAD ckeditor5@46.0.0: resolution: {integrity: sha512-xOvTcZqeVCsEM6hp9kHtTAAS6Elie/WZ/RA3FYZjR2251CI66vNOb0GWU+c0ufr2Ha/FuXRdgV4nSpIv3JLvaA==} -======= - ckeditor5@47.1.0: - resolution: {integrity: sha512-Vnmt6eKIpiM+EpJSwxzCjJC5/9ykUhegwqWS9znAuAz2ZgBiVUFt54Y+CBhVpMru3z4zQ+NncVgCqoiU3ocHGQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 class-variance-authority@0.7.1: resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==} @@ -5165,13 +3415,6 @@ packages: resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==} engines: {node: '>=6'} -<<<<<<< HEAD -======= - cli-width@4.1.0: - resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} - engines: {node: '>= 12'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 client-only@0.0.1: resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} @@ -5191,13 +3434,8 @@ packages: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} -<<<<<<< HEAD cmdk@1.0.4: resolution: {integrity: sha512-AnsjfHyHpQ/EFeAnG216WY7A5LiYCoZzCSygiLvfXC3H3LFGCprErteUcszaVluGOhuOTbJS3jWHrSDYPBBygg==} -======= - cmdk@1.1.1: - resolution: {integrity: sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^18 || ^19 || ^19.0.0-rc react-dom: ^18 || ^19 || ^19.0.0-rc @@ -5209,13 +3447,8 @@ packages: code-block-writer@12.0.0: resolution: {integrity: sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==} -<<<<<<< HEAD collect-v8-coverage@1.0.2: resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==} -======= - collect-v8-coverage@1.0.3: - resolution: {integrity: sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} @@ -5234,13 +3467,8 @@ packages: color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} -<<<<<<< HEAD color-name@2.0.0: resolution: {integrity: sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==} -======= - color-name@2.0.2: - resolution: {integrity: sha512-9vEt7gE16EW7Eu7pvZnR0abW9z6ufzhXxGXZEVU9IqPdlsUiMwJeJfRtq0zePUmnbHGT9zajca7mX8zgoayo4A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=12.20'} color-parse@1.4.2: @@ -5285,60 +3513,24 @@ packages: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} -<<<<<<< HEAD compute-scroll-into-view@3.1.0: resolution: {integrity: sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==} -======= - compute-scroll-into-view@3.1.1: - resolution: {integrity: sha512-VRhuHOLoKYOy4UbilLbUzbYg93XLjv2PncJC50EuTWPA3gaja1UjBsUP/D/9/juV3vQFr6XBEzn9KCAHdUvOHw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} -<<<<<<< HEAD -======= - content-disposition@1.0.0: - resolution: {integrity: sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==} - engines: {node: '>= 0.6'} - - content-type@1.0.5: - resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} - engines: {node: '>= 0.6'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 convert-source-map@1.9.0: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} -<<<<<<< HEAD -======= - cookie-signature@1.2.2: - resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==} - engines: {node: '>=6.6.0'} - - cookie@0.7.2: - resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==} - engines: {node: '>= 0.6'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 cookie@1.0.2: resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} -<<<<<<< HEAD core-js@3.43.0: resolution: {integrity: sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==} -======= - core-js@3.46.0: - resolution: {integrity: sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==} - - cors@2.8.5: - resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} - engines: {node: '>= 0.10'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 cose-base@1.0.3: resolution: {integrity: sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==} @@ -5400,13 +3592,8 @@ packages: peerDependencies: cytoscape: ^3.2.0 -<<<<<<< HEAD cytoscape@3.30.4: resolution: {integrity: sha512-OxtlZwQl1WbwMmLiyPSEBuzeTIQnwZhJYYWFzZ2PhEHVFwpeaqNIkUzSiso00D98qk60l8Gwon2RP304d3BJ1A==} -======= - cytoscape@3.33.1: - resolution: {integrity: sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=0.10'} d3-array@2.12.1: @@ -5577,13 +3764,8 @@ packages: date-fns@3.6.0: resolution: {integrity: sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==} -<<<<<<< HEAD dayjs@1.11.13: resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==} -======= - dayjs@1.11.18: - resolution: {integrity: sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 debounce@1.2.1: resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==} @@ -5596,13 +3778,8 @@ packages: supports-color: optional: true -<<<<<<< HEAD debug@4.4.0: resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} -======= - debug@4.4.3: - resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -5613,7 +3790,6 @@ packages: decimal.js-light@2.5.1: resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==} -<<<<<<< HEAD decimal.js@10.4.3: resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==} @@ -5625,16 +3801,6 @@ packages: dedent@1.6.0: resolution: {integrity: sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==} -======= - decimal.js@10.6.0: - resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==} - - decode-named-character-reference@1.2.0: - resolution: {integrity: sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==} - - dedent@1.7.0: - resolution: {integrity: sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: babel-plugin-macros: ^3.1.0 peerDependenciesMeta: @@ -5666,13 +3832,6 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} -<<<<<<< HEAD -======= - depd@2.0.0: - resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} - engines: {node: '>= 0.8'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} @@ -5680,13 +3839,8 @@ packages: detect-element-overflow@1.4.2: resolution: {integrity: sha512-4m6cVOtvm/GJLjo7WFkPfwXoEIIbM7GQwIh4WEa4g7IsNi1YzwUsGL5ApNLrrHL29bHeNeQ+/iZhw+YHqgE2Fw==} -<<<<<<< HEAD detect-libc@2.0.3: resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} -======= - detect-libc@2.1.2: - resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=8'} detect-newline@3.1.0: @@ -5749,19 +3903,11 @@ packages: dompurify@3.1.6: resolution: {integrity: sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==} -<<<<<<< HEAD dompurify@3.2.6: resolution: {integrity: sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==} domutils@3.2.1: resolution: {integrity: sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==} -======= - dompurify@3.3.0: - resolution: {integrity: sha512-r+f6MYR1gGN1eJv0TVQbhA7if/U7P87cdPl3HN5rikqaBSBxLiCb/b9O+2eG0cxz0ghyU+mU1QkbsOwERMYlWQ==} - - domutils@3.2.2: - resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dunder-proto@1.0.1: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} @@ -5773,21 +3919,12 @@ packages: eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} -<<<<<<< HEAD electron-to-chromium@1.5.97: resolution: {integrity: sha512-HKLtaH02augM7ZOdYRuO19rWDeY+QSJ1VxnXFa/XDFLf07HvM90pALIJFgrO+UVaajI3+aJMMpojoUTLZyQ7JQ==} -======= - ee-first@1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - - electron-to-chromium@1.5.239: - resolution: {integrity: sha512-1y5w0Zsq39MSPmEjHjbizvhYoTaulVtivpxkp5q5kaPmQtsK6/2nvAzGRxNMS9DoYySp9PkW0MAQDwU1m764mg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 elkjs@0.9.3: resolution: {integrity: sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==} -<<<<<<< HEAD embla-carousel-autoplay@8.5.1: resolution: {integrity: sha512-FnZklFpePfp8wbj177UwVaGFehgs+ASVcJvYLWTtHuYKURynCc3IdDn2qrn0E5Qpa3g9yeGwCS4p8QkrZmO8xg==} peerDependencies: @@ -5805,25 +3942,6 @@ packages: embla-carousel@8.5.1: resolution: {integrity: sha512-JUb5+FOHobSiWQ2EJNaueCNT/cQU9L6XWBbWmorWPQT9bkbk+fhsuLr8wWrzXKagO3oWszBO7MSx+GfaRk4E6A==} -======= - embla-carousel-autoplay@8.6.0: - resolution: {integrity: sha512-OBu5G3nwaSXkZCo1A6LTaFMZ8EpkYbwIaH+bPqdBnDGQ2fh4+NbzjXjs2SktoPNKCtflfVMc75njaDHOYXcrsA==} - peerDependencies: - embla-carousel: 8.6.0 - - embla-carousel-react@8.6.0: - resolution: {integrity: sha512-0/PjqU7geVmo6F734pmPqpyHqiM99olvyecY7zdweCw+6tKEXnrE90pBiBbMMU8s5tICemzpQ3hi5EpxzGW+JA==} - peerDependencies: - react: ^16.8.0 || ^17.0.1 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc - - embla-carousel-reactive-utils@8.6.0: - resolution: {integrity: sha512-fMVUDUEx0/uIEDM0Mz3dHznDhfX+znCCDCeIophYb1QGVM7YThSWX+wz11zlYwWFOr74b4QLGg0hrGPJeG2s4A==} - peerDependencies: - embla-carousel: 8.6.0 - - embla-carousel@8.6.0: - resolution: {integrity: sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} @@ -5838,37 +3956,19 @@ packages: emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} -<<<<<<< HEAD enhanced-resolve@5.18.0: resolution: {integrity: sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==} engines: {node: '>=10.13.0'} -======= - encodeurl@2.0.0: - resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==} - engines: {node: '>= 0.8'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} -<<<<<<< HEAD error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} es-abstract@1.23.7: resolution: {integrity: sha512-OygGC8kIcDhXX+6yAZRGLqwi2CmEXCbLQixeGUgYeR+Qwlppqmo7DIDr8XibtEBZp+fJcoYpoatp5qwLMEdcqQ==} -======= - entities@6.0.1: - resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==} - engines: {node: '>=0.12'} - - error-ex@1.3.4: - resolution: {integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==} - - es-abstract@1.24.0: - resolution: {integrity: sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} es-define-property@1.0.1: @@ -5883,7 +3983,6 @@ packages: resolution: {integrity: sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==} engines: {node: '>= 0.4'} -<<<<<<< HEAD es-object-atoms@1.0.0: resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} engines: {node: '>= 0.4'} @@ -5894,19 +3993,6 @@ packages: es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} -======= - es-object-atoms@1.1.1: - resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} - engines: {node: '>= 0.4'} - - es-set-tostringtag@2.1.0: - resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} - engines: {node: '>= 0.4'} - - es-shim-unscopables@1.1.0: - resolution: {integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==} - engines: {node: '>= 0.4'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-to-primitive@1.3.0: resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==} @@ -5919,12 +4005,6 @@ packages: resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} engines: {node: '>=6'} -<<<<<<< HEAD -======= - escape-html@1.0.3: - resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -5953,13 +4033,8 @@ packages: eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} -<<<<<<< HEAD eslint-import-resolver-typescript@3.7.0: resolution: {integrity: sha512-Vrwyi8HHxY97K5ebydMtffsWAn1SCR9eol49eCd5fJS4O1WV7PaAjbcjmbfJJSMz/t4Mal212Uz/fQZrOB8mow==} -======= - eslint-import-resolver-typescript@3.10.1: - resolution: {integrity: sha512-A1rHYb06zjMGAxdLSkN2fXPBwuSaQ0iO5M/hdyS0Ajj1VBaRp0sPD3dn1FhME3c/JluGFbwSxyCfqdSbtQLAHQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -5971,13 +4046,8 @@ packages: eslint-plugin-import-x: optional: true -<<<<<<< HEAD eslint-module-utils@2.12.0: resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==} -======= - eslint-module-utils@2.12.1: - resolution: {integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -5997,13 +4067,8 @@ packages: eslint-import-resolver-webpack: optional: true -<<<<<<< HEAD eslint-plugin-import@2.31.0: resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==} -======= - eslint-plugin-import@2.32.0: - resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -6024,13 +4089,8 @@ packages: peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 -<<<<<<< HEAD eslint-plugin-react@7.37.3: resolution: {integrity: sha512-DomWuTQPFYZwF/7c9W2fkKkStqZmBd3uugfqBYLdkZ3Hii23WzZuOLUskGxB8qkSKqftxEeGL1TB2kMhrce0jA==} -======= - eslint-plugin-react@7.37.5: - resolution: {integrity: sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=4'} peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7 @@ -6082,14 +4142,9 @@ packages: estree-util-to-js@1.2.0: resolution: {integrity: sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==} -<<<<<<< HEAD estree-util-value-to-estree@1.3.0: resolution: {integrity: sha512-Y+ughcF9jSUJvncXwqRageavjrNPAI+1M/L3BI3PyLp1nmgYTGUXU6t5z1Y7OWuThoDdhPME07bQU+d5LxdJqw==} engines: {node: '>=12.0.0'} -======= - estree-util-value-to-estree@3.4.1: - resolution: {integrity: sha512-E4fEc8KLhDXnbyDa5XrbdT9PbgSMt0AGZPFUsGFok8N2Q7DTO+F6xAFJjIdw71EkidRg186I1mQCKzZ1ZbEsCw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 estree-util-visit@1.2.1: resolution: {integrity: sha512-xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw==} @@ -6101,27 +4156,9 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} -<<<<<<< HEAD eventemitter3@4.0.7: resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} -======= - etag@1.8.1: - resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} - engines: {node: '>= 0.6'} - - eventemitter3@4.0.7: - resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} - - eventsource-parser@3.0.6: - resolution: {integrity: sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==} - engines: {node: '>=18.0.0'} - - eventsource@3.0.7: - resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==} - engines: {node: '>=18.0.0'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 execa@0.8.0: resolution: {integrity: sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==} engines: {node: '>=4'} @@ -6138,27 +4175,10 @@ packages: resolution: {integrity: sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==} engines: {node: '>= 0.8.0'} -<<<<<<< HEAD expect@30.0.5: resolution: {integrity: sha512-P0te2pt+hHI5qLJkIR+iMvS+lYUZml8rKKsohVHAGY+uClp9XVbdyYNJOIjSRpHVp8s8YqxJCiHUkSYZGr8rtQ==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} -======= - expect@30.2.0: - resolution: {integrity: sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - express-rate-limit@7.5.1: - resolution: {integrity: sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==} - engines: {node: '>= 16'} - peerDependencies: - express: '>= 4.11' - - express@5.1.0: - resolution: {integrity: sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==} - engines: {node: '>= 18'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 extend-shallow@2.0.1: resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==} engines: {node: '>=0.10.0'} @@ -6169,21 +4189,12 @@ packages: fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} -<<<<<<< HEAD fast-equals@5.0.1: resolution: {integrity: sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==} engines: {node: '>=6.0.0'} fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} -======= - fast-equals@5.3.2: - resolution: {integrity: sha512-6rxyATwPCkaFIL3JLqw8qXqMpIZ942pTX/tbQFkRsDGblS8tNGtlUauA/+mt6RUfqn/4MoEr+WDkYoIQbibWuQ==} - engines: {node: '>=6.0.0'} - - fast-glob@3.3.3: - resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=8.6.0'} fast-json-stable-stringify@2.1.0: @@ -6192,16 +4203,8 @@ packages: fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} -<<<<<<< HEAD fastq@1.18.0: resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} -======= - fast-png@6.4.0: - resolution: {integrity: sha512-kAqZq1TlgBjZcLr5mcN6NP5Rv4V2f22z00c3g8vRrwkcqjerx7BEhPbOnWCPqaHUl2XWQBJQvOT/FQhdMT7X/Q==} - - fastq@1.19.1: - resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 fault@1.0.4: resolution: {integrity: sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==} @@ -6209,18 +4212,6 @@ packages: fb-watchman@2.0.2: resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} -<<<<<<< HEAD -======= - fdir@6.5.0: - resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} - engines: {node: '>=12.0.0'} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 fetch-blob@3.2.0: resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} engines: {node: ^12.20 || >= 14.13} @@ -6240,13 +4231,6 @@ packages: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} -<<<<<<< HEAD -======= - finalhandler@2.1.0: - resolution: {integrity: sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==} - engines: {node: '>= 0.8'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 find-root@1.1.0: resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==} @@ -6262,13 +4246,8 @@ packages: resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} -<<<<<<< HEAD flatted@3.3.2: resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==} -======= - flatted@3.3.3: - resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 flexsearch@0.7.43: resolution: {integrity: sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg==} @@ -6276,13 +4255,8 @@ packages: focus-visible@5.2.1: resolution: {integrity: sha512-8Bx950VD1bWTQJEH/AM6SpEk+SU55aVnp4Ujhuuxy3eMEBCRwBnTBnVXr9YAPvZL3/CNjCa8u4IWfNmEO53whA==} -<<<<<<< HEAD follow-redirects@1.15.9: resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} -======= - follow-redirects@1.15.11: - resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=4.0'} peerDependencies: debug: '*' @@ -6290,7 +4264,6 @@ packages: debug: optional: true -<<<<<<< HEAD for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -6300,18 +4273,6 @@ packages: form-data@4.0.1: resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==} -======= - for-each@0.3.5: - resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==} - engines: {node: '>= 0.4'} - - foreground-child@3.3.1: - resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==} - engines: {node: '>=14'} - - form-data@4.0.4: - resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 6'} format@0.2.2: @@ -6322,17 +4283,8 @@ packages: resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==} engines: {node: '>=12.20.0'} -<<<<<<< HEAD framer-motion@11.15.0: resolution: {integrity: sha512-MLk8IvZntxOMg7lDBLw2qgTHHv664bYoYmnFTmE0Gm/FW67aOJk0WM3ctMcG+Xhcv+vh5uyyXwxvxhSeJzSe+w==} -======= - forwarded@0.2.0: - resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} - engines: {node: '>= 0.6'} - - framer-motion@11.18.2: - resolution: {integrity: sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@emotion/is-prop-valid': '*' react: ^18.0.0 || ^19.0.0 @@ -6345,17 +4297,8 @@ packages: react-dom: optional: true -<<<<<<< HEAD fs-extra@11.3.0: resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==} -======= - fresh@2.0.0: - resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==} - engines: {node: '>= 0.8'} - - fs-extra@11.3.2: - resolution: {integrity: sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.14'} fs.realpath@1.0.0: @@ -6379,13 +4322,6 @@ packages: fuzzysort@3.1.0: resolution: {integrity: sha512-sR9BNCjBg6LNgwvxlBd0sBABvQitkLzoVY9MYYROQVX/FvfJ4Mai9LsGhDgd8qYdds0bY77VzYd5iuB+v5rwQQ==} -<<<<<<< HEAD -======= - generator-function@2.0.1: - resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==} - engines: {node: '>= 0.4'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -6398,13 +4334,8 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} -<<<<<<< HEAD get-intrinsic@1.2.6: resolution: {integrity: sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==} -======= - get-intrinsic@1.3.0: - resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} get-nonce@1.0.1: @@ -6419,13 +4350,6 @@ packages: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} engines: {node: '>=8.0.0'} -<<<<<<< HEAD -======= - get-proto@1.0.1: - resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} - engines: {node: '>= 0.4'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 get-stream@3.0.0: resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==} engines: {node: '>=4'} @@ -6438,13 +4362,8 @@ packages: resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==} engines: {node: '>= 0.4'} -<<<<<<< HEAD get-tsconfig@4.8.1: resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==} -======= - get-tsconfig@4.13.0: - resolution: {integrity: sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 get-user-locale@2.3.2: resolution: {integrity: sha512-O2GWvQkhnbDoWFUJfaBlDIKUEdND8ATpBXD6KXcbhxlfktyD/d8w6mkzM/IlQEqGZAMz/PW6j6Hv53BiigKLUQ==} @@ -6479,13 +4398,10 @@ packages: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} deprecated: Glob versions prior to v9 are no longer supported -<<<<<<< HEAD globals@11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 globals@13.24.0: resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} engines: {node: '>=8'} @@ -6498,13 +4414,8 @@ packages: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} -<<<<<<< HEAD goober@2.1.16: resolution: {integrity: sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==} -======= - goober@2.1.18: - resolution: {integrity: sha512-2vFqsaDVIT9Gz7N6kAL++pLpp41l3PfDuusHcjnGLfR6+huZkl6ziX+zgVC3ZxpqWhzH6pyDdGrCeDhMIvwaxw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: csstype: ^3.0.10 @@ -6518,13 +4429,6 @@ packages: graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} -<<<<<<< HEAD -======= - graphql@16.11.0: - resolution: {integrity: sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw==} - engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gray-matter@4.0.3: resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==} engines: {node: '>=6.0'} @@ -6580,13 +4484,8 @@ packages: hast-util-from-html@2.0.3: resolution: {integrity: sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==} -<<<<<<< HEAD hast-util-from-parse5@8.0.2: resolution: {integrity: sha512-SfMzfdAi/zAoZ1KkFEyyeXBn7u/ShQrfd675ZEE9M3qj+PMFX05xubzRyF76CCSJu8au9jgVxDV1+okFvgZU4A==} -======= - hast-util-from-parse5@8.0.3: - resolution: {integrity: sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hast-util-has-property@3.0.0: resolution: {integrity: sha512-MNilsvEKLFpV604hwfhVStK0usFY/QmM5zX16bo7EjnAEGofr5YyI37kzopBlZJkHD4t887i+q/C8/tr5Q94cA==} @@ -6639,21 +4538,12 @@ packages: hastscript@6.0.0: resolution: {integrity: sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==} -<<<<<<< HEAD hastscript@9.0.0: resolution: {integrity: sha512-jzaLBGavEDKHrc5EfFImKN7nZKKBdSLIdGvCwDZ9TfzbF2ffXiov8CKE445L2Z1Ek2t/m4SKQ2j6Ipv7NyUolw==} hastscript@9.0.1: resolution: {integrity: sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==} -======= - hastscript@9.0.1: - resolution: {integrity: sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==} - - headers-polyfill@4.0.3: - resolution: {integrity: sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 highlight.js@10.7.3: resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} @@ -6663,13 +4553,8 @@ packages: hoist-non-react-statics@3.3.2: resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} -<<<<<<< HEAD html-dom-parser@5.0.12: resolution: {integrity: sha512-LP2BI8aCnv6HCnO1kyQMaycqL7RCTUODGFWdKwrlc6ROG5rtbVEtE4mkBn1tokBMflUN7wyNKL4AXq7EMmga6Q==} -======= - html-dom-parser@5.1.1: - resolution: {integrity: sha512-+o4Y4Z0CLuyemeccvGN4bAO20aauB2N9tFEAep5x4OW34kV4PTarBHm6RL02afYt2BMKcr0D2Agep8S3nJPIBg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 html-encoding-sniffer@4.0.0: resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==} @@ -6678,13 +4563,8 @@ packages: html-escaper@2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} -<<<<<<< HEAD html-react-parser@5.2.1: resolution: {integrity: sha512-4FZBYVzmlYzmNgoDVETZd/I/OnVR0d46UMnLdf/VdKTE973jImSfbonIRCov/AQQsL7zp7D1UKqMz0gbK6M0yA==} -======= - html-react-parser@5.2.7: - resolution: {integrity: sha512-WzIAcqQoZoF49J9aev8NBDLz9TJvt2RmipeYA+/5+5x0sWCwFxqKiq0lysieiSA/G6dbUZ6KGGy65Cx2fjie5Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': 0.14 || 15 || 16 || 17 || 18 || 19 react: 0.14 || 15 || 16 || 17 || 18 || 19 @@ -6699,23 +4579,11 @@ packages: resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==} engines: {node: '>=8.0.0'} -<<<<<<< HEAD htmlparser2@8.0.2: resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==} htmlparser2@9.1.0: resolution: {integrity: sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==} -======= - htmlparser2@10.0.0: - resolution: {integrity: sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==} - - htmlparser2@8.0.2: - resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==} - - http-errors@2.0.0: - resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} - engines: {node: '>= 0.8'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 http-proxy-agent@7.0.2: resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} @@ -6744,13 +4612,6 @@ packages: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} -<<<<<<< HEAD -======= - iconv-lite@0.7.0: - resolution: {integrity: sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==} - engines: {node: '>=0.10.0'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} @@ -6758,13 +4619,8 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} -<<<<<<< HEAD import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} -======= - import-fresh@3.3.1: - resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6'} import-local@3.2.0: @@ -6793,13 +4649,8 @@ packages: inline-style-parser@0.2.4: resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==} -<<<<<<< HEAD input-otp@1.4.1: resolution: {integrity: sha512-+yvpmKYKHi9jIGngxagY9oWiiblPB7+nEO75F2l2o4vs+6vpPZZmUl4tBNYuTCvQjhvEIbdNeJu70bhfYP2nbw==} -======= - input-otp@1.4.2: - resolution: {integrity: sha512-l3jWwYNvrEa6NTCt7BECfCm48GvwuZzkoeG3gBL2w4CHeOXW3eKFmf9UNYkNfYc3mxMrthMnxjIE07MT0zLBQA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc @@ -6817,30 +4668,13 @@ packages: intersection-observer@0.12.2: resolution: {integrity: sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==} -<<<<<<< HEAD intl-messageformat@10.7.10: resolution: {integrity: sha512-hp7iejCBiJdW3zmOe18FdlJu8U/JsADSDiBPQhfdSeI8B9POtvPRvPh3nMlvhYayGMKLv6maldhR7y3Pf1vkpw==} -======= - deprecated: The Intersection Observer polyfill is no longer needed and can safely be removed. Intersection Observer has been Baseline since 2019. - - intl-messageformat@10.7.18: - resolution: {integrity: sha512-m3Ofv/X/tV8Y3tHXLohcuVuhWKo7BBq62cqY15etqmLxg2DZ34AGGgQDeR+SCta2+zICb1NX83af0GJmbQ1++g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 invariant@2.2.4: resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==} -<<<<<<< HEAD -======= - iobuffer@5.4.0: - resolution: {integrity: sha512-DRebOWuqDvxunfkNJAlc3IzWIPD5xVxwUNbHr7xKB8E6aLJxIPfNX3CoMJghcFjpv6RWQsrcJbghtEwSPoJqMA==} - - ipaddr.js@1.9.1: - resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} - engines: {node: '>= 0.10'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-alphabetical@1.0.4: resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==} @@ -6860,19 +4694,11 @@ packages: is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} -<<<<<<< HEAD is-arrayish@0.3.2: resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} is-async-function@2.0.0: resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==} -======= - is-arrayish@0.3.4: - resolution: {integrity: sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==} - - is-async-function@2.1.1: - resolution: {integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} is-bigint@1.1.0: @@ -6883,26 +4709,16 @@ packages: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} -<<<<<<< HEAD is-boolean-object@1.2.1: resolution: {integrity: sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==} -======= - is-boolean-object@1.2.2: - resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} is-buffer@2.0.5: resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==} engines: {node: '>=4'} -<<<<<<< HEAD is-bun-module@1.3.0: resolution: {integrity: sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==} -======= - is-bun-module@2.0.0: - resolution: {integrity: sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} @@ -6946,13 +4762,8 @@ packages: resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==} engines: {node: '>=6'} -<<<<<<< HEAD is-generator-function@1.0.10: resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==} -======= - is-generator-function@1.1.2: - resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} is-glob@4.0.3: @@ -6973,16 +4784,6 @@ packages: resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==} engines: {node: '>= 0.4'} -<<<<<<< HEAD -======= - is-negative-zero@2.0.3: - resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} - engines: {node: '>= 0.4'} - - is-node-process@1.2.0: - resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-number-object@1.1.1: resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==} engines: {node: '>= 0.4'} @@ -6999,13 +4800,10 @@ packages: resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} engines: {node: '>=8'} -<<<<<<< HEAD is-plain-obj@3.0.0: resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==} engines: {node: '>=10'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-plain-obj@4.1.0: resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} engines: {node: '>=12'} @@ -7017,12 +4815,6 @@ packages: is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} -<<<<<<< HEAD -======= - is-promise@4.0.0: - resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-reference@3.0.3: resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==} @@ -7042,13 +4834,8 @@ packages: resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==} engines: {node: '>= 0.4'} -<<<<<<< HEAD is-ssh@1.4.0: resolution: {integrity: sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==} -======= - is-ssh@1.4.1: - resolution: {integrity: sha512-JNeu1wQsHjyHgn9NcWTaXq6zWSR6hqE0++zhfZlkFBbScNkyvxCdeV8sRkSBaeLKxmbpR21brail63ACNxJ0Tg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-stream@1.1.0: resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==} @@ -7085,13 +4872,8 @@ packages: resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==} engines: {node: '>= 0.4'} -<<<<<<< HEAD is-weakref@1.1.0: resolution: {integrity: sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==} -======= - is-weakref@1.1.1: - resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} is-weakset@2.0.4: @@ -7120,21 +4902,12 @@ packages: resolution: {integrity: sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==} engines: {node: '>=10'} -<<<<<<< HEAD istanbul-reports@3.1.7: resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==} engines: {node: '>=8'} iterator.prototype@1.1.4: resolution: {integrity: sha512-x4WH0BWmrMmg4oHHl+duwubhrvczGlyuGAZu3nvrf0UXOfPu8IhZObFEr7DE/iv01YgVZrsOiRcqw2srkKEDIA==} -======= - istanbul-reports@3.2.0: - resolution: {integrity: sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==} - engines: {node: '>=8'} - - iterator.prototype@1.1.5: - resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} jackspeak@2.3.6: @@ -7144,7 +4917,6 @@ packages: jackspeak@3.4.3: resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} -<<<<<<< HEAD jest-changed-files@30.0.5: resolution: {integrity: sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -7155,18 +4927,6 @@ packages: jest-cli@30.0.5: resolution: {integrity: sha512-Sa45PGMkBZzF94HMrlX4kUyPOwUpdZasaliKN3mifvDmkhLYqLLg8HQTzn6gq7vJGahFYMQjXgyJWfYImKZzOw==} -======= - jest-changed-files@30.2.0: - resolution: {integrity: sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-circus@30.2.0: - resolution: {integrity: sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-cli@30.2.0: - resolution: {integrity: sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: @@ -7175,13 +4935,8 @@ packages: node-notifier: optional: true -<<<<<<< HEAD jest-config@30.0.5: resolution: {integrity: sha512-aIVh+JNOOpzUgzUnPn5FLtyVnqc3TQHVMupYtyeURSb//iLColiMIR8TxCIDKyx9ZgjKnXGucuW68hCxgbrwmA==} -======= - jest-config@30.2.0: - resolution: {integrity: sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: '@types/node': '*' @@ -7195,7 +4950,6 @@ packages: ts-node: optional: true -<<<<<<< HEAD jest-diff@30.0.5: resolution: {integrity: sha512-1UIqE9PoEKaHcIKvq2vbibrCog4Y8G0zmOxgQUVEiTqwR5hJVMCoDsN1vFvI5JvwD37hjueZ1C4l2FyGnfpE0A==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -7210,22 +4964,6 @@ packages: jest-environment-jsdom@30.0.5: resolution: {integrity: sha512-BmnDEoAH+jEjkPrvE9DTKS2r3jYSJWlN/r46h0/DBUxKrkgt2jAZ5Nj4wXLAcV1KWkRpcFqA5zri9SWzJZ1cCg==} -======= - jest-diff@30.2.0: - resolution: {integrity: sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-docblock@30.2.0: - resolution: {integrity: sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-each@30.2.0: - resolution: {integrity: sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-environment-jsdom@30.2.0: - resolution: {integrity: sha512-zbBTiqr2Vl78pKp/laGBREYzbZx9ZtqPjOK4++lL4BNDhxRnahg51HtoDrk9/VjIy9IthNEWdKVd7H5bqBhiWQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} peerDependencies: canvas: ^3.0.0 @@ -7233,7 +4971,6 @@ packages: canvas: optional: true -<<<<<<< HEAD jest-environment-node@30.0.5: resolution: {integrity: sha512-ppYizXdLMSvciGsRsMEnv/5EFpvOdXBaXRBzFUDPWrsfmog4kYrOGWXarLllz6AXan6ZAA/kYokgDWuos1IKDA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -7256,30 +4993,6 @@ packages: jest-mock@30.0.5: resolution: {integrity: sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==} -======= - jest-environment-node@30.2.0: - resolution: {integrity: sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-haste-map@30.2.0: - resolution: {integrity: sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-leak-detector@30.2.0: - resolution: {integrity: sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-matcher-utils@30.2.0: - resolution: {integrity: sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-message-util@30.2.0: - resolution: {integrity: sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-mock@30.2.0: - resolution: {integrity: sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} jest-pnp-resolver@1.2.3: @@ -7295,7 +5008,6 @@ packages: resolution: {integrity: sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} -<<<<<<< HEAD jest-resolve-dependencies@30.0.5: resolution: {integrity: sha512-/xMvBR4MpwkrHW4ikZIWRttBBRZgWK4d6xt3xW1iRDSKt4tXzYkMkyPfBnSCgv96cpkrctfXs6gexeqMYqdEpw==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -7334,46 +5046,6 @@ packages: jest@30.0.5: resolution: {integrity: sha512-y2mfcJywuTUkvLm2Lp1/pFX8kTgMO5yyQGq/Sk/n2mN7XWYp4JsCZ/QXW34M8YScgk8bPZlREH04f6blPnoHnQ==} -======= - jest-resolve-dependencies@30.2.0: - resolution: {integrity: sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-resolve@30.2.0: - resolution: {integrity: sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-runner@30.2.0: - resolution: {integrity: sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-runtime@30.2.0: - resolution: {integrity: sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-snapshot@30.2.0: - resolution: {integrity: sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-util@30.2.0: - resolution: {integrity: sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-validate@30.2.0: - resolution: {integrity: sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-watcher@30.2.0: - resolution: {integrity: sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest-worker@30.2.0: - resolution: {integrity: sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==} - engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} - - jest@30.2.0: - resolution: {integrity: sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: @@ -7392,7 +5064,6 @@ packages: react: ~0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 react-dom: ~0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 -<<<<<<< HEAD jodit@4.2.47: resolution: {integrity: sha512-3dSdV+dUjwbuNKhn2M6hs8F7qkiufBPJFMB6YVJWbja7RqkQHGtrCGkpZJ1PH16chUgET2Yi+LVOonWyf/nV8g==} @@ -7403,24 +5074,6 @@ packages: '@types/react': '>=17.0.0' react: '>=17.0.0' peerDependenciesMeta: -======= - jodit@4.7.4: - resolution: {integrity: sha512-qjjhGBqFE3ZhqXsCInJRPwjOQDhXAxun+zof2hq0Qn/aV+k4YqeKyWq72uKkVmSW86VGxP38Mvezx+/QdM/PUQ==} - - jotai@2.15.0: - resolution: {integrity: sha512-nbp/6jN2Ftxgw0VwoVnOg0m5qYM1rVcfvij+MZx99Z5IK13eGve9FJoCwGv+17JvVthTjhSmNtT5e1coJnr6aw==} - engines: {node: '>=12.20.0'} - peerDependencies: - '@babel/core': '>=7.0.0' - '@babel/template': '>=7.0.0' - '@types/react': '>=17.0.0' - react: '>=17.0.0' - peerDependenciesMeta: - '@babel/core': - optional: true - '@babel/template': - optional: true ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/react': optional: true react: @@ -7429,13 +5082,8 @@ packages: jquery@3.7.1: resolution: {integrity: sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==} -<<<<<<< HEAD js-base64@3.7.7: resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==} -======= - js-base64@3.7.8: - resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 js-cookie@3.0.5: resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==} @@ -7490,19 +5138,11 @@ packages: jsonc-parser@3.3.1: resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} -<<<<<<< HEAD jsonfile@6.1.0: resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} jspdf@3.0.1: resolution: {integrity: sha512-qaGIxqxetdoNnFQQXxTKUD9/Z7AloLaw94fFsOiJMxbfYdBbrBuhWmbzI8TVjrw7s3jBY1PFHofBKMV/wZPapg==} -======= - jsonfile@6.2.0: - resolution: {integrity: sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==} - - jspdf@3.0.3: - resolution: {integrity: sha512-eURjAyz5iX1H8BOYAfzvdPfIKK53V7mCpBTe7Kb16PaM8JSXEcUQNBQaiWMI8wY5RvNOPj4GccMjTlfwRBd+oQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 jsx-ast-utils@3.3.5: resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==} @@ -7511,13 +5151,8 @@ packages: just-debounce-it@3.2.0: resolution: {integrity: sha512-WXzwLL0745uNuedrCsCs3rpmfD6DBaf7uuVwaq98/8dafURfgQaBsSpjiPp5+CW6Vjltwy9cOGI6qE71b3T8iQ==} -<<<<<<< HEAD katex@0.16.18: resolution: {integrity: sha512-LRuk0rPdXrecAFwQucYjMiIs0JFefk6N1q/04mlw14aVIVgxq1FO0MA9RiIIGVaKOB5GIP5GH4aBBNraZERmaQ==} -======= - katex@0.16.25: - resolution: {integrity: sha512-woHRUZ/iF23GBP1dkDQMh1QBad9dmr8/PAwNA54VrSOVYgI12MAcE14TqnDdQOdzyEonGzMepYnqBMYdsoAr8Q==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hasBin: true kdbush@4.0.2: @@ -7603,10 +5238,6 @@ packages: lodash.get@4.4.2: resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} -<<<<<<< HEAD -======= - deprecated: This package is deprecated. Use the optional chaining (?.) operator instead. ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} @@ -7776,13 +5407,6 @@ packages: mdast-util-to-string@4.0.0: resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==} -<<<<<<< HEAD -======= - media-typer@1.1.0: - resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==} - engines: {node: '>= 0.8'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mem@8.1.1: resolution: {integrity: sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==} engines: {node: '>=10'} @@ -7793,13 +5417,6 @@ packages: memoize-one@6.0.0: resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==} -<<<<<<< HEAD -======= - merge-descriptors@2.0.0: - resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==} - engines: {node: '>=18'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -7807,13 +5424,8 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} -<<<<<<< HEAD mermaid@10.9.3: resolution: {integrity: sha512-V80X1isSEvAewIL3xhmz/rVmc27CVljcsbWxkxlWJWY/1kQa4XOABqpDl2qQLGKzpKm6WbTfUEKImBlUfFYArw==} -======= - mermaid@10.9.4: - resolution: {integrity: sha512-VIG2B0R9ydvkS+wShA8sXqkzfpYglM2Qwj7VyUeqzNVqSGPoP/tcaUr3ub4ESykv8eqQJn3p99bHNvYdg3gCHQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-core-commonmark@1.1.0: resolution: {integrity: sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==} @@ -7998,13 +5610,8 @@ packages: micromark-util-types@1.1.0: resolution: {integrity: sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==} -<<<<<<< HEAD micromark-util-types@2.0.1: resolution: {integrity: sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==} -======= - micromark-util-types@2.0.2: - resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark@3.2.0: resolution: {integrity: sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==} @@ -8020,24 +5627,10 @@ packages: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} -<<<<<<< HEAD -======= - mime-db@1.54.0: - resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==} - engines: {node: '>= 0.6'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mime-types@2.1.35: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} -<<<<<<< HEAD -======= - mime-types@3.0.1: - resolution: {integrity: sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==} - engines: {node: '>= 0.6'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} @@ -8084,53 +5677,23 @@ packages: moment@2.30.1: resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==} -<<<<<<< HEAD motion-dom@11.14.3: resolution: {integrity: sha512-lW+D2wBy5vxLJi6aCP0xyxTxlTfiu+b+zcpVbGVFUxotwThqhdpPRSmX8xztAgtZMPMeU0WGVn/k1w4I+TbPqA==} motion-utils@11.14.3: resolution: {integrity: sha512-Xg+8xnqIJTpr0L/cidfTTBFkvRw26ZtGGuIhA94J9PQ2p4mEa06Xx7QVYZH0BP+EpMSaDlu+q0I0mmvwADPsaQ==} -======= - motion-dom@11.18.1: - resolution: {integrity: sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==} - - motion-utils@11.18.1: - resolution: {integrity: sha512-49Kt+HKjtbJKLtgO/LKj9Ld+6vw9BjH5d9sc40R/kVyH8GLAXgT42M2NnuPcJNuA3s9ZfZBUcwIgpmZWGEE+hA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mri@1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} -<<<<<<< HEAD mrmime@2.0.0: resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==} -======= - mrmime@2.0.1: - resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=10'} ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} -<<<<<<< HEAD -======= - msw@2.11.6: - resolution: {integrity: sha512-MCYMykvmiYScyUm7I6y0VCxpNq1rgd5v7kG8ks5dKtvmxRUUPjribX6mUoUNBbM5/3PhUyoelEWiKXGOz84c+w==} - engines: {node: '>=18'} - hasBin: true - peerDependencies: - typescript: '>= 4.8.x' - peerDependenciesMeta: - typescript: - optional: true - - mute-stream@2.0.0: - resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==} - engines: {node: ^18.17.0 || >=20.5.0} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} @@ -8138,7 +5701,6 @@ packages: resolution: {integrity: sha512-Jd0fILWG44a9luj8v5kED4WI+zfkkgwKyRQKItTtlPfEsh7Lznfi1kr8/iZ+XAIss4Qq5GqRB0qtWbaz9ceO/A==} engines: {node: ^18.0.0 || >=20.0.0} -<<<<<<< HEAD nanoid@3.3.8: resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -8146,15 +5708,6 @@ packages: napi-postinstall@0.3.2: resolution: {integrity: sha512-tWVJxJHmBWLy69PvO96TZMZDrzmw5KeiZBz3RHmiM2XZ9grBJ2WgMAFVVg25nqp3ZjTFUs2Ftw1JhscL3Teliw==} -======= - nanoid@3.3.11: - resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - - napi-postinstall@0.3.4: - resolution: {integrity: sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} hasBin: true @@ -8165,13 +5718,8 @@ packages: resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==} engines: {node: '>= 0.6'} -<<<<<<< HEAD next-intl@3.26.3: resolution: {integrity: sha512-6Y97ODrDsEE1J8cXKMHwg1laLdtkN66QMIqG8BzH4zennJRUNTtM8UMtBDyhfmF6uiZ+xsbWLXmHUgmUymUsfQ==} -======= - next-intl@3.26.5: - resolution: {integrity: sha512-EQlCIfY0jOhRldiFxwSXG+ImwkQtDEfQeSOEQp6ieAGSLWGlgjdb/Ck/O7wMfC430ZHGeUKVKax8KGusTPKCgg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: next: ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0 @@ -8183,13 +5731,8 @@ packages: react: '>=16.x <=18.x' react-dom: '>=16.x <=18.x' -<<<<<<< HEAD next-seo@6.6.0: resolution: {integrity: sha512-0VSted/W6XNtgAtH3D+BZrMLLudqfm0D5DYNJRXHcDgan/1ZF1tDFIsWrmvQlYngALyphPfZ3ZdOqlKpKdvG6w==} -======= - next-seo@6.8.0: - resolution: {integrity: sha512-zcxaV67PFXCSf8e6SXxbxPaOTgc8St/esxfsYXfQXMM24UESUVSXFm7f2A9HMkAwa0Gqn4s64HxYZAGfdF4Vhg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: next: ^8.1.1-canary.54 || >=9.0.0 react: '>=16.0.0' @@ -8208,13 +5751,8 @@ packages: react: ^16.8 || ^17 || ^18 react-dom: ^16.8 || ^17 || ^18 -<<<<<<< HEAD next@14.2.3: resolution: {integrity: sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==} -======= - next@14.2.33: - resolution: {integrity: sha512-GiKHLsD00t4ACm1p00VgrI0rUFAC9cRDGReKyERlM57aeEZkOQGcZTpIbsGn0b562FTPJWmYfKwplfO9EaT6ng==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=18.17.0'} hasBin: true peerDependencies: @@ -8250,10 +5788,6 @@ packages: node-domexception@1.0.0: resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} engines: {node: '>=10.5.0'} -<<<<<<< HEAD -======= - deprecated: Use your platform's native DOMException instead ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 node-fetch@2.7.0: resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} @@ -8271,13 +5805,8 @@ packages: node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} -<<<<<<< HEAD node-releases@2.0.19: resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} -======= - node-releases@2.0.26: - resolution: {integrity: sha512-S2M9YimhSjBSvYnlr5/+umAnPHE++ODwt5e2Ij6FoX45HA/s4vHdkDx1eax2pAPeAOqu4s9b7ppahsyEFdVqQA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 non-layered-tidy-tree-layout@2.0.2: resolution: {integrity: sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==} @@ -8302,13 +5831,8 @@ packages: resolution: {integrity: sha512-O/j/ROyX0KGLG7O6Ieut/seQ0oiTpHF2tXAcFbpdTLQFiaNtkyTXXocM1fwpaa60dg1qpWj0nHlbNhx6qwuENQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -<<<<<<< HEAD nwsapi@2.2.20: resolution: {integrity: sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==} -======= - nwsapi@2.2.22: - resolution: {integrity: sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} @@ -8318,13 +5842,8 @@ packages: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} -<<<<<<< HEAD object-inspect@1.13.3: resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==} -======= - object-inspect@1.13.4: - resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} object-keys@1.1.1: @@ -8335,13 +5854,8 @@ packages: resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==} engines: {node: '>= 0.4'} -<<<<<<< HEAD object.entries@1.1.8: resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==} -======= - object.entries@1.1.9: - resolution: {integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} object.fromentries@2.0.8: @@ -8356,13 +5870,6 @@ packages: resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==} engines: {node: '>= 0.4'} -<<<<<<< HEAD -======= - on-finished@2.4.1: - resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} - engines: {node: '>= 0.8'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -8386,16 +5893,6 @@ packages: resolution: {integrity: sha512-ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} -<<<<<<< HEAD -======= - outvariant@1.4.3: - resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==} - - own-keys@1.0.1: - resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==} - engines: {node: '>= 0.4'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 p-defer@1.0.0: resolution: {integrity: sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==} engines: {node: '>=4'} @@ -8427,12 +5924,6 @@ packages: package-json-from-dist@1.0.1: resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} -<<<<<<< HEAD -======= - pako@2.1.0: - resolution: {integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -8450,13 +5941,8 @@ packages: parse-numeric-range@1.3.0: resolution: {integrity: sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==} -<<<<<<< HEAD parse-path@7.0.0: resolution: {integrity: sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==} -======= - parse-path@7.1.0: - resolution: {integrity: sha512-EuCycjZtfPcjWk7KTksnJ5xPMvWGA/6i4zrLYhRG0hGvC3GPU/jGUj3Cy+ZR0v30duV3e23R95T1lE2+lsndSw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 parse-srcset@1.0.2: resolution: {integrity: sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==} @@ -8464,17 +5950,8 @@ packages: parse-url@8.1.0: resolution: {integrity: sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==} -<<<<<<< HEAD parse5@7.2.1: resolution: {integrity: sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==} -======= - parse5@7.3.0: - resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==} - - parseurl@1.3.3: - resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} - engines: {node: '>= 0.8'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 path-browserify@1.0.1: resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} @@ -8506,15 +5983,6 @@ packages: resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} engines: {node: '>=16 || 14 >=14.18'} -<<<<<<< HEAD -======= - path-to-regexp@6.3.0: - resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==} - - path-to-regexp@8.3.0: - resolution: {integrity: sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} @@ -8540,35 +6008,20 @@ packages: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} -<<<<<<< HEAD pirates@4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 pirates@4.0.7: resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} engines: {node: '>= 6'} -<<<<<<< HEAD -======= - pkce-challenge@5.0.0: - resolution: {integrity: sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==} - engines: {node: '>=16.20.0'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 pkg-dir@4.2.0: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} -<<<<<<< HEAD possible-typed-array-names@1.0.0: resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} -======= - possible-typed-array-names@1.1.0: - resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} postcss-import@15.1.0: @@ -8577,18 +6030,12 @@ packages: peerDependencies: postcss: ^8.0.0 -<<<<<<< HEAD postcss-js@4.0.1: resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} -======= - postcss-js@4.1.0: - resolution: {integrity: sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^12 || ^14 || >= 16} peerDependencies: postcss: ^8.4.21 -<<<<<<< HEAD postcss-load-config@4.0.2: resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==} engines: {node: '>= 14'} @@ -8599,24 +6046,6 @@ packages: postcss: optional: true ts-node: -======= - postcss-load-config@6.0.1: - resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==} - engines: {node: '>= 18'} - peerDependencies: - jiti: '>=1.21.0' - postcss: '>=8.0.9' - tsx: ^4.8.1 - yaml: ^2.4.2 - peerDependenciesMeta: - jiti: - optional: true - postcss: - optional: true - tsx: - optional: true - yaml: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 optional: true postcss-nested@6.2.0: @@ -8636,13 +6065,8 @@ packages: resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} engines: {node: ^10 || ^12 || >=14} -<<<<<<< HEAD postcss@8.4.49: resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==} -======= - postcss@8.5.6: - resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^10 || ^12 || >=14} preact@10.12.1: @@ -8656,26 +6080,16 @@ packages: resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} -<<<<<<< HEAD pretty-format@30.0.5: resolution: {integrity: sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==} -======= - pretty-format@30.2.0: - resolution: {integrity: sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} prismjs@1.27.0: resolution: {integrity: sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==} engines: {node: '>=6'} -<<<<<<< HEAD prismjs@1.29.0: resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} -======= - prismjs@1.30.0: - resolution: {integrity: sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=6'} prompts@2.4.2: @@ -8700,17 +6114,8 @@ packages: property-information@7.1.0: resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==} -<<<<<<< HEAD protocols@2.0.1: resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==} -======= - protocols@2.0.2: - resolution: {integrity: sha512-hHVTzba3wboROl0/aWRRG9dMytgH6ow//STBZh43l/wQgmMhYhOFi0EHWAPtoCz9IAUymsyP0TSBHkhgMEGNnQ==} - - proxy-addr@2.0.7: - resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} - engines: {node: '>= 0.10'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} @@ -8725,13 +6130,8 @@ packages: pure-rand@7.0.1: resolution: {integrity: sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==} -<<<<<<< HEAD qs@6.13.1: resolution: {integrity: sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==} -======= - qs@6.14.0: - resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=0.6'} querystringify@2.2.0: @@ -8743,21 +6143,8 @@ packages: raf@3.4.1: resolution: {integrity: sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==} -<<<<<<< HEAD react-apexcharts@1.7.0: resolution: {integrity: sha512-03oScKJyNLRf0Oe+ihJxFZliBQM9vW3UWwomVn4YVRTN1jsIR58dLWt0v1sb8RwJVHDMbeHiKQueM0KGpn7nOA==} -======= - range-parser@1.2.1: - resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} - engines: {node: '>= 0.6'} - - raw-body@3.0.1: - resolution: {integrity: sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==} - engines: {node: '>= 0.10'} - - react-apexcharts@1.8.0: - resolution: {integrity: sha512-MuEp56gc0NMO2UUgY94fxQzoBE4XEjmcCha4xYY0vJdRrc1yfFFZE4QrCekOt2wcS3nibghzca/q/CbgkAgN5w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: apexcharts: '>=4.0.0' react: '>=0.13' @@ -8780,19 +6167,11 @@ packages: react: '>=16.2.0' react-dom: '>=16.2.0' -<<<<<<< HEAD react-chartjs-2@5.2.0: resolution: {integrity: sha512-98iN5aguJyVSxp5U3CblRLH67J8gkfyGNbiK3c+l1QI/G4irHMPQw44aEPmjVag+YKTyQ260NcF82GTQ3bdscA==} peerDependencies: chart.js: ^4.1.1 react: ^16.8.0 || ^17.0.0 || ^18.0.0 -======= - react-chartjs-2@5.3.0: - resolution: {integrity: sha512-UfZZFnDsERI3c3CZGxzvNJd02SHjaSJ8kgW1djn65H1KK8rehwTjyrRKOG3VTMG8wtHZ5rgAO5oTHtHi9GCCmw==} - peerDependencies: - chart.js: ^4.1.1 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-clock@5.1.0: resolution: {integrity: sha512-DKmr29VOK6M8wpbzGUZZa9PwGnG9uC6QXtDLwGwcc2r3vdS/HxNhf5xMMjudXLk7m096mNJQf7AgfjiDpzAYYw==} @@ -8810,19 +6189,11 @@ packages: peerDependencies: react: '>=16' -<<<<<<< HEAD react-datepicker@7.5.0: resolution: {integrity: sha512-6MzeamV8cWSOcduwePHfGqY40acuGlS1cG//ePHT6bVbLxWyqngaStenfH03n1wbzOibFggF66kWaBTb1SbTtQ==} peerDependencies: react: ^16.9.0 || ^17 || ^18 react-dom: ^16.9.0 || ^17 || ^18 -======= - react-datepicker@7.6.0: - resolution: {integrity: sha512-9cQH6Z/qa4LrGhzdc3XoHbhrxNcMi9MKjZmYgF/1MNNaJwvdSjv3Xd+jjvrEEbKEf71ZgCA3n7fQbdwd70qCRw==} - peerDependencies: - react: ^16.9.0 || ^17 || ^18 || ^19 || ^19.0.0-rc - react-dom: ^16.9.0 || ^17 || ^18 || ^19 || ^19.0.0-rc ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-day-picker@8.10.1: resolution: {integrity: sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==} @@ -8835,13 +6206,8 @@ packages: peerDependencies: react: ^18.3.1 -<<<<<<< HEAD react-dropzone@14.3.5: resolution: {integrity: sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==} -======= - react-dropzone@14.3.8: - resolution: {integrity: sha512-sBgODnq+lcA4P296DY4wacOZz3JFpD99fp+hb//iBO2HHnyeZU3FwWyXJ6salNpqQdsZrgMrotuko/BdJMV8Ug==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 10.13'} peerDependencies: react: '>= 16.8 || 18.0.0' @@ -8865,36 +6231,21 @@ packages: react-geocode@0.2.3: resolution: {integrity: sha512-sIpbgmn1IUzAxO4haOZ6jeeFnMD8ya9PC38yiNrmJ9vPWbvAO2D/2yfCBzZjGZVUm4PRzKAc0KghXfaEnug0TQ==} -<<<<<<< HEAD react-hook-form@7.54.2: resolution: {integrity: sha512-eHpAUgUjWbZocoQYUHposymRb4ZP6d0uwUnooL2uOybA9/3tPUvoAKqEWK1WaSiTxxOfTpffNZP7QwlnM3/gEg==} -======= - react-hook-form@7.65.0: - resolution: {integrity: sha512-xtOzDz063WcXvGWaHgLNrNzlsdFgtUWcb32E6WFaGTd7kPZG3EeDusjdZfUsPwKCKVXy1ZlntifaHZ4l8pAsmw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=18.0.0'} peerDependencies: react: ^16.8.0 || ^17 || ^18 || ^19 -<<<<<<< HEAD react-hot-toast@2.4.1: resolution: {integrity: sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==} -======= - react-hot-toast@2.6.0: - resolution: {integrity: sha512-bH+2EBMZ4sdyou/DPrfgIouFpcRLCJ+HoCA32UoAYHn6T3Ur5yfcDCeSr5mwldl6pFOsiocmrXMuoCJ1vV8bWg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=10'} peerDependencies: react: '>=16' react-dom: '>=16' -<<<<<<< HEAD react-icons@5.4.0: resolution: {integrity: sha512-7eltJxgVt7X64oHh6wSWNwwbKTCtMfK35hcjvJS0yxEAhPM8oUKdS3+kqaW1vicIltw+kR2unHaa12S9pPALoQ==} -======= - react-icons@5.5.0: - resolution: {integrity: sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: '*' @@ -8907,13 +6258,8 @@ packages: react-is@18.3.1: resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} -<<<<<<< HEAD react-is@19.0.0: resolution: {integrity: sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g==} -======= - react-is@19.2.0: - resolution: {integrity: sha512-x3Ax3kNSMIIkyVYhWPyO09bu0uttcAIoecO/um/rKGQ4EltYWVYtyiGkS/3xMynrbVQdS69Jhlv8FXUEZehlzA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-leaflet@4.2.1: resolution: {integrity: sha512-p9chkvhcKrWn/H/1FFeVSqLdReGwn2qmiobOQGO3BifX+/vV/39qhY8dGqbdcPh1e6jxh/QHriLXr7a4eLFK4Q==} @@ -8932,13 +6278,8 @@ packages: peerDependencies: react: '>16.0.0-alpha || >17.0.0-alpha || >18.0.0-alpha' -<<<<<<< HEAD react-player@2.16.0: resolution: {integrity: sha512-mAIPHfioD7yxO0GNYVFD1303QFtI3lyyQZLY229UEAp/a10cSW+hPcakg0Keq8uWJxT2OiT/4Gt+Lc9bD6bJmQ==} -======= - react-player@2.16.1: - resolution: {integrity: sha512-mxP6CqjSWjidtyDoMOSHVPdhX0pY16aSvw5fVr44EMaT7X5Xz46uQ4b/YBm1v2x+3hHkB9PmjEEkmbHb9PXQ4w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: '>=16.6.0' @@ -8955,13 +6296,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD react-remove-scroll@2.6.2: resolution: {integrity: sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==} -======= - react-remove-scroll@2.7.1: - resolution: {integrity: sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=10'} peerDependencies: '@types/react': '*' @@ -8970,13 +6306,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD react-resizable-panels@2.1.7: resolution: {integrity: sha512-JtT6gI+nURzhMYQYsx8DKkx6bSoOGFp7A3CwMrOb8y5jFHFyqwo9m68UhmXRw57fRVJksFn1TSlm3ywEQ9vMgA==} -======= - react-resizable-panels@2.1.9: - resolution: {integrity: sha512-z77+X08YDIrgAes4jl8xhnUu1LNIRp4+E7cv4xHmLOxxUPO/ML7PSrE813b90vj7xvQ1lcf7g2uA9GeMZonjhQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc @@ -8987,13 +6318,8 @@ packages: peerDependencies: react: '>=16.8.0' -<<<<<<< HEAD react-select@5.9.0: resolution: {integrity: sha512-nwRKGanVHGjdccsnzhFte/PULziueZxGD8LL2WojON78Mvnq7LdAMEtu2frrwld1fr3geixg3iiMBIc/LLAZpw==} -======= - react-select@5.10.2: - resolution: {integrity: sha512-Z33nHdEFWq9tfnfVXaiM12rbJmk+QjFEztWLtmXqQhz6Al4UZZ9xc0wiatmGtUOCCnHN0WizL3tCMYRENX4rVQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 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 @@ -9014,13 +6340,8 @@ packages: '@types/react': optional: true -<<<<<<< HEAD react-syntax-highlighter@15.6.1: resolution: {integrity: sha512-OqJ2/vL7lEeV5zTJyG7kmARppUjiB9h9udl4qHQjjgEos66z00Ia0OckwYfRxCSFrW8RJIBnsBwQsHZbVPspqg==} -======= - react-syntax-highlighter@15.6.6: - resolution: {integrity: sha512-DgXrc+AZF47+HvAPEmn7Ua/1p10jNoVZVI/LoPiYdtY+OM+/nG5yefLHKJwdKqY1adMuHFbeyBaG9j64ML7vTw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: '>= 0.14.0' @@ -9058,13 +6379,8 @@ packages: reading-time@1.5.0: resolution: {integrity: sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==} -<<<<<<< HEAD recast@0.23.9: resolution: {integrity: sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==} -======= - recast@0.23.11: - resolution: {integrity: sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 4'} recharts-scale@0.4.5: @@ -9081,13 +6397,8 @@ packages: resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} engines: {node: '>=8'} -<<<<<<< HEAD reflect.getprototypeof@1.0.9: resolution: {integrity: sha512-r0Ay04Snci87djAsI4U+WNRcSw5S4pOH7qFjd/veA5gC7TbqESR3tcj28ia95L/fYUDw11JKP7uqUKUAfVvV5Q==} -======= - reflect.getprototypeof@1.0.10: - resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} refractor@3.6.0: @@ -9096,16 +6407,11 @@ packages: regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} -<<<<<<< HEAD regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} regexp.prototype.flags@1.5.3: resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==} -======= - regexp.prototype.flags@1.5.4: - resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} rehype-dom-parse@5.0.2: @@ -9153,13 +6459,8 @@ packages: remark-parse@11.0.0: resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==} -<<<<<<< HEAD remark-reading-time@2.0.1: resolution: {integrity: sha512-fy4BKy9SRhtYbEHvp6AItbRTnrhiDGbqLQTSYVbQPGuRCncU1ubSsh9p/W5QZSxtYcUXv8KGL0xBgPLyNJA1xw==} -======= - remark-reading-time@2.0.2: - resolution: {integrity: sha512-ILjIuR0dQQ8pELPgaFvz7ralcSN62rD/L1pTUJgWb4gfua3ZwYEI8mnKGxEQCbrXSUF/OvycTkcUbifGOtOn5A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 remark-rehype@10.1.0: resolution: {integrity: sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==} @@ -9199,13 +6500,8 @@ packages: resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==} deprecated: https://github.com/lydell/resolve-url#deprecated -<<<<<<< HEAD resolve@1.22.10: resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} -======= - resolve@1.22.11: - resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} hasBin: true @@ -9221,16 +6517,8 @@ packages: resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} engines: {node: '>= 4'} -<<<<<<< HEAD reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} -======= - rettime@0.7.0: - resolution: {integrity: sha512-LPRKoHnLKd/r3dVxcwO7vhCW+orkOGj9ViueosEBK6ie89CijnfRlhaDhHq/3Hxu4CkWQtxwlBG0mzTQY6uQjw==} - - reusify@1.1.0: - resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {iojs: '>=1.0.0', node: '>=0.10.0'} rgbcolor@1.0.1: @@ -9245,13 +6533,6 @@ packages: robust-predicates@3.0.2: resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==} -<<<<<<< HEAD -======= - router@2.2.0: - resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==} - engines: {node: '>= 18'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 rrweb-cssom@0.8.0: resolution: {integrity: sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==} @@ -9275,13 +6556,6 @@ packages: safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} -<<<<<<< HEAD -======= - safe-push-apply@1.0.0: - resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==} - engines: {node: '>= 0.4'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 safe-regex-test@1.1.0: resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==} engines: {node: '>= 0.4'} @@ -9289,13 +6563,8 @@ packages: safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} -<<<<<<< HEAD sanitize-html@2.14.0: resolution: {integrity: sha512-CafX+IUPxZshXqqRaG9ZClSlfPVjSxI0td7n07hk8QO2oO+9JDnlcL8iM8TWeOXOIBFgIOx6zioTzM53AOMn3g==} -======= - sanitize-html@2.17.0: - resolution: {integrity: sha512-dLAADUSS8rBwhaevT12yCezvioCA+bmUTPH/u57xKPT8d++voeYE6HeluA/bPbQ15TwDBG2ii+QZIEmYx8VdxA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 saxes@6.0.0: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} @@ -9315,7 +6584,6 @@ packages: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true -<<<<<<< HEAD semver@7.6.3: resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} engines: {node: '>=10'} @@ -9325,20 +6593,6 @@ packages: resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} engines: {node: '>=10'} hasBin: true -======= - semver@7.7.3: - resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==} - engines: {node: '>=10'} - hasBin: true - - send@1.2.0: - resolution: {integrity: sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==} - engines: {node: '>= 18'} - - serve-static@2.2.0: - resolution: {integrity: sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==} - engines: {node: '>= 18'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 set-function-length@1.2.2: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} @@ -9348,20 +6602,8 @@ packages: resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} engines: {node: '>= 0.4'} -<<<<<<< HEAD shadcn@2.3.0: resolution: {integrity: sha512-Q/ra8/r2wb5W0DX0LKuPpsT6/0vtgwW/DR9uunJ6/3lXMOBo2UyUeCQ2m9/XAlALHhyGnzHngf8s8NrW1kcg5Q==} -======= - set-proto@1.0.0: - resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==} - engines: {node: '>= 0.4'} - - setprototypeof@1.2.0: - resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} - - shadcn@2.10.0: - resolution: {integrity: sha512-/zxjmHGbaYVFtI6bUridFVV7VFStIv3vU/w1h7xenhz7KRzc9pqHsyFvcExZprG7dlA5kW9knRgv8+Cl/H7w9w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hasBin: true shallow-equal@3.1.0: @@ -9413,13 +6655,8 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} -<<<<<<< HEAD simple-swizzle@0.2.2: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} -======= - simple-swizzle@0.2.4: - resolution: {integrity: sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 sirv@2.0.4: resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==} @@ -9432,13 +6669,8 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} -<<<<<<< HEAD sonner@1.7.1: resolution: {integrity: sha512-b6LHBfH32SoVasRFECrdY8p8s7hXPDn3OHUFbZZbiB1ctLS9Gdh6rpX2dVrpQA0kiL5jcRzDDldwwLkSKk3+QQ==} -======= - sonner@1.7.4: - resolution: {integrity: sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc @@ -9462,15 +6694,9 @@ packages: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} -<<<<<<< HEAD source-map@0.7.4: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} engines: {node: '>= 8'} -======= - source-map@0.7.6: - resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==} - engines: {node: '>= 12'} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 space-separated-tokens@1.1.5: resolution: {integrity: sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==} @@ -9481,13 +6707,8 @@ packages: sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} -<<<<<<< HEAD stable-hash@0.0.4: resolution: {integrity: sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==} -======= - stable-hash@0.0.5: - resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 stack-utils@2.0.6: resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} @@ -9497,38 +6718,14 @@ packages: resolution: {integrity: sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==} engines: {node: '>=0.1.14'} -<<<<<<< HEAD -======= - statuses@2.0.1: - resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} - engines: {node: '>= 0.8'} - - statuses@2.0.2: - resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==} - engines: {node: '>= 0.8'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 stdin-discarder@0.1.0: resolution: {integrity: sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} -<<<<<<< HEAD -======= - stop-iteration-iterator@1.1.0: - resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==} - engines: {node: '>= 0.4'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 streamsearch@1.1.0: resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} engines: {node: '>=10.0.0'} -<<<<<<< HEAD -======= - strict-event-emitter@0.5.1: - resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string-length@4.0.2: resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==} engines: {node: '>=10'} @@ -9578,13 +6775,8 @@ packages: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} -<<<<<<< HEAD strip-ansi@7.1.0: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} -======= - strip-ansi@7.1.2: - resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=12'} strip-bom-string@1.0.0: @@ -9619,24 +6811,14 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} -<<<<<<< HEAD style-to-js@1.1.16: resolution: {integrity: sha512-/Q6ld50hKYPH3d/r6nr117TZkHR0w0kGGIVfpG9N6D8NymRPM9RqCUv4pRpJ62E5DqOYx2AFpbZMyCPnjQCnOw==} -======= - style-to-js@1.1.18: - resolution: {integrity: sha512-JFPn62D4kJaPTnhFUI244MThx+FEGbi+9dw1b9yBBQ+1CZpV7QAT8kUtJ7b7EUNdHajjF/0x8fT+16oLJoojLg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 style-to-object@0.4.4: resolution: {integrity: sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==} -<<<<<<< HEAD style-to-object@1.0.8: resolution: {integrity: sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==} -======= - style-to-object@1.0.11: - resolution: {integrity: sha512-5A560JmXr7wDyGLK12Nq/EYS38VkGlglVzkis1JEdbGWSnbQIEhZzTJhzURXN5/8WwwFCs/f/VVcmkTppbXLow==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 styled-jsx@5.1.1: resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} @@ -9654,13 +6836,8 @@ packages: stylis@4.2.0: resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==} -<<<<<<< HEAD stylis@4.3.4: resolution: {integrity: sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==} -======= - stylis@4.3.6: - resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} @@ -9697,19 +6874,11 @@ packages: react-dom: ^18.0.0 || ^19.0.0 sweetalert2: ^11.0.0 -<<<<<<< HEAD sweetalert2@11.15.3: resolution: {integrity: sha512-+0imNg+XYL8tKgx8hM0xoiXX3KfgxHDmiDc8nTJFO89fQEEhJlkecSdyYOZ3IhVMcUmoNte4fTIwWiugwkPU6w==} swiper@11.1.15: resolution: {integrity: sha512-IzWeU34WwC7gbhjKsjkImTuCRf+lRbO6cnxMGs88iVNKDwV+xQpBCJxZ4bNH6gSrIbbyVJ1kuGzo3JTtz//CBw==} -======= - sweetalert2@11.26.3: - resolution: {integrity: sha512-VU0hGw/WfI9h7Mh+SCsDlWgtxDwWZ6ccqS7QcO8zEeWnwplN1GptcLstq76OluUBSLUza6ldvKd3558OhjpJ9A==} - - swiper@11.2.10: - resolution: {integrity: sha512-RMeVUUjTQH+6N3ckimK93oxz6Sn5la4aDlgPzB+rBrG/smPdCTicXyhxa+woIpopz+jewEloiEE3lKo1h9w2YQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 4.7.0'} symbol-tree@3.2.4: @@ -9719,13 +6888,8 @@ packages: resolution: {integrity: sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==} engines: {node: ^14.18.0 || >=16.0.0} -<<<<<<< HEAD tabbable@6.2.0: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} -======= - tabbable@6.3.0: - resolution: {integrity: sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tailwind-merge@2.6.0: resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} @@ -9735,7 +6899,6 @@ packages: peerDependencies: tailwindcss: '>=3.0.0 || insiders' -<<<<<<< HEAD tailwindcss@3.4.17: resolution: {integrity: sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==} engines: {node: '>=14.0.0'} @@ -9745,13 +6908,6 @@ packages: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} -======= - tailwindcss@3.4.18: - resolution: {integrity: sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==} - engines: {node: '>=14.0.0'} - hasBin: true - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 test-exclude@6.0.0: resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} engines: {node: '>=8'} @@ -9775,13 +6931,6 @@ packages: tiny-invariant@1.3.3: resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} -<<<<<<< HEAD -======= - tinyglobby@0.2.15: - resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} - engines: {node: '>=12.0.0'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 title@3.5.3: resolution: {integrity: sha512-20JyowYglSEeCvZv3EZ0nZ046vLarO37prvV0mbtQV7C8DJPGgN967r8SJkqd3XK3K3lD3/Iyfp3avjfil8Q2Q==} hasBin: true @@ -9793,23 +6942,10 @@ packages: tldts-core@6.1.86: resolution: {integrity: sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==} -<<<<<<< HEAD -======= - tldts-core@7.0.17: - resolution: {integrity: sha512-DieYoGrP78PWKsrXr8MZwtQ7GLCUeLxihtjC1jZsW1DnvSMdKPitJSe8OSYDM2u5H6g3kWJZpePqkp43TfLh0g==} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tldts@6.1.86: resolution: {integrity: sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==} hasBin: true -<<<<<<< HEAD -======= - tldts@7.0.17: - resolution: {integrity: sha512-Y1KQBgDd/NUc+LfOtKS6mNsC9CCaH+m2P1RoIZy7RAPo3C3/t8X45+zgut31cRZtZ3xKPjfn3TkGTrctC2TQIQ==} - hasBin: true - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tmpl@1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} @@ -9817,13 +6953,6 @@ packages: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} -<<<<<<< HEAD -======= - toidentifier@1.0.1: - resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} - engines: {node: '>=0.6'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 toposort@2.0.2: resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==} @@ -9835,13 +6964,6 @@ packages: resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==} engines: {node: '>=16'} -<<<<<<< HEAD -======= - tough-cookie@6.0.0: - resolution: {integrity: sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==} - engines: {node: '>=16'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} @@ -9884,13 +7006,8 @@ packages: tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} -<<<<<<< HEAD tus-js-client@4.2.3: resolution: {integrity: sha512-UkQUCeDWKh5AwArcasIJWcL5EP66XPypKQtsdPu82wNnTea8eAUHdpDx3DcfZgDERAiCII895zMYkXri4M1wzw==} -======= - tus-js-client@4.3.1: - resolution: {integrity: sha512-ZLeYmjrkaU1fUsKbIi8JML52uAocjEZtBx4DKjRrqzrZa0O4MYwT6db+oqePlspV+FxXJAyFBc/L5gwUi2OFsg==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=18'} type-check@0.4.0: @@ -9917,17 +7034,6 @@ packages: resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} engines: {node: '>=12.20'} -<<<<<<< HEAD -======= - type-fest@4.41.0: - resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==} - engines: {node: '>=16'} - - type-is@2.0.1: - resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==} - engines: {node: '>= 0.6'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 typed-array-buffer@1.0.3: resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==} engines: {node: '>= 0.4'} @@ -9944,13 +7050,8 @@ packages: resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==} engines: {node: '>= 0.4'} -<<<<<<< HEAD typescript@5.7.2: resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} -======= - typescript@5.9.3: - resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=14.17'} hasBin: true @@ -9958,13 +7059,8 @@ packages: resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==} engines: {node: '>= 0.4'} -<<<<<<< HEAD undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} -======= - undici-types@6.21.0: - resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unified@10.1.2: resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==} @@ -9981,13 +7077,8 @@ packages: unist-util-is@5.2.1: resolution: {integrity: sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==} -<<<<<<< HEAD unist-util-is@6.0.0: resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==} -======= - unist-util-is@6.0.1: - resolution: {integrity: sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unist-util-position-from-estree@1.1.2: resolution: {integrity: sha512-poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww==} @@ -10019,13 +7110,8 @@ packages: unist-util-visit-parents@5.1.3: resolution: {integrity: sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==} -<<<<<<< HEAD unist-util-visit-parents@6.0.1: resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==} -======= - unist-util-visit-parents@6.0.2: - resolution: {integrity: sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unist-util-visit@3.1.0: resolution: {integrity: sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==} @@ -10040,26 +7126,11 @@ packages: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} engines: {node: '>= 10.0.0'} -<<<<<<< HEAD unrs-resolver@1.11.1: resolution: {integrity: sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==} update-browserslist-db@1.1.2: resolution: {integrity: sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==} -======= - unpipe@1.0.0: - resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} - engines: {node: '>= 0.8'} - - unrs-resolver@1.11.1: - resolution: {integrity: sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==} - - until-async@3.0.2: - resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} - - update-browserslist-db@1.1.4: - resolution: {integrity: sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -10083,7 +7154,6 @@ packages: '@types/react': optional: true -<<<<<<< HEAD use-intl@3.26.3: resolution: {integrity: sha512-yY0a2YseO17cKwHA9M6fcpiEJ2Uo81DEU0NOUxNTp6lJVNOuI6nULANPVVht6IFdrYFtlsMmMoc97+Eq9/Tnng==} peerDependencies: @@ -10091,15 +7161,6 @@ packages: use-isomorphic-layout-effect@1.2.0: resolution: {integrity: sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==} -======= - use-intl@3.26.5: - resolution: {integrity: sha512-OdsJnC/znPvHCHLQH/duvQNXnP1w0hPfS+tkSi3mAbfjYBGh4JnyfdwkQBfIVf7t8gs9eSX/CntxUMvtKdG2MQ==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0 - - use-isomorphic-layout-effect@1.2.1: - resolution: {integrity: sha512-tpZZ+EX0gaghDAiFR37hj5MgY6ZN55kLiPkJsKxBMZ6GZdOSPJXiOzPM984oPYZ5AnehYx5WQp1+ME8I/P/pRA==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: '@types/react': '*' react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -10122,7 +7183,6 @@ packages: '@types/react': optional: true -<<<<<<< HEAD use-sync-external-store@1.2.2: resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==} peerDependencies: @@ -10130,10 +7190,6 @@ packages: use-sync-external-store@1.4.0: resolution: {integrity: sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==} -======= - use-sync-external-store@1.6.0: - resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -10163,13 +7219,6 @@ packages: vanilla-colorful@0.7.2: resolution: {integrity: sha512-z2YZusTFC6KnLERx1cgoIRX2CjPRP0W75N+3CC6gbvdX5Ch47rZkEMGO2Xnf+IEmi3RiFLxS18gayMA27iU7Kg==} -<<<<<<< HEAD -======= - vary@1.1.2: - resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} - engines: {node: '>= 0.8'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 vaul@0.9.9: resolution: {integrity: sha512-7afKg48srluhZwIkaU+lgGtFCUsYBSGOl8vcc8N/M3YQlZFlynHD15AE+pwrYdc826o7nrIND4lL9Y6b9WWZZQ==} peerDependencies: @@ -10185,13 +7234,8 @@ packages: vfile-message@3.1.4: resolution: {integrity: sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==} -<<<<<<< HEAD vfile-message@4.0.2: resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==} -======= - vfile-message@4.0.3: - resolution: {integrity: sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 vfile@5.3.7: resolution: {integrity: sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==} @@ -10218,13 +7262,8 @@ packages: warning@4.0.3: resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} -<<<<<<< HEAD wavesurfer.js@7.8.16: resolution: {integrity: sha512-lhQF42A4Wn7ug5bixaqGK53qWF2minWdXlzxPtLV+QoVH3WgvVSdsP2HBaHRbkfT2Lh67kJG6CquFdukmf95gg==} -======= - wavesurfer.js@7.11.0: - resolution: {integrity: sha512-LOGdIBIKv/roYuQYClhoqhwbIdQL1GfobLnS2vx0heoLD9lu57OUHWE2DIsCNXBvCsmmbkUvJq9W8bPLPbikGw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} @@ -10236,13 +7275,8 @@ packages: resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==} engines: {node: '>= 8'} -<<<<<<< HEAD web-worker@1.3.0: resolution: {integrity: sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==} -======= - web-worker@1.5.0: - resolution: {integrity: sha512-RiMReJrTAiA+mBjGONMnjVDP2u3p9R1vkcGz6gDIrOMT3oGuYwX2WRMYI9ipkphSuE5XKEhydbhNEJh4NY9mlw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} @@ -10283,13 +7317,8 @@ packages: resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==} engines: {node: '>= 0.4'} -<<<<<<< HEAD which-typed-array@1.1.18: resolution: {integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==} -======= - which-typed-array@1.1.19: - resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>= 0.4'} which@1.3.1: @@ -10305,13 +7334,6 @@ packages: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} -<<<<<<< HEAD -======= - wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 wrap-ansi@7.0.0: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} @@ -10376,14 +7398,11 @@ packages: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} -<<<<<<< HEAD yaml@2.6.1: resolution: {integrity: sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==} engines: {node: '>= 14'} hasBin: true -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -10396,7 +7415,6 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} -<<<<<<< HEAD yup@1.6.1: resolution: {integrity: sha512-JED8pB50qbA4FOkDol0bYF/p60qSEDQqBD0/qeIrUCG1KbPBIQ776fCUNb9ldbPcSTxA69g/47XTo4TqWiuXOA==} @@ -10405,25 +7423,6 @@ packages: zustand@4.5.5: resolution: {integrity: sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==} -======= - yoctocolors-cjs@2.1.3: - resolution: {integrity: sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==} - engines: {node: '>=18'} - - yup@1.7.1: - resolution: {integrity: sha512-GKHFX2nXul2/4Dtfxhozv701jLQHdf6J34YDh2cEkpqoo8le5Mg6/LrdseVLrFarmFygZTlfIhHx/QKfb/QWXw==} - - zod-to-json-schema@3.24.6: - resolution: {integrity: sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==} - peerDependencies: - zod: ^3.24.1 - - zod@3.25.76: - resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} - - zustand@4.5.7: - resolution: {integrity: sha512-CHOUy7mu3lbD6o6LJLfllpjkzhHXSBlX8B9+qPddUsIfeF5S/UZ5q0kmCsnRqT1UHFQZchNFDDzMbQsuesHWlw==} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 engines: {node: '>=12.7.0'} peerDependencies: '@types/react': '>=16.8' @@ -10442,7 +7441,6 @@ packages: snapshots: -<<<<<<< HEAD '@adobe/css-tools@4.4.3': {} '@alloc/quick-lru@5.2.0': {} @@ -10453,42 +7451,27 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 '@antfu/ni@0.21.12': {} -======= - '@adobe/css-tools@4.4.4': {} - - '@alloc/quick-lru@5.2.0': {} - - '@antfu/ni@23.3.1': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@asamuzakjp/css-color@3.2.0': dependencies: '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4) -<<<<<<< HEAD '@csstools/css-color-parser': 3.0.10(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4) -======= - '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4) '@csstools/css-tokenizer': 3.0.4 lru-cache: 10.4.3 -<<<<<<< HEAD '@babel/code-frame@7.26.2': dependencies: '@babel/helper-validator-identifier': 7.25.9 js-tokens: 4.0.0 picocolors: 1.1.1 -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@babel/code-frame@7.27.1': dependencies: '@babel/helper-validator-identifier': 7.27.1 js-tokens: 4.0.0 picocolors: 1.1.1 -<<<<<<< HEAD '@babel/compat-data@7.26.8': {} '@babel/compat-data@7.28.0': {} @@ -10528,31 +7511,12 @@ snapshots: '@babel/types': 7.28.1 convert-source-map: 2.0.0 debug: 4.4.0 -======= - '@babel/compat-data@7.28.4': {} - - '@babel/core@7.28.4': - dependencies: - '@babel/code-frame': 7.27.1 - '@babel/generator': 7.28.3 - '@babel/helper-compilation-targets': 7.27.2 - '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.4) - '@babel/helpers': 7.28.4 - '@babel/parser': 7.28.4 - '@babel/template': 7.27.2 - '@babel/traverse': 7.28.4 - '@babel/types': 7.28.4 - '@jridgewell/remapping': 2.3.5 - convert-source-map: 2.0.0 - debug: 4.4.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/generator@7.26.3': dependencies: '@babel/parser': 7.26.3 @@ -10606,44 +7570,12 @@ snapshots: '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.8) '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 '@babel/traverse': 7.26.4 -======= - '@babel/generator@7.28.3': - dependencies: - '@babel/parser': 7.28.4 - '@babel/types': 7.28.4 - '@jridgewell/gen-mapping': 0.3.13 - '@jridgewell/trace-mapping': 0.3.31 - jsesc: 3.1.0 - - '@babel/helper-annotate-as-pure@7.27.3': - dependencies: - '@babel/types': 7.28.4 - - '@babel/helper-compilation-targets@7.27.2': - dependencies: - '@babel/compat-data': 7.28.4 - '@babel/helper-validator-option': 7.27.1 - browserslist: 4.27.0 - lru-cache: 5.1.1 - semver: 6.3.1 - - '@babel/helper-create-class-features-plugin@7.28.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-member-expression-to-functions': 7.27.1 - '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.4) - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 - '@babel/traverse': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 semver: 6.3.1 transitivePeerDependencies: - supports-color '@babel/helper-globals@7.28.0': {} -<<<<<<< HEAD '@babel/helper-member-expression-to-functions@7.25.9': dependencies: '@babel/traverse': 7.26.4 @@ -10655,18 +7587,11 @@ snapshots: dependencies: '@babel/traverse': 7.26.4 '@babel/types': 7.26.3 -======= - '@babel/helper-member-expression-to-functions@7.27.1': - dependencies: - '@babel/traverse': 7.28.4 - '@babel/types': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color '@babel/helper-module-imports@7.27.1': dependencies: -<<<<<<< HEAD '@babel/traverse': 7.28.0 '@babel/types': 7.28.1 transitivePeerDependencies: @@ -10866,161 +7791,10 @@ snapshots: '@babel/code-frame': 7.26.2 '@babel/parser': 7.26.8 '@babel/types': 7.26.8 -======= - '@babel/traverse': 7.28.4 - '@babel/types': 7.28.4 - transitivePeerDependencies: - - supports-color - - '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-module-imports': 7.27.1 - '@babel/helper-validator-identifier': 7.27.1 - '@babel/traverse': 7.28.4 - transitivePeerDependencies: - - supports-color - - '@babel/helper-optimise-call-expression@7.27.1': - dependencies: - '@babel/types': 7.28.4 - - '@babel/helper-plugin-utils@7.27.1': {} - - '@babel/helper-replace-supers@7.27.1(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-member-expression-to-functions': 7.27.1 - '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/traverse': 7.28.4 - transitivePeerDependencies: - - supports-color - - '@babel/helper-skip-transparent-expression-wrappers@7.27.1': - dependencies: - '@babel/traverse': 7.28.4 - '@babel/types': 7.28.4 - transitivePeerDependencies: - - supports-color - - '@babel/helper-string-parser@7.27.1': {} - - '@babel/helper-validator-identifier@7.27.1': {} - - '@babel/helper-validator-option@7.27.1': {} - - '@babel/helpers@7.28.4': - dependencies: - '@babel/template': 7.27.2 - '@babel/types': 7.28.4 - - '@babel/parser@7.28.4': - dependencies: - '@babel/types': 7.28.4 - - '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-import-attributes@7.27.1(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-transform-typescript@7.28.0(@babel/core@7.28.4)': - dependencies: - '@babel/core': 7.28.4 - '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.28.4) - '@babel/helper-plugin-utils': 7.27.1 - '@babel/helper-skip-transparent-expression-wrappers': 7.27.1 - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.4) - transitivePeerDependencies: - - supports-color - - '@babel/runtime@7.28.4': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@babel/template@7.27.2': dependencies: '@babel/code-frame': 7.27.1 -<<<<<<< HEAD '@babel/parser': 7.28.0 '@babel/types': 7.28.1 @@ -11071,24 +7845,6 @@ snapshots: '@babel/helper-validator-identifier': 7.25.9 '@babel/types@7.28.1': -======= - '@babel/parser': 7.28.4 - '@babel/types': 7.28.4 - - '@babel/traverse@7.28.4': - dependencies: - '@babel/code-frame': 7.27.1 - '@babel/generator': 7.28.3 - '@babel/helper-globals': 7.28.0 - '@babel/parser': 7.28.4 - '@babel/template': 7.27.2 - '@babel/types': 7.28.4 - debug: 4.4.3 - transitivePeerDependencies: - - supports-color - - '@babel/types@7.28.4': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.27.1 @@ -11097,27 +7853,16 @@ snapshots: '@braintree/sanitize-url@6.0.4': {} -<<<<<<< HEAD '@ckeditor/ckeditor5-adapter-ckfinder@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 '@ckeditor/ckeditor5-upload': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-adapter-ckfinder@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-upload': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-alignment@41.3.1': dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-alignment@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11125,15 +7870,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-alignment@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -11141,7 +7877,6 @@ snapshots: dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-autoformat@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11158,24 +7893,6 @@ snapshots: '@ckeditor/ckeditor5-core': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-autoformat@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-heading': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-autosave@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color @@ -11184,7 +7901,6 @@ snapshots: dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-basic-styles@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11195,22 +7911,11 @@ snapshots: ckeditor5: 46.0.0 transitivePeerDependencies: - supports-color -======= - '@ckeditor/ckeditor5-basic-styles@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-block-quote@41.3.1': dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-block-quote@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11247,49 +7952,10 @@ snapshots: '@ckeditor/ckeditor5-utils': 46.0.0 blurhash: 2.0.5 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-block-quote@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-enter': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-bookmark@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-link': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-ckbox@47.1.0': - dependencies: - '@ckeditor/ckeditor5-cloud-services': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-image': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-upload': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - blurhash: 2.0.5 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@ckeditor/ckeditor5-ckfinder@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11298,16 +7964,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-ckfinder@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-image': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -11320,7 +7976,6 @@ snapshots: '@ckeditor/ckeditor5-widget': 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-clipboard@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11328,34 +7983,17 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 '@ckeditor/ckeditor5-widget': 46.0.0 -======= - '@ckeditor/ckeditor5-clipboard@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 '@ckeditor/ckeditor5-cloud-services@41.3.1': dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-cloud-services@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-cloud-services@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -11363,7 +8001,6 @@ snapshots: dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-code-block@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -11374,18 +8011,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-code-block@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-enter': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -11395,26 +8020,16 @@ snapshots: '@ckeditor/ckeditor5-utils': 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-core@46.0.0': dependencies: '@ckeditor/ckeditor5-engine': 46.0.0 '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 '@ckeditor/ckeditor5-watchdog': 46.0.0 -======= - '@ckeditor/ckeditor5-core@47.1.0': - dependencies: - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-watchdog': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@ckeditor/ckeditor5-easy-image@46.0.0': dependencies: '@ckeditor/ckeditor5-cloud-services': 46.0.0 @@ -11432,25 +8047,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-easy-image@47.1.0': - dependencies: - '@ckeditor/ckeditor5-cloud-services': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-upload': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-editor-balloon@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 '@ckeditor/ckeditor5-editor-classic@41.3.1': @@ -11458,7 +8054,6 @@ snapshots: ckeditor5: 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-editor-classic@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11466,20 +8061,10 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-editor-classic@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@ckeditor/ckeditor5-editor-decoupled@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11505,20 +8090,10 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-editor-decoupled@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@ckeditor/ckeditor5-emoji@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11528,39 +8103,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-editor-inline@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - es-toolkit: 1.39.5 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-editor-multi-root@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - es-toolkit: 1.39.5 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-emoji@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-mention': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 fuzzysort: 3.1.0 transitivePeerDependencies: @@ -11571,19 +8113,10 @@ snapshots: '@ckeditor/ckeditor5-utils': 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-engine@46.0.0': dependencies: '@ckeditor/ckeditor5-utils': 46.0.0 es-toolkit: 1.39.5 -======= - '@ckeditor/ckeditor5-engine@47.1.0': - dependencies: - '@ckeditor/ckeditor5-utils': 47.1.0 - es-toolkit: 1.39.5 - transitivePeerDependencies: - - supports-color ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-enter@41.3.1': dependencies: @@ -11591,25 +8124,16 @@ snapshots: '@ckeditor/ckeditor5-engine': 41.3.1 '@ckeditor/ckeditor5-utils': 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-enter@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 '@ckeditor/ckeditor5-engine': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 -======= - '@ckeditor/ckeditor5-enter@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-essentials@41.3.1': dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-essentials@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -11630,35 +8154,12 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-essentials@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-enter': 47.1.0 - '@ckeditor/ckeditor5-select-all': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-undo': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-find-and-replace@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 '@ckeditor/ckeditor5-font@41.3.1': dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-font@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11679,28 +8180,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-font@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-fullscreen@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-editor-classic': 47.1.0 - '@ckeditor/ckeditor5-editor-decoupled': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -11708,7 +8187,6 @@ snapshots: dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-heading@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11764,72 +8242,11 @@ snapshots: '@ckeditor/ckeditor5-utils': 46.0.0 '@ckeditor/ckeditor5-widget': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-heading@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-paragraph': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-highlight@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-horizontal-line@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 - - '@ckeditor/ckeditor5-html-embed@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-html-support@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-enter': 47.1.0 - '@ckeditor/ckeditor5-heading': 47.1.0 - '@ckeditor/ckeditor5-image': 47.1.0 - '@ckeditor/ckeditor5-list': 47.1.0 - '@ckeditor/ckeditor5-remove-format': 47.1.0 - '@ckeditor/ckeditor5-table': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@ckeditor/ckeditor5-icons@46.0.0': {} -======= - '@ckeditor/ckeditor5-icons@47.1.0': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-image@41.3.1': dependencies: @@ -11837,7 +8254,6 @@ snapshots: ckeditor5: 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-image@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -11851,21 +8267,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 46.0.0 '@ckeditor/ckeditor5-widget': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-image@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-undo': 47.1.0 - '@ckeditor/ckeditor5-upload': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color @@ -11874,7 +8275,6 @@ snapshots: dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-indent@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -11894,27 +8294,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-indent@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-heading': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-list': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-language@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -11924,7 +8303,6 @@ snapshots: ckeditor5: 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-link@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -11937,20 +8315,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 46.0.0 '@ckeditor/ckeditor5-widget': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-link@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-image': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color @@ -11959,7 +8323,6 @@ snapshots: dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-list@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -11982,30 +8345,6 @@ snapshots: '@ckeditor/ckeditor5-engine': 46.0.0 '@types/hast': 3.0.4 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-list@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-enter': 47.1.0 - '@ckeditor/ckeditor5-font': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-markdown-gfm@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@types/hast': 3.0.4 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hast-util-from-dom: 5.0.1 hast-util-to-html: 9.0.5 hast-util-to-mdast: 10.1.2 @@ -12028,7 +8367,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 41.3.1 ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-media-embed@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -12051,35 +8389,10 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-media-embed@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-undo': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-mention@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@ckeditor/ckeditor5-minimap@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -12098,26 +8411,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 46.0.0 '@ckeditor/ckeditor5-widget': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-minimap@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-page-break@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -12127,7 +8420,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 41.3.1 '@ckeditor/ckeditor5-utils': 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-paragraph@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -12135,21 +8427,11 @@ snapshots: '@ckeditor/ckeditor5-icons': 46.0.0 '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 -======= - '@ckeditor/ckeditor5-paragraph@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-paste-from-office@41.3.1': dependencies: ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-paste-from-office@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -12185,43 +8467,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-paste-from-office@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - ckeditor5: 47.1.0 - - '@ckeditor/ckeditor5-react@6.3.0(@ckeditor/ckeditor5-core@41.3.1)(@ckeditor/ckeditor5-editor-multi-root@47.1.0)(@ckeditor/ckeditor5-engine@41.3.1)(@ckeditor/ckeditor5-utils@41.3.1)(@ckeditor/ckeditor5-watchdog@41.3.1)(react@18.3.1)': - dependencies: - '@ckeditor/ckeditor5-core': 41.3.1 - '@ckeditor/ckeditor5-editor-multi-root': 47.1.0 - '@ckeditor/ckeditor5-engine': 41.3.1 - '@ckeditor/ckeditor5-utils': 41.3.1 - '@ckeditor/ckeditor5-watchdog': 41.3.1 - prop-types: 15.8.1 - react: 18.3.1 - - '@ckeditor/ckeditor5-remove-format@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-restricted-editing@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-select-all@41.3.1': dependencies: @@ -12229,7 +8474,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 41.3.1 '@ckeditor/ckeditor5-utils': 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-select-all@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -12245,23 +8489,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-select-all@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - - '@ckeditor/ckeditor5-show-blocks@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -12270,7 +8497,6 @@ snapshots: '@ckeditor/ckeditor5-theme-lark': 41.3.1 ckeditor5: 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-source-editing@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -12299,38 +8525,6 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-source-editing@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-theme-lark': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - transitivePeerDependencies: - - supports-color - - '@ckeditor/ckeditor5-special-characters@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 - - '@ckeditor/ckeditor5-style@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-html-support': 47.1.0 - '@ckeditor/ckeditor5-list': 47.1.0 - '@ckeditor/ckeditor5-table': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color @@ -12340,7 +8534,6 @@ snapshots: ckeditor5: 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-table@46.0.0': dependencies: '@ckeditor/ckeditor5-clipboard': 46.0.0 @@ -12351,18 +8544,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 46.0.0 '@ckeditor/ckeditor5-widget': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-table@47.1.0': - dependencies: - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color @@ -12371,15 +8552,9 @@ snapshots: dependencies: '@ckeditor/ckeditor5-ui': 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-theme-lark@46.0.0': dependencies: '@ckeditor/ckeditor5-ui': 46.0.0 -======= - '@ckeditor/ckeditor5-theme-lark@47.1.0': - dependencies: - '@ckeditor/ckeditor5-ui': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-typing@41.3.1': dependencies: @@ -12388,19 +8563,11 @@ snapshots: '@ckeditor/ckeditor5-utils': 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-typing@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 '@ckeditor/ckeditor5-engine': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 -======= - '@ckeditor/ckeditor5-typing@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 '@ckeditor/ckeditor5-ui@41.3.1': @@ -12412,7 +8579,6 @@ snapshots: lodash-es: 4.17.21 vanilla-colorful: 0.7.2 -<<<<<<< HEAD '@ckeditor/ckeditor5-ui@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -12420,15 +8586,6 @@ snapshots: '@ckeditor/ckeditor5-engine': 46.0.0 '@ckeditor/ckeditor5-icons': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 -======= - '@ckeditor/ckeditor5-ui@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-editor-multi-root': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/color-convert': 2.0.4 color-convert: 3.1.0 color-parse: 2.0.2 @@ -12443,7 +8600,6 @@ snapshots: '@ckeditor/ckeditor5-engine': 41.3.1 '@ckeditor/ckeditor5-ui': 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-undo@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -12451,46 +8607,24 @@ snapshots: '@ckeditor/ckeditor5-icons': 46.0.0 '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 -======= - '@ckeditor/ckeditor5-undo@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-upload@41.3.1': dependencies: '@ckeditor/ckeditor5-core': 41.3.1 '@ckeditor/ckeditor5-utils': 41.3.1 -<<<<<<< HEAD '@ckeditor/ckeditor5-upload@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 -======= - '@ckeditor/ckeditor5-upload@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ckeditor/ckeditor5-utils@41.3.1': dependencies: lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-utils@46.0.0': dependencies: '@ckeditor/ckeditor5-ui': 46.0.0 -======= - '@ckeditor/ckeditor5-utils@47.1.0': - dependencies: - '@ckeditor/ckeditor5-ui': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color @@ -12499,21 +8633,12 @@ snapshots: dependencies: lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-watchdog@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 '@ckeditor/ckeditor5-editor-multi-root': 46.0.0 '@ckeditor/ckeditor5-engine': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 -======= - '@ckeditor/ckeditor5-watchdog@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-editor-multi-root': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color @@ -12528,7 +8653,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 41.3.1 lodash-es: 4.17.21 -<<<<<<< HEAD '@ckeditor/ckeditor5-widget@46.0.0': dependencies: '@ckeditor/ckeditor5-core': 46.0.0 @@ -12546,49 +8670,20 @@ snapshots: '@ckeditor/ckeditor5-ui': 46.0.0 '@ckeditor/ckeditor5-utils': 46.0.0 ckeditor5: 46.0.0 -======= - '@ckeditor/ckeditor5-widget@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-enter': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - es-toolkit: 1.39.5 - - '@ckeditor/ckeditor5-word-count@47.1.0': - dependencies: - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - ckeditor5: 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-toolkit: 1.39.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@csstools/color-helpers@5.0.2': {} -======= - '@csstools/color-helpers@5.1.0': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)': dependencies: '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4) '@csstools/css-tokenizer': 3.0.4 -<<<<<<< HEAD '@csstools/css-color-parser@3.0.10(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)': dependencies: '@csstools/color-helpers': 5.0.2 -======= - '@csstools/css-color-parser@3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)': - dependencies: - '@csstools/color-helpers': 5.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4) '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4) '@csstools/css-tokenizer': 3.0.4 @@ -12633,7 +8728,6 @@ snapshots: react: 18.3.1 tslib: 2.8.1 -<<<<<<< HEAD '@emnapi/core@1.4.5': dependencies: '@emnapi/wasi-threads': 1.0.4 @@ -12641,29 +8735,16 @@ snapshots: optional: true '@emnapi/runtime@1.3.1': -======= - '@emnapi/core@1.6.0': - dependencies: - '@emnapi/wasi-threads': 1.1.0 - tslib: 2.8.1 - optional: true - - '@emnapi/runtime@1.6.0': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: tslib: 2.8.1 optional: true -<<<<<<< HEAD '@emnapi/runtime@1.4.5': dependencies: tslib: 2.8.1 optional: true '@emnapi/wasi-threads@1.0.4': -======= - '@emnapi/wasi-threads@1.1.0': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: tslib: 2.8.1 optional: true @@ -12677,13 +8758,8 @@ snapshots: '@emotion/babel-plugin@11.13.5': dependencies: -<<<<<<< HEAD '@babel/helper-module-imports': 7.25.9 '@babel/runtime': 7.26.0 -======= - '@babel/helper-module-imports': 7.27.1 - '@babel/runtime': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@emotion/hash': 0.9.2 '@emotion/memoize': 0.9.0 '@emotion/serialize': 1.3.3 @@ -12708,15 +8784,9 @@ snapshots: '@emotion/memoize@0.9.0': {} -<<<<<<< HEAD '@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1)': dependencies: '@babel/runtime': 7.26.0 -======= - '@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@emotion/babel-plugin': 11.13.5 '@emotion/cache': 11.14.0 '@emotion/serialize': 1.3.3 @@ -12726,11 +8796,7 @@ snapshots: hoist-non-react-statics: 3.3.2 react: 18.3.1 optionalDependencies: -<<<<<<< HEAD '@types/react': 18.3.18 -======= - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -12754,37 +8820,21 @@ snapshots: '@emotion/weak-memoize@0.4.0': {} -<<<<<<< HEAD '@eslint-community/eslint-utils@4.4.1(eslint@8.57.1)': -======= - '@eslint-community/eslint-utils@4.9.0(eslint@8.57.1)': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: eslint: 8.57.1 eslint-visitor-keys: 3.4.3 -<<<<<<< HEAD '@eslint-community/regexpp@4.12.1': {} -======= - '@eslint-community/regexpp@4.12.2': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 -<<<<<<< HEAD debug: 4.4.0 espree: 9.6.1 globals: 13.24.0 ignore: 5.3.2 import-fresh: 3.3.0 -======= - debug: 4.4.3 - espree: 9.6.1 - globals: 13.24.0 - ignore: 5.3.2 - import-fresh: 3.3.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 js-yaml: 4.1.0 minimatch: 3.1.2 strip-json-comments: 3.1.1 @@ -12802,7 +8852,6 @@ snapshots: transitivePeerDependencies: - encoding -<<<<<<< HEAD '@floating-ui/core@1.6.8': dependencies: '@floating-ui/utils': 0.2.8 @@ -12880,89 +8929,6 @@ snapshots: dependencies: '@fullcalendar/core': 6.1.15 '@fullcalendar/daygrid': 6.1.15(@fullcalendar/core@6.1.15) -======= - '@floating-ui/core@1.7.3': - dependencies: - '@floating-ui/utils': 0.2.10 - - '@floating-ui/dom@1.7.4': - dependencies: - '@floating-ui/core': 1.7.3 - '@floating-ui/utils': 0.2.10 - - '@floating-ui/react-dom@2.1.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@floating-ui/dom': 1.7.4 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - '@floating-ui/react@0.27.16(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@floating-ui/react-dom': 2.1.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@floating-ui/utils': 0.2.10 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - tabbable: 6.3.0 - - '@floating-ui/utils@0.2.10': {} - - '@formatjs/ecma402-abstract@2.3.6': - dependencies: - '@formatjs/fast-memoize': 2.2.7 - '@formatjs/intl-localematcher': 0.6.2 - decimal.js: 10.6.0 - tslib: 2.8.1 - - '@formatjs/fast-memoize@2.2.7': - dependencies: - tslib: 2.8.1 - - '@formatjs/icu-messageformat-parser@2.11.4': - dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - '@formatjs/icu-skeleton-parser': 1.8.16 - tslib: 2.8.1 - - '@formatjs/icu-skeleton-parser@1.8.16': - dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - tslib: 2.8.1 - - '@formatjs/intl-localematcher@0.5.10': - dependencies: - tslib: 2.8.1 - - '@formatjs/intl-localematcher@0.6.2': - dependencies: - tslib: 2.8.1 - - '@fullcalendar/core@6.1.19': - dependencies: - preact: 10.12.1 - - '@fullcalendar/daygrid@6.1.19(@fullcalendar/core@6.1.19)': - dependencies: - '@fullcalendar/core': 6.1.19 - - '@fullcalendar/interaction@6.1.19(@fullcalendar/core@6.1.19)': - dependencies: - '@fullcalendar/core': 6.1.19 - - '@fullcalendar/list@6.1.19(@fullcalendar/core@6.1.19)': - dependencies: - '@fullcalendar/core': 6.1.19 - - '@fullcalendar/react@6.1.19(@fullcalendar/core@6.1.19)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@fullcalendar/core': 6.1.19 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - '@fullcalendar/timegrid@6.1.19(@fullcalendar/core@6.1.19)': - dependencies: - '@fullcalendar/core': 6.1.19 - '@fullcalendar/daygrid': 6.1.19(@fullcalendar/core@6.1.19) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@googlemaps/js-api-loader@1.16.8': {} @@ -12973,33 +8939,19 @@ snapshots: '@headlessui/react@1.7.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: -<<<<<<< HEAD '@tanstack/react-virtual': 3.11.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - '@tanstack/react-virtual': 3.13.12(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 client-only: 0.0.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) -<<<<<<< HEAD '@hookform/resolvers@3.9.1(react-hook-form@7.54.2(react@18.3.1))': dependencies: react-hook-form: 7.54.2(react@18.3.1) -======= - '@hookform/resolvers@3.10.0(react-hook-form@7.65.0(react@18.3.1))': - dependencies: - react-hook-form: 7.65.0(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@humanwhocodes/config-array@0.13.0': dependencies: '@humanwhocodes/object-schema': 2.0.3 -<<<<<<< HEAD debug: 4.4.0 -======= - debug: 4.4.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -13008,11 +8960,7 @@ snapshots: '@humanwhocodes/object-schema@2.0.3': {} -<<<<<<< HEAD '@iconify/react@5.1.0(react@18.3.1)': -======= - '@iconify/react@5.2.1(react@18.3.1)': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@iconify/types': 2.0.0 react: 18.3.1 @@ -13085,11 +9033,7 @@ snapshots: '@img/sharp-wasm32@0.33.5': dependencies: -<<<<<<< HEAD '@emnapi/runtime': 1.3.1 -======= - '@emnapi/runtime': 1.6.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 optional: true '@img/sharp-win32-ia32@0.33.5': @@ -13098,46 +9042,11 @@ snapshots: '@img/sharp-win32-x64@0.33.5': optional: true -<<<<<<< HEAD -======= - '@inquirer/ansi@1.0.1': {} - - '@inquirer/confirm@5.1.19(@types/node@20.19.23)': - dependencies: - '@inquirer/core': 10.3.0(@types/node@20.19.23) - '@inquirer/type': 3.0.9(@types/node@20.19.23) - optionalDependencies: - '@types/node': 20.19.23 - - '@inquirer/core@10.3.0(@types/node@20.19.23)': - dependencies: - '@inquirer/ansi': 1.0.1 - '@inquirer/figures': 1.0.14 - '@inquirer/type': 3.0.9(@types/node@20.19.23) - cli-width: 4.1.0 - mute-stream: 2.0.0 - signal-exit: 4.1.0 - wrap-ansi: 6.2.0 - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 20.19.23 - - '@inquirer/figures@1.0.14': {} - - '@inquirer/type@3.0.9(@types/node@20.19.23)': - optionalDependencies: - '@types/node': 20.19.23 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 string-width-cjs: string-width@4.2.3 -<<<<<<< HEAD strip-ansi: 7.1.0 -======= - strip-ansi: 7.1.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 strip-ansi-cjs: strip-ansi@6.0.1 wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 @@ -13152,7 +9061,6 @@ snapshots: '@istanbuljs/schema@0.1.3': {} -<<<<<<< HEAD '@jest/console@30.0.5': dependencies: '@jest/types': 30.0.5 @@ -13191,46 +9099,6 @@ snapshots: jest-watcher: 30.0.5 micromatch: 4.0.8 pretty-format: 30.0.5 -======= - '@jest/console@30.2.0': - dependencies: - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - chalk: 4.1.2 - jest-message-util: 30.2.0 - jest-util: 30.2.0 - slash: 3.0.0 - - '@jest/core@30.2.0(babel-plugin-macros@3.1.0)': - dependencies: - '@jest/console': 30.2.0 - '@jest/pattern': 30.0.1 - '@jest/reporters': 30.2.0 - '@jest/test-result': 30.2.0 - '@jest/transform': 30.2.0 - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - ci-info: 4.3.1 - exit-x: 0.2.2 - graceful-fs: 4.2.11 - jest-changed-files: 30.2.0 - jest-config: 30.2.0(@types/node@20.19.23)(babel-plugin-macros@3.1.0) - jest-haste-map: 30.2.0 - jest-message-util: 30.2.0 - jest-regex-util: 30.0.1 - jest-resolve: 30.2.0 - jest-resolve-dependencies: 30.2.0 - jest-runner: 30.2.0 - jest-runtime: 30.2.0 - jest-snapshot: 30.2.0 - jest-util: 30.2.0 - jest-validate: 30.2.0 - jest-watcher: 30.2.0 - micromatch: 4.0.8 - pretty-format: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 slash: 3.0.0 transitivePeerDependencies: - babel-plugin-macros @@ -13240,7 +9108,6 @@ snapshots: '@jest/diff-sequences@30.0.1': {} -<<<<<<< HEAD '@jest/environment-jsdom-abstract@30.0.5(jsdom@26.1.0)': dependencies: '@jest/environment': 30.0.5 @@ -13287,60 +9154,11 @@ snapshots: '@jest/expect': 30.0.5 '@jest/types': 30.0.5 jest-mock: 30.0.5 -======= - '@jest/environment-jsdom-abstract@30.2.0(jsdom@26.1.0)': - dependencies: - '@jest/environment': 30.2.0 - '@jest/fake-timers': 30.2.0 - '@jest/types': 30.2.0 - '@types/jsdom': 21.1.7 - '@types/node': 20.19.23 - jest-mock: 30.2.0 - jest-util: 30.2.0 - jsdom: 26.1.0 - - '@jest/environment@30.2.0': - dependencies: - '@jest/fake-timers': 30.2.0 - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - jest-mock: 30.2.0 - - '@jest/expect-utils@30.2.0': - dependencies: - '@jest/get-type': 30.1.0 - - '@jest/expect@30.2.0': - dependencies: - expect: 30.2.0 - jest-snapshot: 30.2.0 - transitivePeerDependencies: - - supports-color - - '@jest/fake-timers@30.2.0': - dependencies: - '@jest/types': 30.2.0 - '@sinonjs/fake-timers': 13.0.5 - '@types/node': 20.19.23 - jest-message-util: 30.2.0 - jest-mock: 30.2.0 - jest-util: 30.2.0 - - '@jest/get-type@30.1.0': {} - - '@jest/globals@30.2.0': - dependencies: - '@jest/environment': 30.2.0 - '@jest/expect': 30.2.0 - '@jest/types': 30.2.0 - jest-mock: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color '@jest/pattern@30.0.1': dependencies: -<<<<<<< HEAD '@types/node': 20.17.10 jest-regex-util: 30.0.1 @@ -13355,22 +9173,6 @@ snapshots: '@types/node': 20.17.10 chalk: 4.1.2 collect-v8-coverage: 1.0.2 -======= - '@types/node': 20.19.23 - jest-regex-util: 30.0.1 - - '@jest/reporters@30.2.0': - dependencies: - '@bcoe/v8-coverage': 0.2.3 - '@jest/console': 30.2.0 - '@jest/test-result': 30.2.0 - '@jest/transform': 30.2.0 - '@jest/types': 30.2.0 - '@jridgewell/trace-mapping': 0.3.31 - '@types/node': 20.19.23 - chalk: 4.1.2 - collect-v8-coverage: 1.0.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 exit-x: 0.2.2 glob: 10.4.5 graceful-fs: 4.2.11 @@ -13378,17 +9180,10 @@ snapshots: istanbul-lib-instrument: 6.0.3 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 5.0.6 -<<<<<<< HEAD istanbul-reports: 3.1.7 jest-message-util: 30.0.5 jest-util: 30.0.5 jest-worker: 30.0.5 -======= - istanbul-reports: 3.2.0 - jest-message-util: 30.2.0 - jest-util: 30.2.0 - jest-worker: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 slash: 3.0.0 string-length: 4.0.2 v8-to-istanbul: 9.3.0 @@ -13397,26 +9192,17 @@ snapshots: '@jest/schemas@30.0.5': dependencies: -<<<<<<< HEAD '@sinclair/typebox': 0.34.38 '@jest/snapshot-utils@30.0.5': dependencies: '@jest/types': 30.0.5 -======= - '@sinclair/typebox': 0.34.41 - - '@jest/snapshot-utils@30.2.0': - dependencies: - '@jest/types': 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 chalk: 4.1.2 graceful-fs: 4.2.11 natural-compare: 1.4.0 '@jest/source-map@30.0.1': dependencies: -<<<<<<< HEAD '@jridgewell/trace-mapping': 0.3.25 callsites: 3.1.0 graceful-fs: 4.2.11 @@ -13441,45 +9227,13 @@ snapshots: '@jest/types': 30.0.5 '@jridgewell/trace-mapping': 0.3.25 babel-plugin-istanbul: 7.0.0 -======= - '@jridgewell/trace-mapping': 0.3.31 - callsites: 3.1.0 - graceful-fs: 4.2.11 - - '@jest/test-result@30.2.0': - dependencies: - '@jest/console': 30.2.0 - '@jest/types': 30.2.0 - '@types/istanbul-lib-coverage': 2.0.6 - collect-v8-coverage: 1.0.3 - - '@jest/test-sequencer@30.2.0': - dependencies: - '@jest/test-result': 30.2.0 - graceful-fs: 4.2.11 - jest-haste-map: 30.2.0 - slash: 3.0.0 - - '@jest/transform@30.2.0': - dependencies: - '@babel/core': 7.28.4 - '@jest/types': 30.2.0 - '@jridgewell/trace-mapping': 0.3.31 - babel-plugin-istanbul: 7.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 chalk: 4.1.2 convert-source-map: 2.0.0 fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.11 -<<<<<<< HEAD jest-haste-map: 30.0.5 jest-regex-util: 30.0.1 jest-util: 30.0.5 -======= - jest-haste-map: 30.2.0 - jest-regex-util: 30.0.1 - jest-util: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromatch: 4.0.8 pirates: 4.0.7 slash: 3.0.0 @@ -13487,17 +9241,12 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@jest/types@30.0.5': -======= - '@jest/types@30.2.0': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@jest/pattern': 30.0.1 '@jest/schemas': 30.0.5 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 -<<<<<<< HEAD '@types/node': 20.17.10 '@types/yargs': 17.0.33 chalk: 4.1.2 @@ -13528,30 +9277,6 @@ snapshots: dependencies: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 -======= - '@types/node': 20.19.23 - '@types/yargs': 17.0.33 - chalk: 4.1.2 - - '@jridgewell/gen-mapping@0.3.13': - dependencies: - '@jridgewell/sourcemap-codec': 1.5.5 - '@jridgewell/trace-mapping': 0.3.31 - - '@jridgewell/remapping@2.3.5': - dependencies: - '@jridgewell/gen-mapping': 0.3.13 - '@jridgewell/trace-mapping': 0.3.31 - - '@jridgewell/resolve-uri@3.1.2': {} - - '@jridgewell/sourcemap-codec@1.5.5': {} - - '@jridgewell/trace-mapping@0.3.31': - dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.5 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@kurkle/color@0.3.4': {} @@ -13580,7 +9305,6 @@ snapshots: '@mdx-js/react@2.3.0(react@18.3.1)': dependencies: '@types/mdx': 2.0.13 -<<<<<<< HEAD '@types/react': 18.3.18 react: 18.3.1 @@ -13595,54 +9319,11 @@ snapshots: '@mui/utils': 6.4.3(@types/react@18.3.18)(react@18.3.1) '@popperjs/core': 2.11.8 '@types/react-transition-group': 4.4.12(@types/react@18.3.18) -======= - '@types/react': 18.3.26 - react: 18.3.1 - - '@modelcontextprotocol/sdk@1.20.1': - dependencies: - ajv: 6.12.6 - content-type: 1.0.5 - cors: 2.8.5 - cross-spawn: 7.0.6 - eventsource: 3.0.7 - eventsource-parser: 3.0.6 - express: 5.1.0 - express-rate-limit: 7.5.1(express@5.1.0) - pkce-challenge: 5.0.0 - raw-body: 3.0.1 - zod: 3.25.76 - zod-to-json-schema: 3.24.6(zod@3.25.76) - transitivePeerDependencies: - - supports-color - - '@mswjs/interceptors@0.40.0': - dependencies: - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/logger': 0.3.0 - '@open-draft/until': 2.1.0 - is-node-process: 1.2.0 - outvariant: 1.4.3 - strict-event-emitter: 0.5.1 - - '@mui/core-downloads-tracker@7.3.4': {} - - '@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 - '@mui/core-downloads-tracker': 7.3.4 - '@mui/system': 7.3.3(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react@18.3.1) - '@mui/types': 7.4.7(@types/react@18.3.26) - '@mui/utils': 7.3.3(@types/react@18.3.26)(react@18.3.1) - '@popperjs/core': 2.11.8 - '@types/react-transition-group': 4.4.12(@types/react@18.3.26) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) -<<<<<<< HEAD react-is: 19.0.0 react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) optionalDependencies: @@ -13661,26 +9342,6 @@ snapshots: '@mui/styled-engine@6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.27.6 -======= - react-is: 19.2.0 - react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - optionalDependencies: - '@emotion/react': 11.14.0(@types/react@18.3.26)(react@18.3.1) - '@types/react': 18.3.26 - - '@mui/private-theming@7.3.3(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 - '@mui/utils': 7.3.3(@types/react@18.3.26)(react@18.3.1) - prop-types: 15.8.1 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@mui/styled-engine@7.3.3(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@emotion/cache': 11.14.0 '@emotion/serialize': 1.3.3 '@emotion/sheet': 1.4.0 @@ -13688,7 +9349,6 @@ snapshots: prop-types: 15.8.1 react: 18.3.1 optionalDependencies: -<<<<<<< HEAD '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1) '@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1)': @@ -13698,23 +9358,11 @@ snapshots: '@mui/styled-engine': 6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.21(@types/react@18.3.18) '@mui/utils': 6.4.3(@types/react@18.3.18)(react@18.3.1) -======= - '@emotion/react': 11.14.0(@types/react@18.3.26)(react@18.3.1) - - '@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 - '@mui/private-theming': 7.3.3(@types/react@18.3.26)(react@18.3.1) - '@mui/styled-engine': 7.3.3(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(react@18.3.1) - '@mui/types': 7.4.7(@types/react@18.3.26) - '@mui/utils': 7.3.3(@types/react@18.3.26)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 optionalDependencies: -<<<<<<< HEAD '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1) '@types/react': 18.3.18 @@ -13742,37 +9390,6 @@ snapshots: '@types/d3-interpolate': 3.0.4 '@types/d3-scale': 4.0.8 '@types/d3-shape': 3.1.6 -======= - '@emotion/react': 11.14.0(@types/react@18.3.26)(react@18.3.1) - '@types/react': 18.3.26 - - '@mui/types@7.4.7(@types/react@18.3.26)': - dependencies: - '@babel/runtime': 7.28.4 - optionalDependencies: - '@types/react': 18.3.26 - - '@mui/utils@7.3.3(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 - '@mui/types': 7.4.7(@types/react@18.3.26) - '@types/prop-types': 15.7.15 - clsx: 2.1.1 - prop-types: 15.8.1 - react: 18.3.1 - react-is: 19.2.0 - optionalDependencies: - '@types/react': 18.3.26 - - '@mui/x-charts-vendor@7.20.0': - dependencies: - '@babel/runtime': 7.28.4 - '@types/d3-color': 3.1.3 - '@types/d3-delaunay': 6.0.4 - '@types/d3-interpolate': 3.0.4 - '@types/d3-scale': 4.0.9 - '@types/d3-shape': 3.1.7 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/d3-time': 3.0.4 d3-color: 3.1.0 d3-delaunay: 6.0.4 @@ -13783,7 +9400,6 @@ snapshots: delaunator: 5.0.1 robust-predicates: 3.0.2 -<<<<<<< HEAD '@mui/x-charts@7.26.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@mui/material@6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.26.0 @@ -13792,16 +9408,6 @@ snapshots: '@mui/utils': 6.4.3(@types/react@18.3.18)(react@18.3.1) '@mui/x-charts-vendor': 7.20.0 '@mui/x-internals': 7.26.0(@types/react@18.3.18)(react@18.3.1) -======= - '@mui/x-charts@7.29.1(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@mui/material@7.3.4(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@7.3.3(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 - '@mui/material': 7.3.4(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': 7.3.3(@emotion/react@11.14.0(@types/react@18.3.26)(react@18.3.1))(@types/react@18.3.26)(react@18.3.1) - '@mui/utils': 7.3.3(@types/react@18.3.26)(react@18.3.1) - '@mui/x-charts-vendor': 7.20.0 - '@mui/x-internals': 7.29.0(@types/react@18.3.26)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@react-spring/rafz': 9.7.5 '@react-spring/web': 9.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) clsx: 2.1.1 @@ -13809,7 +9415,6 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: -<<<<<<< HEAD '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1) transitivePeerDependencies: - '@types/react' @@ -13818,21 +9423,10 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 '@mui/utils': 6.4.3(@types/react@18.3.18)(react@18.3.1) -======= - '@emotion/react': 11.14.0(@types/react@18.3.26)(react@18.3.1) - transitivePeerDependencies: - - '@types/react' - - '@mui/x-internals@7.29.0(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 - '@mui/utils': 7.3.3(@types/react@18.3.26)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 transitivePeerDependencies: - '@types/react' -<<<<<<< HEAD '@napi-rs/simple-git-android-arm-eabi@0.1.19': optional: true @@ -13900,96 +9494,18 @@ snapshots: optional: true '@next/bundle-analyzer@15.1.2': -======= - '@napi-rs/simple-git-android-arm-eabi@0.1.22': - optional: true - - '@napi-rs/simple-git-android-arm64@0.1.22': - optional: true - - '@napi-rs/simple-git-darwin-arm64@0.1.22': - optional: true - - '@napi-rs/simple-git-darwin-x64@0.1.22': - optional: true - - '@napi-rs/simple-git-freebsd-x64@0.1.22': - optional: true - - '@napi-rs/simple-git-linux-arm-gnueabihf@0.1.22': - optional: true - - '@napi-rs/simple-git-linux-arm64-gnu@0.1.22': - optional: true - - '@napi-rs/simple-git-linux-arm64-musl@0.1.22': - optional: true - - '@napi-rs/simple-git-linux-ppc64-gnu@0.1.22': - optional: true - - '@napi-rs/simple-git-linux-s390x-gnu@0.1.22': - optional: true - - '@napi-rs/simple-git-linux-x64-gnu@0.1.22': - optional: true - - '@napi-rs/simple-git-linux-x64-musl@0.1.22': - optional: true - - '@napi-rs/simple-git-win32-arm64-msvc@0.1.22': - optional: true - - '@napi-rs/simple-git-win32-ia32-msvc@0.1.22': - optional: true - - '@napi-rs/simple-git-win32-x64-msvc@0.1.22': - optional: true - - '@napi-rs/simple-git@0.1.22': - optionalDependencies: - '@napi-rs/simple-git-android-arm-eabi': 0.1.22 - '@napi-rs/simple-git-android-arm64': 0.1.22 - '@napi-rs/simple-git-darwin-arm64': 0.1.22 - '@napi-rs/simple-git-darwin-x64': 0.1.22 - '@napi-rs/simple-git-freebsd-x64': 0.1.22 - '@napi-rs/simple-git-linux-arm-gnueabihf': 0.1.22 - '@napi-rs/simple-git-linux-arm64-gnu': 0.1.22 - '@napi-rs/simple-git-linux-arm64-musl': 0.1.22 - '@napi-rs/simple-git-linux-ppc64-gnu': 0.1.22 - '@napi-rs/simple-git-linux-s390x-gnu': 0.1.22 - '@napi-rs/simple-git-linux-x64-gnu': 0.1.22 - '@napi-rs/simple-git-linux-x64-musl': 0.1.22 - '@napi-rs/simple-git-win32-arm64-msvc': 0.1.22 - '@napi-rs/simple-git-win32-ia32-msvc': 0.1.22 - '@napi-rs/simple-git-win32-x64-msvc': 0.1.22 - - '@napi-rs/wasm-runtime@0.2.12': - dependencies: - '@emnapi/core': 1.6.0 - '@emnapi/runtime': 1.6.0 - '@tybys/wasm-util': 0.10.1 - optional: true - - '@next/bundle-analyzer@15.5.6': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: webpack-bundle-analyzer: 4.10.1 transitivePeerDependencies: - bufferutil - utf-8-validate -<<<<<<< HEAD '@next/env@14.2.3': {} -======= - '@next/env@14.2.33': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@next/eslint-plugin-next@14.2.3': dependencies: glob: 10.3.10 -<<<<<<< HEAD '@next/swc-darwin-arm64@14.2.3': optional: true @@ -14015,33 +9531,6 @@ snapshots: optional: true '@next/swc-win32-x64-msvc@14.2.3': -======= - '@next/swc-darwin-arm64@14.2.33': - optional: true - - '@next/swc-darwin-x64@14.2.33': - optional: true - - '@next/swc-linux-arm64-gnu@14.2.33': - optional: true - - '@next/swc-linux-arm64-musl@14.2.33': - optional: true - - '@next/swc-linux-x64-gnu@14.2.33': - optional: true - - '@next/swc-linux-x64-musl@14.2.33': - optional: true - - '@next/swc-win32-arm64-msvc@14.2.33': - optional: true - - '@next/swc-win32-ia32-msvc@14.2.33': - optional: true - - '@next/swc-win32-x64-msvc@14.2.33': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 optional: true '@nodelib/fs.scandir@2.1.5': @@ -14054,32 +9543,15 @@ snapshots: '@nodelib/fs.walk@1.2.8': dependencies: '@nodelib/fs.scandir': 2.1.5 -<<<<<<< HEAD fastq: 1.18.0 '@nolyfill/is-core-module@1.0.39': {} -======= - fastq: 1.19.1 - - '@nolyfill/is-core-module@1.0.39': {} - - '@open-draft/deferred-promise@2.2.0': {} - - '@open-draft/logger@0.3.0': - dependencies: - is-node-process: 1.2.0 - outvariant: 1.4.3 - - '@open-draft/until@2.1.0': {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@pkgjs/parseargs@0.11.0': optional: true '@pkgr/core@0.2.9': {} -<<<<<<< HEAD '@polka/url@1.0.0-next.28': {} '@popperjs/core@2.11.8': {} @@ -14705,649 +10177,6 @@ snapshots: '@radix-ui/rect@1.1.0': {} '@react-google-maps/api@2.20.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': -======= - '@polka/url@1.0.0-next.29': {} - - '@popperjs/core@2.11.8': {} - - '@radix-ui/number@1.1.1': {} - - '@radix-ui/primitive@1.1.3': {} - - '@radix-ui/react-accordion@1.2.12(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collapsible': 1.1.12(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-alert-dialog@1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dialog': 1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-arrow@1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-aspect-ratio@1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-avatar@1.1.10(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-checkbox@1.3.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-collapsible@1.1.12(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-collection@1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-compose-refs@1.1.2(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-context-menu@2.2.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-menu': 2.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-context@1.1.2(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-dialog@1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-portal': 1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - aria-hidden: 1.2.6 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.7.1(@types/react@18.3.26)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-direction@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-dismissable-layer@1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-dropdown-menu@2.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-menu': 2.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-focus-guards@1.1.3(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-focus-scope@1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-hover-card@1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-popper': 1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-id@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-label@2.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-menu@2.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-popper': 1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - aria-hidden: 1.2.6 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.7.1(@types/react@18.3.26)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-menubar@1.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-menu': 2.1.16(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-navigation-menu@1.2.14(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.2.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-popover@1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-popper': 1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - aria-hidden: 1.2.6 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.7.1(@types/react@18.3.26)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-popper@1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@floating-ui/react-dom': 2.1.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-arrow': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-rect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/rect': 1.1.1 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-portal@1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-presence@1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-primitive@2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-progress@1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-radio-group@1.3.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-roving-focus@1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-scroll-area@1.2.10(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/number': 1.1.1 - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-select@2.2.6(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/number': 1.1.1 - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-popper': 1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.2.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - aria-hidden: 1.2.6 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.7.1(@types/react@18.3.26)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-separator@1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-slider@1.3.6(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/number': 1.1.1 - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-slot@1.2.3(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-switch@1.2.6(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-tabs@1.1.13(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-toast@1.2.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-collection': 1.1.7(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.2.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-toggle-group@1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-direction': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-toggle': 1.1.10(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-toggle@1.1.10(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-tooltip@1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.3 - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-context': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.11(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-popper': 1.2.8(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.5(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.2.3(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.2.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-callback-ref@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-controllable-state@1.2.2(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@radix-ui/react-use-effect-event': 0.0.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-effect-event@0.0.2(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-is-hydrated@0.1.0(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - use-sync-external-store: 1.6.0(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-layout-effect@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-previous@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-rect@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@radix-ui/rect': 1.1.1 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-use-size@1.1.1(@types/react@18.3.26)(react@18.3.1)': - dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.3.26)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/react-visually-hidden@1.2.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@radix-ui/rect@1.1.1': {} - - '@react-google-maps/api@2.20.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@googlemaps/js-api-loader': 1.16.8 '@googlemaps/markerclusterer': 2.5.3 @@ -15402,15 +10231,9 @@ snapshots: '@rtsao/scc@1.1.0': {} -<<<<<<< HEAD '@rushstack/eslint-patch@1.10.4': {} '@sinclair/typebox@0.34.38': {} -======= - '@rushstack/eslint-patch@1.14.0': {} - - '@sinclair/typebox@0.34.41': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@sinonjs/commons@3.0.1': dependencies: @@ -15434,25 +10257,16 @@ snapshots: dependencies: '@studio-freight/hamo': 0.6.33(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@studio-freight/lenis': 1.0.42 -<<<<<<< HEAD '@types/react': 18.3.18 clsx: 2.1.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) zustand: 4.5.5(@types/react@18.3.18)(react@18.3.1) -======= - '@types/react': 18.3.26 - clsx: 2.1.1 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - zustand: 4.5.7(@types/react@18.3.26)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - immer '@studio-freight/tempus@0.0.38': {} -<<<<<<< HEAD '@svgdotjs/svg.draggable.js@3.0.6(@svgdotjs/svg.js@3.2.4)': dependencies: '@svgdotjs/svg.js': 3.2.4 @@ -15471,26 +10285,6 @@ snapshots: '@svgdotjs/svg.select.js@4.0.3(@svgdotjs/svg.js@3.2.4)': dependencies: '@svgdotjs/svg.js': 3.2.4 -======= - '@svgdotjs/svg.draggable.js@3.0.6(@svgdotjs/svg.js@3.2.5)': - dependencies: - '@svgdotjs/svg.js': 3.2.5 - - '@svgdotjs/svg.filter.js@3.0.9': - dependencies: - '@svgdotjs/svg.js': 3.2.5 - - '@svgdotjs/svg.js@3.2.5': {} - - '@svgdotjs/svg.resize.js@2.0.5(@svgdotjs/svg.js@3.2.5)(@svgdotjs/svg.select.js@4.0.3(@svgdotjs/svg.js@3.2.5))': - dependencies: - '@svgdotjs/svg.js': 3.2.5 - '@svgdotjs/svg.select.js': 4.0.3(@svgdotjs/svg.js@3.2.5) - - '@svgdotjs/svg.select.js@4.0.3(@svgdotjs/svg.js@3.2.5)': - dependencies: - '@svgdotjs/svg.js': 3.2.5 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@swc/counter@0.1.3': {} @@ -15499,7 +10293,6 @@ snapshots: '@swc/counter': 0.1.3 tslib: 2.8.1 -<<<<<<< HEAD '@tanstack/react-table@8.20.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@tanstack/table-core': 8.20.5 @@ -15553,60 +10346,6 @@ snapshots: '@theguild/remark-mermaid@0.0.5(react@18.3.1)': dependencies: mermaid: 10.9.3 -======= - '@tanstack/react-table@8.21.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@tanstack/table-core': 8.21.3 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - '@tanstack/react-virtual@3.13.12(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@tanstack/virtual-core': 3.13.12 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - '@tanstack/table-core@8.21.3': {} - - '@tanstack/virtual-core@3.13.12': {} - - '@testing-library/dom@10.4.1': - dependencies: - '@babel/code-frame': 7.27.1 - '@babel/runtime': 7.28.4 - '@types/aria-query': 5.0.4 - aria-query: 5.3.0 - dom-accessibility-api: 0.5.16 - lz-string: 1.5.0 - picocolors: 1.1.1 - pretty-format: 27.5.1 - - '@testing-library/jest-dom@6.9.1': - dependencies: - '@adobe/css-tools': 4.4.4 - aria-query: 5.3.2 - css.escape: 1.5.1 - dom-accessibility-api: 0.6.3 - picocolors: 1.1.1 - redent: 3.0.0 - - '@testing-library/react@16.3.0(@testing-library/dom@10.4.1)(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.28.4 - '@testing-library/dom': 10.4.1 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)': - dependencies: - '@testing-library/dom': 10.4.1 - - '@theguild/remark-mermaid@0.0.5(react@18.3.1)': - dependencies: - mermaid: 10.9.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 unist-util-visit: 5.0.0 transitivePeerDependencies: @@ -15617,11 +10356,7 @@ snapshots: npm-to-yarn: 2.2.1 unist-util-visit: 5.0.0 -<<<<<<< HEAD '@tinymce/tinymce-react@6.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': -======= - '@tinymce/tinymce-react@6.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: prop-types: 15.8.1 react: 18.3.1 @@ -15629,37 +10364,24 @@ snapshots: '@ts-morph/common@0.19.0': dependencies: -<<<<<<< HEAD fast-glob: 3.3.2 -======= - fast-glob: 3.3.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 minimatch: 7.4.6 mkdirp: 2.1.6 path-browserify: 1.0.1 -<<<<<<< HEAD '@tybys/wasm-util@0.10.0': -======= - '@tybys/wasm-util@0.10.1': ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: tslib: 2.8.1 optional: true '@types/acorn@4.0.6': dependencies: -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/aria-query@5.0.4': {} '@types/babel__core@7.20.5': dependencies: -<<<<<<< HEAD '@babel/parser': 7.26.8 '@babel/types': 7.26.8 '@types/babel__generator': 7.27.0 @@ -15682,30 +10404,6 @@ snapshots: '@types/cleave.js@1.4.12': dependencies: '@types/react': 18.3.18 -======= - '@babel/parser': 7.28.4 - '@babel/types': 7.28.4 - '@types/babel__generator': 7.27.0 - '@types/babel__template': 7.4.4 - '@types/babel__traverse': 7.28.0 - - '@types/babel__generator@7.27.0': - dependencies: - '@babel/types': 7.28.4 - - '@types/babel__template@7.4.4': - dependencies: - '@babel/parser': 7.28.4 - '@babel/types': 7.28.4 - - '@types/babel__traverse@7.28.0': - dependencies: - '@babel/types': 7.28.4 - - '@types/cleave.js@1.4.12': - dependencies: - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/color-convert@2.0.4': dependencies: @@ -15715,11 +10413,7 @@ snapshots: '@types/crypto-js@4.2.2': {} -<<<<<<< HEAD '@types/d3-array@3.2.1': {} -======= - '@types/d3-array@3.2.2': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/d3-color@3.1.3': {} @@ -15731,7 +10425,6 @@ snapshots: dependencies: '@types/d3-color': 3.1.3 -<<<<<<< HEAD '@types/d3-path@3.1.0': {} '@types/d3-scale-chromatic@3.1.0': {} @@ -15743,19 +10436,6 @@ snapshots: '@types/d3-shape@3.1.6': dependencies: '@types/d3-path': 3.1.0 -======= - '@types/d3-path@3.1.1': {} - - '@types/d3-scale-chromatic@3.1.0': {} - - '@types/d3-scale@4.0.9': - dependencies: - '@types/d3-time': 3.0.4 - - '@types/d3-shape@3.1.7': - dependencies: - '@types/d3-path': 3.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/d3-time@3.0.4': {} @@ -15763,7 +10443,6 @@ snapshots: '@types/debug@4.1.12': dependencies: -<<<<<<< HEAD '@types/ms': 0.7.34 '@types/domhandler@2.4.5': {} @@ -15781,23 +10460,6 @@ snapshots: '@types/gensync@1.0.4': {} '@types/geojson@7946.0.15': {} -======= - '@types/ms': 2.1.0 - - '@types/domhandler@2.4.5': {} - - '@types/domutils@2.1.0': - dependencies: - domutils: 3.2.2 - - '@types/estree-jsx@1.0.5': - dependencies: - '@types/estree': 1.0.8 - - '@types/estree@1.0.8': {} - - '@types/geojson@7946.0.16': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/google.maps@3.58.1': {} @@ -15812,13 +10474,8 @@ snapshots: '@types/htmlparser2@3.10.7': dependencies: '@types/domhandler': 2.4.5 -<<<<<<< HEAD '@types/domutils': 1.7.8 '@types/node': 20.17.10 -======= - '@types/domutils': 2.1.0 - '@types/node': 20.19.23 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 domhandler: 2.4.2 '@types/istanbul-lib-coverage@2.0.6': {} @@ -15833,21 +10490,12 @@ snapshots: '@types/jest@30.0.0': dependencies: -<<<<<<< HEAD expect: 30.0.5 pretty-format: 30.0.5 '@types/jquery@3.5.32': dependencies: '@types/sizzle': 2.3.9 -======= - expect: 30.2.0 - pretty-format: 30.2.0 - - '@types/jquery@3.5.33': - dependencies: - '@types/sizzle': 2.3.10 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/js-cookie@3.0.6': {} @@ -15855,29 +10503,17 @@ snapshots: '@types/jsdom@21.1.7': dependencies: -<<<<<<< HEAD '@types/node': 20.17.10 '@types/tough-cookie': 4.0.5 parse5: 7.2.1 -======= - '@types/node': 20.19.23 - '@types/tough-cookie': 4.0.5 - parse5: 7.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/json5@0.0.29': {} '@types/katex@0.16.7': {} -<<<<<<< HEAD '@types/leaflet@1.9.15': dependencies: '@types/geojson': 7946.0.15 -======= - '@types/leaflet@1.9.21': - dependencies: - '@types/geojson': 7946.0.16 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/mdast@3.0.15': dependencies: @@ -15891,19 +10527,11 @@ snapshots: '@types/minimatch@5.1.2': {} -<<<<<<< HEAD '@types/ms@0.7.34': {} '@types/next@9.0.0(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: next: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - '@types/ms@2.1.0': {} - - '@types/next@9.0.0(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - next: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - '@babel/core' - '@opentelemetry/api' @@ -15913,7 +10541,6 @@ snapshots: - react-dom - sass -<<<<<<< HEAD '@types/node@20.17.10': dependencies: undici-types: 6.19.8 @@ -15923,19 +10550,6 @@ snapshots: '@types/prop-types@15.7.14': {} '@types/qs@6.9.17': {} -======= - '@types/node@20.19.23': - dependencies: - undici-types: 6.21.0 - - '@types/pako@2.0.4': {} - - '@types/parse-json@4.0.2': {} - - '@types/prop-types@15.7.15': {} - - '@types/qs@6.14.0': {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/raf@3.4.3': optional: true @@ -15944,7 +10558,6 @@ snapshots: '@types/react-google-recaptcha@2.1.9': dependencies: -<<<<<<< HEAD '@types/react': 18.3.18 '@types/react-html-parser@2.0.6': @@ -15963,31 +10576,10 @@ snapshots: '@types/react@18.3.18': dependencies: '@types/prop-types': 15.7.14 -======= - '@types/react': 18.3.26 - - '@types/react-html-parser@2.0.7': - dependencies: - '@types/htmlparser2': 3.10.7 - '@types/react': 18.3.26 - - '@types/react-syntax-highlighter@15.5.13': - dependencies: - '@types/react': 18.3.26 - - '@types/react-transition-group@4.4.12(@types/react@18.3.26)': - dependencies: - '@types/react': 18.3.26 - - '@types/react@18.3.26': - dependencies: - '@types/prop-types': 15.7.15 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 csstype: 3.1.3 '@types/rtl-detect@1.0.3': {} -<<<<<<< HEAD '@types/sanitize-html@2.13.0': dependencies: htmlparser2: 8.0.2 @@ -15996,18 +10588,6 @@ snapshots: '@types/stack-utils@2.0.3': {} -======= - '@types/sanitize-html@2.16.0': - dependencies: - htmlparser2: 8.0.2 - - '@types/sizzle@2.3.10': {} - - '@types/stack-utils@2.0.3': {} - - '@types/statuses@2.0.6': {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/tough-cookie@4.0.5': {} '@types/trusted-types@2.0.7': @@ -16023,7 +10603,6 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 -<<<<<<< HEAD '@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.7.2)': dependencies: '@typescript-eslint/scope-manager': 7.2.0 @@ -16034,18 +10613,6 @@ snapshots: eslint: 8.57.1 optionalDependencies: typescript: 5.7.2 -======= - '@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.9.3)': - dependencies: - '@typescript-eslint/scope-manager': 7.2.0 - '@typescript-eslint/types': 7.2.0 - '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 7.2.0 - debug: 4.4.3 - eslint: 8.57.1 - optionalDependencies: - typescript: 5.9.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -16056,7 +10623,6 @@ snapshots: '@typescript-eslint/types@7.2.0': {} -<<<<<<< HEAD '@typescript-eslint/typescript-estree@7.2.0(typescript@5.7.2)': dependencies: '@typescript-eslint/types': 7.2.0 @@ -16069,20 +10635,6 @@ snapshots: ts-api-utils: 1.4.3(typescript@5.7.2) optionalDependencies: typescript: 5.7.2 -======= - '@typescript-eslint/typescript-estree@7.2.0(typescript@5.9.3)': - dependencies: - '@typescript-eslint/types': 7.2.0 - '@typescript-eslint/visitor-keys': 7.2.0 - debug: 4.4.3 - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.3 - semver: 7.7.3 - ts-api-utils: 1.4.3(typescript@5.9.3) - optionalDependencies: - typescript: 5.9.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -16091,11 +10643,8 @@ snapshots: '@typescript-eslint/types': 7.2.0 eslint-visitor-keys: 3.4.3 -<<<<<<< HEAD '@ungap/structured-clone@1.2.1': {} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@ungap/structured-clone@1.3.0': {} '@unrs/resolver-binding-android-arm-eabi@1.11.1': @@ -16157,7 +10706,6 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.11.1': optional: true -<<<<<<< HEAD '@vercel/analytics@1.4.1(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': optionalDependencies: next: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -16167,23 +10715,11 @@ snapshots: dependencies: react: 18.3.1 wavesurfer.js: 7.8.16 -======= - '@vercel/analytics@1.5.0(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': - optionalDependencies: - next: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - - '@wavesurfer/react@1.0.11(react@18.3.1)(wavesurfer.js@7.11.0)': - dependencies: - react: 18.3.1 - wavesurfer.js: 7.11.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@wojtekmaj/date-utils@1.5.1': {} '@yr/monotone-cubic-spline@1.0.3': {} -<<<<<<< HEAD acorn-jsx@5.3.2(acorn@8.14.0): dependencies: acorn: 8.14.0 @@ -16195,24 +10731,6 @@ snapshots: acorn@8.14.0: {} agent-base@7.1.3: {} -======= - accepts@2.0.0: - dependencies: - mime-types: 3.0.1 - negotiator: 1.0.0 - - acorn-jsx@5.3.2(acorn@8.15.0): - dependencies: - acorn: 8.15.0 - - acorn-walk@8.3.4: - dependencies: - acorn: 8.15.0 - - acorn@8.15.0: {} - - agent-base@7.1.4: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ajv@6.12.6: dependencies: @@ -16227,15 +10745,9 @@ snapshots: ansi-regex@5.0.1: {} -<<<<<<< HEAD ansi-regex@6.1.0: {} ansi-sequence-parser@1.1.1: {} -======= - ansi-regex@6.2.2: {} - - ansi-sequence-parser@1.1.3: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ansi-styles@3.2.1: dependencies: @@ -16247,11 +10759,7 @@ snapshots: ansi-styles@5.2.0: {} -<<<<<<< HEAD ansi-styles@6.2.1: {} -======= - ansi-styles@6.2.3: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 any-promise@1.3.0: {} @@ -16262,19 +10770,11 @@ snapshots: apexcharts@4.7.0: dependencies: -<<<<<<< HEAD '@svgdotjs/svg.draggable.js': 3.0.6(@svgdotjs/svg.js@3.2.4) '@svgdotjs/svg.filter.js': 3.0.9 '@svgdotjs/svg.js': 3.2.4 '@svgdotjs/svg.resize.js': 2.0.5(@svgdotjs/svg.js@3.2.4)(@svgdotjs/svg.select.js@4.0.3(@svgdotjs/svg.js@3.2.4)) '@svgdotjs/svg.select.js': 4.0.3(@svgdotjs/svg.js@3.2.4) -======= - '@svgdotjs/svg.draggable.js': 3.0.6(@svgdotjs/svg.js@3.2.5) - '@svgdotjs/svg.filter.js': 3.0.9 - '@svgdotjs/svg.js': 3.2.5 - '@svgdotjs/svg.resize.js': 2.0.5(@svgdotjs/svg.js@3.2.5)(@svgdotjs/svg.select.js@4.0.3(@svgdotjs/svg.js@3.2.5)) - '@svgdotjs/svg.select.js': 4.0.3(@svgdotjs/svg.js@3.2.5) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@yr/monotone-cubic-spline': 1.0.3 arch@2.2.0: {} @@ -16289,11 +10789,7 @@ snapshots: argparse@2.0.1: {} -<<<<<<< HEAD aria-hidden@1.2.4: -======= - aria-hidden@1.2.6: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: tslib: 2.8.1 @@ -16305,7 +10801,6 @@ snapshots: array-buffer-byte-length@1.0.2: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 is-array-buffer: 3.0.5 @@ -16317,21 +10812,6 @@ snapshots: es-object-atoms: 1.0.0 get-intrinsic: 1.2.6 is-string: 1.1.1 -======= - call-bound: 1.0.4 - is-array-buffer: 3.0.5 - - array-includes@3.1.9: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - es-abstract: 1.24.0 - es-object-atoms: 1.1.1 - get-intrinsic: 1.3.0 - is-string: 1.1.1 - math-intrinsics: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 array-union@2.1.0: {} @@ -16339,7 +10819,6 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 es-errors: 1.3.0 es-object-atoms: 1.0.0 @@ -16353,75 +10832,37 @@ snapshots: es-errors: 1.3.0 es-object-atoms: 1.0.0 es-shim-unscopables: 1.0.2 -======= - es-abstract: 1.24.0 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - es-shim-unscopables: 1.1.0 - - array.prototype.findlastindex@1.2.6: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - es-abstract: 1.24.0 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - es-shim-unscopables: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 array.prototype.flat@1.3.3: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 es-shim-unscopables: 1.0.2 -======= - es-abstract: 1.24.0 - es-shim-unscopables: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 array.prototype.flatmap@1.3.3: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 es-shim-unscopables: 1.0.2 -======= - es-abstract: 1.24.0 - es-shim-unscopables: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 array.prototype.tosorted@1.1.4: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 es-errors: 1.3.0 es-shim-unscopables: 1.0.2 -======= - es-abstract: 1.24.0 - es-errors: 1.3.0 - es-shim-unscopables: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 arraybuffer.prototype.slice@1.0.4: dependencies: array-buffer-byte-length: 1.0.2 call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 es-errors: 1.3.0 get-intrinsic: 1.2.6 -======= - es-abstract: 1.24.0 - es-errors: 1.3.0 - get-intrinsic: 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-array-buffer: 3.0.5 ast-types-flow@0.0.8: {} @@ -16432,7 +10873,6 @@ snapshots: astring@1.9.0: {} -<<<<<<< HEAD asynckit@0.4.0: {} atob@2.1.2: {} @@ -16451,31 +10891,12 @@ snapshots: dependencies: follow-redirects: 1.15.9 form-data: 4.0.1 -======= - async-function@1.0.0: {} - - asynckit@0.4.0: {} - - attr-accept@2.2.5: {} - - available-typed-arrays@1.0.7: - dependencies: - possible-typed-array-names: 1.1.0 - - axe-core@4.11.0: {} - - axios@1.12.2: - dependencies: - follow-redirects: 1.15.11 - form-data: 4.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 proxy-from-env: 1.1.0 transitivePeerDependencies: - debug axobject-query@4.1.0: {} -<<<<<<< HEAD babel-jest@30.0.5(@babel/core@7.28.0): dependencies: '@babel/core': 7.28.0 @@ -16483,30 +10904,15 @@ snapshots: '@types/babel__core': 7.20.5 babel-plugin-istanbul: 7.0.0 babel-preset-jest: 30.0.1(@babel/core@7.28.0) -======= - babel-jest@30.2.0(@babel/core@7.28.4): - dependencies: - '@babel/core': 7.28.4 - '@jest/transform': 30.2.0 - '@types/babel__core': 7.20.5 - babel-plugin-istanbul: 7.0.1 - babel-preset-jest: 30.2.0(@babel/core@7.28.4) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 transitivePeerDependencies: - supports-color -<<<<<<< HEAD babel-plugin-istanbul@7.0.0: dependencies: '@babel/helper-plugin-utils': 7.26.5 -======= - babel-plugin-istanbul@7.0.1: - dependencies: - '@babel/helper-plugin-utils': 7.27.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 istanbul-lib-instrument: 6.0.3 @@ -16514,20 +10920,14 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD babel-plugin-jest-hoist@30.0.1: dependencies: '@babel/template': 7.27.2 '@babel/types': 7.28.1 -======= - babel-plugin-jest-hoist@30.2.0: - dependencies: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/babel__core': 7.20.5 babel-plugin-macros@3.1.0: dependencies: -<<<<<<< HEAD '@babel/runtime': 7.27.6 cosmiconfig: 7.1.0 resolve: 1.22.10 @@ -16556,36 +10956,6 @@ snapshots: '@babel/core': 7.28.0 babel-plugin-jest-hoist: 30.0.1 babel-preset-current-node-syntax: 1.1.0(@babel/core@7.28.0) -======= - '@babel/runtime': 7.28.4 - cosmiconfig: 7.1.0 - resolve: 1.22.11 - - babel-preset-current-node-syntax@1.2.0(@babel/core@7.28.4): - dependencies: - '@babel/core': 7.28.4 - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.28.4) - '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.28.4) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.28.4) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.28.4) - '@babel/plugin-syntax-import-attributes': 7.27.1(@babel/core@7.28.4) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.28.4) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.28.4) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.28.4) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.28.4) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.28.4) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.28.4) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.28.4) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.28.4) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.28.4) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.28.4) - - babel-preset-jest@30.2.0(@babel/core@7.28.4): - dependencies: - '@babel/core': 7.28.4 - babel-plugin-jest-hoist: 30.2.0 - babel-preset-current-node-syntax: 1.2.0(@babel/core@7.28.4) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 bail@2.0.2: {} @@ -16596,11 +10966,6 @@ snapshots: base64-js@1.5.1: {} -<<<<<<< HEAD -======= - baseline-browser-mapping@2.8.19: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 binary-extensions@2.3.0: {} bl@5.1.0: @@ -16611,34 +10976,12 @@ snapshots: blurhash@2.0.5: {} -<<<<<<< HEAD brace-expansion@1.1.11: -======= - body-parser@2.2.0: - dependencies: - bytes: 3.1.2 - content-type: 1.0.5 - debug: 4.4.3 - http-errors: 2.0.0 - iconv-lite: 0.6.3 - on-finished: 2.4.1 - qs: 6.14.0 - raw-body: 3.0.1 - type-is: 2.0.1 - transitivePeerDependencies: - - supports-color - - brace-expansion@1.1.12: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 -<<<<<<< HEAD brace-expansion@2.0.1: -======= - brace-expansion@2.0.2: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: balanced-match: 1.0.2 @@ -16646,32 +10989,19 @@ snapshots: dependencies: fill-range: 7.1.1 -<<<<<<< HEAD browserslist@4.24.4: dependencies: caniuse-lite: 1.0.30001690 electron-to-chromium: 1.5.97 node-releases: 2.0.19 update-browserslist-db: 1.1.2(browserslist@4.24.4) -======= - browserslist@4.27.0: - dependencies: - baseline-browser-mapping: 2.8.19 - caniuse-lite: 1.0.30001751 - electron-to-chromium: 1.5.239 - node-releases: 2.0.26 - update-browserslist-db: 1.1.4(browserslist@4.27.0) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 bser@2.1.1: dependencies: node-int64: 0.4.0 -<<<<<<< HEAD btoa@1.2.1: {} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 buffer-from@1.1.2: {} buffer@6.0.3: @@ -16683,20 +11013,13 @@ snapshots: dependencies: streamsearch: 1.1.0 -<<<<<<< HEAD call-bind-apply-helpers@1.0.1: -======= - bytes@3.1.2: {} - - call-bind-apply-helpers@1.0.2: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: es-errors: 1.3.0 function-bind: 1.1.2 call-bind@1.0.8: dependencies: -<<<<<<< HEAD call-bind-apply-helpers: 1.0.1 es-define-property: 1.0.1 get-intrinsic: 1.2.6 @@ -16706,17 +11029,6 @@ snapshots: dependencies: call-bind-apply-helpers: 1.0.1 get-intrinsic: 1.2.6 -======= - call-bind-apply-helpers: 1.0.2 - es-define-property: 1.0.1 - get-intrinsic: 1.3.0 - set-function-length: 1.2.2 - - call-bound@1.0.4: - dependencies: - call-bind-apply-helpers: 1.0.2 - get-intrinsic: 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 callsites@3.1.0: {} @@ -16726,7 +11038,6 @@ snapshots: camelcase@6.3.0: {} -<<<<<<< HEAD caniuse-lite@1.0.30001690: {} canvg@3.0.11: @@ -16734,15 +11045,6 @@ snapshots: '@babel/runtime': 7.27.6 '@types/raf': 3.4.3 core-js: 3.43.0 -======= - caniuse-lite@1.0.30001751: {} - - canvg@3.0.11: - dependencies: - '@babel/runtime': 7.28.4 - '@types/raf': 3.4.3 - core-js: 3.46.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 raf: 3.4.1 regenerator-runtime: 0.13.11 rgbcolor: 1.0.1 @@ -16758,24 +11060,17 @@ snapshots: escape-string-regexp: 1.0.5 supports-color: 4.5.0 -<<<<<<< HEAD chalk@3.0.0: dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 chalk@4.1.2: dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 -<<<<<<< HEAD chalk@5.4.1: {} -======= - chalk@5.6.2: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 char-regex@1.0.2: {} @@ -16793,11 +11088,7 @@ snapshots: character-reference-invalid@2.0.1: {} -<<<<<<< HEAD chart.js@4.5.0: -======= - chart.js@4.5.1: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@kurkle/color': 0.3.4 @@ -16813,11 +11104,7 @@ snapshots: optionalDependencies: fsevents: 2.3.3 -<<<<<<< HEAD ci-info@4.3.0: {} -======= - ci-info@4.3.1: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 cjs-module-lexer@2.1.0: {} @@ -16862,7 +11149,6 @@ snapshots: '@ckeditor/ckeditor5-watchdog': 41.3.1 '@ckeditor/ckeditor5-widget': 41.3.1 -<<<<<<< HEAD ckeditor5@46.0.0: dependencies: '@ckeditor/ckeditor5-adapter-ckfinder': 46.0.0 @@ -16926,71 +11212,6 @@ snapshots: '@ckeditor/ckeditor5-watchdog': 46.0.0 '@ckeditor/ckeditor5-widget': 46.0.0 '@ckeditor/ckeditor5-word-count': 46.0.0 -======= - ckeditor5@47.1.0: - dependencies: - '@ckeditor/ckeditor5-adapter-ckfinder': 47.1.0 - '@ckeditor/ckeditor5-alignment': 47.1.0 - '@ckeditor/ckeditor5-autoformat': 47.1.0 - '@ckeditor/ckeditor5-autosave': 47.1.0 - '@ckeditor/ckeditor5-basic-styles': 47.1.0 - '@ckeditor/ckeditor5-block-quote': 47.1.0 - '@ckeditor/ckeditor5-bookmark': 47.1.0 - '@ckeditor/ckeditor5-ckbox': 47.1.0 - '@ckeditor/ckeditor5-ckfinder': 47.1.0 - '@ckeditor/ckeditor5-clipboard': 47.1.0 - '@ckeditor/ckeditor5-cloud-services': 47.1.0 - '@ckeditor/ckeditor5-code-block': 47.1.0 - '@ckeditor/ckeditor5-core': 47.1.0 - '@ckeditor/ckeditor5-easy-image': 47.1.0 - '@ckeditor/ckeditor5-editor-balloon': 47.1.0 - '@ckeditor/ckeditor5-editor-classic': 47.1.0 - '@ckeditor/ckeditor5-editor-decoupled': 47.1.0 - '@ckeditor/ckeditor5-editor-inline': 47.1.0 - '@ckeditor/ckeditor5-editor-multi-root': 47.1.0 - '@ckeditor/ckeditor5-emoji': 47.1.0 - '@ckeditor/ckeditor5-engine': 47.1.0 - '@ckeditor/ckeditor5-enter': 47.1.0 - '@ckeditor/ckeditor5-essentials': 47.1.0 - '@ckeditor/ckeditor5-find-and-replace': 47.1.0 - '@ckeditor/ckeditor5-font': 47.1.0 - '@ckeditor/ckeditor5-fullscreen': 47.1.0 - '@ckeditor/ckeditor5-heading': 47.1.0 - '@ckeditor/ckeditor5-highlight': 47.1.0 - '@ckeditor/ckeditor5-horizontal-line': 47.1.0 - '@ckeditor/ckeditor5-html-embed': 47.1.0 - '@ckeditor/ckeditor5-html-support': 47.1.0 - '@ckeditor/ckeditor5-icons': 47.1.0 - '@ckeditor/ckeditor5-image': 47.1.0 - '@ckeditor/ckeditor5-indent': 47.1.0 - '@ckeditor/ckeditor5-language': 47.1.0 - '@ckeditor/ckeditor5-link': 47.1.0 - '@ckeditor/ckeditor5-list': 47.1.0 - '@ckeditor/ckeditor5-markdown-gfm': 47.1.0 - '@ckeditor/ckeditor5-media-embed': 47.1.0 - '@ckeditor/ckeditor5-mention': 47.1.0 - '@ckeditor/ckeditor5-minimap': 47.1.0 - '@ckeditor/ckeditor5-page-break': 47.1.0 - '@ckeditor/ckeditor5-paragraph': 47.1.0 - '@ckeditor/ckeditor5-paste-from-office': 47.1.0 - '@ckeditor/ckeditor5-remove-format': 47.1.0 - '@ckeditor/ckeditor5-restricted-editing': 47.1.0 - '@ckeditor/ckeditor5-select-all': 47.1.0 - '@ckeditor/ckeditor5-show-blocks': 47.1.0 - '@ckeditor/ckeditor5-source-editing': 47.1.0 - '@ckeditor/ckeditor5-special-characters': 47.1.0 - '@ckeditor/ckeditor5-style': 47.1.0 - '@ckeditor/ckeditor5-table': 47.1.0 - '@ckeditor/ckeditor5-theme-lark': 47.1.0 - '@ckeditor/ckeditor5-typing': 47.1.0 - '@ckeditor/ckeditor5-ui': 47.1.0 - '@ckeditor/ckeditor5-undo': 47.1.0 - '@ckeditor/ckeditor5-upload': 47.1.0 - '@ckeditor/ckeditor5-utils': 47.1.0 - '@ckeditor/ckeditor5-watchdog': 47.1.0 - '@ckeditor/ckeditor5-widget': 47.1.0 - '@ckeditor/ckeditor5-word-count': 47.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -17006,11 +11227,6 @@ snapshots: cli-spinners@2.9.2: {} -<<<<<<< HEAD -======= - cli-width@4.1.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 client-only@0.0.1: {} clipboardy@1.2.2: @@ -17028,7 +11244,6 @@ snapshots: clsx@2.1.1: {} -<<<<<<< HEAD cmdk@1.0.4(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@radix-ui/react-dialog': 1.1.4(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -17037,16 +11252,6 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) use-sync-external-store: 1.4.0(react@18.3.1) -======= - cmdk@1.1.1(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-dialog': 1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.1(@types/react@18.3.26)(react@18.3.1) - '@radix-ui/react-primitive': 2.1.3(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - '@types/react' - '@types/react-dom' @@ -17055,11 +11260,7 @@ snapshots: code-block-writer@12.0.0: {} -<<<<<<< HEAD collect-v8-coverage@1.0.2: {} -======= - collect-v8-coverage@1.0.3: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 color-convert@1.9.3: dependencies: @@ -17071,21 +11272,13 @@ snapshots: color-convert@3.1.0: dependencies: -<<<<<<< HEAD color-name: 2.0.0 -======= - color-name: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 color-name@1.1.3: {} color-name@1.1.4: {} -<<<<<<< HEAD color-name@2.0.0: {} -======= - color-name@2.0.2: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 color-parse@1.4.2: dependencies: @@ -17093,20 +11286,12 @@ snapshots: color-parse@2.0.2: dependencies: -<<<<<<< HEAD color-name: 2.0.0 -======= - color-name: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 color-string@1.9.1: dependencies: color-name: 1.1.4 -<<<<<<< HEAD simple-swizzle: 0.2.2 -======= - simple-swizzle: 0.2.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 color@4.2.3: dependencies: @@ -17134,49 +11319,19 @@ snapshots: commander@8.3.0: {} -<<<<<<< HEAD compute-scroll-into-view@3.1.0: {} concat-map@0.0.1: {} -======= - compute-scroll-into-view@3.1.1: {} - - concat-map@0.0.1: {} - - content-disposition@1.0.0: - dependencies: - safe-buffer: 5.2.1 - - content-type@1.0.5: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 convert-source-map@1.9.0: {} convert-source-map@2.0.0: {} -<<<<<<< HEAD cookie@1.0.2: {} core-js@3.43.0: optional: true -======= - cookie-signature@1.2.2: {} - - cookie@0.7.2: {} - - cookie@1.0.2: {} - - core-js@3.46.0: - optional: true - - cors@2.8.5: - dependencies: - object-assign: 4.1.1 - vary: 1.1.2 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 cose-base@1.0.3: dependencies: layout-base: 1.0.2 @@ -17184,33 +11339,19 @@ snapshots: cosmiconfig@7.1.0: dependencies: '@types/parse-json': 4.0.2 -<<<<<<< HEAD import-fresh: 3.3.0 -======= - import-fresh: 3.3.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 parse-json: 5.2.0 path-type: 4.0.0 yaml: 1.10.2 -<<<<<<< HEAD cosmiconfig@8.3.6(typescript@5.7.2): dependencies: import-fresh: 3.3.0 -======= - cosmiconfig@8.3.6(typescript@5.9.3): - dependencies: - import-fresh: 3.3.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 optionalDependencies: -<<<<<<< HEAD typescript: 5.7.2 -======= - typescript: 5.9.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 cross-env@7.0.3: dependencies: @@ -17250,21 +11391,12 @@ snapshots: custom-error-instance@2.1.1: {} -<<<<<<< HEAD cytoscape-cose-bilkent@4.1.0(cytoscape@3.30.4): dependencies: cose-base: 1.0.3 cytoscape: 3.30.4 cytoscape@3.30.4: {} -======= - cytoscape-cose-bilkent@4.1.0(cytoscape@3.33.1): - dependencies: - cose-base: 1.0.3 - cytoscape: 3.33.1 - - cytoscape@3.33.1: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 d3-array@2.12.1: dependencies: @@ -17449,41 +11581,25 @@ snapshots: data-view-buffer@1.0.2: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-errors: 1.3.0 is-data-view: 1.0.2 data-view-byte-length@1.0.2: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-errors: 1.3.0 is-data-view: 1.0.2 data-view-byte-offset@1.0.1: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-errors: 1.3.0 is-data-view: 1.0.2 date-fns@3.6.0: {} -<<<<<<< HEAD dayjs@1.11.13: {} -======= - dayjs@1.11.18: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 debounce@1.2.1: {} @@ -17491,17 +11607,12 @@ snapshots: dependencies: ms: 2.1.3 -<<<<<<< HEAD debug@4.4.0: -======= - debug@4.4.3: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: ms: 2.1.3 decimal.js-light@2.5.1: {} -<<<<<<< HEAD decimal.js@10.4.3: {} decimal.js@10.6.0: {} @@ -17511,15 +11622,6 @@ snapshots: character-entities: 2.0.2 dedent@1.6.0(babel-plugin-macros@3.1.0): -======= - decimal.js@10.6.0: {} - - decode-named-character-reference@1.2.0: - dependencies: - character-entities: 2.0.2 - - dedent@1.7.0(babel-plugin-macros@3.1.0): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 optionalDependencies: babel-plugin-macros: 3.1.0 @@ -17549,20 +11651,11 @@ snapshots: delayed-stream@1.0.0: {} -<<<<<<< HEAD -======= - depd@2.0.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dequal@2.0.3: {} detect-element-overflow@1.4.2: {} -<<<<<<< HEAD detect-libc@2.0.3: {} -======= - detect-libc@2.1.2: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 detect-newline@3.1.0: {} @@ -17596,11 +11689,7 @@ snapshots: dom-helpers@5.2.1: dependencies: -<<<<<<< HEAD '@babel/runtime': 7.26.0 -======= - '@babel/runtime': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 csstype: 3.1.3 dom-serializer@2.0.0: @@ -17623,20 +11712,12 @@ snapshots: dompurify@3.1.6: {} -<<<<<<< HEAD dompurify@3.2.6: -======= - dompurify@3.3.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 optionalDependencies: '@types/trusted-types': 2.0.7 optional: true -<<<<<<< HEAD domutils@3.2.1: -======= - domutils@3.2.2: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: dom-serializer: 2.0.0 domelementtype: 2.3.0 @@ -17644,11 +11725,7 @@ snapshots: dunder-proto@1.0.1: dependencies: -<<<<<<< HEAD call-bind-apply-helpers: 1.0.1 -======= - call-bind-apply-helpers: 1.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-errors: 1.3.0 gopd: 1.2.0 @@ -17656,7 +11733,6 @@ snapshots: eastasianwidth@0.2.0: {} -<<<<<<< HEAD electron-to-chromium@1.5.97: {} elkjs@0.9.3: {} @@ -17676,29 +11752,6 @@ snapshots: embla-carousel: 8.5.1 embla-carousel@8.5.1: {} -======= - ee-first@1.1.1: {} - - electron-to-chromium@1.5.239: {} - - elkjs@0.9.3: {} - - embla-carousel-autoplay@8.6.0(embla-carousel@8.6.0): - dependencies: - embla-carousel: 8.6.0 - - embla-carousel-react@8.6.0(react@18.3.1): - dependencies: - embla-carousel: 8.6.0 - embla-carousel-reactive-utils: 8.6.0(embla-carousel@8.6.0) - react: 18.3.1 - - embla-carousel-reactive-utils@8.6.0(embla-carousel@8.6.0): - dependencies: - embla-carousel: 8.6.0 - - embla-carousel@8.6.0: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 emittery@0.13.1: {} @@ -17708,7 +11761,6 @@ snapshots: emoji-regex@9.2.2: {} -<<<<<<< HEAD enhanced-resolve@5.18.0: dependencies: graceful-fs: 4.2.11 @@ -17721,48 +11773,22 @@ snapshots: is-arrayish: 0.2.1 es-abstract@1.23.7: -======= - encodeurl@2.0.0: {} - - entities@4.5.0: {} - - entities@6.0.1: {} - - error-ex@1.3.4: - dependencies: - is-arrayish: 0.2.1 - - es-abstract@1.24.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: array-buffer-byte-length: 1.0.2 arraybuffer.prototype.slice: 1.0.4 available-typed-arrays: 1.0.7 call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 data-view-buffer: 1.0.2 data-view-byte-length: 1.0.2 data-view-byte-offset: 1.0.1 es-define-property: 1.0.1 es-errors: 1.3.0 -<<<<<<< HEAD es-object-atoms: 1.0.0 es-set-tostringtag: 2.0.3 es-to-primitive: 1.3.0 function.prototype.name: 1.1.8 get-intrinsic: 1.2.6 -======= - es-object-atoms: 1.1.1 - es-set-tostringtag: 2.1.0 - es-to-primitive: 1.3.0 - function.prototype.name: 1.1.8 - get-intrinsic: 1.3.0 - get-proto: 1.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 get-symbol-description: 1.1.0 globalthis: 1.0.4 gopd: 1.2.0 @@ -17774,7 +11800,6 @@ snapshots: is-array-buffer: 3.0.5 is-callable: 1.2.7 is-data-view: 1.0.2 -<<<<<<< HEAD is-regex: 1.2.1 is-shared-array-buffer: 1.0.4 is-string: 1.1.1 @@ -17787,26 +11812,6 @@ snapshots: regexp.prototype.flags: 1.5.3 safe-array-concat: 1.1.3 safe-regex-test: 1.1.0 -======= - is-negative-zero: 2.0.3 - is-regex: 1.2.1 - is-set: 2.0.3 - is-shared-array-buffer: 1.0.4 - is-string: 1.1.1 - is-typed-array: 1.1.15 - is-weakref: 1.1.1 - math-intrinsics: 1.1.0 - object-inspect: 1.13.4 - object-keys: 1.1.1 - object.assign: 4.1.7 - own-keys: 1.0.1 - regexp.prototype.flags: 1.5.4 - safe-array-concat: 1.1.3 - safe-push-apply: 1.0.0 - safe-regex-test: 1.1.0 - set-proto: 1.0.0 - stop-iteration-iterator: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string.prototype.trim: 1.2.10 string.prototype.trimend: 1.0.9 string.prototype.trimstart: 1.0.8 @@ -17815,11 +11820,7 @@ snapshots: typed-array-byte-offset: 1.0.4 typed-array-length: 1.0.7 unbox-primitive: 1.1.0 -<<<<<<< HEAD which-typed-array: 1.1.18 -======= - which-typed-array: 1.1.19 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-define-property@1.0.1: {} @@ -17828,7 +11829,6 @@ snapshots: es-iterator-helpers@1.2.1: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 define-properties: 1.2.1 es-abstract: 1.23.7 @@ -17836,22 +11836,12 @@ snapshots: es-set-tostringtag: 2.0.3 function-bind: 1.1.2 get-intrinsic: 1.2.6 -======= - call-bound: 1.0.4 - define-properties: 1.2.1 - es-abstract: 1.24.0 - es-errors: 1.3.0 - es-set-tostringtag: 2.1.0 - function-bind: 1.1.2 - get-intrinsic: 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 globalthis: 1.0.4 gopd: 1.2.0 has-property-descriptors: 1.0.2 has-proto: 1.2.0 has-symbols: 1.1.0 internal-slot: 1.1.0 -<<<<<<< HEAD iterator.prototype: 1.1.4 safe-array-concat: 1.1.3 @@ -17866,23 +11856,6 @@ snapshots: hasown: 2.0.2 es-shim-unscopables@1.0.2: -======= - iterator.prototype: 1.1.5 - safe-array-concat: 1.1.3 - - es-object-atoms@1.1.1: - dependencies: - es-errors: 1.3.0 - - es-set-tostringtag@2.1.0: - dependencies: - es-errors: 1.3.0 - get-intrinsic: 1.3.0 - has-tostringtag: 1.0.2 - hasown: 2.0.2 - - es-shim-unscopables@1.1.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: hasown: 2.0.2 @@ -17896,11 +11869,6 @@ snapshots: escalade@3.2.0: {} -<<<<<<< HEAD -======= - escape-html@1.0.3: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 escape-string-regexp@1.0.5: {} escape-string-regexp@2.0.0: {} @@ -17909,7 +11877,6 @@ snapshots: escape-string-regexp@5.0.0: {} -<<<<<<< HEAD eslint-config-next@14.2.3(eslint@8.57.1)(typescript@5.7.2): dependencies: '@next/eslint-plugin-next': 14.2.3 @@ -17924,22 +11891,6 @@ snapshots: eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1) optionalDependencies: typescript: 5.7.2 -======= - eslint-config-next@14.2.3(eslint@8.57.1)(typescript@5.9.3): - dependencies: - '@next/eslint-plugin-next': 14.2.3 - '@rushstack/eslint-patch': 1.14.0 - '@typescript-eslint/parser': 7.2.0(eslint@8.57.1)(typescript@5.9.3) - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1) - eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1) - eslint-plugin-react: 7.37.5(eslint@8.57.1) - eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1) - optionalDependencies: - typescript: 5.9.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - eslint-import-resolver-webpack - eslint-plugin-import-x @@ -17949,7 +11900,6 @@ snapshots: dependencies: debug: 3.2.7 is-core-module: 2.16.1 -<<<<<<< HEAD resolve: 1.22.10 transitivePeerDependencies: - supports-color @@ -17986,54 +11936,13 @@ snapshots: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 -======= - resolve: 1.22.11 - transitivePeerDependencies: - - supports-color - - eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(eslint@8.57.1))(eslint@8.57.1): - dependencies: - '@nolyfill/is-core-module': 1.0.39 - debug: 4.4.3 - eslint: 8.57.1 - get-tsconfig: 4.13.0 - is-bun-module: 2.0.0 - stable-hash: 0.0.5 - tinyglobby: 0.2.15 - unrs-resolver: 1.11.1 - optionalDependencies: - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1) - transitivePeerDependencies: - - supports-color - - eslint-module-utils@2.12.1(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - debug: 3.2.7 - optionalDependencies: - '@typescript-eslint/parser': 7.2.0(eslint@8.57.1)(typescript@5.9.3) - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(eslint@8.57.1))(eslint@8.57.1) - transitivePeerDependencies: - - supports-color - - eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1): - dependencies: - '@rtsao/scc': 1.1.0 - array-includes: 3.1.9 - array.prototype.findlastindex: 1.2.6 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 array.prototype.flat: 1.3.3 array.prototype.flatmap: 1.3.3 debug: 3.2.7 doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 -<<<<<<< HEAD eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) -======= - eslint-module-utils: 2.12.1(@typescript-eslint/parser@7.2.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -18045,11 +11954,7 @@ snapshots: string.prototype.trimend: 1.0.9 tsconfig-paths: 3.15.0 optionalDependencies: -<<<<<<< HEAD '@typescript-eslint/parser': 7.2.0(eslint@8.57.1)(typescript@5.7.2) -======= - '@typescript-eslint/parser': 7.2.0(eslint@8.57.1)(typescript@5.9.3) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -18058,17 +11963,10 @@ snapshots: eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1): dependencies: aria-query: 5.3.2 -<<<<<<< HEAD array-includes: 3.1.8 array.prototype.flatmap: 1.3.3 ast-types-flow: 0.0.8 axe-core: 4.10.2 -======= - array-includes: 3.1.9 - array.prototype.flatmap: 1.3.3 - ast-types-flow: 0.0.8 - axe-core: 4.11.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 axobject-query: 4.1.0 damerau-levenshtein: 1.0.8 emoji-regex: 9.2.2 @@ -18085,15 +11983,9 @@ snapshots: dependencies: eslint: 8.57.1 -<<<<<<< HEAD eslint-plugin-react@7.37.3(eslint@8.57.1): dependencies: array-includes: 3.1.8 -======= - eslint-plugin-react@7.37.5(eslint@8.57.1): - dependencies: - array-includes: 3.1.9 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 array.prototype.findlast: 1.2.5 array.prototype.flatmap: 1.3.3 array.prototype.tosorted: 1.1.4 @@ -18104,11 +11996,7 @@ snapshots: hasown: 2.0.2 jsx-ast-utils: 3.3.5 minimatch: 3.1.2 -<<<<<<< HEAD object.entries: 1.1.8 -======= - object.entries: 1.1.9 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 object.fromentries: 2.0.8 object.values: 1.2.1 prop-types: 15.8.1 @@ -18126,31 +12014,18 @@ snapshots: eslint@8.57.1: dependencies: -<<<<<<< HEAD '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1) '@eslint-community/regexpp': 4.12.1 -======= - '@eslint-community/eslint-utils': 4.9.0(eslint@8.57.1) - '@eslint-community/regexpp': 4.12.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@eslint/eslintrc': 2.1.4 '@eslint/js': 8.57.1 '@humanwhocodes/config-array': 0.13.0 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 -<<<<<<< HEAD '@ungap/structured-clone': 1.2.1 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 debug: 4.4.0 -======= - '@ungap/structured-clone': 1.3.0 - ajv: 6.12.6 - chalk: 4.1.2 - cross-spawn: 7.0.6 - debug: 4.4.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -18182,13 +12057,8 @@ snapshots: espree@9.6.1: dependencies: -<<<<<<< HEAD acorn: 8.14.0 acorn-jsx: 5.3.2(acorn@8.14.0) -======= - acorn: 8.15.0 - acorn-jsx: 5.3.2(acorn@8.15.0) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 eslint-visitor-keys: 3.4.3 esprima@4.0.1: {} @@ -18205,11 +12075,7 @@ snapshots: estree-util-attach-comments@2.1.1: dependencies: -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 estree-util-build-jsx@2.2.2: dependencies: @@ -18223,19 +12089,11 @@ snapshots: dependencies: '@types/estree-jsx': 1.0.5 astring: 1.9.0 -<<<<<<< HEAD source-map: 0.7.4 estree-util-value-to-estree@1.3.0: dependencies: is-plain-obj: 3.0.0 -======= - source-map: 0.7.6 - - estree-util-value-to-estree@3.4.1: - dependencies: - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 estree-util-visit@1.2.1: dependencies: @@ -18244,29 +12102,12 @@ snapshots: estree-walker@3.0.3: dependencies: -<<<<<<< HEAD '@types/estree': 1.0.6 esutils@2.0.3: {} eventemitter3@4.0.7: {} -======= - '@types/estree': 1.0.8 - - esutils@2.0.3: {} - - etag@1.8.1: {} - - eventemitter3@4.0.7: {} - - eventsource-parser@3.0.6: {} - - eventsource@3.0.7: - dependencies: - eventsource-parser: 3.0.6 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 execa@0.8.0: dependencies: cross-spawn: 5.1.0 @@ -18303,7 +12144,6 @@ snapshots: exit-x@0.2.2: {} -<<<<<<< HEAD expect@30.0.5: dependencies: '@jest/expect-utils': 30.0.5 @@ -18312,52 +12152,6 @@ snapshots: jest-message-util: 30.0.5 jest-mock: 30.0.5 jest-util: 30.0.5 -======= - expect@30.2.0: - dependencies: - '@jest/expect-utils': 30.2.0 - '@jest/get-type': 30.1.0 - jest-matcher-utils: 30.2.0 - jest-message-util: 30.2.0 - jest-mock: 30.2.0 - jest-util: 30.2.0 - - express-rate-limit@7.5.1(express@5.1.0): - dependencies: - express: 5.1.0 - - express@5.1.0: - dependencies: - accepts: 2.0.0 - body-parser: 2.2.0 - content-disposition: 1.0.0 - content-type: 1.0.5 - cookie: 0.7.2 - cookie-signature: 1.2.2 - debug: 4.4.3 - encodeurl: 2.0.0 - escape-html: 1.0.3 - etag: 1.8.1 - finalhandler: 2.1.0 - fresh: 2.0.0 - http-errors: 2.0.0 - merge-descriptors: 2.0.0 - mime-types: 3.0.1 - on-finished: 2.4.1 - once: 1.4.0 - parseurl: 1.3.3 - proxy-addr: 2.0.7 - qs: 6.14.0 - range-parser: 1.2.1 - router: 2.2.0 - send: 1.2.0 - serve-static: 2.2.0 - statuses: 2.0.2 - type-is: 2.0.1 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 extend-shallow@2.0.1: dependencies: @@ -18367,15 +12161,9 @@ snapshots: fast-deep-equal@3.1.3: {} -<<<<<<< HEAD fast-equals@5.0.1: {} fast-glob@3.3.2: -======= - fast-equals@5.3.2: {} - - fast-glob@3.3.3: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@nodelib/fs.stat': 2.0.5 '@nodelib/fs.walk': 1.2.8 @@ -18387,21 +12175,9 @@ snapshots: fast-levenshtein@2.0.6: {} -<<<<<<< HEAD fastq@1.18.0: dependencies: reusify: 1.0.4 -======= - fast-png@6.4.0: - dependencies: - '@types/pako': 2.0.4 - iobuffer: 5.4.0 - pako: 2.1.0 - - fastq@1.19.1: - dependencies: - reusify: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 fault@1.0.4: dependencies: @@ -18411,13 +12187,6 @@ snapshots: dependencies: bser: 2.1.1 -<<<<<<< HEAD -======= - fdir@6.5.0(picomatch@4.0.3): - optionalDependencies: - picomatch: 4.0.3 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 fetch-blob@3.2.0: dependencies: node-domexception: 1.0.0 @@ -18437,20 +12206,6 @@ snapshots: dependencies: to-regex-range: 5.0.1 -<<<<<<< HEAD -======= - finalhandler@2.1.0: - dependencies: - debug: 4.4.3 - encodeurl: 2.0.0 - escape-html: 1.0.3 - on-finished: 2.4.1 - parseurl: 1.3.3 - statuses: 2.0.2 - transitivePeerDependencies: - - supports-color - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 find-root@1.1.0: {} find-up@4.1.0: @@ -18465,25 +12220,16 @@ snapshots: flat-cache@3.2.0: dependencies: -<<<<<<< HEAD flatted: 3.3.2 keyv: 4.5.4 rimraf: 3.0.2 flatted@3.3.2: {} -======= - flatted: 3.3.3 - keyv: 4.5.4 - rimraf: 3.0.2 - - flatted@3.3.3: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 flexsearch@0.7.43: {} focus-visible@5.2.1: {} -<<<<<<< HEAD follow-redirects@1.15.9: {} for-each@0.3.3: @@ -18491,32 +12237,14 @@ snapshots: is-callable: 1.2.7 foreground-child@3.3.0: -======= - follow-redirects@1.15.11: {} - - for-each@0.3.5: - dependencies: - is-callable: 1.2.7 - - foreground-child@3.3.1: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: cross-spawn: 7.0.6 signal-exit: 4.1.0 -<<<<<<< HEAD form-data@4.0.1: dependencies: asynckit: 0.4.0 combined-stream: 1.0.8 -======= - form-data@4.0.4: - dependencies: - asynckit: 0.4.0 - combined-stream: 1.0.8 - es-set-tostringtag: 2.1.0 - hasown: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mime-types: 2.1.35 format@0.2.2: {} @@ -18525,37 +12253,19 @@ snapshots: dependencies: fetch-blob: 3.2.0 -<<<<<<< HEAD framer-motion@11.15.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: motion-dom: 11.14.3 motion-utils: 11.14.3 -======= - forwarded@0.2.0: {} - - framer-motion@11.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - motion-dom: 11.18.1 - motion-utils: 11.18.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tslib: 2.8.1 optionalDependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) -<<<<<<< HEAD fs-extra@11.3.0: dependencies: graceful-fs: 4.2.11 jsonfile: 6.1.0 -======= - fresh@2.0.0: {} - - fs-extra@11.3.2: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 universalify: 2.0.1 fs.realpath@1.0.0: {} @@ -18568,11 +12278,7 @@ snapshots: function.prototype.name@1.1.8: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 define-properties: 1.2.1 functions-have-names: 1.2.3 hasown: 2.0.2 @@ -18582,18 +12288,12 @@ snapshots: fuzzysort@3.1.0: {} -<<<<<<< HEAD -======= - generator-function@2.0.1: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gensync@1.0.0-beta.2: {} geojson@0.5.0: {} get-caller-file@2.0.5: {} -<<<<<<< HEAD get-intrinsic@1.2.6: dependencies: call-bind-apply-helpers: 1.0.1 @@ -18602,16 +12302,6 @@ snapshots: es-errors: 1.3.0 es-object-atoms: 1.0.0 function-bind: 1.1.2 -======= - get-intrinsic@1.3.0: - dependencies: - call-bind-apply-helpers: 1.0.2 - es-define-property: 1.0.1 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - function-bind: 1.1.2 - get-proto: 1.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gopd: 1.2.0 has-symbols: 1.1.0 hasown: 2.0.2 @@ -18623,33 +12313,17 @@ snapshots: get-package-type@0.1.0: {} -<<<<<<< HEAD -======= - get-proto@1.0.1: - dependencies: - dunder-proto: 1.0.1 - es-object-atoms: 1.1.1 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 get-stream@3.0.0: {} get-stream@6.0.1: {} get-symbol-description@1.1.0: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 es-errors: 1.3.0 get-intrinsic: 1.2.6 get-tsconfig@4.8.1: -======= - call-bound: 1.0.4 - es-errors: 1.3.0 - get-intrinsic: 1.3.0 - - get-tsconfig@4.13.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: resolve-pkg-maps: 1.0.0 @@ -18659,11 +12333,7 @@ snapshots: git-up@7.0.0: dependencies: -<<<<<<< HEAD is-ssh: 1.4.0 -======= - is-ssh: 1.4.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 parse-url: 8.1.0 git-url-parse@13.1.1: @@ -18682,11 +12352,7 @@ snapshots: glob@10.3.10: dependencies: -<<<<<<< HEAD foreground-child: 3.3.0 -======= - foreground-child: 3.3.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 jackspeak: 2.3.6 minimatch: 9.0.5 minipass: 7.1.2 @@ -18694,11 +12360,7 @@ snapshots: glob@10.4.5: dependencies: -<<<<<<< HEAD foreground-child: 3.3.0 -======= - foreground-child: 3.3.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 jackspeak: 3.4.3 minimatch: 9.0.5 minipass: 7.1.2 @@ -18714,11 +12376,8 @@ snapshots: once: 1.4.0 path-is-absolute: 1.0.1 -<<<<<<< HEAD globals@11.12.0: {} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 globals@13.24.0: dependencies: type-fest: 0.20.2 @@ -18732,20 +12391,12 @@ snapshots: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 -<<<<<<< HEAD fast-glob: 3.3.2 -======= - fast-glob: 3.3.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ignore: 5.3.2 merge2: 1.4.1 slash: 3.0.0 -<<<<<<< HEAD goober@2.1.16(csstype@3.1.3): -======= - goober@2.1.18(csstype@3.1.3): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: csstype: 3.1.3 @@ -18755,11 +12406,6 @@ snapshots: graphemer@1.4.0: {} -<<<<<<< HEAD -======= - graphql@16.11.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gray-matter@4.0.3: dependencies: js-yaml: 3.14.1 @@ -18809,11 +12455,7 @@ snapshots: hast-util-from-dom@5.0.1: dependencies: '@types/hast': 3.0.4 -<<<<<<< HEAD hastscript: 9.0.0 -======= - hastscript: 9.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 web-namespaces: 2.0.1 hast-util-from-html-isomorphic@2.0.0: @@ -18827,32 +12469,18 @@ snapshots: dependencies: '@types/hast': 3.0.4 devlop: 1.1.0 -<<<<<<< HEAD hast-util-from-parse5: 8.0.2 parse5: 7.2.1 vfile: 6.0.3 vfile-message: 4.0.2 hast-util-from-parse5@8.0.2: -======= - hast-util-from-parse5: 8.0.3 - parse5: 7.3.0 - vfile: 6.0.3 - vfile-message: 4.0.3 - - hast-util-from-parse5@8.0.3: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@types/hast': 3.0.4 '@types/unist': 3.0.3 devlop: 1.1.0 -<<<<<<< HEAD hastscript: 9.0.0 property-information: 6.5.0 -======= - hastscript: 9.0.1 - property-information: 7.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 vfile: 6.0.3 vfile-location: 5.0.3 web-namespaces: 2.0.1 @@ -18875,11 +12503,7 @@ snapshots: hast-util-embedded: 3.0.0 hast-util-is-element: 3.0.0 hast-util-whitespace: 3.0.0 -<<<<<<< HEAD unist-util-is: 6.0.0 -======= - unist-util-is: 6.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hast-util-parse-selector@2.2.5: {} @@ -18899,21 +12523,12 @@ snapshots: dependencies: '@types/hast': 3.0.4 '@types/unist': 3.0.3 -<<<<<<< HEAD '@ungap/structured-clone': 1.2.1 hast-util-from-parse5: 8.0.2 hast-util-to-parse5: 8.0.0 html-void-elements: 3.0.0 mdast-util-to-hast: 13.2.0 parse5: 7.2.1 -======= - '@ungap/structured-clone': 1.3.0 - hast-util-from-parse5: 8.0.3 - hast-util-to-parse5: 8.0.0 - html-void-elements: 3.0.0 - mdast-util-to-hast: 13.2.0 - parse5: 7.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unist-util-position: 5.0.0 unist-util-visit: 5.0.0 vfile: 6.0.3 @@ -18928,11 +12543,7 @@ snapshots: hast-util-to-estree@2.3.3: dependencies: -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/estree-jsx': 1.0.5 '@types/hast': 2.3.10 '@types/unist': 2.0.11 @@ -19012,7 +12623,6 @@ snapshots: property-information: 5.6.0 space-separated-tokens: 1.1.5 -<<<<<<< HEAD hastscript@9.0.0: dependencies: '@types/hast': 3.0.4 @@ -19021,8 +12631,6 @@ snapshots: property-information: 6.5.0 space-separated-tokens: 2.0.2 -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 hastscript@9.0.1: dependencies: '@types/hast': 3.0.4 @@ -19031,11 +12639,6 @@ snapshots: property-information: 7.1.0 space-separated-tokens: 2.0.2 -<<<<<<< HEAD -======= - headers-polyfill@4.0.3: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 highlight.js@10.7.3: {} highlightjs-vue@1.0.0: {} @@ -19044,17 +12647,10 @@ snapshots: dependencies: react-is: 16.13.1 -<<<<<<< HEAD html-dom-parser@5.0.12: dependencies: domhandler: 5.0.3 htmlparser2: 9.1.0 -======= - html-dom-parser@5.1.1: - dependencies: - domhandler: 5.0.3 - htmlparser2: 10.0.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 html-encoding-sniffer@4.0.0: dependencies: @@ -19062,7 +12658,6 @@ snapshots: html-escaper@2.0.2: {} -<<<<<<< HEAD html-react-parser@5.2.1(@types/react@18.3.18)(react@18.3.1): dependencies: domhandler: 5.0.3 @@ -19072,17 +12667,6 @@ snapshots: style-to-js: 1.1.16 optionalDependencies: '@types/react': 18.3.18 -======= - html-react-parser@5.2.7(@types/react@18.3.26)(react@18.3.1): - dependencies: - domhandler: 5.0.3 - html-dom-parser: 5.1.1 - react: 18.3.1 - react-property: 2.0.2 - style-to-js: 1.1.18 - optionalDependencies: - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 html-void-elements@3.0.0: {} @@ -19092,21 +12676,10 @@ snapshots: text-segmentation: 1.0.3 optional: true -<<<<<<< HEAD -======= - htmlparser2@10.0.0: - dependencies: - domelementtype: 2.3.0 - domhandler: 5.0.3 - domutils: 3.2.2 - entities: 6.0.1 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 htmlparser2@8.0.2: dependencies: domelementtype: 2.3.0 domhandler: 5.0.3 -<<<<<<< HEAD domutils: 3.2.1 entities: 4.5.0 @@ -19121,47 +12694,20 @@ snapshots: dependencies: agent-base: 7.1.3 debug: 4.4.0 -======= - domutils: 3.2.2 - entities: 4.5.0 - - http-errors@2.0.0: - dependencies: - depd: 2.0.0 - inherits: 2.0.4 - setprototypeof: 1.2.0 - statuses: 2.0.1 - toidentifier: 1.0.1 - - http-proxy-agent@7.0.2: - dependencies: - agent-base: 7.1.4 - debug: 4.4.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color https-proxy-agent@6.2.1: dependencies: -<<<<<<< HEAD agent-base: 7.1.3 debug: 4.4.0 -======= - agent-base: 7.1.4 - debug: 4.4.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color https-proxy-agent@7.0.6: dependencies: -<<<<<<< HEAD agent-base: 7.1.3 debug: 4.4.0 -======= - agent-base: 7.1.4 - debug: 4.4.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -19175,22 +12721,11 @@ snapshots: dependencies: safer-buffer: 2.1.2 -<<<<<<< HEAD -======= - iconv-lite@0.7.0: - dependencies: - safer-buffer: 2.1.2 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ieee754@1.2.1: {} ignore@5.3.2: {} -<<<<<<< HEAD import-fresh@3.3.0: -======= - import-fresh@3.3.1: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: parent-module: 1.0.1 resolve-from: 4.0.0 @@ -19215,11 +12750,7 @@ snapshots: inline-style-parser@0.2.4: {} -<<<<<<< HEAD input-otp@1.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - input-otp@1.4.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -19236,32 +12767,17 @@ snapshots: intersection-observer@0.12.2: {} -<<<<<<< HEAD intl-messageformat@10.7.10: dependencies: '@formatjs/ecma402-abstract': 2.3.1 '@formatjs/fast-memoize': 2.2.5 '@formatjs/icu-messageformat-parser': 2.9.7 -======= - intl-messageformat@10.7.18: - dependencies: - '@formatjs/ecma402-abstract': 2.3.6 - '@formatjs/fast-memoize': 2.2.7 - '@formatjs/icu-messageformat-parser': 2.11.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tslib: 2.8.1 invariant@2.2.4: dependencies: loose-envify: 1.4.0 -<<<<<<< HEAD -======= - iobuffer@5.4.0: {} - - ipaddr.js@1.9.1: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-alphabetical@1.0.4: {} is-alphabetical@2.0.1: {} @@ -19279,7 +12795,6 @@ snapshots: is-array-buffer@3.0.5: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 get-intrinsic: 1.2.6 @@ -19290,22 +12805,6 @@ snapshots: is-async-function@2.0.0: dependencies: has-tostringtag: 1.0.2 -======= - call-bound: 1.0.4 - get-intrinsic: 1.3.0 - - is-arrayish@0.2.1: {} - - is-arrayish@0.3.4: {} - - is-async-function@2.1.1: - dependencies: - async-function: 1.0.0 - call-bound: 1.0.4 - get-proto: 1.0.1 - has-tostringtag: 1.0.2 - safe-regex-test: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-bigint@1.1.0: dependencies: @@ -19315,28 +12814,16 @@ snapshots: dependencies: binary-extensions: 2.3.0 -<<<<<<< HEAD is-boolean-object@1.2.1: dependencies: call-bound: 1.0.3 -======= - is-boolean-object@1.2.2: - dependencies: - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-tostringtag: 1.0.2 is-buffer@2.0.5: {} -<<<<<<< HEAD is-bun-module@1.3.0: dependencies: semver: 7.6.3 -======= - is-bun-module@2.0.0: - dependencies: - semver: 7.7.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-callable@1.2.7: {} @@ -19346,22 +12833,13 @@ snapshots: is-data-view@1.0.2: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 get-intrinsic: 1.2.6 -======= - call-bound: 1.0.4 - get-intrinsic: 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-typed-array: 1.1.15 is-date-object@1.1.0: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-tostringtag: 1.0.2 is-decimal@1.0.4: {} @@ -19374,29 +12852,15 @@ snapshots: is-finalizationregistry@1.1.1: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-fullwidth-code-point@3.0.0: {} is-generator-fn@2.1.0: {} -<<<<<<< HEAD is-generator-function@1.0.10: dependencies: has-tostringtag: 1.0.2 -======= - is-generator-function@1.1.2: - dependencies: - call-bound: 1.0.4 - generator-function: 2.0.1 - get-proto: 1.0.1 - has-tostringtag: 1.0.2 - safe-regex-test: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-glob@4.0.3: dependencies: @@ -19410,19 +12874,9 @@ snapshots: is-map@2.0.3: {} -<<<<<<< HEAD is-number-object@1.1.1: dependencies: call-bound: 1.0.3 -======= - is-negative-zero@2.0.3: {} - - is-node-process@1.2.0: {} - - is-number-object@1.1.1: - dependencies: - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-tostringtag: 1.0.2 is-number@7.0.0: {} @@ -19431,18 +12885,14 @@ snapshots: is-path-inside@3.0.3: {} -<<<<<<< HEAD is-plain-obj@3.0.0: {} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-plain-obj@4.1.0: {} is-plain-object@5.0.0: {} is-potential-custom-element-name@1.0.1: {} -<<<<<<< HEAD is-reference@3.0.3: dependencies: '@types/estree': 1.0.6 @@ -19450,17 +12900,6 @@ snapshots: is-regex@1.2.1: dependencies: call-bound: 1.0.3 -======= - is-promise@4.0.0: {} - - is-reference@3.0.3: - dependencies: - '@types/estree': 1.0.8 - - is-regex@1.2.1: - dependencies: - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gopd: 1.2.0 has-tostringtag: 1.0.2 hasown: 2.0.2 @@ -19471,19 +12910,11 @@ snapshots: is-shared-array-buffer@1.0.4: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 is-ssh@1.4.0: dependencies: protocols: 2.0.1 -======= - call-bound: 1.0.4 - - is-ssh@1.4.1: - dependencies: - protocols: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-stream@1.1.0: {} @@ -19493,30 +12924,18 @@ snapshots: is-string@1.1.1: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-tostringtag: 1.0.2 is-symbol@1.1.1: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 -======= - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-symbols: 1.1.0 safe-regex-test: 1.1.0 is-typed-array@1.1.15: dependencies: -<<<<<<< HEAD which-typed-array: 1.1.18 -======= - which-typed-array: 1.1.19 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-unicode-supported@1.3.0: {} @@ -19524,7 +12943,6 @@ snapshots: is-weakmap@2.0.2: {} -<<<<<<< HEAD is-weakref@1.1.0: dependencies: call-bound: 1.0.3 @@ -19533,16 +12951,6 @@ snapshots: dependencies: call-bound: 1.0.3 get-intrinsic: 1.2.6 -======= - is-weakref@1.1.1: - dependencies: - call-bound: 1.0.4 - - is-weakset@2.0.4: - dependencies: - call-bound: 1.0.4 - get-intrinsic: 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 isarray@2.0.5: {} @@ -19552,19 +12960,11 @@ snapshots: istanbul-lib-instrument@6.0.3: dependencies: -<<<<<<< HEAD '@babel/core': 7.26.8 '@babel/parser': 7.26.8 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 7.6.3 -======= - '@babel/core': 7.28.4 - '@babel/parser': 7.28.4 - '@istanbuljs/schema': 0.1.3 - istanbul-lib-coverage: 3.2.2 - semver: 7.7.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -19576,27 +12976,17 @@ snapshots: istanbul-lib-source-maps@5.0.6: dependencies: -<<<<<<< HEAD '@jridgewell/trace-mapping': 0.3.25 debug: 4.4.0 -======= - '@jridgewell/trace-mapping': 0.3.31 - debug: 4.4.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 istanbul-lib-coverage: 3.2.2 transitivePeerDependencies: - supports-color -<<<<<<< HEAD istanbul-reports@3.1.7: -======= - istanbul-reports@3.2.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: html-escaper: 2.0.2 istanbul-lib-report: 3.0.1 -<<<<<<< HEAD iterator.prototype@1.1.4: dependencies: define-data-property: 1.1.4 @@ -19604,15 +12994,6 @@ snapshots: get-intrinsic: 1.2.6 has-symbols: 1.1.0 reflect.getprototypeof: 1.0.9 -======= - iterator.prototype@1.1.5: - dependencies: - define-data-property: 1.1.4 - es-object-atoms: 1.1.1 - get-intrinsic: 1.3.0 - get-proto: 1.0.1 - has-symbols: 1.1.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 set-function-name: 2.0.2 jackspeak@2.3.6: @@ -19627,7 +13008,6 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 -<<<<<<< HEAD jest-changed-files@30.0.5: dependencies: execa: 5.1.1 @@ -19653,33 +13033,6 @@ snapshots: jest-util: 30.0.5 p-limit: 3.1.0 pretty-format: 30.0.5 -======= - jest-changed-files@30.2.0: - dependencies: - execa: 5.1.1 - jest-util: 30.2.0 - p-limit: 3.1.0 - - jest-circus@30.2.0(babel-plugin-macros@3.1.0): - dependencies: - '@jest/environment': 30.2.0 - '@jest/expect': 30.2.0 - '@jest/test-result': 30.2.0 - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - chalk: 4.1.2 - co: 4.6.0 - dedent: 1.7.0(babel-plugin-macros@3.1.0) - is-generator-fn: 2.1.0 - jest-each: 30.2.0 - jest-matcher-utils: 30.2.0 - jest-message-util: 30.2.0 - jest-runtime: 30.2.0 - jest-snapshot: 30.2.0 - jest-util: 30.2.0 - p-limit: 3.1.0 - pretty-format: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 pure-rand: 7.0.1 slash: 3.0.0 stack-utils: 2.0.6 @@ -19687,7 +13040,6 @@ snapshots: - babel-plugin-macros - supports-color -<<<<<<< HEAD jest-cli@30.0.5(@types/node@20.17.10)(babel-plugin-macros@3.1.0): dependencies: '@jest/core': 30.0.5(babel-plugin-macros@3.1.0) @@ -19699,19 +13051,6 @@ snapshots: jest-config: 30.0.5(@types/node@20.17.10)(babel-plugin-macros@3.1.0) jest-util: 30.0.5 jest-validate: 30.0.5 -======= - jest-cli@30.2.0(@types/node@20.19.23)(babel-plugin-macros@3.1.0): - dependencies: - '@jest/core': 30.2.0(babel-plugin-macros@3.1.0) - '@jest/test-result': 30.2.0 - '@jest/types': 30.2.0 - chalk: 4.1.2 - exit-x: 0.2.2 - import-local: 3.2.0 - jest-config: 30.2.0(@types/node@20.19.23)(babel-plugin-macros@3.1.0) - jest-util: 30.2.0 - jest-validate: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 yargs: 17.7.2 transitivePeerDependencies: - '@types/node' @@ -19720,7 +13059,6 @@ snapshots: - supports-color - ts-node -<<<<<<< HEAD jest-config@30.0.5(@types/node@20.17.10)(babel-plugin-macros@3.1.0): dependencies: '@babel/core': 7.28.0 @@ -19749,41 +13087,10 @@ snapshots: strip-json-comments: 3.1.1 optionalDependencies: '@types/node': 20.17.10 -======= - jest-config@30.2.0(@types/node@20.19.23)(babel-plugin-macros@3.1.0): - dependencies: - '@babel/core': 7.28.4 - '@jest/get-type': 30.1.0 - '@jest/pattern': 30.0.1 - '@jest/test-sequencer': 30.2.0 - '@jest/types': 30.2.0 - babel-jest: 30.2.0(@babel/core@7.28.4) - chalk: 4.1.2 - ci-info: 4.3.1 - deepmerge: 4.3.1 - glob: 10.4.5 - graceful-fs: 4.2.11 - jest-circus: 30.2.0(babel-plugin-macros@3.1.0) - jest-docblock: 30.2.0 - jest-environment-node: 30.2.0 - jest-regex-util: 30.0.1 - jest-resolve: 30.2.0 - jest-runner: 30.2.0 - jest-util: 30.2.0 - jest-validate: 30.2.0 - micromatch: 4.0.8 - parse-json: 5.2.0 - pretty-format: 30.2.0 - slash: 3.0.0 - strip-json-comments: 3.1.1 - optionalDependencies: - '@types/node': 20.19.23 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - babel-plugin-macros - supports-color -<<<<<<< HEAD jest-diff@30.0.5: dependencies: '@jest/diff-sequences': 30.0.1 @@ -19809,40 +13116,12 @@ snapshots: '@jest/environment-jsdom-abstract': 30.0.5(jsdom@26.1.0) '@types/jsdom': 21.1.7 '@types/node': 20.17.10 -======= - jest-diff@30.2.0: - dependencies: - '@jest/diff-sequences': 30.0.1 - '@jest/get-type': 30.1.0 - chalk: 4.1.2 - pretty-format: 30.2.0 - - jest-docblock@30.2.0: - dependencies: - detect-newline: 3.1.0 - - jest-each@30.2.0: - dependencies: - '@jest/get-type': 30.1.0 - '@jest/types': 30.2.0 - chalk: 4.1.2 - jest-util: 30.2.0 - pretty-format: 30.2.0 - - jest-environment-jsdom@30.2.0: - dependencies: - '@jest/environment': 30.2.0 - '@jest/environment-jsdom-abstract': 30.2.0(jsdom@26.1.0) - '@types/jsdom': 21.1.7 - '@types/node': 20.19.23 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 jsdom: 26.1.0 transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate -<<<<<<< HEAD jest-environment-node@30.0.5: dependencies: '@jest/environment': 30.0.5 @@ -19857,39 +13136,17 @@ snapshots: dependencies: '@jest/types': 30.0.5 '@types/node': 20.17.10 -======= - jest-environment-node@30.2.0: - dependencies: - '@jest/environment': 30.2.0 - '@jest/fake-timers': 30.2.0 - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - jest-mock: 30.2.0 - jest-util: 30.2.0 - jest-validate: 30.2.0 - - jest-haste-map@30.2.0: - dependencies: - '@jest/types': 30.2.0 - '@types/node': 20.19.23 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 jest-regex-util: 30.0.1 -<<<<<<< HEAD jest-util: 30.0.5 jest-worker: 30.0.5 -======= - jest-util: 30.2.0 - jest-worker: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromatch: 4.0.8 walker: 1.0.8 optionalDependencies: fsevents: 2.3.3 -<<<<<<< HEAD jest-leak-detector@30.0.5: dependencies: '@jest/get-type': 30.0.1 @@ -19906,29 +13163,10 @@ snapshots: dependencies: '@babel/code-frame': 7.27.1 '@jest/types': 30.0.5 -======= - jest-leak-detector@30.2.0: - dependencies: - '@jest/get-type': 30.1.0 - pretty-format: 30.2.0 - - jest-matcher-utils@30.2.0: - dependencies: - '@jest/get-type': 30.1.0 - chalk: 4.1.2 - jest-diff: 30.2.0 - pretty-format: 30.2.0 - - jest-message-util@30.2.0: - dependencies: - '@babel/code-frame': 7.27.1 - '@jest/types': 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/stack-utils': 2.0.3 chalk: 4.1.2 graceful-fs: 4.2.11 micromatch: 4.0.8 -<<<<<<< HEAD pretty-format: 30.0.5 slash: 3.0.0 stack-utils: 2.0.6 @@ -19971,55 +13209,10 @@ snapshots: '@jest/transform': 30.0.5 '@jest/types': 30.0.5 '@types/node': 20.17.10 -======= - pretty-format: 30.2.0 - slash: 3.0.0 - stack-utils: 2.0.6 - - jest-mock@30.2.0: - dependencies: - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - jest-util: 30.2.0 - - jest-pnp-resolver@1.2.3(jest-resolve@30.2.0): - optionalDependencies: - jest-resolve: 30.2.0 - - jest-regex-util@30.0.1: {} - - jest-resolve-dependencies@30.2.0: - dependencies: - jest-regex-util: 30.0.1 - jest-snapshot: 30.2.0 - transitivePeerDependencies: - - supports-color - - jest-resolve@30.2.0: - dependencies: - chalk: 4.1.2 - graceful-fs: 4.2.11 - jest-haste-map: 30.2.0 - jest-pnp-resolver: 1.2.3(jest-resolve@30.2.0) - jest-util: 30.2.0 - jest-validate: 30.2.0 - slash: 3.0.0 - unrs-resolver: 1.11.1 - - jest-runner@30.2.0: - dependencies: - '@jest/console': 30.2.0 - '@jest/environment': 30.2.0 - '@jest/test-result': 30.2.0 - '@jest/transform': 30.2.0 - '@jest/types': 30.2.0 - '@types/node': 20.19.23 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 chalk: 4.1.2 emittery: 0.13.1 exit-x: 0.2.2 graceful-fs: 4.2.11 -<<<<<<< HEAD jest-docblock: 30.0.1 jest-environment-node: 30.0.5 jest-haste-map: 30.0.5 @@ -20030,24 +13223,11 @@ snapshots: jest-util: 30.0.5 jest-watcher: 30.0.5 jest-worker: 30.0.5 -======= - jest-docblock: 30.2.0 - jest-environment-node: 30.2.0 - jest-haste-map: 30.2.0 - jest-leak-detector: 30.2.0 - jest-message-util: 30.2.0 - jest-resolve: 30.2.0 - jest-runtime: 30.2.0 - jest-util: 30.2.0 - jest-watcher: 30.2.0 - jest-worker: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 p-limit: 3.1.0 source-map-support: 0.5.13 transitivePeerDependencies: - supports-color -<<<<<<< HEAD jest-runtime@30.0.5: dependencies: '@jest/environment': 30.0.5 @@ -20070,36 +13250,11 @@ snapshots: jest-resolve: 30.0.5 jest-snapshot: 30.0.5 jest-util: 30.0.5 -======= - jest-runtime@30.2.0: - dependencies: - '@jest/environment': 30.2.0 - '@jest/fake-timers': 30.2.0 - '@jest/globals': 30.2.0 - '@jest/source-map': 30.0.1 - '@jest/test-result': 30.2.0 - '@jest/transform': 30.2.0 - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - chalk: 4.1.2 - cjs-module-lexer: 2.1.0 - collect-v8-coverage: 1.0.3 - glob: 10.4.5 - graceful-fs: 4.2.11 - jest-haste-map: 30.2.0 - jest-message-util: 30.2.0 - jest-mock: 30.2.0 - jest-regex-util: 30.0.1 - jest-resolve: 30.2.0 - jest-snapshot: 30.2.0 - jest-util: 30.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 slash: 3.0.0 strip-bom: 4.0.0 transitivePeerDependencies: - supports-color -<<<<<<< HEAD jest-snapshot@30.0.5: dependencies: '@babel/core': 7.28.0 @@ -20122,35 +13277,10 @@ snapshots: jest-util: 30.0.5 pretty-format: 30.0.5 semver: 7.7.2 -======= - jest-snapshot@30.2.0: - dependencies: - '@babel/core': 7.28.4 - '@babel/generator': 7.28.3 - '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4) - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.4) - '@babel/types': 7.28.4 - '@jest/expect-utils': 30.2.0 - '@jest/get-type': 30.1.0 - '@jest/snapshot-utils': 30.2.0 - '@jest/transform': 30.2.0 - '@jest/types': 30.2.0 - babel-preset-current-node-syntax: 1.2.0(@babel/core@7.28.4) - chalk: 4.1.2 - expect: 30.2.0 - graceful-fs: 4.2.11 - jest-diff: 30.2.0 - jest-matcher-utils: 30.2.0 - jest-message-util: 30.2.0 - jest-util: 30.2.0 - pretty-format: 30.2.0 - semver: 7.7.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 synckit: 0.11.11 transitivePeerDependencies: - supports-color -<<<<<<< HEAD jest-util@30.0.5: dependencies: '@jest/types': 30.0.5 @@ -20194,51 +13324,6 @@ snapshots: '@jest/types': 30.0.5 import-local: 3.2.0 jest-cli: 30.0.5(@types/node@20.17.10)(babel-plugin-macros@3.1.0) -======= - jest-util@30.2.0: - dependencies: - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - chalk: 4.1.2 - ci-info: 4.3.1 - graceful-fs: 4.2.11 - picomatch: 4.0.3 - - jest-validate@30.2.0: - dependencies: - '@jest/get-type': 30.1.0 - '@jest/types': 30.2.0 - camelcase: 6.3.0 - chalk: 4.1.2 - leven: 3.1.0 - pretty-format: 30.2.0 - - jest-watcher@30.2.0: - dependencies: - '@jest/test-result': 30.2.0 - '@jest/types': 30.2.0 - '@types/node': 20.19.23 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - emittery: 0.13.1 - jest-util: 30.2.0 - string-length: 4.0.2 - - jest-worker@30.2.0: - dependencies: - '@types/node': 20.19.23 - '@ungap/structured-clone': 1.3.0 - jest-util: 30.2.0 - merge-stream: 2.0.0 - supports-color: 8.1.1 - - jest@30.2.0(@types/node@20.19.23)(babel-plugin-macros@3.1.0): - dependencies: - '@jest/core': 30.2.0(babel-plugin-macros@3.1.0) - '@jest/types': 30.2.0 - import-local: 3.2.0 - jest-cli: 30.2.0(@types/node@20.19.23)(babel-plugin-macros@3.1.0) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -20250,7 +13335,6 @@ snapshots: jodit-react@4.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: -<<<<<<< HEAD jodit: 4.2.47 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -20262,28 +13346,11 @@ snapshots: jotai@2.11.0(@types/react@18.3.18)(react@18.3.1): optionalDependencies: '@types/react': 18.3.18 -======= - jodit: 4.7.4 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - jodit@4.7.4: {} - - jotai@2.15.0(@babel/core@7.28.4)(@babel/template@7.27.2)(@types/react@18.3.26)(react@18.3.1): - optionalDependencies: - '@babel/core': 7.28.4 - '@babel/template': 7.27.2 - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 jquery@3.7.1: {} -<<<<<<< HEAD js-base64@3.7.7: {} -======= - js-base64@3.7.8: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 js-cookie@3.0.5: {} @@ -20307,13 +13374,8 @@ snapshots: http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.6 is-potential-custom-element-name: 1.0.1 -<<<<<<< HEAD nwsapi: 2.2.20 parse5: 7.2.1 -======= - nwsapi: 2.2.22 - parse5: 7.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 rrweb-cssom: 0.8.0 saxes: 6.0.0 symbol-tree: 3.2.4 @@ -20348,17 +13410,12 @@ snapshots: jsonc-parser@3.3.1: {} -<<<<<<< HEAD jsonfile@6.1.0: -======= - jsonfile@6.2.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: universalify: 2.0.1 optionalDependencies: graceful-fs: 4.2.11 -<<<<<<< HEAD jspdf@3.0.1: dependencies: '@babel/runtime': 7.27.6 @@ -20369,37 +13426,18 @@ snapshots: canvg: 3.0.11 core-js: 3.43.0 dompurify: 3.2.6 -======= - jspdf@3.0.3: - dependencies: - '@babel/runtime': 7.28.4 - fast-png: 6.4.0 - fflate: 0.8.2 - optionalDependencies: - canvg: 3.0.11 - core-js: 3.46.0 - dompurify: 3.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 html2canvas: 1.4.1 jsx-ast-utils@3.3.5: dependencies: -<<<<<<< HEAD array-includes: 3.1.8 -======= - array-includes: 3.1.9 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 array.prototype.flat: 1.3.3 object.assign: 4.1.7 object.values: 1.2.1 just-debounce-it@3.2.0: {} -<<<<<<< HEAD katex@0.16.18: -======= - katex@0.16.25: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: commander: 8.3.0 @@ -20484,11 +13522,7 @@ snapshots: log-symbols@5.1.0: dependencies: -<<<<<<< HEAD chalk: 5.4.1 -======= - chalk: 5.6.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-unicode-supported: 1.3.0 longest-streak@3.1.0: {} @@ -20521,11 +13555,7 @@ snapshots: make-dir@4.0.0: dependencies: -<<<<<<< HEAD semver: 7.6.3 -======= - semver: 7.7.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 make-event-props@1.6.2: {} @@ -20543,11 +13573,7 @@ snapshots: match-sorter@6.3.4: dependencies: -<<<<<<< HEAD '@babel/runtime': 7.26.0 -======= - '@babel/runtime': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 remove-accents: 0.5.0 matchmediaquery@0.4.2: @@ -20573,23 +13599,14 @@ snapshots: dependencies: '@types/mdast': 4.0.4 escape-string-regexp: 5.0.0 -<<<<<<< HEAD unist-util-is: 6.0.0 unist-util-visit-parents: 6.0.1 -======= - unist-util-is: 6.0.1 - unist-util-visit-parents: 6.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mdast-util-from-markdown@1.3.1: dependencies: '@types/mdast': 3.0.15 '@types/unist': 2.0.11 -<<<<<<< HEAD decode-named-character-reference: 1.0.2 -======= - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mdast-util-to-string: 3.2.0 micromark: 3.2.0 micromark-util-decode-numeric-character-reference: 1.1.0 @@ -20606,11 +13623,7 @@ snapshots: dependencies: '@types/mdast': 4.0.4 '@types/unist': 3.0.3 -<<<<<<< HEAD decode-named-character-reference: 1.0.2 -======= - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 devlop: 1.1.0 mdast-util-to-string: 4.0.0 micromark: 4.0.2 @@ -20618,11 +13631,7 @@ snapshots: micromark-util-decode-string: 2.0.1 micromark-util-normalize-identifier: 2.0.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unist-util-stringify-position: 4.0.0 transitivePeerDependencies: - supports-color @@ -20794,11 +13803,7 @@ snapshots: mdast-util-phrasing@4.1.0: dependencies: '@types/mdast': 4.0.4 -<<<<<<< HEAD unist-util-is: 6.0.0 -======= - unist-util-is: 6.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mdast-util-to-hast@12.3.0: dependencies: @@ -20815,11 +13820,7 @@ snapshots: dependencies: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 -<<<<<<< HEAD '@ungap/structured-clone': 1.2.1 -======= - '@ungap/structured-clone': 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 devlop: 1.1.0 micromark-util-sanitize-uri: 2.0.1 trim-lines: 3.0.1 @@ -20858,11 +13859,6 @@ snapshots: dependencies: '@types/mdast': 4.0.4 -<<<<<<< HEAD -======= - media-typer@1.1.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mem@8.1.1: dependencies: map-age-cleaner: 0.1.3 @@ -20872,16 +13868,10 @@ snapshots: memoize-one@6.0.0: {} -<<<<<<< HEAD -======= - merge-descriptors@2.0.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 merge-stream@2.0.0: {} merge2@1.4.1: {} -<<<<<<< HEAD mermaid@10.9.3: dependencies: '@braintree/sanitize-url': 6.0.4 @@ -20896,47 +13886,20 @@ snapshots: dompurify: 3.1.6 elkjs: 0.9.3 katex: 0.16.18 -======= - mermaid@10.9.4: - dependencies: - '@braintree/sanitize-url': 6.0.4 - '@types/d3-scale': 4.0.9 - '@types/d3-scale-chromatic': 3.1.0 - cytoscape: 3.33.1 - cytoscape-cose-bilkent: 4.1.0(cytoscape@3.33.1) - d3: 7.9.0 - d3-sankey: 0.12.3 - dagre-d3-es: 7.0.10 - dayjs: 1.11.18 - dompurify: 3.1.6 - elkjs: 0.9.3 - katex: 0.16.25 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 khroma: 2.1.0 lodash-es: 4.17.21 mdast-util-from-markdown: 1.3.1 non-layered-tidy-tree-layout: 2.0.2 -<<<<<<< HEAD stylis: 4.3.4 ts-dedent: 2.2.0 uuid: 9.0.1 web-worker: 1.3.0 -======= - stylis: 4.3.6 - ts-dedent: 2.2.0 - uuid: 9.0.1 - web-worker: 1.5.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color micromark-core-commonmark@1.1.0: dependencies: -<<<<<<< HEAD decode-named-character-reference: 1.0.2 -======= - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-factory-destination: 1.1.0 micromark-factory-label: 1.1.0 micromark-factory-space: 1.1.0 @@ -20955,11 +13918,7 @@ snapshots: micromark-core-commonmark@2.0.3: dependencies: -<<<<<<< HEAD decode-named-character-reference: 1.0.2 -======= - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 devlop: 1.1.0 micromark-factory-destination: 2.0.1 micromark-factory-label: 2.0.1 @@ -20974,11 +13933,7 @@ snapshots: micromark-util-resolve-all: 2.0.1 micromark-util-subtokenize: 2.1.0 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-gfm-autolink-literal@1.0.5: dependencies: @@ -20992,11 +13947,7 @@ snapshots: micromark-util-character: 2.1.1 micromark-util-sanitize-uri: 2.0.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-gfm-footnote@1.1.2: dependencies: @@ -21018,11 +13969,7 @@ snapshots: micromark-util-normalize-identifier: 2.0.1 micromark-util-sanitize-uri: 2.0.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-gfm-strikethrough@1.0.7: dependencies: @@ -21040,11 +13987,7 @@ snapshots: micromark-util-classify-character: 2.0.1 micromark-util-resolve-all: 2.0.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-gfm-table@1.0.7: dependencies: @@ -21060,11 +14003,7 @@ snapshots: micromark-factory-space: 2.0.1 micromark-util-character: 2.1.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-gfm-tagfilter@1.0.2: dependencies: @@ -21072,11 +14011,7 @@ snapshots: micromark-extension-gfm-tagfilter@2.0.0: dependencies: -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-gfm-task-list-item@1.0.5: dependencies: @@ -21092,11 +14027,7 @@ snapshots: micromark-factory-space: 2.0.1 micromark-util-character: 2.1.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-gfm@2.0.3: dependencies: @@ -21118,20 +14049,12 @@ snapshots: micromark-extension-gfm-tagfilter: 2.0.0 micromark-extension-gfm-task-list-item: 2.1.0 micromark-util-combine-extensions: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-math@2.1.2: dependencies: '@types/katex': 0.16.7 -<<<<<<< HEAD katex: 0.16.18 -======= - katex: 0.16.25 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-factory-space: 1.1.0 micromark-util-character: 1.2.0 micromark-util-symbol: 1.1.0 @@ -21140,11 +14063,7 @@ snapshots: micromark-extension-mdx-expression@1.0.8: dependencies: -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-factory-mdx-expression: 1.0.9 micromark-factory-space: 1.1.0 micromark-util-character: 1.2.0 @@ -21156,11 +14075,7 @@ snapshots: micromark-extension-mdx-jsx@1.0.5: dependencies: '@types/acorn': 4.0.6 -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 estree-util-is-identifier-name: 2.1.0 micromark-factory-mdx-expression: 1.0.9 micromark-factory-space: 1.1.0 @@ -21176,11 +14091,7 @@ snapshots: micromark-extension-mdxjs-esm@1.0.5: dependencies: -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-core-commonmark: 1.1.0 micromark-util-character: 1.2.0 micromark-util-events-to-acorn: 1.2.3 @@ -21192,13 +14103,8 @@ snapshots: micromark-extension-mdxjs@1.0.1: dependencies: -<<<<<<< HEAD acorn: 8.14.0 acorn-jsx: 5.3.2(acorn@8.14.0) -======= - acorn: 8.15.0 - acorn-jsx: 5.3.2(acorn@8.15.0) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-extension-mdx-expression: 1.0.8 micromark-extension-mdx-jsx: 1.0.5 micromark-extension-mdx-md: 1.0.1 @@ -21216,11 +14122,7 @@ snapshots: dependencies: micromark-util-character: 2.1.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-factory-label@1.1.0: dependencies: @@ -21234,19 +14136,11 @@ snapshots: devlop: 1.1.0 micromark-util-character: 2.1.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 micromark-factory-mdx-expression@1.0.9: dependencies: '@types/estree': 1.0.6 -======= - micromark-util-types: 2.0.2 - - micromark-factory-mdx-expression@1.0.9: - dependencies: - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-character: 1.2.0 micromark-util-events-to-acorn: 1.2.3 micromark-util-symbol: 1.1.0 @@ -21263,11 +14157,7 @@ snapshots: micromark-factory-space@2.0.1: dependencies: micromark-util-character: 2.1.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-factory-title@1.1.0: dependencies: @@ -21281,11 +14171,7 @@ snapshots: micromark-factory-space: 2.0.1 micromark-util-character: 2.1.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-factory-whitespace@1.1.0: dependencies: @@ -21299,11 +14185,7 @@ snapshots: micromark-factory-space: 2.0.1 micromark-util-character: 2.1.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-character@1.2.0: dependencies: @@ -21313,11 +14195,7 @@ snapshots: micromark-util-character@2.1.1: dependencies: micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-chunked@1.1.0: dependencies: @@ -21337,11 +14215,7 @@ snapshots: dependencies: micromark-util-character: 2.1.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-combine-extensions@1.1.0: dependencies: @@ -21351,11 +14225,7 @@ snapshots: micromark-util-combine-extensions@2.0.1: dependencies: micromark-util-chunked: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-decode-numeric-character-reference@1.1.0: dependencies: @@ -21367,22 +14237,14 @@ snapshots: micromark-util-decode-string@1.1.0: dependencies: -<<<<<<< HEAD decode-named-character-reference: 1.0.2 -======= - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-character: 1.2.0 micromark-util-decode-numeric-character-reference: 1.1.0 micromark-util-symbol: 1.1.0 micromark-util-decode-string@2.0.1: dependencies: -<<<<<<< HEAD decode-named-character-reference: 1.0.2 -======= - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-character: 2.1.1 micromark-util-decode-numeric-character-reference: 2.0.2 micromark-util-symbol: 2.0.1 @@ -21394,11 +14256,7 @@ snapshots: micromark-util-events-to-acorn@1.2.3: dependencies: '@types/acorn': 4.0.6 -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/unist': 2.0.11 estree-util-visit: 1.2.1 micromark-util-symbol: 1.1.0 @@ -21424,11 +14282,7 @@ snapshots: micromark-util-resolve-all@2.0.1: dependencies: -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-sanitize-uri@1.2.0: dependencies: @@ -21454,11 +14308,7 @@ snapshots: devlop: 1.1.0 micromark-util-chunked: 2.0.1 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-util-symbol@1.1.0: {} @@ -21466,22 +14316,13 @@ snapshots: micromark-util-types@1.1.0: {} -<<<<<<< HEAD micromark-util-types@2.0.1: {} -======= - micromark-util-types@2.0.2: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark@3.2.0: dependencies: '@types/debug': 4.1.12 -<<<<<<< HEAD debug: 4.4.0 decode-named-character-reference: 1.0.2 -======= - debug: 4.4.3 - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 micromark-core-commonmark: 1.1.0 micromark-factory-space: 1.1.0 micromark-util-character: 1.2.0 @@ -21502,13 +14343,8 @@ snapshots: micromark@4.0.2: dependencies: '@types/debug': 4.1.12 -<<<<<<< HEAD debug: 4.4.0 decode-named-character-reference: 1.0.2 -======= - debug: 4.4.3 - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 devlop: 1.1.0 micromark-core-commonmark: 2.0.3 micromark-factory-space: 2.0.1 @@ -21522,11 +14358,7 @@ snapshots: micromark-util-sanitize-uri: 2.0.1 micromark-util-subtokenize: 2.1.0 micromark-util-symbol: 2.0.1 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -21537,22 +14369,10 @@ snapshots: mime-db@1.52.0: {} -<<<<<<< HEAD -======= - mime-db@1.54.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mime-types@2.1.35: dependencies: mime-db: 1.52.0 -<<<<<<< HEAD -======= - mime-types@3.0.1: - dependencies: - mime-db: 1.54.0 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mimic-fn@2.1.0: {} mimic-fn@3.1.0: {} @@ -21563,7 +14383,6 @@ snapshots: minimatch@3.1.2: dependencies: -<<<<<<< HEAD brace-expansion: 1.1.11 minimatch@7.4.6: @@ -21577,21 +14396,6 @@ snapshots: minimatch@9.0.5: dependencies: brace-expansion: 2.0.1 -======= - brace-expansion: 1.1.12 - - minimatch@7.4.6: - dependencies: - brace-expansion: 2.0.2 - - minimatch@9.0.3: - dependencies: - brace-expansion: 2.0.2 - - minimatch@9.0.5: - dependencies: - brace-expansion: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 minimist@1.2.8: {} @@ -21601,7 +14405,6 @@ snapshots: moment@2.30.1: {} -<<<<<<< HEAD motion-dom@11.14.3: {} motion-utils@11.14.3: {} @@ -21612,47 +14415,6 @@ snapshots: ms@2.1.3: {} -======= - motion-dom@11.18.1: - dependencies: - motion-utils: 11.18.1 - - motion-utils@11.18.1: {} - - mri@1.2.0: {} - - mrmime@2.0.1: {} - - ms@2.1.3: {} - - msw@2.11.6(@types/node@20.19.23)(typescript@5.9.3): - dependencies: - '@inquirer/confirm': 5.1.19(@types/node@20.19.23) - '@mswjs/interceptors': 0.40.0 - '@open-draft/deferred-promise': 2.2.0 - '@types/statuses': 2.0.6 - cookie: 1.0.2 - graphql: 16.11.0 - headers-polyfill: 4.0.3 - is-node-process: 1.2.0 - outvariant: 1.4.3 - path-to-regexp: 6.3.0 - picocolors: 1.1.1 - rettime: 0.7.0 - statuses: 2.0.2 - strict-event-emitter: 0.5.1 - tough-cookie: 6.0.0 - type-fest: 4.41.0 - until-async: 3.0.2 - yargs: 17.7.2 - optionalDependencies: - typescript: 5.9.3 - transitivePeerDependencies: - - '@types/node' - - mute-stream@2.0.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 mz@2.7.0: dependencies: any-promise: 1.3.0 @@ -21661,21 +14423,14 @@ snapshots: nanoevents@9.1.0: {} -<<<<<<< HEAD nanoid@3.3.8: {} napi-postinstall@0.3.2: {} -======= - nanoid@3.3.11: {} - - napi-postinstall@0.3.4: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 natural-compare@1.4.0: {} negotiator@1.0.0: {} -<<<<<<< HEAD next-intl@3.26.3(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1): dependencies: '@formatjs/intl-localematcher': 0.5.9 @@ -21683,15 +14438,6 @@ snapshots: next: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 use-intl: 3.26.3(react@18.3.1) -======= - next-intl@3.26.5(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1): - dependencies: - '@formatjs/intl-localematcher': 0.5.10 - negotiator: 1.0.0 - next: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - use-intl: 3.26.5(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 next-mdx-remote@4.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: @@ -21704,7 +14450,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD next-seo@6.6.0(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: next: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -21714,17 +14459,6 @@ snapshots: next-themes@0.2.1(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: next: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - next-seo@6.8.0(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - next: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - next-themes@0.2.1(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - next: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -21733,26 +14467,16 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) -<<<<<<< HEAD next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@next/env': 14.2.3 '@swc/helpers': 0.5.5 busboy: 1.6.0 caniuse-lite: 1.0.30001690 -======= - next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@next/env': 14.2.33 - '@swc/helpers': 0.5.5 - busboy: 1.6.0 - caniuse-lite: 1.0.30001751 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 graceful-fs: 4.2.11 postcss: 8.4.31 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) -<<<<<<< HEAD styled-jsx: 5.1.1(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react@18.3.1) optionalDependencies: '@next/swc-darwin-arm64': 14.2.3 @@ -21764,28 +14488,11 @@ snapshots: '@next/swc-win32-arm64-msvc': 14.2.3 '@next/swc-win32-ia32-msvc': 14.2.3 '@next/swc-win32-x64-msvc': 14.2.3 -======= - styled-jsx: 5.1.1(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react@18.3.1) - optionalDependencies: - '@next/swc-darwin-arm64': 14.2.33 - '@next/swc-darwin-x64': 14.2.33 - '@next/swc-linux-arm64-gnu': 14.2.33 - '@next/swc-linux-arm64-musl': 14.2.33 - '@next/swc-linux-x64-gnu': 14.2.33 - '@next/swc-linux-x64-musl': 14.2.33 - '@next/swc-win32-arm64-msvc': 14.2.33 - '@next/swc-win32-ia32-msvc': 14.2.33 - '@next/swc-win32-x64-msvc': 14.2.33 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros -<<<<<<< HEAD nextra-theme-docs@2.13.4(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(nextra@2.13.4(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - nextra-theme-docs@2.13.4(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(nextra@2.13.4(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@headlessui/react': 1.7.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@popperjs/core': 2.11.8 @@ -21796,7 +14503,6 @@ snapshots: git-url-parse: 13.1.1 intersection-observer: 0.12.2 match-sorter: 6.3.4 -<<<<<<< HEAD next: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) next-seo: 6.6.0(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) next-themes: 0.2.1(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -21807,42 +14513,20 @@ snapshots: zod: 3.24.1 nextra@2.13.4(next@14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - next: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - next-seo: 6.8.0(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - next-themes: 0.2.1(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - nextra: 2.13.4(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - scroll-into-view-if-needed: 3.1.0 - zod: 3.25.76 - - nextra@2.13.4(next@14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@headlessui/react': 1.7.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mdx-js/mdx': 2.3.0 '@mdx-js/react': 2.3.0(react@18.3.1) -<<<<<<< HEAD '@napi-rs/simple-git': 0.1.19 -======= - '@napi-rs/simple-git': 0.1.22 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@theguild/remark-mermaid': 0.0.5(react@18.3.1) '@theguild/remark-npm2yarn': 0.2.1 clsx: 2.1.1 github-slugger: 2.0.0 graceful-fs: 4.2.11 gray-matter: 4.0.3 -<<<<<<< HEAD katex: 0.16.18 lodash.get: 4.4.2 next: 14.2.3(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - katex: 0.16.25 - lodash.get: 4.4.2 - next: 14.2.33(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 next-mdx-remote: 4.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) p-limit: 3.1.0 react: 18.3.1 @@ -21852,21 +14536,13 @@ snapshots: rehype-raw: 7.0.0 remark-gfm: 3.0.1 remark-math: 5.1.1 -<<<<<<< HEAD remark-reading-time: 2.0.1 -======= - remark-reading-time: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 shiki: 0.14.7 slash: 3.0.0 title: 3.5.3 unist-util-remove: 4.0.0 unist-util-visit: 5.0.0 -<<<<<<< HEAD zod: 3.24.1 -======= - zod: 3.25.76 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - supports-color @@ -21884,11 +14560,7 @@ snapshots: node-int64@0.4.0: {} -<<<<<<< HEAD node-releases@2.0.19: {} -======= - node-releases@2.0.26: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 non-layered-tidy-tree-layout@2.0.2: {} @@ -21908,28 +14580,19 @@ snapshots: npm-to-yarn@2.2.1: {} -<<<<<<< HEAD nwsapi@2.2.20: {} -======= - nwsapi@2.2.22: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 object-assign@4.1.1: {} object-hash@3.0.0: {} -<<<<<<< HEAD object-inspect@1.13.3: {} -======= - object-inspect@1.13.4: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 object-keys@1.1.1: {} object.assign@4.1.7: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 define-properties: 1.2.1 es-object-atoms: 1.0.0 @@ -21941,59 +14604,26 @@ snapshots: call-bind: 1.0.8 define-properties: 1.2.1 es-object-atoms: 1.0.0 -======= - call-bound: 1.0.4 - define-properties: 1.2.1 - es-object-atoms: 1.1.1 - has-symbols: 1.1.0 - object-keys: 1.1.1 - - object.entries@1.1.9: - dependencies: - call-bind: 1.0.8 - call-bound: 1.0.4 - define-properties: 1.2.1 - es-object-atoms: 1.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 object.fromentries@2.0.8: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 es-object-atoms: 1.0.0 -======= - es-abstract: 1.24.0 - es-object-atoms: 1.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 object.groupby@1.0.3: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 -======= - es-abstract: 1.24.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 object.values@1.2.1: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 define-properties: 1.2.1 es-object-atoms: 1.0.0 -======= - call-bound: 1.0.4 - define-properties: 1.2.1 - es-object-atoms: 1.1.1 - - on-finished@2.4.1: - dependencies: - ee-first: 1.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 once@1.4.0: dependencies: @@ -22020,34 +14650,16 @@ snapshots: ora@6.3.1: dependencies: -<<<<<<< HEAD chalk: 5.4.1 -======= - chalk: 5.6.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 cli-cursor: 4.0.0 cli-spinners: 2.9.2 is-interactive: 2.0.0 is-unicode-supported: 1.3.0 log-symbols: 5.1.0 stdin-discarder: 0.1.0 -<<<<<<< HEAD strip-ansi: 7.1.0 wcwidth: 1.0.1 -======= - strip-ansi: 7.1.2 - wcwidth: 1.0.1 - - outvariant@1.4.3: {} - - own-keys@1.0.1: - dependencies: - get-intrinsic: 1.3.0 - object-keys: 1.1.1 - safe-push-apply: 1.0.0 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 p-defer@1.0.0: {} p-finally@1.0.0: {} @@ -22072,11 +14684,6 @@ snapshots: package-json-from-dist@1.0.1: {} -<<<<<<< HEAD -======= - pako@2.1.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 parent-module@1.0.1: dependencies: callsites: 3.1.0 @@ -22095,58 +14702,33 @@ snapshots: '@types/unist': 2.0.11 character-entities-legacy: 3.0.0 character-reference-invalid: 2.0.1 -<<<<<<< HEAD decode-named-character-reference: 1.0.2 -======= - decode-named-character-reference: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-alphanumerical: 2.0.1 is-decimal: 2.0.1 is-hexadecimal: 2.0.1 parse-json@5.2.0: dependencies: -<<<<<<< HEAD '@babel/code-frame': 7.26.2 error-ex: 1.3.2 -======= - '@babel/code-frame': 7.27.1 - error-ex: 1.3.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 parse-numeric-range@1.3.0: {} -<<<<<<< HEAD parse-path@7.0.0: dependencies: protocols: 2.0.1 -======= - parse-path@7.1.0: - dependencies: - protocols: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 parse-srcset@1.0.2: {} parse-url@8.1.0: dependencies: -<<<<<<< HEAD parse-path: 7.0.0 parse5@7.2.1: dependencies: entities: 4.5.0 -======= - parse-path: 7.1.0 - - parse5@7.3.0: - dependencies: - entities: 6.0.1 - - parseurl@1.3.3: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 path-browserify@1.0.1: {} @@ -22167,13 +14749,6 @@ snapshots: lru-cache: 10.4.3 minipass: 7.1.2 -<<<<<<< HEAD -======= - path-to-regexp@6.3.0: {} - - path-to-regexp@8.3.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 path-type@4.0.0: {} performance-now@2.1.0: @@ -22181,11 +14756,7 @@ snapshots: periscopic@3.1.0: dependencies: -<<<<<<< HEAD '@types/estree': 1.0.6 -======= - '@types/estree': 1.0.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 estree-walker: 3.0.3 is-reference: 3.0.3 @@ -22197,22 +14768,14 @@ snapshots: pify@2.3.0: {} -<<<<<<< HEAD pirates@4.0.6: {} pirates@4.0.7: {} -======= - pirates@4.0.7: {} - - pkce-challenge@5.0.0: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 pkg-dir@4.2.0: dependencies: find-up: 4.1.0 -<<<<<<< HEAD possible-typed-array-names@1.0.0: {} postcss-import@15.1.0(postcss@8.4.49): @@ -22237,32 +14800,6 @@ snapshots: postcss-nested@6.2.0(postcss@8.4.49): dependencies: postcss: 8.4.49 -======= - possible-typed-array-names@1.1.0: {} - - postcss-import@15.1.0(postcss@8.5.6): - dependencies: - postcss: 8.5.6 - postcss-value-parser: 4.2.0 - read-cache: 1.0.0 - resolve: 1.22.11 - - postcss-js@4.1.0(postcss@8.5.6): - dependencies: - camelcase-css: 2.0.1 - postcss: 8.5.6 - - postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.5.6): - dependencies: - lilconfig: 3.1.3 - optionalDependencies: - jiti: 1.21.7 - postcss: 8.5.6 - - postcss-nested@6.2.0(postcss@8.5.6): - dependencies: - postcss: 8.5.6 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 postcss-selector-parser: 6.1.2 postcss-selector-parser@6.1.2: @@ -22274,7 +14811,6 @@ snapshots: postcss@8.4.31: dependencies: -<<<<<<< HEAD nanoid: 3.3.8 picocolors: 1.1.1 source-map-js: 1.2.1 @@ -22282,15 +14818,6 @@ snapshots: postcss@8.4.49: dependencies: nanoid: 3.3.8 -======= - nanoid: 3.3.11 - picocolors: 1.1.1 - source-map-js: 1.2.1 - - postcss@8.5.6: - dependencies: - nanoid: 3.3.11 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 picocolors: 1.1.1 source-map-js: 1.2.1 @@ -22304,11 +14831,7 @@ snapshots: ansi-styles: 5.2.0 react-is: 17.0.2 -<<<<<<< HEAD pretty-format@30.0.5: -======= - pretty-format@30.2.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@jest/schemas': 30.0.5 ansi-styles: 5.2.0 @@ -22316,11 +14839,7 @@ snapshots: prismjs@1.27.0: {} -<<<<<<< HEAD prismjs@1.29.0: {} -======= - prismjs@1.30.0: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 prompts@2.4.2: dependencies: @@ -22349,16 +14868,7 @@ snapshots: property-information@7.1.0: {} -<<<<<<< HEAD protocols@2.0.1: {} -======= - protocols@2.0.2: {} - - proxy-addr@2.0.7: - dependencies: - forwarded: 0.2.0 - ipaddr.js: 1.9.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 proxy-from-env@1.1.0: {} @@ -22368,11 +14878,7 @@ snapshots: pure-rand@7.0.1: {} -<<<<<<< HEAD qs@6.13.1: -======= - qs@6.14.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: side-channel: 1.1.0 @@ -22385,20 +14891,7 @@ snapshots: performance-now: 2.1.0 optional: true -<<<<<<< HEAD react-apexcharts@1.7.0(apexcharts@4.7.0)(react@18.3.1): -======= - range-parser@1.2.1: {} - - raw-body@3.0.1: - dependencies: - bytes: 3.1.2 - http-errors: 2.0.0 - iconv-lite: 0.7.0 - unpipe: 1.0.0 - - react-apexcharts@1.8.0(apexcharts@4.7.0)(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: apexcharts: 4.7.0 prop-types: 15.8.1 @@ -22424,21 +14917,12 @@ snapshots: transitivePeerDependencies: - encoding -<<<<<<< HEAD react-chartjs-2@5.2.0(chart.js@4.5.0)(react@18.3.1): dependencies: chart.js: 4.5.0 react: 18.3.1 react-clock@5.1.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - react-chartjs-2@5.3.0(chart.js@4.5.1)(react@18.3.1): - dependencies: - chart.js: 4.5.1 - react: 18.3.1 - - react-clock@5.1.0(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@wojtekmaj/date-utils': 1.5.1 clsx: 2.1.1 @@ -22446,37 +14930,21 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: -<<<<<<< HEAD '@types/react': 18.3.18 react-cssfx-loading@2.1.0(csstype@3.1.3)(react@18.3.1): dependencies: goober: 2.1.16(csstype@3.1.3) -======= - '@types/react': 18.3.26 - - react-cssfx-loading@2.1.0(csstype@3.1.3)(react@18.3.1): - dependencies: - goober: 2.1.18(csstype@3.1.3) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 transitivePeerDependencies: - csstype -<<<<<<< HEAD react-datepicker@7.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@floating-ui/react': 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1) clsx: 2.1.1 date-fns: 3.6.0 prop-types: 15.8.1 -======= - react-datepicker@7.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@floating-ui/react': 0.27.16(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - clsx: 2.1.1 - date-fns: 3.6.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -22491,11 +14959,7 @@ snapshots: react: 18.3.1 scheduler: 0.23.2 -<<<<<<< HEAD react-dropzone@14.3.5(react@18.3.1): -======= - react-dropzone@14.3.8(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: attr-accept: 2.2.5 file-selector: 2.1.2 @@ -22504,28 +14968,19 @@ snapshots: react-fast-compare@3.2.2: {} -<<<<<<< HEAD react-fit@2.0.1(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - react-fit@2.0.1(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: detect-element-overflow: 1.4.2 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) warning: 4.0.3 optionalDependencies: -<<<<<<< HEAD '@types/react': 18.3.18 -======= - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-geocode@0.2.3: dependencies: regenerator-runtime: 0.13.11 -<<<<<<< HEAD react-hook-form@7.54.2(react@18.3.1): dependencies: react: 18.3.1 @@ -22539,20 +14994,6 @@ snapshots: - csstype react-icons@5.4.0(react@18.3.1): -======= - react-hook-form@7.65.0(react@18.3.1): - dependencies: - react: 18.3.1 - - react-hot-toast@2.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - csstype: 3.1.3 - goober: 2.1.18(csstype@3.1.3) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - - react-icons@5.5.0(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: react: 18.3.1 @@ -22562,11 +15003,7 @@ snapshots: react-is@18.3.1: {} -<<<<<<< HEAD react-is@19.0.0: {} -======= - react-is@19.2.0: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react-leaflet@4.2.1(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: @@ -22583,11 +15020,7 @@ snapshots: dependencies: react: 18.3.1 -<<<<<<< HEAD react-player@2.16.0(react@18.3.1): -======= - react-player@2.16.1(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: deepmerge: 4.3.1 load-script: 1.0.0 @@ -22598,7 +15031,6 @@ snapshots: react-property@2.0.2: {} -<<<<<<< HEAD react-remove-scroll-bar@2.3.8(@types/react@18.3.18)(react@18.3.1): dependencies: react: 18.3.1 @@ -22619,28 +15051,6 @@ snapshots: '@types/react': 18.3.18 react-resizable-panels@2.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - react-remove-scroll-bar@2.3.8(@types/react@18.3.26)(react@18.3.1): - dependencies: - react: 18.3.1 - react-style-singleton: 2.2.3(@types/react@18.3.26)(react@18.3.1) - tslib: 2.8.1 - optionalDependencies: - '@types/react': 18.3.26 - - react-remove-scroll@2.7.1(@types/react@18.3.26)(react@18.3.1): - dependencies: - react: 18.3.1 - react-remove-scroll-bar: 2.3.8(@types/react@18.3.26)(react@18.3.1) - react-style-singleton: 2.2.3(@types/react@18.3.26)(react@18.3.1) - tslib: 2.8.1 - use-callback-ref: 1.3.3(@types/react@18.3.26)(react@18.3.1) - use-sidecar: 1.1.3(@types/react@18.3.26)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 - - react-resizable-panels@2.1.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -22653,7 +15063,6 @@ snapshots: react: 18.3.1 shallow-equal: 3.1.0 -<<<<<<< HEAD react-select@5.9.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 @@ -22661,52 +15070,30 @@ snapshots: '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1) '@floating-ui/dom': 1.6.12 '@types/react-transition-group': 4.4.12(@types/react@18.3.18) -======= - react-select@5.10.2(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@babel/runtime': 7.28.4 - '@emotion/cache': 11.14.0 - '@emotion/react': 11.14.0(@types/react@18.3.26)(react@18.3.1) - '@floating-ui/dom': 1.7.4 - '@types/react-transition-group': 4.4.12(@types/react@18.3.26) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 memoize-one: 6.0.0 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -<<<<<<< HEAD use-isomorphic-layout-effect: 1.2.0(@types/react@18.3.18)(react@18.3.1) -======= - use-isomorphic-layout-effect: 1.2.1(@types/react@18.3.26)(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - '@types/react' - supports-color react-smooth@4.0.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: -<<<<<<< HEAD fast-equals: 5.0.1 -======= - fast-equals: 5.3.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -<<<<<<< HEAD react-style-singleton@2.2.3(@types/react@18.3.18)(react@18.3.1): -======= - react-style-singleton@2.2.3(@types/react@18.3.26)(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: get-nonce: 1.0.1 react: 18.3.1 tslib: 2.8.1 optionalDependencies: -<<<<<<< HEAD '@types/react': 18.3.18 react-syntax-highlighter@15.6.1(react@18.3.1): @@ -22720,52 +15107,24 @@ snapshots: refractor: 3.6.0 react-time-picker@7.0.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - '@types/react': 18.3.26 - - react-syntax-highlighter@15.6.6(react@18.3.1): - dependencies: - '@babel/runtime': 7.28.4 - highlight.js: 10.7.3 - highlightjs-vue: 1.0.0 - lowlight: 1.20.0 - prismjs: 1.30.0 - react: 18.3.1 - refractor: 3.6.0 - - react-time-picker@7.0.0(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@wojtekmaj/date-utils': 1.5.1 clsx: 2.1.1 get-user-locale: 2.3.2 make-event-props: 1.6.2 react: 18.3.1 -<<<<<<< HEAD react-clock: 5.1.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-dom: 18.3.1(react@18.3.1) react-fit: 2.0.1(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) update-input-width: 1.4.2 optionalDependencies: '@types/react': 18.3.18 -======= - react-clock: 5.1.0(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react-dom: 18.3.1(react@18.3.1) - react-fit: 2.0.1(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - update-input-width: 1.4.2 - optionalDependencies: - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 transitivePeerDependencies: - '@types/react-dom' react-transition-group@4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: -<<<<<<< HEAD '@babel/runtime': 7.26.0 -======= - '@babel/runtime': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -22792,11 +15151,7 @@ snapshots: reading-time@1.5.0: {} -<<<<<<< HEAD recast@0.23.9: -======= - recast@0.23.11: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: ast-types: 0.16.1 esprima: 4.0.1 @@ -22826,7 +15181,6 @@ snapshots: indent-string: 4.0.0 strip-indent: 3.0.0 -<<<<<<< HEAD reflect.getprototypeof@1.0.9: dependencies: call-bind: 1.0.8 @@ -22836,17 +15190,6 @@ snapshots: es-errors: 1.3.0 get-intrinsic: 1.2.6 gopd: 1.2.0 -======= - reflect.getprototypeof@1.0.10: - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.24.0 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - get-intrinsic: 1.3.0 - get-proto: 1.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 which-builtin-type: 1.2.1 refractor@3.6.0: @@ -22857,22 +15200,13 @@ snapshots: regenerator-runtime@0.13.11: {} -<<<<<<< HEAD regenerator-runtime@0.14.1: {} regexp.prototype.flags@1.5.3: -======= - regexp.prototype.flags@1.5.4: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: call-bind: 1.0.8 define-properties: 1.2.1 es-errors: 1.3.0 -<<<<<<< HEAD -======= - get-proto: 1.0.1 - gopd: 1.2.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 set-function-name: 2.0.2 rehype-dom-parse@5.0.2: @@ -22893,13 +15227,8 @@ snapshots: '@types/katex': 0.16.7 hast-util-from-html-isomorphic: 2.0.0 hast-util-to-text: 4.0.2 -<<<<<<< HEAD katex: 0.16.18 unist-util-visit-parents: 6.0.1 -======= - katex: 0.16.25 - unist-util-visit-parents: 6.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 vfile: 6.0.3 rehype-minify-whitespace@6.0.2: @@ -22980,26 +15309,15 @@ snapshots: dependencies: '@types/mdast': 4.0.4 mdast-util-from-markdown: 2.0.2 -<<<<<<< HEAD micromark-util-types: 2.0.1 -======= - micromark-util-types: 2.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unified: 11.0.5 transitivePeerDependencies: - supports-color -<<<<<<< HEAD remark-reading-time@2.0.1: dependencies: estree-util-is-identifier-name: 2.1.0 estree-util-value-to-estree: 1.3.0 -======= - remark-reading-time@2.0.2: - dependencies: - estree-util-is-identifier-name: 2.1.0 - estree-util-value-to-estree: 3.4.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 reading-time: 1.5.0 unist-util-visit: 3.1.0 @@ -23042,11 +15360,7 @@ snapshots: resolve-url@0.2.1: {} -<<<<<<< HEAD resolve@1.22.10: -======= - resolve@1.22.11: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: is-core-module: 2.16.1 path-parse: 1.0.7 @@ -23065,13 +15379,7 @@ snapshots: retry@0.12.0: {} -<<<<<<< HEAD reusify@1.0.4: {} -======= - rettime@0.7.0: {} - - reusify@1.1.0: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 rgbcolor@1.0.1: optional: true @@ -23082,19 +15390,6 @@ snapshots: robust-predicates@3.0.2: {} -<<<<<<< HEAD -======= - router@2.2.0: - dependencies: - debug: 4.4.3 - depd: 2.0.0 - is-promise: 4.0.0 - parseurl: 1.3.3 - path-to-regexp: 8.3.0 - transitivePeerDependencies: - - supports-color - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 rrweb-cssom@0.8.0: {} rtl-detect@1.1.2: {} @@ -23112,53 +15407,29 @@ snapshots: safe-array-concat@1.1.3: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 get-intrinsic: 1.2.6 -======= - call-bound: 1.0.4 - get-intrinsic: 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-symbols: 1.1.0 isarray: 2.0.5 safe-buffer@5.2.1: {} -<<<<<<< HEAD safe-regex-test@1.1.0: dependencies: call-bound: 1.0.3 -======= - safe-push-apply@1.0.0: - dependencies: - es-errors: 1.3.0 - isarray: 2.0.5 - - safe-regex-test@1.1.0: - dependencies: - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-errors: 1.3.0 is-regex: 1.2.1 safer-buffer@2.1.2: {} -<<<<<<< HEAD sanitize-html@2.14.0: -======= - sanitize-html@2.17.0: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: deepmerge: 4.3.1 escape-string-regexp: 4.0.0 htmlparser2: 8.0.2 is-plain-object: 5.0.0 parse-srcset: 1.0.2 -<<<<<<< HEAD postcss: 8.4.49 -======= - postcss: 8.5.6 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 saxes@6.0.0: dependencies: @@ -23170,11 +15441,7 @@ snapshots: scroll-into-view-if-needed@3.1.0: dependencies: -<<<<<<< HEAD compute-scroll-into-view: 3.1.0 -======= - compute-scroll-into-view: 3.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 section-matter@1.0.0: dependencies: @@ -23183,49 +15450,16 @@ snapshots: semver@6.3.1: {} -<<<<<<< HEAD semver@7.6.3: {} semver@7.7.2: {} -======= - semver@7.7.3: {} - - send@1.2.0: - dependencies: - debug: 4.4.3 - encodeurl: 2.0.0 - escape-html: 1.0.3 - etag: 1.8.1 - fresh: 2.0.0 - http-errors: 2.0.0 - mime-types: 3.0.1 - ms: 2.1.3 - on-finished: 2.4.1 - range-parser: 1.2.1 - statuses: 2.0.2 - transitivePeerDependencies: - - supports-color - - serve-static@2.2.0: - dependencies: - encodeurl: 2.0.0 - escape-html: 1.0.3 - parseurl: 1.3.3 - send: 1.2.0 - transitivePeerDependencies: - - supports-color ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 set-function-length@1.2.2: dependencies: define-data-property: 1.1.4 es-errors: 1.3.0 function-bind: 1.1.2 -<<<<<<< HEAD get-intrinsic: 1.2.6 -======= - get-intrinsic: 1.3.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gopd: 1.2.0 has-property-descriptors: 1.0.2 @@ -23236,7 +15470,6 @@ snapshots: functions-have-names: 1.2.3 has-property-descriptors: 1.0.2 -<<<<<<< HEAD shadcn@2.3.0(typescript@5.7.2): dependencies: '@antfu/ni': 0.21.12 @@ -23262,45 +15495,6 @@ snapshots: tsconfig-paths: 4.2.0 zod: 3.24.1 transitivePeerDependencies: -======= - set-proto@1.0.0: - dependencies: - dunder-proto: 1.0.1 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - - setprototypeof@1.2.0: {} - - shadcn@2.10.0(@types/node@20.19.23)(typescript@5.9.3): - dependencies: - '@antfu/ni': 23.3.1 - '@babel/core': 7.28.4 - '@babel/parser': 7.28.4 - '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4) - '@modelcontextprotocol/sdk': 1.20.1 - commander: 10.0.1 - cosmiconfig: 8.3.6(typescript@5.9.3) - deepmerge: 4.3.1 - diff: 5.2.0 - execa: 7.2.0 - fast-glob: 3.3.3 - fs-extra: 11.3.2 - https-proxy-agent: 6.2.1 - kleur: 4.1.5 - msw: 2.11.6(@types/node@20.19.23)(typescript@5.9.3) - node-fetch: 3.3.2 - ora: 6.3.1 - postcss: 8.5.6 - prompts: 2.4.2 - recast: 0.23.11 - stringify-object: 5.0.0 - ts-morph: 18.0.0 - tsconfig-paths: 4.2.0 - zod: 3.25.76 - zod-to-json-schema: 3.24.6(zod@3.25.76) - transitivePeerDependencies: - - '@types/node' ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 - supports-color - typescript @@ -23309,13 +15503,8 @@ snapshots: sharp@0.33.5: dependencies: color: 4.2.3 -<<<<<<< HEAD detect-libc: 2.0.3 semver: 7.6.3 -======= - detect-libc: 2.1.2 - semver: 7.7.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 optionalDependencies: '@img/sharp-darwin-arm64': 0.33.5 '@img/sharp-darwin-x64': 0.33.5 @@ -23351,11 +15540,7 @@ snapshots: shiki@0.14.7: dependencies: -<<<<<<< HEAD ansi-sequence-parser: 1.1.1 -======= - ansi-sequence-parser: 1.1.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 jsonc-parser: 3.3.1 vscode-oniguruma: 1.7.0 vscode-textmate: 8.0.0 @@ -23363,7 +15548,6 @@ snapshots: side-channel-list@1.0.0: dependencies: es-errors: 1.3.0 -<<<<<<< HEAD object-inspect: 1.13.3 side-channel-map@1.0.1: @@ -23379,33 +15563,12 @@ snapshots: es-errors: 1.3.0 get-intrinsic: 1.2.6 object-inspect: 1.13.3 -======= - object-inspect: 1.13.4 - - side-channel-map@1.0.1: - dependencies: - call-bound: 1.0.4 - es-errors: 1.3.0 - get-intrinsic: 1.3.0 - object-inspect: 1.13.4 - - side-channel-weakmap@1.0.2: - dependencies: - call-bound: 1.0.4 - es-errors: 1.3.0 - get-intrinsic: 1.3.0 - object-inspect: 1.13.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 side-channel-map: 1.0.1 side-channel@1.1.0: dependencies: es-errors: 1.3.0 -<<<<<<< HEAD object-inspect: 1.13.3 -======= - object-inspect: 1.13.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 side-channel-list: 1.0.0 side-channel-map: 1.0.1 side-channel-weakmap: 1.0.2 @@ -23414,7 +15577,6 @@ snapshots: signal-exit@4.1.0: {} -<<<<<<< HEAD simple-swizzle@0.2.2: dependencies: is-arrayish: 0.3.2 @@ -23423,27 +15585,13 @@ snapshots: dependencies: '@polka/url': 1.0.0-next.28 mrmime: 2.0.0 -======= - simple-swizzle@0.2.4: - dependencies: - is-arrayish: 0.3.4 - - sirv@2.0.4: - dependencies: - '@polka/url': 1.0.0-next.29 - mrmime: 2.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 totalist: 3.0.1 sisteransi@1.0.5: {} slash@3.0.0: {} -<<<<<<< HEAD sonner@1.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): -======= - sonner@1.7.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -23463,11 +15611,7 @@ snapshots: source-map@0.6.1: {} -<<<<<<< HEAD source-map@0.7.4: {} -======= - source-map@0.7.6: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 space-separated-tokens@1.1.5: {} @@ -23475,11 +15619,7 @@ snapshots: sprintf-js@1.0.3: {} -<<<<<<< HEAD stable-hash@0.0.4: {} -======= - stable-hash@0.0.5: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 stack-utils@2.0.6: dependencies: @@ -23488,31 +15628,12 @@ snapshots: stackblur-canvas@2.7.0: optional: true -<<<<<<< HEAD -======= - statuses@2.0.1: {} - - statuses@2.0.2: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 stdin-discarder@0.1.0: dependencies: bl: 5.1.0 -<<<<<<< HEAD streamsearch@1.1.0: {} -======= - stop-iteration-iterator@1.1.0: - dependencies: - es-errors: 1.3.0 - internal-slot: 1.1.0 - - streamsearch@1.1.0: {} - - strict-event-emitter@0.5.1: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string-length@4.0.2: dependencies: char-regex: 1.0.2 @@ -23528,26 +15649,17 @@ snapshots: dependencies: eastasianwidth: 0.2.0 emoji-regex: 9.2.2 -<<<<<<< HEAD strip-ansi: 7.1.0 -======= - strip-ansi: 7.1.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string.prototype.includes@2.0.1: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 -======= - es-abstract: 1.24.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string.prototype.matchall@4.0.12: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 define-properties: 1.2.1 es-abstract: 1.23.7 @@ -23558,70 +15670,36 @@ snapshots: has-symbols: 1.1.0 internal-slot: 1.1.0 regexp.prototype.flags: 1.5.3 -======= - call-bound: 1.0.4 - define-properties: 1.2.1 - es-abstract: 1.24.0 - es-errors: 1.3.0 - es-object-atoms: 1.1.1 - get-intrinsic: 1.3.0 - gopd: 1.2.0 - has-symbols: 1.1.0 - internal-slot: 1.1.0 - regexp.prototype.flags: 1.5.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 set-function-name: 2.0.2 side-channel: 1.1.0 string.prototype.repeat@1.0.0: dependencies: define-properties: 1.2.1 -<<<<<<< HEAD es-abstract: 1.23.7 -======= - es-abstract: 1.24.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string.prototype.trim@1.2.10: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 define-data-property: 1.1.4 define-properties: 1.2.1 es-abstract: 1.23.7 es-object-atoms: 1.0.0 -======= - call-bound: 1.0.4 - define-data-property: 1.1.4 - define-properties: 1.2.1 - es-abstract: 1.24.0 - es-object-atoms: 1.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-property-descriptors: 1.0.2 string.prototype.trimend@1.0.9: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD call-bound: 1.0.3 define-properties: 1.2.1 es-object-atoms: 1.0.0 -======= - call-bound: 1.0.4 - define-properties: 1.2.1 - es-object-atoms: 1.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string.prototype.trimstart@1.0.8: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 -<<<<<<< HEAD es-object-atoms: 1.0.0 -======= - es-object-atoms: 1.1.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 string_decoder@1.3.0: dependencies: @@ -23642,15 +15720,9 @@ snapshots: dependencies: ansi-regex: 5.0.1 -<<<<<<< HEAD strip-ansi@7.1.0: dependencies: ansi-regex: 6.1.0 -======= - strip-ansi@7.1.2: - dependencies: - ansi-regex: 6.2.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 strip-bom-string@1.0.0: {} @@ -23670,68 +15742,38 @@ snapshots: strip-json-comments@3.1.1: {} -<<<<<<< HEAD style-to-js@1.1.16: dependencies: style-to-object: 1.0.8 -======= - style-to-js@1.1.18: - dependencies: - style-to-object: 1.0.11 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 style-to-object@0.4.4: dependencies: inline-style-parser: 0.1.1 -<<<<<<< HEAD style-to-object@1.0.8: dependencies: inline-style-parser: 0.2.4 styled-jsx@5.1.1(@babel/core@7.26.8)(babel-plugin-macros@3.1.0)(react@18.3.1): -======= - style-to-object@1.0.11: - dependencies: - inline-style-parser: 0.2.4 - - styled-jsx@5.1.1(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: client-only: 0.0.1 react: 18.3.1 optionalDependencies: -<<<<<<< HEAD '@babel/core': 7.26.8 -======= - '@babel/core': 7.28.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 babel-plugin-macros: 3.1.0 stylis@4.2.0: {} -<<<<<<< HEAD stylis@4.3.4: {} sucrase@3.35.0: dependencies: '@jridgewell/gen-mapping': 0.3.8 -======= - stylis@4.3.6: {} - - sucrase@3.35.0: - dependencies: - '@jridgewell/gen-mapping': 0.3.13 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 commander: 4.1.1 glob: 10.4.5 lines-and-columns: 1.2.4 mz: 2.7.0 -<<<<<<< HEAD pirates: 4.0.6 -======= - pirates: 4.0.7 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ts-interface-checker: 0.1.13 supercluster@8.0.1: @@ -23755,7 +15797,6 @@ snapshots: svg-pathdata@6.0.3: optional: true -<<<<<<< HEAD sweetalert2-react-content@5.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sweetalert2@11.15.3): dependencies: react: 18.3.1 @@ -23765,17 +15806,6 @@ snapshots: sweetalert2@11.15.3: {} swiper@11.1.15: {} -======= - sweetalert2-react-content@5.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sweetalert2@11.26.3): - dependencies: - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - sweetalert2: 11.26.3 - - sweetalert2@11.26.3: {} - - swiper@11.2.10: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 symbol-tree@3.2.4: {} @@ -23783,7 +15813,6 @@ snapshots: dependencies: '@pkgr/core': 0.2.9 -<<<<<<< HEAD tabbable@6.2.0: {} tailwind-merge@2.6.0: {} @@ -23793,28 +15822,13 @@ snapshots: tailwindcss: 3.4.17 tailwindcss@3.4.17: -======= - tabbable@6.3.0: {} - - tailwind-merge@2.6.0: {} - - tailwindcss-animate@1.0.7(tailwindcss@3.4.18): - dependencies: - tailwindcss: 3.4.18 - - tailwindcss@3.4.18: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 chokidar: 3.6.0 didyoumean: 1.2.2 dlv: 1.1.3 -<<<<<<< HEAD fast-glob: 3.3.2 -======= - fast-glob: 3.3.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 glob-parent: 6.0.2 is-glob: 4.0.3 jiti: 1.21.7 @@ -23823,7 +15837,6 @@ snapshots: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.1.1 -<<<<<<< HEAD postcss: 8.4.49 postcss-import: 15.1.0(postcss@8.4.49) postcss-js: 4.0.1(postcss@8.4.49) @@ -23836,19 +15849,6 @@ snapshots: - ts-node tapable@2.2.1: {} -======= - postcss: 8.5.6 - postcss-import: 15.1.0(postcss@8.5.6) - postcss-js: 4.1.0(postcss@8.5.6) - postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.6) - postcss-nested: 6.2.0(postcss@8.5.6) - postcss-selector-parser: 6.1.2 - resolve: 1.22.11 - sucrase: 3.35.0 - transitivePeerDependencies: - - tsx - - yaml ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 test-exclude@6.0.0: dependencies: @@ -23875,14 +15875,6 @@ snapshots: tiny-invariant@1.3.3: {} -<<<<<<< HEAD -======= - tinyglobby@0.2.15: - dependencies: - fdir: 6.5.0(picomatch@4.0.3) - picomatch: 4.0.3 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 title@3.5.3: dependencies: arg: 1.0.0 @@ -23894,33 +15886,16 @@ snapshots: tldts-core@6.1.86: {} -<<<<<<< HEAD -======= - tldts-core@7.0.17: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tldts@6.1.86: dependencies: tldts-core: 6.1.86 -<<<<<<< HEAD -======= - tldts@7.0.17: - dependencies: - tldts-core: 7.0.17 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tmpl@1.0.5: {} to-regex-range@5.0.1: dependencies: is-number: 7.0.0 -<<<<<<< HEAD -======= - toidentifier@1.0.1: {} - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 toposort@2.0.2: {} totalist@3.0.1: {} @@ -23929,13 +15904,6 @@ snapshots: dependencies: tldts: 6.1.86 -<<<<<<< HEAD -======= - tough-cookie@6.0.0: - dependencies: - tldts: 7.0.17 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 tr46@0.0.3: {} tr46@5.1.1: @@ -23948,15 +15916,9 @@ snapshots: trough@2.2.0: {} -<<<<<<< HEAD ts-api-utils@1.4.3(typescript@5.7.2): dependencies: typescript: 5.7.2 -======= - ts-api-utils@1.4.3(typescript@5.9.3): - dependencies: - typescript: 5.9.3 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 ts-dedent@2.2.0: {} @@ -23982,20 +15944,12 @@ snapshots: tslib@2.8.1: {} -<<<<<<< HEAD tus-js-client@4.2.3: -======= - tus-js-client@4.3.1: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: buffer-from: 1.1.2 combine-errors: 3.0.3 is-stream: 2.0.1 -<<<<<<< HEAD js-base64: 3.7.7 -======= - js-base64: 3.7.8 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 lodash.throttle: 4.1.1 proper-lockfile: 4.1.2 url-parse: 1.5.10 @@ -24014,34 +15968,16 @@ snapshots: type-fest@2.19.0: {} -<<<<<<< HEAD typed-array-buffer@1.0.3: dependencies: call-bound: 1.0.3 -======= - type-fest@4.41.0: {} - - type-is@2.0.1: - dependencies: - content-type: 1.0.5 - media-typer: 1.1.0 - mime-types: 3.0.1 - - typed-array-buffer@1.0.3: - dependencies: - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 es-errors: 1.3.0 is-typed-array: 1.1.15 typed-array-byte-length@1.0.3: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD for-each: 0.3.3 -======= - for-each: 0.3.5 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gopd: 1.2.0 has-proto: 1.2.0 is-typed-array: 1.1.15 @@ -24050,24 +15986,15 @@ snapshots: dependencies: available-typed-arrays: 1.0.7 call-bind: 1.0.8 -<<<<<<< HEAD for-each: 0.3.3 gopd: 1.2.0 has-proto: 1.2.0 is-typed-array: 1.1.15 reflect.getprototypeof: 1.0.9 -======= - for-each: 0.3.5 - gopd: 1.2.0 - has-proto: 1.2.0 - is-typed-array: 1.1.15 - reflect.getprototypeof: 1.0.10 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 typed-array-length@1.0.7: dependencies: call-bind: 1.0.8 -<<<<<<< HEAD for-each: 0.3.3 gopd: 1.2.0 is-typed-array: 1.1.15 @@ -24079,28 +16006,11 @@ snapshots: unbox-primitive@1.1.0: dependencies: call-bound: 1.0.3 -======= - for-each: 0.3.5 - gopd: 1.2.0 - is-typed-array: 1.1.15 - possible-typed-array-names: 1.1.0 - reflect.getprototypeof: 1.0.10 - - typescript@5.9.3: {} - - unbox-primitive@1.1.0: - dependencies: - call-bound: 1.0.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 has-bigints: 1.1.0 has-symbols: 1.1.0 which-boxed-primitive: 1.1.1 -<<<<<<< HEAD undici-types@6.19.8: {} -======= - undici-types@6.21.0: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unified@10.1.2: dependencies: @@ -24125,11 +16035,7 @@ snapshots: unist-util-find-after@5.0.0: dependencies: '@types/unist': 3.0.3 -<<<<<<< HEAD unist-util-is: 6.0.0 -======= - unist-util-is: 6.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unist-util-generated@2.0.1: {} @@ -24137,11 +16043,7 @@ snapshots: dependencies: '@types/unist': 2.0.11 -<<<<<<< HEAD unist-util-is@6.0.0: -======= - unist-util-is@6.0.1: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@types/unist': 3.0.3 @@ -24170,13 +16072,8 @@ snapshots: unist-util-remove@4.0.0: dependencies: '@types/unist': 3.0.3 -<<<<<<< HEAD unist-util-is: 6.0.0 unist-util-visit-parents: 6.0.1 -======= - unist-util-is: 6.0.1 - unist-util-visit-parents: 6.0.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unist-util-stringify-position@3.0.3: dependencies: @@ -24196,17 +16093,10 @@ snapshots: '@types/unist': 2.0.11 unist-util-is: 5.2.1 -<<<<<<< HEAD unist-util-visit-parents@6.0.1: dependencies: '@types/unist': 3.0.3 unist-util-is: 6.0.0 -======= - unist-util-visit-parents@6.0.2: - dependencies: - '@types/unist': 3.0.3 - unist-util-is: 6.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 unist-util-visit@3.1.0: dependencies: @@ -24223,7 +16113,6 @@ snapshots: unist-util-visit@5.0.0: dependencies: '@types/unist': 3.0.3 -<<<<<<< HEAD unist-util-is: 6.0.0 unist-util-visit-parents: 6.0.1 @@ -24232,18 +16121,6 @@ snapshots: unrs-resolver@1.11.1: dependencies: napi-postinstall: 0.3.2 -======= - unist-util-is: 6.0.1 - unist-util-visit-parents: 6.0.2 - - universalify@2.0.1: {} - - unpipe@1.0.0: {} - - unrs-resolver@1.11.1: - dependencies: - napi-postinstall: 0.3.4 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 optionalDependencies: '@unrs/resolver-binding-android-arm-eabi': 1.11.1 '@unrs/resolver-binding-android-arm64': 1.11.1 @@ -24265,17 +16142,9 @@ snapshots: '@unrs/resolver-binding-win32-ia32-msvc': 1.11.1 '@unrs/resolver-binding-win32-x64-msvc': 1.11.1 -<<<<<<< HEAD update-browserslist-db@1.1.2(browserslist@4.24.4): dependencies: browserslist: 4.24.4 -======= - until-async@3.0.2: {} - - update-browserslist-db@1.1.4(browserslist@4.27.0): - dependencies: - browserslist: 4.27.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 escalade: 3.2.0 picocolors: 1.1.1 @@ -24290,16 +16159,11 @@ snapshots: querystringify: 2.2.0 requires-port: 1.0.0 -<<<<<<< HEAD use-callback-ref@1.3.3(@types/react@18.3.18)(react@18.3.1): -======= - use-callback-ref@1.3.3(@types/react@18.3.26)(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: react: 18.3.1 tslib: 2.8.1 optionalDependencies: -<<<<<<< HEAD '@types/react': 18.3.18 use-intl@3.26.3(react@18.3.1): @@ -24313,37 +16177,17 @@ snapshots: react: 18.3.1 optionalDependencies: '@types/react': 18.3.18 -======= - '@types/react': 18.3.26 - - use-intl@3.26.5(react@18.3.1): - dependencies: - '@formatjs/fast-memoize': 2.2.7 - intl-messageformat: 10.7.18 - react: 18.3.1 - - use-isomorphic-layout-effect@1.2.1(@types/react@18.3.26)(react@18.3.1): - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 use-places-autocomplete@4.0.1(react@18.3.1): dependencies: react: 18.3.1 -<<<<<<< HEAD use-sidecar@1.1.3(@types/react@18.3.18)(react@18.3.1): -======= - use-sidecar@1.1.3(@types/react@18.3.26)(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: detect-node-es: 1.1.0 react: 18.3.1 tslib: 2.8.1 optionalDependencies: -<<<<<<< HEAD '@types/react': 18.3.18 use-sync-external-store@1.2.2(react@18.3.1): @@ -24351,11 +16195,6 @@ snapshots: react: 18.3.1 use-sync-external-store@1.4.0(react@18.3.1): -======= - '@types/react': 18.3.26 - - use-sync-external-store@1.6.0(react@18.3.1): ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: react: 18.3.1 @@ -24379,27 +16218,15 @@ snapshots: v8-to-istanbul@9.3.0: dependencies: -<<<<<<< HEAD '@jridgewell/trace-mapping': 0.3.25 -======= - '@jridgewell/trace-mapping': 0.3.31 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/istanbul-lib-coverage': 2.0.6 convert-source-map: 2.0.0 vanilla-colorful@0.7.2: {} -<<<<<<< HEAD vaul@0.9.9(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@radix-ui/react-dialog': 1.1.4(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) -======= - vary@1.1.2: {} - - vaul@0.9.9(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@radix-ui/react-dialog': 1.1.15(@types/react@18.3.26)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) transitivePeerDependencies: @@ -24422,11 +16249,7 @@ snapshots: '@types/unist': 2.0.11 unist-util-stringify-position: 3.0.3 -<<<<<<< HEAD vfile-message@4.0.2: -======= - vfile-message@4.0.3: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: '@types/unist': 3.0.3 unist-util-stringify-position: 4.0.0 @@ -24441,7 +16264,6 @@ snapshots: vfile@6.0.3: dependencies: '@types/unist': 3.0.3 -<<<<<<< HEAD vfile-message: 4.0.2 victory-vendor@36.9.2: @@ -24451,17 +16273,6 @@ snapshots: '@types/d3-interpolate': 3.0.4 '@types/d3-scale': 4.0.8 '@types/d3-shape': 3.1.6 -======= - vfile-message: 4.0.3 - - victory-vendor@36.9.2: - dependencies: - '@types/d3-array': 3.2.2 - '@types/d3-ease': 3.0.2 - '@types/d3-interpolate': 3.0.4 - '@types/d3-scale': 4.0.9 - '@types/d3-shape': 3.1.7 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 '@types/d3-time': 3.0.4 '@types/d3-timer': 3.0.2 d3-array: 3.2.4 @@ -24488,11 +16299,7 @@ snapshots: dependencies: loose-envify: 1.4.0 -<<<<<<< HEAD wavesurfer.js@7.8.16: {} -======= - wavesurfer.js@7.11.0: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 wcwidth@1.0.1: dependencies: @@ -24502,11 +16309,7 @@ snapshots: web-streams-polyfill@3.3.3: {} -<<<<<<< HEAD web-worker@1.3.0: {} -======= - web-worker@1.5.0: {} ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 webidl-conversions@3.0.1: {} @@ -24515,11 +16318,7 @@ snapshots: webpack-bundle-analyzer@4.10.1: dependencies: '@discoveryjs/json-ext': 0.5.7 -<<<<<<< HEAD acorn: 8.14.0 -======= - acorn: 8.15.0 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 acorn-walk: 8.3.4 commander: 7.2.0 debounce: 1.2.1 @@ -24554,18 +16353,13 @@ snapshots: which-boxed-primitive@1.1.1: dependencies: is-bigint: 1.1.0 -<<<<<<< HEAD is-boolean-object: 1.2.1 -======= - is-boolean-object: 1.2.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 is-number-object: 1.1.1 is-string: 1.1.1 is-symbol: 1.1.1 which-builtin-type@1.2.1: dependencies: -<<<<<<< HEAD call-bound: 1.0.3 function.prototype.name: 1.1.8 has-tostringtag: 1.0.2 @@ -24579,21 +16373,6 @@ snapshots: which-boxed-primitive: 1.1.1 which-collection: 1.0.2 which-typed-array: 1.1.18 -======= - call-bound: 1.0.4 - function.prototype.name: 1.1.8 - has-tostringtag: 1.0.2 - is-async-function: 2.1.1 - is-date-object: 1.1.0 - is-finalizationregistry: 1.1.1 - is-generator-function: 1.1.2 - is-regex: 1.2.1 - is-weakref: 1.1.1 - isarray: 2.0.5 - which-boxed-primitive: 1.1.1 - which-collection: 1.0.2 - which-typed-array: 1.1.19 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 which-collection@1.0.2: dependencies: @@ -24602,22 +16381,12 @@ snapshots: is-weakmap: 2.0.2 is-weakset: 2.0.4 -<<<<<<< HEAD which-typed-array@1.1.18: dependencies: available-typed-arrays: 1.0.7 call-bind: 1.0.8 call-bound: 1.0.3 for-each: 0.3.3 -======= - which-typed-array@1.1.19: - dependencies: - available-typed-arrays: 1.0.7 - call-bind: 1.0.8 - call-bound: 1.0.4 - for-each: 0.3.5 - get-proto: 1.0.1 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 gopd: 1.2.0 has-tostringtag: 1.0.2 @@ -24631,15 +16400,6 @@ snapshots: word-wrap@1.2.5: {} -<<<<<<< HEAD -======= - wrap-ansi@6.2.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 wrap-ansi@7.0.0: dependencies: ansi-styles: 4.3.0 @@ -24648,15 +16408,9 @@ snapshots: wrap-ansi@8.1.0: dependencies: -<<<<<<< HEAD ansi-styles: 6.2.1 string-width: 5.1.2 strip-ansi: 7.1.0 -======= - ansi-styles: 6.2.3 - string-width: 5.1.2 - strip-ansi: 7.1.2 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 wrappy@1.0.2: {} @@ -24683,11 +16437,8 @@ snapshots: yaml@1.10.2: {} -<<<<<<< HEAD yaml@2.6.1: {} -======= ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 yargs-parser@21.1.1: {} yargs@17.7.2: @@ -24702,20 +16453,13 @@ snapshots: yocto-queue@0.1.0: {} -<<<<<<< HEAD yup@1.6.1: -======= - yoctocolors-cjs@2.1.3: {} - - yup@1.7.1: ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 dependencies: property-expr: 2.0.6 tiny-case: 1.0.3 toposort: 2.0.2 type-fest: 2.19.0 -<<<<<<< HEAD zod@3.24.1: {} zustand@4.5.5(@types/react@18.3.18)(react@18.3.1): @@ -24723,19 +16467,6 @@ snapshots: use-sync-external-store: 1.2.2(react@18.3.1) optionalDependencies: '@types/react': 18.3.18 -======= - zod-to-json-schema@3.24.6(zod@3.25.76): - dependencies: - zod: 3.25.76 - - zod@3.25.76: {} - - zustand@4.5.7(@types/react@18.3.26)(react@18.3.1): - dependencies: - use-sync-external-store: 1.6.0(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.26 ->>>>>>> f7b1b79c08fb402d324a2534d64950ed5ee89eb2 react: 18.3.1 zwitch@2.0.4: {}