diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 673faeb35..6ac1bce45 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -29,41 +29,12 @@ body: description: If possible, please provide a video that demonstrates the bug. validations: required: false - - type: dropdown - id: app-type - attributes: - label: App Type - options: - - Web - - Electron / App - validations: - required: true - - type: input - id: version - attributes: - label: Version - description: The version of the app you are using. - placeholder: 1.0.0 - validations: - required: true - - type: dropdown - id: os + - type: textarea + id: environment attributes: - label: Operating System - options: - - Windows 11 - - Windows 10 - - macOS - - Linux - validations: - required: true - - type: input - id: browser-info - attributes: - label: Browser Info - description: If you are using the web version, please provide your browser info. - placeholder: Browser name and version + label: Environment + description: Please provide the environment in which you are using the application. You can find this information by going to Settings > About and clicking the copy button next to the version tag. - type: checkboxes id: checkboxes diff --git a/.vscode/settings.json b/.vscode/settings.json index 67e7943f2..523111761 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,8 +9,9 @@ "tailwindCSS.experimental.classRegex": [ ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"], ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"], - // ["tw\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"] - ["tw`([^`]*)`", "([^`]*)"] + ["tw`([^`]*)`", "([^`]*)"], + ["[a-zA-Z]+[cC]lass[nN]ame[\"'`]?:\\s*[\"'`]([^\"'`]*)[\"'`]", "([^\"'`]*)"], + ["[a-zA-Z]+[cC]lass[nN]ame\\s*=\\s*[\"'`]([^\"'`]*)[\"'`]", "([^\"'`]*)"] ], // If you do not want to autofix some rules on save // You can put this in your user settings or workspace settings diff --git a/CHANGELOG.md b/CHANGELOG.md index b2bb95660..dafa7d5d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,26 +1,49 @@ # CHANGELOG -## [0.1.2-beta.0](https://github.com/RSSNext/follow/compare/v0.1.1-beta.1...v0.1.2-beta.0) (2024-11-01) +# [0.2.0-beta.0](https://github.com/RSSNext/follow/compare/v0.1.2-beta.0...v0.2.0-beta.0) (2024-11-08) ### Bug Fixes +* determining app is updated logic ([f61dc56](https://github.com/RSSNext/follow/commit/f61dc5664635a5d01be66da27682774f2c73b494)) +* `defineSettingPageData` remove func wrapper ([d0d4f05](https://github.com/RSSNext/follow/commit/d0d4f0564715c1786e71b0f009e86aa3a9dc4b7c)) +* add changelog ([4de6355](https://github.com/RSSNext/follow/commit/4de6355bb77ae7b00416be6827a5b71a3a724dfa)) +* add manifest to purge cache ([2f8dc0b](https://github.com/RSSNext/follow/commit/2f8dc0bc8561ebf9bb40160de8658eac799b31b0)) * add missing event bus ([33b3ac4](https://github.com/RSSNext/follow/commit/33b3ac4c53faa617080cbcf3039cbee7fdeb1931)) * add rsshub discover error boundary ([665c009](https://github.com/RSSNext/follow/commit/665c009bf8aec87ead601428410f56ba6756a8db)) +* add Supsense wrapper for app upgrade provider ([58f1791](https://github.com/RSSNext/follow/commit/58f1791526620f470aa11c776fd7b245d54c45ab)) * add turbo build in ci ([7b848cd](https://github.com/RSSNext/follow/commit/7b848cd08aa4f97b1df35666166561d6fc30c5c9)) +* adjust activation toast style ([e81245e](https://github.com/RSSNext/follow/commit/e81245e395ce1829f0c185a5a184c4cba8f8406c)) +* allow select from all sidebar ([198bb17](https://github.com/RSSNext/follow/commit/198bb17d838729ec0c406a2c6eed2fba97b196b3)) +* app upgrade toast open link should in new window ([fc81546](https://github.com/RSSNext/follow/commit/fc81546bed6b07626215a57543a735001728f520)) +* app upgraded toast href error ([#1444](https://github.com/RSSNext/follow/issues/1444)) ([c875d69](https://github.com/RSSNext/follow/commit/c875d697b2a1cd9e49f3c91397531a82928e1bc8)) * assets rewrite ([#1204](https://github.com/RSSNext/follow/issues/1204)) ([488e8ef](https://github.com/RSSNext/follow/commit/488e8effc6f00769df7dbf68d4e6d1e4e950b8e7)) +* auto archived list flash ([#1269](https://github.com/RSSNext/follow/issues/1269)) ([8d2478c](https://github.com/RSSNext/follow/commit/8d2478c6a93aa9f5a99fddc55bbb8e532e1a0fe1)) * auto load achieved entries when show achieved button is available ([074a60d](https://github.com/RSSNext/follow/commit/074a60d3cf93bcede88ea4d70b07cf7480be4229)) * **boost:** card text align center ([632d5d4](https://github.com/RSSNext/follow/commit/632d5d42d67999523e602fb18f59ca72543b7d7a)) * build pre script ([8bd2de8](https://github.com/RSSNext/follow/commit/8bd2de84b898ffc1a4863d29d7056a0b9e7a9e2f)) +* can not exit entry by close button ([e654c3a](https://github.com/RSSNext/follow/commit/e654c3ac165e5eb276ba51dc4ae0ab2da230a9d1)), closes [#1311](https://github.com/RSSNext/follow/issues/1311) +* can not play bilibili video ([11ff813](https://github.com/RSSNext/follow/commit/11ff813c450fb519292b187a15236abe7d900abb)), closes [#1376](https://github.com/RSSNext/follow/issues/1376) * **ci:** concurrency group ([fb0152e](https://github.com/RSSNext/follow/commit/fb0152eaec76b28ed9fc26381917ca7ec2aecb0b)) +* **ci:** forge build error ([#1500](https://github.com/RSSNext/follow/issues/1500)) ([a5e3e02](https://github.com/RSSNext/follow/commit/a5e3e0228c7088e78061801466267ebdbd288e2c)) * **ci:** turbo not found ([c812bd7](https://github.com/RSSNext/follow/commit/c812bd71aabc63b5c9ebbe032f25aba5ac51bd64)) * **ci:** windows build ([9f72c26](https://github.com/RSSNext/follow/commit/9f72c263a6945fe90899f85f732c0866c7f61b25)) +* **cmdk:** change default cmdk search type to feed ([4a8fdea](https://github.com/RSSNext/follow/commit/4a8fdea84a4df90313f8c577d77d3944a34aa149)) +* correct z-index in toast ([6507744](https://github.com/RSSNext/follow/commit/6507744847b6ceee093adb17076292993d525313)) +* csrf token singleton ([b4e935f](https://github.com/RSSNext/follow/commit/b4e935fba0b2f874a5c24006d5afdd54f50f3e76)) * css editor lazy and input composition handler ([5c6004a](https://github.com/RSSNext/follow/commit/5c6004a0905c6207c6119de0d37e9a5baf744dab)) +* ctx sub menu z-index higher than root ([8daec12](https://github.com/RSSNext/follow/commit/8daec12d2c1e61260b8917ee43066b752d4c9f06)) +* debug html ([e9afc79](https://github.com/RSSNext/follow/commit/e9afc7944f4dc42be2ea530b4852e9c2f6207ac8)) +* debug proxy page ([#1439](https://github.com/RSSNext/follow/issues/1439)) ([c8d1230](https://github.com/RSSNext/follow/commit/c8d1230be753109bd7eaef45e7d0ad0399d8bd4d)) * detecting windows11 ([#1170](https://github.com/RSSNext/follow/issues/1170)) ([2813f1d](https://github.com/RSSNext/follow/commit/2813f1d6540fcb215287dd32cbc0f8cf87cb1cb0)) * disable `pointerDownOutside` trigger `onDismiss` ([#1215](https://github.com/RSSNext/follow/issues/1215)) ([2bf5245](https://github.com/RSSNext/follow/commit/2bf5245126bc9ef890c06afe5a825d1e1ab4059c)) * disable auto load archive for inbox and list ([7825e16](https://github.com/RSSNext/follow/commit/7825e16b6d1230ba2c13e5ef00474fc05cc510e5)) * **discover:** card text truncate ([557e912](https://github.com/RSSNext/follow/commit/557e91228af27251663904dfd3211c535b5b5415)) +* dnd responsive ([1f51abe](https://github.com/RSSNext/follow/commit/1f51abe3ed2fbca66e6d9ab2ab63ef71b7b9eda4)) +* entry action deps ([4eba28b](https://github.com/RSSNext/follow/commit/4eba28b76fc62133ecd0e4746b3bb0b4d341b338)) * entry thumbnail keep origin aspect ratio ([6e04e6e](https://github.com/RSSNext/follow/commit/6e04e6eacd6346bd2869c683ec417932a0d13807)) +* entry title bar margin-left in zen mode ([25abd8f](https://github.com/RSSNext/follow/commit/25abd8ff1c42a37b741676e1b3a3312f99decb8a)) +* entry title can selectable, fixed [#1428](https://github.com/RSSNext/follow/issues/1428) ([6320c00](https://github.com/RSSNext/follow/commit/6320c00373a98846cdd92235b044fa1fd1b8266e)) * **entry-column:** pre-render cached entries ([5065c8e](https://github.com/RSSNext/follow/commit/5065c8e52dcba1a8d8f16ce3729b7c2eb7f5a192)) * escape for seo meta tags ([9564257](https://github.com/RSSNext/follow/commit/9564257564e417e18bdeedded9397d469e6daf14)), closes [#1232](https://github.com/RSSNext/follow/issues/1232) * **external:** add global 404 page ([5e49b81](https://github.com/RSSNext/follow/commit/5e49b8114e0446b734a54eea3291721d8f9656b3)) @@ -28,37 +51,72 @@ * **external:** remove duplicate border bottom ([32f68ee](https://github.com/RSSNext/follow/commit/32f68ee1987182271295292bff92f482c151b78b)) * **external:** set auth config first ([ef46c70](https://github.com/RSSNext/follow/commit/ef46c70a9849c315cc8d827f4ad8a3c004003bac)) * **external:** should hard go back to app home ([6786e20](https://github.com/RSSNext/follow/commit/6786e203031f18be0ca386dcaf1dddf4d05ae95b)) +* fallback for code can not render to html ([08acded](https://github.com/RSSNext/follow/commit/08acded2d549bc80d2ed8f180a6d89cc3a3c861a)), closes [#1142](https://github.com/RSSNext/follow/issues/1142) +* form button align center ([589c6e4](https://github.com/RSSNext/follow/commit/589c6e469b3fecb1c46f1ec2735494da3367abec)) * group date item z index ([8c5c62e](https://github.com/RSSNext/follow/commit/8c5c62e0d698f3a0d72a2ef0595e44986c95320b)) +* handle tipUsers migration for older feed versions ([#1384](https://github.com/RSSNext/follow/issues/1384)) ([2ca6d80](https://github.com/RSSNext/follow/commit/2ca6d807e3c0626eca79dd6789ae20cdc0639fc3)) +* handling default port in proxy configuration ([0bd76a2](https://github.com/RSSNext/follow/commit/0bd76a24a240951782d44b7e38040c305bb2b9b9)) +* hide cache control in web ([961bd0f](https://github.com/RSSNext/follow/commit/961bd0fccd63e7e9a21c9bea62cd426bac9a8423)) +* hide to tray on close window ([392135b](https://github.com/RSSNext/follow/commit/392135b8c4b4ec00aa49e66b28bcb0e77390683a)) +* hot key switch view ([45d0fd9](https://github.com/RSSNext/follow/commit/45d0fd914f374bb7217e9a48c48bc1df4a5a8c6e)) +* html table to markdown error ([#1288](https://github.com/RSSNext/follow/issues/1288)) ([8d1ca24](https://github.com/RSSNext/follow/commit/8d1ca24f18859f5651559c77cef6fc30ce228f00)) * **i18n:** remove `external` ns in renderer ([229b3e1](https://github.com/RSSNext/follow/commit/229b3e18f50c81c916f877a2a65325e3dcaa783a)) +* **i18n:** update label for notification badge settings in zh-CN locale and others ([#1455](https://github.com/RSSNext/follow/issues/1455)) ([ec82f03](https://github.com/RSSNext/follow/commit/ec82f036b44a3d0d463c48c1d793fc517def1d07)) +* immer object extensible ([6ad35ad](https://github.com/RSSNext/follow/commit/6ad35ad6712a68db9e231bf5733a2956ccecda90)) * initializeDayjs in server ([d408581](https://github.com/RSSNext/follow/commit/d408581a13ad78d5a871d98f3ff0ff9bb5e45ae5)), closes [#1198](https://github.com/RSSNext/follow/issues/1198) +* inline image style ([1d0eca1](https://github.com/RSSNext/follow/commit/1d0eca1ca16621634d0d0957b1d4d6c5f037498c)), closes [#1318](https://github.com/RSSNext/follow/issues/1318) +* input and toast font style use user custom font ([#1322](https://github.com/RSSNext/follow/issues/1322)) ([c40becf](https://github.com/RSSNext/follow/commit/c40becff782e129c42984b354f2004b82c7f2615)) +* md lint ([c8e556a](https://github.com/RSSNext/follow/commit/c8e556a3ac861cab4a4a7aff1aa2fa51aaca1f42)) * missing site url in feed selector ([ea677ac](https://github.com/RSSNext/follow/commit/ea677ac6a3a43489a9508a32ecb22fa38ecf4f27)) * modal bottom buttons align ([#1216](https://github.com/RSSNext/follow/issues/1216)) ([b97096d](https://github.com/RSSNext/follow/commit/b97096dbd06bb7687b6c1313de45d8e91dee25af)) * modal close button overlaps the select content ([#1166](https://github.com/RSSNext/follow/issues/1166)) ([3c103ed](https://github.com/RSSNext/follow/commit/3c103ed15daeb1f57a001d615c047c303087ba46)) +* **modal:** close button can not click on electron ([c544dfc](https://github.com/RSSNext/follow/commit/c544dfcc8d4613e8d4f6025dd8a60cf679881680)) * **modal:** drawer modal layout symmetric padding ([7141e86](https://github.com/RSSNext/follow/commit/7141e869dfc9328e3eeeda909ea2ffc7e6dd0e34)) * **modal:** fixed close modal button position ([78e9424](https://github.com/RSSNext/follow/commit/78e942473fff309e372708b56a59a9009d5bb0e9)) * **modal:** modal dismiss action ([b05ff50](https://github.com/RSSNext/follow/commit/b05ff50f14660f20ed881f6aeabb732d80c9539c)) * **modal:** repeat user profile dialog ([#1155](https://github.com/RSSNext/follow/issues/1155)) ([ad86372](https://github.com/RSSNext/follow/commit/ad86372bfb345b6f921da783c401be30cdbe4b89)) +* not showing feed certification icon on the sidebar ([#1442](https://github.com/RSSNext/follow/issues/1442)) ([b395891](https://github.com/RSSNext/follow/commit/b395891b66a581254f24aae75d0d61869fb6fb33)) +* only show ComboboxOptions when there are suggestions ([136aa20](https://github.com/RSSNext/follow/commit/136aa205794b6193826d1839350e65228d2b4f20)) * optimize some styles ([9b99bf4](https://github.com/RSSNext/follow/commit/9b99bf4428cf6f1ca3218a3074a944af4d014f57)) * optimize the animation of the Follow button on the User Profile Modal ([#1156](https://github.com/RSSNext/follow/issues/1156)) ([87717d6](https://github.com/RSSNext/follow/commit/87717d642607cca4254f11d673a8a910fc6ab076)) +* pass a component for Trans ([7d38cb6](https://github.com/RSSNext/follow/commit/7d38cb6d2f814d3b6012b66ba6024c05b6edcf2d)) * pnpm lockfile ([fdc547a](https://github.com/RSSNext/follow/commit/fdc547a5aaeb11aa13d6321ea60f1d3a4e01a8b4)) * power icon align ([11059f6](https://github.com/RSSNext/follow/commit/11059f639ee955a0f10cbd97cb6eed85e335fed7)) * preferred title not working in entry column ([#1268](https://github.com/RSSNext/follow/issues/1268)) ([4bdf28e](https://github.com/RSSNext/follow/commit/4bdf28ea766242c74af051e36a9ef205f02eb874)) * prevent default for cmd+k ([81d49f0](https://github.com/RSSNext/follow/commit/81d49f0893100de85a22d114765f76e7c9dea36c)) +* prevent default scrolling behavior while using arrow keys to switch between entries ([#1447](https://github.com/RSSNext/follow/issues/1447)) ([ed5ee50](https://github.com/RSSNext/follow/commit/ed5ee50fe2676309e5451d73531baf59bbf0d746)) +* prevent withdrawal of zero amount to avoid unnecessary fees ([#1422](https://github.com/RSSNext/follow/issues/1422)) ([6584526](https://github.com/RSSNext/follow/commit/65845268f9940247d3b645b1588d1564ec0b4cff)) +* **profile-menu:** limit max-char ([8a72a97](https://github.com/RSSNext/follow/commit/8a72a97c0ce145a65583fafe792ae99a634c52c3)) +* reduce timeline refresh, fixed [#1474](https://github.com/RSSNext/follow/issues/1474) ([6fc9d09](https://github.com/RSSNext/follow/commit/6fc9d09c586618efb2d1b62b062fa04e26dc7986)) +* reduce upgrade toast duration and disable prompt on nightly version, fixed 1450 ([7f2ac96](https://github.com/RSSNext/follow/commit/7f2ac967ebc900e57b09bf4c945412e84943ebb2)) * refetch wallet data on mount ([2d11eb2](https://github.com/RSSNext/follow/commit/2d11eb2d92fb57222b14df987b57a75eb9262fc5)) * relogin ([80515f6](https://github.com/RSSNext/follow/commit/80515f67652a77fbdbe20a2a3298fd916515a8d7)) * remove `useSingleton` ([d1d3fcf](https://github.com/RSSNext/follow/commit/d1d3fcf493bf26ce58cd33fedd7320cfcfe8ef5f)) * remove cache-control header ([#1202](https://github.com/RSSNext/follow/issues/1202)) ([c683bda](https://github.com/RSSNext/follow/commit/c683bdaef63716659ca78875022ff38350e50b82)) * remove gcore icon ([#1220](https://github.com/RSSNext/follow/issues/1220)) ([486fa20](https://github.com/RSSNext/follow/commit/486fa202ee9488981a733f235f95c90a073e7166)) +* remove immer set to avoid object extensible ([7e5a791](https://github.com/RSSNext/follow/commit/7e5a79155a083a8242579dee18d019049b7ad6f5)) +* remove vercel header rewrite for assets ([79e6f48](https://github.com/RSSNext/follow/commit/79e6f483265216773e0ccf5ac0690d06300d3e80)) +* response error toast style ([7748588](https://github.com/RSSNext/follow/commit/77485886089e9faea54cf80a96a48a0bedd2a39e)) * scroll bar z index ([5057999](https://github.com/RSSNext/follow/commit/50579995367b871e84768c5983b3302f75f8e077)), closes [#1233](https://github.com/RSSNext/follow/issues/1233) +* **server:** complie esmodule ([c438119](https://github.com/RSSNext/follow/commit/c438119ea8208f4da14da2294a381a6c34a14e25)) * **server:** serialize data ([2410b84](https://github.com/RSSNext/follow/commit/2410b843af3d16f77e88482d9c73f25c1dd3431a)) * **server:** use `xss` to serialize data ([93f58ec](https://github.com/RSSNext/follow/commit/93f58ecfd8fadfa67f56ebfe629e73f44bb94a49)) * set referer ([29557f3](https://github.com/RSSNext/follow/commit/29557f370f37f7f5c7d1f7ccd7157a4449f7e5ca)) * set windows env ([1ea103b](https://github.com/RSSNext/follow/commit/1ea103b7ee1689ba9683c341a2afacacf2884fbd)) +* setting loader type error ([da8aad7](https://github.com/RSSNext/follow/commit/da8aad7327d45cd899f8091cb0315ff2497b2ab9)) +* setting loader type error ([#1469](https://github.com/RSSNext/follow/issues/1469)) ([6ef5622](https://github.com/RSSNext/follow/commit/6ef5622a32eaaebfeec32cca1000bf908f742e34)) +* **share:** normal list item layout ([3a0c039](https://github.com/RSSNext/follow/commit/3a0c0393e01e09ebf86ab1415b3d84bca6d2b882)) * **share:** og image grid width and image align top to description ([14e37da](https://github.com/RSSNext/follow/commit/14e37da0cebbdb1b283c562c21acc2f8ba385bf9)) * **shortcut:** add cmd+k to guide ([e9ab9b6](https://github.com/RSSNext/follow/commit/e9ab9b6f379abe426ac751961e3767c8aa20b663)) +* should remove app skeleton in error page ([4073632](https://github.com/RSSNext/follow/commit/4073632dbf236e19926e013d5048f59f90d9b3ae)) * shouldLoadArchivedEntries condition ([94b097f](https://github.com/RSSNext/follow/commit/94b097fd25533b5d1437bf1054dbe44af7828099)) +* show action limit message ([2ac52eb](https://github.com/RSSNext/follow/commit/2ac52ebda3b4cb06e00ce2759f2cac7cd5d86f3d)), closes [#1360](https://github.com/RSSNext/follow/issues/1360) * show scrollbar when list table overflows in settings menu ([#1266](https://github.com/RSSNext/follow/issues/1266)) ([47b200f](https://github.com/RSSNext/follow/commit/47b200f7f3340b5b262674c71e876328ec758192)) +* sidebar copy feed url, fixed [#1361](https://github.com/RSSNext/follow/issues/1361) ([4e84196](https://github.com/RSSNext/follow/commit/4e841964e6573fa20ae214538b04dd0dc18a6f5e)) +* **store:** immer draft should to raw ([3a3992d](https://github.com/RSSNext/follow/commit/3a3992d63f0f62cd37aa5accb4910ad79e3190e8)) * **store:** singleton store guard ([5a8725b](https://github.com/RSSNext/follow/commit/5a8725b50767bb6faddca6e0af6cef2cfb28da29)) +* **stream:** prevent request if no ids ([a92ef49](https://github.com/RSSNext/follow/commit/a92ef49dedf480f519525cf8f25a0e5383b27059)) +* the volume bar can click and adjust style. ([#1474](https://github.com/RSSNext/follow/issues/1474)) ([c409a5c](https://github.com/RSSNext/follow/commit/c409a5c7945eb178fca5274dd6ac64f82025821d)) * theme cannot be switched ([#1157](https://github.com/RSSNext/follow/issues/1157)) ([d5be028](https://github.com/RSSNext/follow/commit/d5be0287ad03e47635be057222ca7155a033ae80)) * **toc:** fix text truncate in title line ([f9b1a61](https://github.com/RSSNext/follow/commit/f9b1a61c0185b449184b34df5f3a3869a4e722a4)) * **toc:** should focus when toc item clicked ([f51dfdd](https://github.com/RSSNext/follow/commit/f51dfddc9ef40f4a7f226f32f9357e03a04f6ee0)) @@ -66,8 +124,13 @@ * try fix dayjs init ([093f80d](https://github.com/RSSNext/follow/commit/093f80d9da223c567125285cc0f312f419bb4042)) * ts import ([14311dd](https://github.com/RSSNext/follow/commit/14311dde0a9cb14e797e1a0f654a11f8502e58f8)) * turbo build cmd ([0b9c279](https://github.com/RSSNext/follow/commit/0b9c279fccd25231b90810359125571f817b7f7c)) +* **ui:** resolve conflict between video progress bar and swiper drag … ([#1337](https://github.com/RSSNext/follow/issues/1337)) ([aa9206f](https://github.com/RSSNext/follow/commit/aa9206f5b1e3ea0c008f912ef22cdaa406546251)) * **ui:** use safe inset top to fix windows overlays, fixed [#1184](https://github.com/RSSNext/follow/issues/1184) ([dc85570](https://github.com/RSSNext/follow/commit/dc855703289ac98db76f4a57760fcd66047b8dd1)) * **ui:** user profile follow button style ([d629215](https://github.com/RSSNext/follow/commit/d629215305a0ec9323dea0db929582e9609a82f6)) +* update daily claim amount reference in tooltip ([#1487](https://github.com/RSSNext/follow/issues/1487)) ([3792c2d](https://github.com/RSSNext/follow/commit/3792c2d850d9fc3f96ea4591784b61c631ee7e86)) +* update version toast ([25e7cea](https://github.com/RSSNext/follow/commit/25e7cea3c139335960c3de2922cf0ffa9c9c6c39)), closes [#1450](https://github.com/RSSNext/follow/issues/1450) +* **upgrade:** changelog container should w-full ([1551bf6](https://github.com/RSSNext/follow/commit/1551bf648c511cbf615f515b2e2d93077b0e42b4)) +* vercel do not support `__` prefix for api route ([45a66e0](https://github.com/RSSNext/follow/commit/45a66e0f972d18831795d92b1d3c1f3893f396dc)) * vercel rewrite config ([#1203](https://github.com/RSSNext/follow/issues/1203)) ([c954d61](https://github.com/RSSNext/follow/commit/c954d61f074e282a9a86cbf1d1546748871c20e7)) @@ -75,23 +138,45 @@ * add app skeleton to avoid blank page when js loaded ([e2ed162](https://github.com/RSSNext/follow/commit/e2ed162b67d53452af01fe3a7aad3d70c995ff8d)) * add appearance to set thumbnail ratio ([1d3f6bc](https://github.com/RSSNext/follow/commit/1d3f6bc910e3878debca3a7576f3891e6947b443)) +* add application tray functionality ([#1416](https://github.com/RSSNext/follow/issues/1416)) ([76a6e38](https://github.com/RSSNext/follow/commit/76a6e38376a01dbeee83161cdce9fe5e205b1523)) * add follow user button in profile modal ([#1147](https://github.com/RSSNext/follow/issues/1147)) ([7c60d5e](https://github.com/RSSNext/follow/commit/7c60d5e91dd4a21872217427bd99fe8eae688ce1)) +* add hydrate data type-safe helper ([cb6a65b](https://github.com/RSSNext/follow/commit/cb6a65b7cc1651d86b83b5b4089a7145cd59b0be)) * add random color for user fallback bg ([dcbae89](https://github.com/RSSNext/follow/commit/dcbae89020e88947be693c100c644ee603519e96)) +* add sentry trace id ([40843ac](https://github.com/RSSNext/follow/commit/40843ac79f390d0db81490522475a3557f57b2e4)) +* add server announcement toast ([7b34357](https://github.com/RSSNext/follow/commit/7b3435749b8516466eae388172694f22d6b26a83)) * add updatelog modal ([84228bc](https://github.com/RSSNext/follow/commit/84228bc5c8755c4b957bc901e6e552ef176ed00c)) * adjust more ui ([08929ab](https://github.com/RSSNext/follow/commit/08929ab3ae15758850d04b82f7773358579c4a78)) +* **app:** support cache limit and clean cache ([dee294d](https://github.com/RSSNext/follow/commit/dee294dda589ca9e2eaee8a7e55197635b6323c7)) +* bring rehypeUrlToAnchor back ([6f0cc4d](https://github.com/RSSNext/follow/commit/6f0cc4d566c9f2f552f0fedf1a8e570a817e0f56)), closes [#1373](https://github.com/RSSNext/follow/issues/1373) +* **discover:** enhance RSSHub recommendations with filters ([#1481](https://github.com/RSSNext/follow/issues/1481)) ([eb70126](https://github.com/RSSNext/follow/commit/eb70126b8283b6e0b246f86751e588a37cb34902)) * **discover:** improve trending style and discover no image placeholer ([86be1a2](https://github.com/RSSNext/follow/commit/86be1a2e46d3298157cece0731e687a462f833d5)) +* dnd ([#1471](https://github.com/RSSNext/follow/issues/1471)) ([c9333d5](https://github.com/RSSNext/follow/commit/c9333d5004c170955ab96b9f7f5a2825e1042271)) +* entry image gallery modal ([e0d3e17](https://github.com/RSSNext/follow/commit/e0d3e17da4ee17217d7b78871b546f43af87d893)) +* export database ([85b4502](https://github.com/RSSNext/follow/commit/85b4502f9c113b8de73ccf4a167aa514a3c149ea)) * **external:** move `login` and `redirect` route to external ([7916803](https://github.com/RSSNext/follow/commit/791680332d5e1c2c52eda792dd7ff69281f25adb)) * **external:** new open by deeplink logic ([71fcf50](https://github.com/RSSNext/follow/commit/71fcf50d0fd3ac30f8e9c45db90314672904a615)) +* fetch stream entry content ([1739208](https://github.com/RSSNext/follow/commit/173920802edf1f4e13eee68bf5d541391ca6ebf9)) * focusable ([eb01d03](https://github.com/RSSNext/follow/commit/eb01d030129f6196d6e9855be42a218be9d5668b)) +* hide trend ([2b92599](https://github.com/RSSNext/follow/commit/2b92599e18d3d33fd0371d4d3a5f3e3a6d94aeb6)) * **icon:** use gradient fallback background ([e827002](https://github.com/RSSNext/follow/commit/e8270025e469d9a0463d267d3da591a2991951bd)) +* **integration:** add outline integration ([#1229](https://github.com/RSSNext/follow/issues/1229)) ([0d0266b](https://github.com/RSSNext/follow/commit/0d0266b25189a74efdc63ce0062f3a379d4a0729)) * List delete add secondary confirmation ([#1254](https://github.com/RSSNext/follow/issues/1254)) ([14f2bac](https://github.com/RSSNext/follow/commit/14f2bac8f3ba7e8f2dbd3958a4394c5b11ea2537)) * load archived entries automatically ([5fe9e0c](https://github.com/RSSNext/follow/commit/5fe9e0c0e24460ca0fe435db03b753e9dcd3df17)) +* **mark-all-button:** add countdown to auto-confirm message ([#1414](https://github.com/RSSNext/follow/issues/1414)) ([e1a5fc6](https://github.com/RSSNext/follow/commit/e1a5fc63f20c941140071789c9b67685da19ea5c)) * move hideExtraBadge ([2f14c30](https://github.com/RSSNext/follow/commit/2f14c30307a895bc866ac57989df1dc624eab4e6)) * **obsidian:** use readability content when available ([b4a3197](https://github.com/RSSNext/follow/commit/b4a3197e6ebd39bb259a6bc67f408569354a205e)) * prefer origin addresses for content images ([d4d4345](https://github.com/RSSNext/follow/commit/d4d43451dec839b64239e1835b2ac1a1aa2478be)) * **reader:** support custom css, fixed [#256](https://github.com/RSSNext/follow/issues/256) ([b251fa9](https://github.com/RSSNext/follow/commit/b251fa9421417c75d71707c8f08850f2cc902e1a)) +* **renderer:** prevent currently executing async entry action from being executed again ([#1348](https://github.com/RSSNext/follow/issues/1348)) ([be82fe2](https://github.com/RSSNext/follow/commit/be82fe2a8ce37bac7205a1a43abeca396fdadba6)) +* replace twMacro with unplugin-ast ([#1462](https://github.com/RSSNext/follow/issues/1462)) ([05da9ca](https://github.com/RSSNext/follow/commit/05da9ca7d3d1f66bd22250599df8b66ea0fd3a43)) +* reset feed ([#1419](https://github.com/RSSNext/follow/issues/1419)) ([9066758](https://github.com/RSSNext/follow/commit/9066758c322b8b31c1a9a137be017283fa92bea8)) +* separate packaging for macOS x64 and arm64 architectures ([#1389](https://github.com/RSSNext/follow/issues/1389)) ([3e8de30](https://github.com/RSSNext/follow/commit/3e8de308a3b3a07c58ab3fd7d26aad5aa2328c99)) +* show progress in searching ([e592e97](https://github.com/RSSNext/follow/commit/e592e97c9e0e6da8451c09b9b5f27612e6dbb971)), closes [#1457](https://github.com/RSSNext/follow/issues/1457) +* support markdown for announcement content ([539ec03](https://github.com/RSSNext/follow/commit/539ec03293fc6e3a11dbec69bbf78fe1c5dd2e8c)) * support zen mode sidebar entry timeline selector ([4ab132c](https://github.com/RSSNext/follow/commit/4ab132c593a7acce0167d02f6025030775a9fac5)) * unified feed title ([b86afe5](https://github.com/RSSNext/follow/commit/b86afe5a9789ad13c5a026adf553d2c6bc333bff)) +* update og image ([c58df35](https://github.com/RSSNext/follow/commit/c58df35d1f48e7374973a393c9b7efea38d12494)) +* update og image ([142f9f5](https://github.com/RSSNext/follow/commit/142f9f57ce2697ab82fd5e1dd2cee7d0f7500721)) * use FeedTitle ([73d2c30](https://github.com/RSSNext/follow/commit/73d2c30416ad3f2da626db003996c0fb036025ac)) * **ux:** support native space key to page down, fixed [#1121](https://github.com/RSSNext/follow/issues/1121) ([baa66fe](https://github.com/RSSNext/follow/commit/baa66feaf19416d2b9e5efe6b79f6af1b3966404)) * zen mode and hide extra badge ([7ba07ad](https://github.com/RSSNext/follow/commit/7ba07adff1e7cd3292cc308f3e70803fe11fb8ce)) @@ -99,6 +184,8 @@ ### Performance Improvements +* batch profile ([#1464](https://github.com/RSSNext/follow/issues/1464)) ([a3e9c0e](https://github.com/RSSNext/follow/commit/a3e9c0edc83628d9c0ceb998d95184c5fd635f6f)) +* optmize masonry perfermance ([d1748c6](https://github.com/RSSNext/follow/commit/d1748c6ce93f7075270d8cc6e88cbd944d165d50)) * resolve feed item select area performance problem ([f87c0ff](https://github.com/RSSNext/follow/commit/f87c0ff2abfc430719894765796ca457c3f8e7f0)) diff --git a/api/vercel_webhook.ts b/api/vercel_webhook.ts new file mode 100644 index 000000000..af0135f2f --- /dev/null +++ b/api/vercel_webhook.ts @@ -0,0 +1,99 @@ +import crypto from "node:crypto" + +import type { VercelRequest, VercelResponse } from "@vercel/node" +import getRawBody from "raw-body" + +export default async function handler(request: VercelRequest, response: VercelResponse) { + const { WEBHOOK_SECRET: INTEGRATION_SECRET } = process.env + + if (typeof INTEGRATION_SECRET != "string") { + return response.status(400).json({ + code: "invalid_secret", + error: "No integration secret found", + }) + } + + const rawBody = await getRawBody(request) + const bodySignature = sha1(rawBody, INTEGRATION_SECRET) + + if (bodySignature !== request.headers["x-vercel-signature"]) { + return response.status(403).json({ + code: "invalid_signature", + error: "signature didn't match", + }) + } + + const json = JSON.parse(rawBody.toString("utf-8")) + + switch (json.type) { + // https://vercel.com/docs/observability/webhooks-overview/webhooks-api#deployment.succeeded + case "deployment.succeeded": { + const { target } = json.payload || json.data + + if (target === "production") { + await purgeCloudflareCache() + } else { + console.info(`Skipping non-production deployment: ${target}`, json) + } + } + // ... + } + + return response.status(200).end("OK") +} + +function sha1(data: Buffer, secret: string): string { + return crypto.createHmac("sha1", secret).update(data).digest("hex") +} + +export const config = { + api: { + bodyParser: false, + }, +} + +async function purgeCloudflareCache() { + const { CF_TOKEN, CF_ZONE_ID } = process.env + + if (typeof CF_TOKEN !== "string" || typeof CF_ZONE_ID !== "string") { + throw new TypeError("No Cloudflare token or zone ID found") + } + + const apiUrl = `https://api.cloudflare.com/client/v4/zones/${CF_ZONE_ID}/purge_cache` + + const manifestPath = await fetch( + `https://app.follow.is/assets/manifest.txt?t=${Date.now()}`, + ).then((res) => res.text()) + + const allPath = manifestPath.split("\n").map((path) => `https://app.follow.is/${path}`) + + // Function to delay execution + const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)) + + const taskPromise = [] as Promise[] + // Batch processing + for (let i = 0; i < allPath.length; i += 30) { + const batch = allPath.slice(i, i + 30) + + const r = fetch(apiUrl, { + method: "POST", + headers: { + Authorization: CF_TOKEN, + }, + body: JSON.stringify({ + files: batch, + }), + }) + + taskPromise.push(r) + + // Delay for 0.5 seconds between batches + if (i + 30 < allPath.length) { + await delay(500) + } + } + + const result = await Promise.allSettled(taskPromise) + console.info(`Success: ${result.filter((r) => r.status === "fulfilled").length}`) + console.info(`Failed: ${result.filter((r) => r.status === "rejected").length}`) +} diff --git a/apps/main/package.json b/apps/main/package.json index 184ccf7a5..d750db27e 100644 --- a/apps/main/package.json +++ b/apps/main/package.json @@ -25,17 +25,18 @@ "@egoist/tipc": "0.3.2", "@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/utils": "^3.0.0", - "@eneris/push-receiver": "4.2.0", + "@eneris/push-receiver": "4.3.0", "@follow/shared": "workspace:*", "@mozilla/readability": "^0.5.0", - "@sentry/electron": "5.6.0", + "@sentry/electron": "5.7.0", "builder-util-runtime": "9.2.10", "electron-context-menu": "4.0.4", "electron-log": "5.2.0", "electron-squirrel-startup": "1.0.1", "electron-updater": "^6.3.9", + "fast-folder-size": "2.3.0", "font-list": "1.5.1", - "i18next": "^23.16.0", + "i18next": "^23.16.4", "linkedom": "^0.18.5", "lowdb": "7.0.1", "msedge-tts": "1.3.4", @@ -45,9 +46,9 @@ }, "devDependencies": { "@types/lodash-es": "4.17.12", - "@types/node": "^22.7.5", - "electron": "33.0.0", + "@types/node": "^22.8.7", + "electron": "33.0.2", "electron-devtools-installer": "3.2.0", - "hono": "4.6.5" + "hono": "4.6.8" } } diff --git a/apps/main/src/constants/app.ts b/apps/main/src/constants/app.ts index 1391eb05c..9f9441bdc 100644 --- a/apps/main/src/constants/app.ts +++ b/apps/main/src/constants/app.ts @@ -1,2 +1,5 @@ // 5min export const UNREAD_BACKGROUND_POLLING_INTERVAL = 1000 * 60 * 5 + +// https://github.com/electron/electron/issues/25081 +export const START_IN_TRAY_ARGS = "--start-in-tray" diff --git a/apps/main/src/helper.ts b/apps/main/src/helper.ts index caa0c783b..27cf9593b 100644 --- a/apps/main/src/helper.ts +++ b/apps/main/src/helper.ts @@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url" const __dirname = fileURLToPath(new URL(".", import.meta.url)) const iconMap = { prod: path.join(__dirname, "../../resources/icon.png"), - dev: path.join(__dirname, "../../resources/icon-dev.png"), + dev: path.join(__dirname, "../../static/icon-dev.png"), } export const getIconPath = () => iconMap[process.env.NODE_ENV === "development" ? "dev" : "prod"] +export const getTrayIconPath = () => path.join(__dirname, "../../resources/tray-icon.png") diff --git a/apps/main/src/index.ts b/apps/main/src/index.ts index 3788672f6..5db8b71b8 100644 --- a/apps/main/src/index.ts +++ b/apps/main/src/index.ts @@ -11,9 +11,15 @@ import { initializeAppStage0, initializeAppStage1 } from "./init" import { updateProxy } from "./lib/proxy" import { handleUrlRouting } from "./lib/router" import { store } from "./lib/store" +import { registerAppTray } from "./lib/tray" import { setAuthSessionToken, updateNotificationsToken } from "./lib/user" import { registerUpdater } from "./updater" -import { createMainWindow, getMainWindow, windowStateStoreKey } from "./window" +import { + createMainWindow, + getMainWindow, + getMainWindowOrCreate, + windowStateStoreKey, +} from "./window" if (isDev) console.info("[main] env loaded:", env) @@ -65,6 +71,7 @@ function bootstrap() { updateProxy() registerUpdater() + registerAppTray() session.defaultSession.webRequest.onBeforeSendHeaders((details, callback) => { // remove Electron, Follow from user agent @@ -81,8 +88,10 @@ function bootstrap() { details.requestHeaders["Origin"] = "https://app.follow.is" } else { const refererMatch = imageRefererMatches.find((item) => item.url.test(details.url)) - const referer = refererMatch?.referer || details.url - details.requestHeaders["Referer"] = referer + const referer = refererMatch?.referer + if (referer) { + details.requestHeaders["Referer"] = referer + } } callback({ cancel: false, requestHeaders: details.requestHeaders }) @@ -91,11 +100,8 @@ function bootstrap() { app.on("activate", () => { // On macOS it's common to re-create a window in the app when the // dock icon is clicked and there are no other windows open. - if (BrowserWindow.getAllWindows().length === 0) { - mainWindow = createMainWindow() - } - - if (mainWindow) mainWindow.show() + mainWindow = getMainWindowOrCreate() + mainWindow.show() }) app.on("open-url", (_, url) => { diff --git a/apps/main/src/init.ts b/apps/main/src/init.ts index f077c68da..50d9e6a81 100644 --- a/apps/main/src/init.ts +++ b/apps/main/src/init.ts @@ -9,6 +9,7 @@ import { app, nativeTheme, Notification, shell } from "electron" import contextMenu from "electron-context-menu" import { getIconPath } from "./helper" +import { clearCacheCronJob } from "./lib/cleaner" import { t } from "./lib/i18n" import { store } from "./lib/store" import { updateNotificationsToken } from "./lib/user" @@ -59,6 +60,7 @@ export const initializeAppStage1 = () => { registerMenuAndContextMenu() registerPushNotifications() + clearCacheCronJob() } let contextMenuDisposer: () => void diff --git a/apps/main/src/lib/api-client.ts b/apps/main/src/lib/api-client.ts index 934e555ea..faf82a868 100644 --- a/apps/main/src/lib/api-client.ts +++ b/apps/main/src/lib/api-client.ts @@ -5,7 +5,7 @@ import { ofetch } from "ofetch" import type { AppType } from "../../../../packages/shared/src/hono" import { logger } from "../logger" -import { getAuthSessionToken } from "./user" +import { getAuthSessionToken, getUser } from "./user" const abortController = new AbortController() export const apiFetch = ofetch.create({ @@ -33,10 +33,12 @@ export const apiClient = hc("", { fetch: async (input, options = {}) => apiFetch(input.toString(), options), headers() { const authSessionToken = getAuthSessionToken() + const user = getUser() return { "X-App-Version": PKG.version, "X-App-Dev": process.env.NODE_ENV === "development" ? "1" : "0", Cookie: authSessionToken ? `authjs.session-token=${authSessionToken}` : "", + "User-Agent": `Follow/${PKG.version}${user?.id ? ` uid: ${user.id}` : ""}`, } }, }) diff --git a/apps/main/src/lib/cleaner.ts b/apps/main/src/lib/cleaner.ts index bd7d4883b..c761aa658 100644 --- a/apps/main/src/lib/cleaner.ts +++ b/apps/main/src/lib/cleaner.ts @@ -1,9 +1,20 @@ -import { callWindowExpose } from "@follow/shared/bridge" -import { dialog } from "electron" +import { statSync } from "node:fs" +import fsp from "node:fs/promises" +import { createRequire } from "node:module" +import path from "node:path" +import { promisify } from "node:util" +import { callWindowExpose } from "@follow/shared/bridge" +import { app, dialog } from "electron" + +import { logger } from "~/logger" import { getMainWindow } from "~/window" import { t } from "./i18n" +import { store, StoreKey } from "./store" + +const require = createRequire(import.meta.url) +const fastFolderSize = require("fast-folder-size") as any as typeof import("fast-folder-size") export const clearAllDataAndConfirm = async () => { const win = getMainWindow() @@ -53,3 +64,75 @@ export const clearAllData = async () => { caller.toast.error(`Error resetting app data: ${error.message}`) } } +const fastFolderSizeAsync = promisify(fastFolderSize) +export const getCacheSize = async () => { + const cachePath = path.join(app.getPath("userData"), "cache") + + // Size is in bytes + const sizeInBytes = await fastFolderSizeAsync(cachePath) + return sizeInBytes || 0 +} + +const getCachedFilesRecursive = async (dir: string, result: string[] = []) => { + const files = await fsp.readdir(dir) + + for (const file of files) { + const filePath = path.join(dir, file) + const stat = await fsp.stat(filePath) + if (stat.isDirectory()) { + const files = await getCachedFilesRecursive(filePath) + result.push(...files) + } else { + result.push(filePath) + } + } + return result +} + +let timer: any = null +export const clearCacheCronJob = () => { + if (timer) { + timer = clearInterval(timer) + } + timer = setInterval( + async () => { + const hasLimit = store.get(StoreKey.CacheSizeLimit) + + if (!hasLimit) { + return + } + + const cacheSize = await getCacheSize() + + const limitByteSize = hasLimit * 1024 * 1024 + if (cacheSize > limitByteSize) { + const shouldCleanSize = cacheSize - limitByteSize - 1024 * 1024 * 50 // 50MB + + const cachePath = path.join(app.getPath("userData"), "cache") + const files = await getCachedFilesRecursive(cachePath) + // Sort by last modified + files.sort((a, b) => { + const aStat = statSync(a) + const bStat = statSync(b) + return bStat.mtime.getTime() - aStat.mtime.getTime() + }) + + let cleanedSize = 0 + for (const file of files) { + const fileSize = statSync(file).size + cleanedSize += fileSize + if (cleanedSize >= shouldCleanSize) { + logger.info(`Cleaned ${cleanedSize} bytes cache`) + break + } + } + } + }, + 10 * 60 * 1000, + ) // 10 min + + return () => { + if (!timer) return + timer = clearInterval(timer) + } +} diff --git a/apps/main/src/lib/proxy.test.ts b/apps/main/src/lib/proxy.test.ts index 3dba79314..4c2d61a31 100644 --- a/apps/main/src/lib/proxy.test.ts +++ b/apps/main/src/lib/proxy.test.ts @@ -40,6 +40,14 @@ describe("proxy", () => { expect(result).toBe(true) }) + it("should handle default port", () => { + // https://github.com/RSSNext/Follow/issues/1197 + const proxy = "http://example.com:80" + const result = setProxyConfig(proxy) + expect(store.set).toHaveBeenCalledWith("proxy", "http://example.com") + expect(result).toBe(true) + }) + it("should return false for invalid proxy", () => { const proxy = "invalid-proxy" const result = setProxyConfig(proxy) diff --git a/apps/main/src/lib/proxy.ts b/apps/main/src/lib/proxy.ts index ed84a78d1..f9e00c8a3 100644 --- a/apps/main/src/lib/proxy.ts +++ b/apps/main/src/lib/proxy.ts @@ -43,12 +43,12 @@ const normalizeProxyUri = (userProxy: string) => { try { const proxyUrl = new URL(firstInput) - if (!URL_SCHEME.has(proxyUrl.protocol) || !proxyUrl.hostname || !proxyUrl.port) { + if (!URL_SCHEME.has(proxyUrl.protocol) || !proxyUrl.hostname) { return } // There are multiple ways to specify a proxy in Electron, // but for security reasons, we only support simple proxy URLs for now. - return `${proxyUrl.protocol}//${proxyUrl.hostname}:${proxyUrl.port}` + return `${proxyUrl.protocol}//${proxyUrl.hostname}${proxyUrl.port ? `:${proxyUrl.port}` : ""}` } catch { return } diff --git a/apps/main/src/lib/store.ts b/apps/main/src/lib/store.ts index 2fa22bd30..bdde93ca6 100644 --- a/apps/main/src/lib/store.ts +++ b/apps/main/src/lib/store.ts @@ -15,6 +15,11 @@ const createOrGetDb = () => { } return db } + +export enum StoreKey { + CacheSizeLimit = "cacheSizeLimit", +} + export const store = { get: (key: string) => { const db = createOrGetDb() @@ -26,4 +31,9 @@ export const store = { db.data[key] = value db.write() }, + delete: (key: string) => { + const db = createOrGetDb() + delete db.data[key] + db.write() + }, } diff --git a/apps/main/src/lib/tray.ts b/apps/main/src/lib/tray.ts new file mode 100644 index 000000000..7207ec3d0 --- /dev/null +++ b/apps/main/src/lib/tray.ts @@ -0,0 +1,67 @@ +import { name } from "@pkg" +import { app, Menu, nativeImage, Tray } from "electron" + +import { isMacOS } from "~/env" +import { getTrayIconPath } from "~/helper" + +import { getMainWindowOrCreate } from "../window" +import { t } from "./i18n" +import { store } from "./store" + +// https://www.electronjs.org/docs/latest/tutorial/tray + +let tray: Tray | null = null + +export const registerAppTray = () => { + if (!getTrayConfig()) return + if (tray) { + destroyAppTray() + } + + const icon = nativeImage.createFromPath(getTrayIconPath()) + // See https://stackoverflow.com/questions/41664208/electron-tray-icon-change-depending-on-dark-theme/41998326#41998326 + const trayIcon = icon.resize({ width: 16 }) + trayIcon.setTemplateImage(true) + tray = new Tray(trayIcon) + + const contextMenu = Menu.buildFromTemplate([ + { + label: t("menu.open", { name }), + click: showWindow, + }, + { label: t("menu.quit", { name }), click: () => app.quit() }, + ]) + tray.setContextMenu(contextMenu) + tray.setToolTip(app.getName()) + tray.on("click", showWindow) +} + +const showWindow = () => { + const mainWindow = getMainWindowOrCreate() + if (!mainWindow) return + if (mainWindow.isMinimized()) { + mainWindow.restore() + } else { + mainWindow.show() + } +} + +const destroyAppTray = () => { + if (tray) { + tray.destroy() + tray = null + } +} + +const DEFAULT_MINIMIZE_TO_TRAY = isMacOS ? false : true + +export const getTrayConfig = (): boolean => store.get("minimizeToTray") ?? DEFAULT_MINIMIZE_TO_TRAY + +export const setTrayConfig = (input: boolean) => { + store.set("minimizeToTray", input) + if (input) { + registerAppTray() + } else { + destroyAppTray() + } +} diff --git a/apps/main/src/menu.ts b/apps/main/src/menu.ts index e985df608..1a73f46fe 100644 --- a/apps/main/src/menu.ts +++ b/apps/main/src/menu.ts @@ -1,3 +1,4 @@ +import { callWindowExpose } from "@follow/shared/bridge" import { dispatchEventOnWindow } from "@follow/shared/event" import { name } from "@pkg" import type { BrowserWindow, MenuItem, MenuItemConstructorOptions } from "electron" @@ -58,7 +59,8 @@ export const registerAppMenu = () => { const mainWindow = getMainWindow() if (!mainWindow) return mainWindow.show() - dispatchEventOnWindow(mainWindow, "QuickAdd") + const caller = callWindowExpose(mainWindow) + caller.quickAdd() }, }, @@ -70,7 +72,9 @@ export const registerAppMenu = () => { const mainWindow = getMainWindow() if (!mainWindow) return mainWindow.show() - dispatchEventOnWindow(mainWindow, "Discover") + + const caller = callWindowExpose(mainWindow) + caller.goToDiscover() }, }, @@ -130,6 +134,18 @@ export const registerAppMenu = () => { { role: "zoomIn", label: t("menu.zoomIn") }, { role: "zoomOut", label: t("menu.zoomOut") }, { type: "separator" }, + { + type: "normal", + label: t("menu.zenMode"), + accelerator: "Ctrl+Shift+Z", + click: () => { + const mainWindow = getMainWindow() + if (!mainWindow) return + + const caller = callWindowExpose(mainWindow) + caller.zenMode() + }, + }, { role: "togglefullscreen", label: t("menu.toggleFullScreen") }, ], }, diff --git a/apps/main/src/tipc/app.ts b/apps/main/src/tipc/app.ts index 0b09a1d7a..3415a59ca 100644 --- a/apps/main/src/tipc/app.ts +++ b/apps/main/src/tipc/app.ts @@ -8,7 +8,10 @@ import type { BrowserWindow } from "electron" import { app, clipboard, dialog, screen } from "electron" import { registerMenuAndContextMenu } from "~/init" -import { clearAllData } from "~/lib/cleaner" +import { clearAllData, getCacheSize } from "~/lib/cleaner" +import { store, StoreKey } from "~/lib/store" +import { registerAppTray } from "~/lib/tray" +import { logger } from "~/logger" import { isWindows11 } from "../env" import { downloadFile } from "../lib/download" @@ -222,6 +225,7 @@ export const appRoute = { switchAppLocale: t.procedure.input().action(async ({ input }) => { i18n.changeLanguage(input) registerMenuAndContextMenu() + registerAppTray() app.commandLine.appendSwitch("lang", input) }), @@ -267,6 +271,27 @@ ${content} return { success: false, error: errorMessage } } }), + + getCacheSize: t.procedure.action(async () => { + return getCacheSize() + }), + getCacheLimit: t.procedure.action(async () => { + return store.get(StoreKey.CacheSizeLimit) + }), + + clearCache: t.procedure.action(async () => { + const cachePath = path.join(app.getPath("userData"), "cache") + await fsp.rm(cachePath, { recursive: true, force: true }) + }), + + limitCacheSize: t.procedure.input().action(async ({ input }) => { + logger.info("set limitCacheSize", input) + if (input === 0) { + store.delete(StoreKey.CacheSizeLimit) + } else { + store.set(StoreKey.CacheSizeLimit, input) + } + }), } interface Sender extends Electron.WebContents { diff --git a/apps/main/src/tipc/dock.ts b/apps/main/src/tipc/dock.ts index ce16a4535..8b6444d5a 100644 --- a/apps/main/src/tipc/dock.ts +++ b/apps/main/src/tipc/dock.ts @@ -4,10 +4,6 @@ import { setDockCount } from "../lib/dock" import { sleep } from "../lib/utils" import { t } from "./_instance" -const timerMap = { - unread: undefined as any, -} - const pollingMap = { unread: false, } @@ -27,8 +23,8 @@ async function updateUnreadCount() { } export async function pollingUpdateUnreadCount() { - if (timerMap.unread) { - timerMap.unread = clearTimeout(timerMap.unread) + if (pollingMap.unread) { + return } pollingMap.unread = true @@ -42,5 +38,4 @@ export async function pollingUpdateUnreadCount() { export async function cancelPollingUpdateUnreadCount() { pollingMap.unread = false - timerMap.unread = clearTimeout(timerMap.unread) } diff --git a/apps/main/src/tipc/menu.ts b/apps/main/src/tipc/menu.ts index 7d05d1889..c5af20eb5 100644 --- a/apps/main/src/tipc/menu.ts +++ b/apps/main/src/tipc/menu.ts @@ -1,57 +1,49 @@ +import type { ActionContext } from "@egoist/tipc/main" import type { MenuItemConstructorOptions, MessageBoxOptions } from "electron" import { dialog, Menu, ShareMenu } from "electron" import { t } from "./_instance" -type MenuItem = ActionMenuItem | { type: "separator" } -export interface ActionMenuItem { - type: "text" - label: string - enabled?: boolean - - shortcut?: string - icon?: string - submenu?: MenuItem[] - checked?: boolean +type SerializableMenuItem = Omit & { + // id: string + submenu?: SerializableMenuItem[] } + +function normalizeMenuItems( + items: SerializableMenuItem[], + context: ActionContext, + path = [] as number[], +): MenuItemConstructorOptions[] { + return items.map((item, index) => { + const curPath = [...path, index] + return { + ...item, + click() { + context.sender.send("menu-click", { + id: item.id, + path: curPath, + }) + }, + submenu: item.submenu ? normalizeMenuItems(item.submenu, context, curPath) : undefined, + } + }) +} + export const menuRoute = { showContextMenu: t.procedure .input<{ - items: Array + items: SerializableMenuItem[] }>() - .action(async ({ input, context }) => { - const menu = Menu.buildFromTemplate(transformMenuItems(input.items)) - - function transformMenuItems(items: MenuItem[], parentIndex?: number) { - return items.map((item, index) => { - if (item.type === "separator") { - return { - type: "separator" as const, - } - } - - return { - label: item.label, - enabled: item.enabled ?? true, - accelerator: item.shortcut?.replace("Meta", "CmdOrCtrl"), - checked: typeof item.checked === "boolean" ? item.checked : undefined, - type: typeof item.checked === "boolean" ? "checkbox" : undefined, - click() { - context.sender.send( - "menu-click", - parentIndex !== undefined ? `${parentIndex}-${index}` : `${index}`, - ) - }, - submenu: item.submenu ? transformMenuItems(item.submenu, index) : undefined, - } as MenuItemConstructorOptions - }) - } + .action(({ input, context }) => { + const defer = Promise.withResolvers() + const normalizedMenuItems = normalizeMenuItems(input.items, context) + // See https://www.electronjs.org/docs/latest/api/menu + const menu = Menu.buildFromTemplate(normalizedMenuItems) menu.popup({ - callback: () => { - context.sender.send("menu-closed") - }, + callback: () => defer.resolve(), }) + return defer.promise }), /** @deprecated */ diff --git a/apps/main/src/tipc/setting.ts b/apps/main/src/tipc/setting.ts index 7bce61971..e6b4247b0 100644 --- a/apps/main/src/tipc/setting.ts +++ b/apps/main/src/tipc/setting.ts @@ -2,6 +2,9 @@ import { createRequire } from "node:module" import { app, nativeTheme } from "electron" +import { START_IN_TRAY_ARGS } from "~/constants/app" +import { getTrayConfig, setTrayConfig } from "~/lib/tray" + import { setDockCount } from "../lib/dock" import { setProxyConfig, updateProxy } from "../lib/proxy" import { store } from "../lib/store" @@ -10,12 +13,12 @@ import { t } from "./_instance" const require = createRequire(import.meta.url) export const settingRoute = { - getLoginItemSettings: t.procedure - .input() - .action(async () => await app.getLoginItemSettings()), + getLoginItemSettings: t.procedure.input().action(async () => app.getLoginItemSettings()), setLoginItemSettings: t.procedure.input().action(async ({ input }) => { app.setLoginItemSettings({ openAtLogin: input, + openAsHidden: true, + args: [START_IN_TRAY_ARGS], }) }), openSettingWindow: t.procedure.action(async () => createSettingWindow()), @@ -37,6 +40,8 @@ export const settingRoute = { store.set("appearance", input) }), + getMinimizeToTray: t.procedure.action(async () => getTrayConfig()), + setMinimizeToTray: t.procedure.input().action(async ({ input }) => setTrayConfig(input)), setDockBadge: t.procedure.input().action(async ({ input }) => { setDockCount(input) }), diff --git a/apps/main/src/window.ts b/apps/main/src/window.ts index ba11ee409..cd5e0122f 100644 --- a/apps/main/src/window.ts +++ b/apps/main/src/window.ts @@ -4,11 +4,13 @@ import { fileURLToPath } from "node:url" import { is } from "@electron-toolkit/utils" import { callWindowExpose } from "@follow/shared/bridge" import type { BrowserWindowConstructorOptions } from "electron" -import { BrowserWindow, screen, shell } from "electron" +import { app, BrowserWindow, screen, shell } from "electron" +import { START_IN_TRAY_ARGS } from "./constants/app" import { isDev, isMacOS, isWindows, isWindows11 } from "./env" import { getIconPath } from "./helper" import { store } from "./lib/store" +import { getTrayConfig } from "./lib/tray" import { logger } from "./logger" import { cancelPollingUpdateUnreadCount, pollingUpdateUnreadCount } from "./tipc/dock" @@ -97,7 +99,9 @@ export function createWindow( }) window.on("ready-to-show", () => { - window?.show() + const shouldShowWindow = + !app.getLoginItemSettings().wasOpenedAsHidden && !process.argv.includes(START_IN_TRAY_ARGS) + if (shouldShowWindow) window.show() }) window.webContents.setWindowOpenHandler((details) => { @@ -214,7 +218,8 @@ export const createMainWindow = () => { windows.mainWindow = window window.on("close", (event) => { - if (isMacOS) { + const minimizeToTray = getTrayConfig() + if (isMacOS || minimizeToTray) { event.preventDefault() if (window.isFullScreen()) { window.once("leave-full-screen", () => { @@ -282,7 +287,7 @@ export const getMainWindow = () => windows.mainWindow export const getMainWindowOrCreate = () => { if (!windows.mainWindow) { - createMainWindow() + return createMainWindow() } return windows.mainWindow } diff --git a/apps/renderer/__debug_proxy.html b/apps/renderer/__debug_proxy.html index cb7b7d651..f37365d8e 100644 --- a/apps/renderer/__debug_proxy.html +++ b/apps/renderer/__debug_proxy.html @@ -1,94 +1,24 @@ - - - - - - - - - - - Follow - - + Debug Proxy + - -
- -
-
-
-
-
- + diff --git a/apps/renderer/__debug_proxy.ts b/apps/renderer/__debug_proxy.ts new file mode 100644 index 000000000..639991931 --- /dev/null +++ b/apps/renderer/__debug_proxy.ts @@ -0,0 +1,49 @@ +const host = "https://localhost:2233" + +globalThis["__DEBUG_PROXY__"] = true + +fetch(`${host}`) + .then((res) => res.text()) + .then((html) => { + const parser = new DOMParser() + const doc = parser.parseFromString(html, "text/html") + + const scripts = doc.querySelectorAll("script") + + scripts.forEach((script) => { + script.remove() + }) + + // header meta + + const $meta = doc.head.querySelectorAll("meta") + $meta.forEach((meta) => { + document.head.append(meta) + }) + + const $style = doc.head.querySelectorAll("style") + $style.forEach((style) => { + document.head.append(style) + }) + + document.body.innerHTML = doc.body.innerHTML + + scripts.forEach((script) => { + const $script = document.createElement("script") + $script.type = "module" + $script.crossOrigin = script.crossOrigin + + if (script.src) { + $script.src = new URL( + script.src.startsWith("http") ? new URL(script.src).pathname : script.src, + host, + ).toString() + } else if (script.innerHTML) { + $script.innerHTML = script.innerHTML + } else { + return + } + + document.body.append($script) + }) + }) diff --git a/apps/renderer/package.json b/apps/renderer/package.json index b8385ce59..189734a5b 100644 --- a/apps/renderer/package.json +++ b/apps/renderer/package.json @@ -10,16 +10,17 @@ "typecheck": "tsc --noEmit" }, "dependencies": { + "@dnd-kit/core": "^6.1.0", "@egoist/tipc": "0.3.2", "@electron-toolkit/preload": "^3.0.1", "@follow/electron-main": "workspace:*", "@follow/shared": "workspace:*", "@fontsource/sn-pro": "5.1.0", - "@headlessui/react": "2.1.10", - "@hono/auth-js": "1.0.11", - "@hookform/resolvers": "3.9.0", - "@lottiefiles/dotlottie-react": "0.9.1", - "@microflash/remark-callout-directives": "4.3.1", + "@headlessui/react": "2.2.0", + "@hono/auth-js": "1.0.13", + "@hookform/resolvers": "3.9.1", + "@lottiefiles/dotlottie-react": "0.9.3", + "@microflash/remark-callout-directives": "4.3.2", "@openpanel/web": "1.0.1", "@radix-ui/react-avatar": "1.1.1", "@radix-ui/react-context-menu": "2.2.2", @@ -30,32 +31,33 @@ "@radix-ui/react-popover": "1.1.2", "@radix-ui/react-slider": "^1.2.1", "@radix-ui/react-slot": "1.1.0", - "@sentry/react": "8.34.0", - "@shikijs/transformers": "1.22.0", - "@tanstack/query-sync-storage-persister": "5.59.13", - "@tanstack/react-query": "5.59.14", - "@tanstack/react-query-devtools": "5.59.14", - "@tanstack/react-query-persist-client": "5.59.14", + "@sentry/react": "8.36.0", + "@shikijs/transformers": "1.22.2", + "@tanstack/query-sync-storage-persister": "5.59.17", + "@tanstack/react-query": "5.59.19", + "@tanstack/react-query-devtools": "5.59.19", + "@tanstack/react-query-persist-client": "5.59.19", "@use-gesture/react": "10.3.1", "@welldone-software/why-did-you-render": "8.0.3", "@yornaath/batshit": "0.10.1", "camelcase-keys": "9.1.3", "click-to-react-component": "1.1.0", "clsx": "2.1.1", - "cmdk": "1.0.0", + "cmdk": "1.0.3", "dayjs": "1.11.13", - "dexie": "4.0.8", + "dexie": "4.0.9", + "dexie-export-import": "^4.1.2", "dnum": "^2.14.0", "electron-log": "5.2.0", "firebase": "10.14.1", - "foxact": "0.2.39", - "framer-motion": "11.11.9", + "foxact": "0.2.41", + "framer-motion": "11.11.11", "franc-min": "6.2.0", "fuse.js": "7.0.0", "hast-util-to-jsx-runtime": "2.3.2", "hast-util-to-mdast": "^10.1.0", "hast-util-to-text": "4.0.2", - "i18next": "^23.16.0", + "i18next": "^23.16.4", "i18next-browser-languagedetector": "8.0.0", "idb-keyval": "6.2.1", "immer": "10.1.1", @@ -65,8 +67,8 @@ "lodash-es": "4.17.21", "masonic": "4.0.1", "mdast-util-gfm-table": "^2.0.0", - "mdast-util-to-markdown": "^2.1.0", - "nanoid": "5.0.7", + "mdast-util-to-markdown": "^2.1.1", + "nanoid": "5.0.8", "ofetch": "1.4.1", "path-to-regexp": "8.2.0", "plain-shiki": "0.0.12", @@ -74,9 +76,9 @@ "react-blurhash": "^0.3.0", "react-error-boundary": "4.1.2", "react-fast-marquee": "1.6.5", - "react-hook-form": "7.53.0", - "react-hotkeys-hook": "4.5.1", - "react-i18next": "^15.0.3", + "react-hook-form": "7.53.1", + "react-hotkeys-hook": "4.6.1", + "react-i18next": "^15.1.0", "react-intersection-observer": "9.13.1", "react-resizable-layout": "npm:@innei/react-resizable-layout@0.7.3-fork.1", "react-router-dom": "6.27.0", @@ -92,20 +94,21 @@ "remark-gh-alerts": "0.0.3", "remark-parse": "11.0.0", "remark-rehype": "11.1.1", - "shiki": "1.22.0", - "sonner": "^1.5.0", + "shiki": "1.22.2", + "sonner": "1.5.0", "swiper": "11.1.14", - "tldts": "6.1.51", + "tldts": "6.1.58", "unified": "11.0.5", + "unist-util-visit-parents": "^6.0.1", "use-context-selector": "2.0.0", "use-sync-external-store": "1.2.2", "usehooks-ts": "3.1.0", "vfile": "6.0.3", "zod": "3.23.8", - "zustand": "5.0.0" + "zustand": "5.0.1" }, "devDependencies": { - "@babel/generator": "7.25.7", + "@babel/generator": "7.26.2", "@follow/atoms": "workspace:*", "@follow/components": "workspace:*", "@follow/constants": "workspace:*", @@ -114,14 +117,14 @@ "@follow/shared": "workspace:*", "@follow/types": "workspace:*", "@follow/utils": "workspace:*", - "@hono/node-server": "1.13.2", + "@hono/node-server": "1.13.4", "@types/katex": "0.16.7", "@types/lodash-es": "4.17.12", - "@types/node": "^22.7.5", - "@types/react": "^18.3.11", + "@types/node": "^22.8.7", + "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", "fake-indexeddb": "6.0.0", - "happy-dom": "15.7.4", + "happy-dom": "15.8.0", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/apps/renderer/src/App.tsx b/apps/renderer/src/App.tsx index 317952953..e6509ab6a 100644 --- a/apps/renderer/src/App.tsx +++ b/apps/renderer/src/App.tsx @@ -1,6 +1,6 @@ import { IN_ELECTRON } from "@follow/shared/constants" import { cn, getOS } from "@follow/utils/utils" -import { useEffect, useLayoutEffect } from "react" +import { useEffect } from "react" import { Outlet } from "react-router-dom" import { queryClient } from "~/lib/query-client" @@ -29,22 +29,6 @@ function App() { return cleanup }, []) - useLayoutEffect(() => { - // Electron app register in app scope, but web app should register in window scope - if (IN_ELECTRON) return - const handleOpenSettings = (e) => { - if (e.key === "," && (e.metaKey || e.ctrlKey)) { - window.router.showSettings() - e.preventDefault() - } - } - document.addEventListener("keydown", handleOpenSettings) - - return () => { - document.removeEventListener("keydown", handleOpenSettings) - } - }, []) - const windowsElectron = IN_ELECTRON && getOS() === "Windows" return ( @@ -69,6 +53,8 @@ const AppLayer = () => { const appIsReady = useAppIsReady() useEffect(() => { + document.querySelector("#app-skeleton")?.remove() + const doneTime = Math.trunc(performance.now()) window.analytics?.capture("ui_render_init", { time: doneTime, @@ -76,8 +62,6 @@ const AppLayer = () => { appLog("App is ready", `${doneTime}ms`) applyAfterReadyCallbacks() - - document.querySelector("#app-skeleton")?.remove() }, [appIsReady]) return appIsReady ? : diff --git a/apps/renderer/src/atoms/context-menu.ts b/apps/renderer/src/atoms/context-menu.ts new file mode 100644 index 000000000..29a0fe229 --- /dev/null +++ b/apps/renderer/src/atoms/context-menu.ts @@ -0,0 +1,177 @@ +import { IN_ELECTRON } from "@follow/shared/constants" +import { getOS } from "@follow/utils/utils" +import { atom } from "jotai" +import { useCallback } from "react" + +import { tipcClient } from "~/lib/client" +import { createAtomHooks } from "~/lib/jotai" +import type { ElectronMenuItem } from "~/lib/native-menu" +import { showElectronContextMenu } from "~/lib/native-menu" + +// Atom + +type ContextMenuState = + | { open: false } + | { + open: true + position: { x: number; y: number } + menuItems: FollowMenuItem[] + // Just for abort callback + // Also can be optimized by using the `atomWithListeners` + abortController: AbortController + } + +export const [contextMenuAtom, useContextMenuState, useContextMenuValue, useSetContextMenu] = + createAtomHooks(atom({ open: false })) + +const useShowWebContextMenu = () => { + const setContextMenu = useSetContextMenu() + + const showWebContextMenu = useCallback( + async (menuItems: Array, e: MouseEvent | React.MouseEvent) => { + const abortController = new AbortController() + const resolvers = Promise.withResolvers() + setContextMenu({ + open: true, + position: { x: e.clientX, y: e.clientY }, + menuItems, + abortController, + }) + + abortController.signal.addEventListener("abort", () => { + resolvers.resolve() + }) + return resolvers.promise + }, + [setContextMenu], + ) + + return showWebContextMenu +} + +// Menu + +type BaseMenuItemText = { + type: "text" + label: string + click?: () => void + /** only work in web app */ + icon?: React.ReactNode + shortcut?: string + disabled?: boolean + checked?: boolean + supportMultipleSelection?: boolean +} + +type BaseMenuItemSeparator = { + type: "separator" + disabled?: boolean +} + +type BaseMenuItem = BaseMenuItemText | BaseMenuItemSeparator + +export type FollowMenuItem = BaseMenuItem & { + submenu?: FollowMenuItem[] +} + +export type MenuItemInput = + | (BaseMenuItemText & { hide?: boolean; submenu?: MenuItemInput[] }) + | (BaseMenuItemSeparator & { hide?: boolean }) + | null + | undefined + | false + | "" + +function sortShortcutsString(shortcut: string) { + const order = ["Shift", "Ctrl", "Meta", "Alt"] + let nextShortcut = shortcut + if (getOS() === "Windows") { + nextShortcut = shortcut.replace("Meta", "Ctrl").replace("meta", "ctrl") + } + const arr = nextShortcut.split("+") + + const sortedModifiers = arr + .filter((key) => order.includes(key)) + .sort((a, b) => order.indexOf(a) - order.indexOf(b)) + + const otherKeys = arr.filter((key) => !order.includes(key)) + + return [...sortedModifiers, ...otherKeys].join("+") +} + +function normalizeMenuItems(items: MenuItemInput[]): FollowMenuItem[] { + return items + .filter((item) => item !== null && item !== undefined && item !== false && item !== "") + .filter((item) => !item.hide) + .map((item) => { + if (item.type === "separator") { + return item + } + + return { + ...item, + shortcut: item.shortcut ? sortShortcutsString(item.shortcut) : undefined, + submenu: item.submenu ? normalizeMenuItems(item.submenu) : undefined, + } + }) +} + +// MenuItem must have at least one of label, role or type +function transformMenuItemsForNative(nextItems: FollowMenuItem[]): ElectronMenuItem[] { + return nextItems.map((item) => { + if (item.type === "separator") { + return { type: "separator" } + } + return { + type: typeof item.checked === "boolean" ? "checkbox" : undefined, + label: item.label, + click: item.click, + enabled: + (!item.disabled && item.click !== undefined) || (!!item.submenu && item.submenu.length > 0), + accelerator: item.shortcut?.replace("Meta", "CmdOrCtrl"), + checked: typeof item.checked === "boolean" ? item.checked : undefined, + submenu: item.submenu ? transformMenuItemsForNative(item.submenu) : undefined, + } + }) +} + +function withDebugMenu(menuItems: Array, e: MouseEvent | React.MouseEvent) { + if (import.meta.env.DEV && e) { + menuItems.push( + { + type: "separator" as const, + }, + { + type: "text" as const, + label: "Inspect Element", + click: () => { + tipcClient?.inspectElement({ + x: e.pageX, + y: e.pageY, + }) + }, + }, + ) + } + return menuItems +} + +export const useShowContextMenu = () => { + const showWebContextMenu = useShowWebContextMenu() + + const showContextMenu = useCallback( + async (inputMenu: Array, e: MouseEvent | React.MouseEvent) => { + const menuItems = normalizeMenuItems(inputMenu) + // only show native menu on macOS electron, because in other platform, the native ui is not good + if (IN_ELECTRON && getOS() === "macOS") { + withDebugMenu(menuItems, e) + await showElectronContextMenu(transformMenuItemsForNative(menuItems)) + return + } + await showWebContextMenu(menuItems, e) + }, + [showWebContextMenu], + ) + + return showContextMenu +} diff --git a/apps/renderer/src/atoms/settings/general.ts b/apps/renderer/src/atoms/settings/general.ts index e16703fe9..671ac46aa 100644 --- a/apps/renderer/src/atoms/settings/general.ts +++ b/apps/renderer/src/atoms/settings/general.ts @@ -10,6 +10,7 @@ const createDefaultSettings = (): GeneralSettings => ({ // Data control dataPersist: true, sendAnonymousData: true, + reduceRefetch: true, // view unreadOnly: false, diff --git a/apps/renderer/src/atoms/settings/ui.ts b/apps/renderer/src/atoms/settings/ui.ts index abd685b44..ed8b83b23 100644 --- a/apps/renderer/src/atoms/settings/ui.ts +++ b/apps/renderer/src/atoms/settings/ui.ts @@ -1,8 +1,8 @@ import { createSettingAtom } from "@follow/atoms/helper/setting.js" import type { UISettings } from "@follow/shared/interface/settings" -import { atom, useAtomValue } from "jotai" - -import { internal_feedColumnShowAtom } from "../sidebar" +import { jotaiStore } from "@follow/utils/jotai" +import { atom, useAtomValue, useSetAtom } from "jotai" +import { useEventCallback } from "usehooks-ts" export const createDefaultSettings = (): UISettings => ({ // Sidebar @@ -42,6 +42,8 @@ export const createDefaultSettings = (): UISettings => ({ wideMode: false, }) +const zenModeAtom = atom(false) + export const { useSettingKey: useUISettingKey, useSettingSelector: useUISettingSelector, @@ -61,9 +63,28 @@ export const uiServerSyncWhiteListKeys: (keyof UISettings)[] = [ "customCSS", ] -const isZenModeAtom = atom((get) => { - const ui = get(__uiSettingAtom) - return ui.wideMode && !get(internal_feedColumnShowAtom) -}) +export const useIsZenMode = () => useAtomValue(zenModeAtom) +export const getIsZenMode = () => jotaiStore.get(zenModeAtom) -export const useIsZenMode = () => useAtomValue(isZenModeAtom) +export const useSetZenMode = () => { + const setZenMode = useSetAtom(zenModeAtom) + return useEventCallback((checked: boolean) => { + setZenMode(checked) + }) +} + +export const useToggleZenMode = () => { + const setZenMode = useSetZenMode() + const isZenMode = useIsZenMode() + return useEventCallback(() => { + const newIsZenMode = !isZenMode + document.documentElement.dataset.zenMode = newIsZenMode.toString() + setZenMode(newIsZenMode) + }) +} + +export const useRealInWideMode = () => { + const wideMode = useUISettingKey("wideMode") + const isZenMode = useIsZenMode() + return wideMode || isZenMode +} diff --git a/apps/renderer/src/atoms/sidebar.ts b/apps/renderer/src/atoms/sidebar.ts index f39b05478..910e70c22 100644 --- a/apps/renderer/src/atoms/sidebar.ts +++ b/apps/renderer/src/atoms/sidebar.ts @@ -4,6 +4,8 @@ import { atom } from "jotai" import { getRouteParams } from "~/hooks/biz/useRouteParams" import { createAtomHooks } from "~/lib/jotai" +import { getIsZenMode, useIsZenMode } from "./settings/ui" + const defaultFeedView = FeedViewType.Articles const viewAtom = atom(-1) const [ @@ -48,14 +50,20 @@ viewAtom.onMount = () => { setSidebarActiveView(view) } } -export const [ - internal_feedColumnShowAtom, - , - useFeedColumnShow, - , - getFeedColumnShow, - setFeedColumnShow, -] = createAtomHooks(atom(true)) +const [, , internal_useFeedColumnShow, , internal_getFeedColumnShow, setFeedColumnShow] = + createAtomHooks(atom(true)) + +export const useFeedColumnShow = () => { + const isZenMode = useIsZenMode() + return internal_useFeedColumnShow() && !isZenMode +} + +export const getFeedColumnShow = () => { + const isZenMode = getIsZenMode() + return internal_getFeedColumnShow() && !isZenMode +} + +export { setFeedColumnShow } export const [, , useFeedColumnTempShow, , getFeedColumnTempShow, setFeedColumnTempShow] = createAtomHooks(atom(false)) diff --git a/apps/renderer/src/components/common/ErrorElement.tsx b/apps/renderer/src/components/common/ErrorElement.tsx index 2c8ae4f1e..08e97f22b 100644 --- a/apps/renderer/src/components/common/ErrorElement.tsx +++ b/apps/renderer/src/components/common/ErrorElement.tsx @@ -20,6 +20,10 @@ export function ErrorElement() { : JSON.stringify(error) const stack = error instanceof Error ? error.stack : null + useEffect(() => { + document.querySelector("#app-skeleton")?.remove() + }, []) + useEffect(() => { console.error("Error handled by React Router default ErrorBoundary:", error) @@ -78,7 +82,7 @@ export function ErrorElement() { - +
@@ -89,15 +93,18 @@ export function ErrorElement() { export const FeedbackIssue = ({ message, stack, + error, }: { message: string stack: string | null | undefined + error?: unknown }) => (

Still having this issue? Please give feedback in GitHub, thanks! = ({ resetError, error }) => { diff --git a/apps/renderer/src/components/errors/FeedNotFound.tsx b/apps/renderer/src/components/errors/FeedNotFound.tsx index 3bf105e0e..d572f7288 100644 --- a/apps/renderer/src/components/errors/FeedNotFound.tsx +++ b/apps/renderer/src/components/errors/FeedNotFound.tsx @@ -3,8 +3,9 @@ import { Button } from "@follow/components/ui/button/index.js" import type { FC } from "react" import { useNavigate } from "react-router-dom" +import { CustomSafeError } from "../../errors/CustomSafeError" import type { AppErrorFallbackProps } from "../common/AppErrorBoundary" -import { CustomSafeError, useResetErrorWhenRouteChange } from "./helper" +import { useResetErrorWhenRouteChange } from "./helper" const FeedNotFoundErrorFallback: FC = ({ resetError, error }) => { if (!(error instanceof FeedNotFound)) { diff --git a/apps/renderer/src/components/errors/ModalError.tsx b/apps/renderer/src/components/errors/ModalError.tsx index 03024282d..1b14fa6fb 100644 --- a/apps/renderer/src/components/errors/ModalError.tsx +++ b/apps/renderer/src/components/errors/ModalError.tsx @@ -45,7 +45,7 @@ const ModalErrorFallback: FC = (props) => {

- + ) diff --git a/apps/renderer/src/components/errors/PageError.tsx b/apps/renderer/src/components/errors/PageError.tsx index e90163359..fa89a7378 100644 --- a/apps/renderer/src/components/errors/PageError.tsx +++ b/apps/renderer/src/components/errors/PageError.tsx @@ -38,7 +38,7 @@ const PageErrorFallback: FC = (props) => { - + ) diff --git a/apps/renderer/src/components/errors/RSSHubError.tsx b/apps/renderer/src/components/errors/RSSHubError.tsx index 1bfea7afc..ca269b38f 100644 --- a/apps/renderer/src/components/errors/RSSHubError.tsx +++ b/apps/renderer/src/components/errors/RSSHubError.tsx @@ -23,7 +23,7 @@ const RSSHubErrorFallback: FC = (props) => { ) : null} - + ) diff --git a/apps/renderer/src/components/errors/helper.ts b/apps/renderer/src/components/errors/helper.ts index ca745671c..b80fbe894 100644 --- a/apps/renderer/src/components/errors/helper.ts +++ b/apps/renderer/src/components/errors/helper.ts @@ -1,10 +1,7 @@ -import { nextFrame } from "@follow/utils/dom" import type { FC } from "react" import { createElement, useEffect, useRef } from "react" import { useLocation } from "react-router-dom" -import { createErrorToaster } from "~/lib/error-parser" - import type { AppErrorFallbackProps } from "../common/AppErrorBoundary" export const parseError = (error: unknown): { message?: string; stack?: string } => { @@ -21,16 +18,6 @@ export const parseError = (error: unknown): { message?: string; stack?: string } } } -// TODO: move this -export class CustomSafeError extends Error { - constructor(message: string, toast?: boolean) { - super(message) - if (toast) { - nextFrame(() => createErrorToaster(message)(this)) - } - } -} - export const useResetErrorWhenRouteChange = (resetError: () => void) => { const location = useLocation() const currentPathnameRef = useRef(location.pathname) diff --git a/apps/renderer/src/components/ui/auto-completion/AutoCompletion.tsx b/apps/renderer/src/components/ui/auto-completion/AutoCompletion.tsx index 809cacce9..d196c085e 100644 --- a/apps/renderer/src/components/ui/auto-completion/AutoCompletion.tsx +++ b/apps/renderer/src/components/ui/auto-completion/AutoCompletion.tsx @@ -1,4 +1,5 @@ import { Input } from "@follow/components/ui/input/index.js" +import { useCorrectZIndex } from "@follow/components/ui/z-index/ctx.js" import { stopPropagation } from "@follow/utils/dom" import { cn } from "@follow/utils/utils" import { Combobox, ComboboxInput, ComboboxOption, ComboboxOptions } from "@headlessui/react" @@ -6,8 +7,6 @@ import { AnimatePresence, m } from "framer-motion" import Fuse from "fuse.js" import { forwardRef, Fragment, useCallback, useEffect, useState } from "react" -import { useCorrectZIndex } from "../modal/stacked/hooks" - export type Suggestion = { name: string value: string @@ -87,7 +86,7 @@ export const Autocomplete = forwardRef( {...inputProps} /> - {open && ( + {open && filterableSuggestions.length > 0 && ( -
+
{elements.map((element) => element)}
diff --git a/apps/renderer/src/components/ui/markdown/components/Toc.tsx b/apps/renderer/src/components/ui/markdown/components/Toc.tsx index 248a3d0d5..80505cfaf 100644 --- a/apps/renderer/src/components/ui/markdown/components/Toc.tsx +++ b/apps/renderer/src/components/ui/markdown/components/Toc.tsx @@ -18,7 +18,7 @@ import { } from "react" import { useEventCallback } from "usehooks-ts" -import { useUISettingKey } from "~/atoms/settings/ui" +import { useRealInWideMode } from "~/atoms/settings/ui" import { useGetWrappedElementPosition, useWrappedElementPosition, @@ -58,7 +58,7 @@ export const Toc: Component = ({ className, onItemClick }) => { const renderContentElementPosition = useWrappedElementPosition() const renderContentElementSize = useWrappedElementSize() - const entryContentInWideMode = useUISettingKey("wideMode") + const entryContentInWideMode = useRealInWideMode() const shouldShowTitle = useViewport((v) => { if (!entryContentInWideMode) return false const { w } = v diff --git a/apps/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx b/apps/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx index 089dd1f0c..38abc3d03 100644 --- a/apps/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx +++ b/apps/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx @@ -4,6 +4,7 @@ import { TooltipPortal, TooltipTrigger, } from "@follow/components/ui/tooltip/index.jsx" +import { useCorrectZIndex } from "@follow/components/ui/z-index/ctx.js" import { useContext } from "react" import type { LinkProps } from "../../link" @@ -17,6 +18,7 @@ export const MarkdownLink = (props: LinkProps) => { const populatedFullHref = transformUrl(props.href) const parseTimeStamp = isAudio(populatedFullHref) + const zIndex = useCorrectZIndex(0) if (parseTimeStamp) { const childrenText = props.children @@ -30,6 +32,7 @@ export const MarkdownLink = (props: LinkProps) => {
{ {!!props.href && ( - + {populatedFullHref} diff --git a/apps/renderer/src/components/ui/media.tsx b/apps/renderer/src/components/ui/media.tsx index 2fab62b7f..756815bfd 100644 --- a/apps/renderer/src/components/ui/media.tsx +++ b/apps/renderer/src/components/ui/media.tsx @@ -179,7 +179,7 @@ const MediaImpl: FC = ({ onError={errorHandle} className={cn( "size-full object-contain", - // "bg-gray-200 dark:bg-neutral-800", + inline && "size-auto", popper && "cursor-zoom-in", "duration-200", mediaLoadState === "loaded" ? "opacity-100" : "opacity-0", @@ -226,6 +226,7 @@ const MediaImpl: FC = ({ src, thumbnail, type, + inline, ]) if (!type || !src) return null @@ -268,7 +269,7 @@ const MediaImpl: FC = ({ return ( {!!props.width && !!props.height && !!containerWidth ? ( diff --git a/apps/renderer/src/components/ui/media/VideoPlayer.tsx b/apps/renderer/src/components/ui/media/VideoPlayer.tsx index b51743992..b4a9a7e8a 100644 --- a/apps/renderer/src/components/ui/media/VideoPlayer.tsx +++ b/apps/renderer/src/components/ui/media/VideoPlayer.tsx @@ -344,6 +344,7 @@ const VolumeControl = () => { return ( } + enableHoverableContent onClick={() => { if (muted) { controls.unmute() @@ -377,7 +378,7 @@ const PlayProgressBar = () => { }) return ( void label: React.ReactNode children?: React.ReactNode shortcut?: string + enableHoverableContent?: boolean }) => { return ( {children || } diff --git a/apps/renderer/src/components/ui/media/VolumeSlider.tsx b/apps/renderer/src/components/ui/media/VolumeSlider.tsx index 1f5467511..3bc599460 100644 --- a/apps/renderer/src/components/ui/media/VolumeSlider.tsx +++ b/apps/renderer/src/components/ui/media/VolumeSlider.tsx @@ -6,7 +6,7 @@ export const VolumeSlider: FC<{ onVolumeChange: (volume: number) => void }> = ({ onVolumeChange, volume }) => ( - + ) diff --git a/apps/renderer/src/components/ui/modal/components/close.tsx b/apps/renderer/src/components/ui/modal/components/close.tsx index 0a5941a47..f08a3e703 100644 --- a/apps/renderer/src/components/ui/modal/components/close.tsx +++ b/apps/renderer/src/components/ui/modal/components/close.tsx @@ -12,7 +12,7 @@ export const FixedModalCloseButton: Component<{ useContextSelector(CurrentModalStateContext, (v) => v.isTop) - -export const useCorrectZIndex = (fallbackZIndex = 0) => { - const inModal = useCurrentModal() - - return useAtomValue( - useMemo( - () => - selectAtom(modalStackAtom, (v) => - inModal ? v.length + MODAL_STACK_Z_INDEX + inModal.getIndex() + 1 : fallbackZIndex, - ), - [fallbackZIndex, inModal], - ), - ) -} diff --git a/apps/renderer/src/components/ui/modal/stacked/modal.tsx b/apps/renderer/src/components/ui/modal/stacked/modal.tsx index e56d7bd97..8254ab6d7 100644 --- a/apps/renderer/src/components/ui/modal/stacked/modal.tsx +++ b/apps/renderer/src/components/ui/modal/stacked/modal.tsx @@ -1,13 +1,15 @@ import { Divider } from "@follow/components/ui/divider/index.js" import { RootPortalProvider } from "@follow/components/ui/portal/provider.js" import { EllipsisHorizontalTextWithTooltip } from "@follow/components/ui/typography/index.js" +import { ZIndexProvider } from "@follow/components/ui/z-index/index.js" import { useRefValue } from "@follow/hooks" import { nextFrame, preventDefault, stopPropagation } from "@follow/utils/dom" import { cn, getOS } from "@follow/utils/utils" import * as Dialog from "@radix-ui/react-dialog" import type { BoundingBox } from "framer-motion" import { produce } from "immer" -import { useSetAtom } from "jotai" +import { useAtomValue, useSetAtom } from "jotai" +import { selectAtom } from "jotai/utils" import { Resizable } from "re-resizable" import type { FC, PropsWithChildren, SyntheticEvent } from "react" import { @@ -405,6 +407,14 @@ const ModalContext: FC< isTop: boolean } > = ({ modalContextProps, isTop, children }) => { + const { getIndex } = modalContextProps + const zIndex = useAtomValue( + useMemo( + () => selectAtom(modalStackAtom, (v) => v.length + MODAL_STACK_Z_INDEX + getIndex() + 1), + [getIndex], + ), + ) + return ( - {children} + {children} ) diff --git a/apps/renderer/src/components/ui/modal/stacked/provider.tsx b/apps/renderer/src/components/ui/modal/stacked/provider.tsx index 68d49b30f..ecbcdfce5 100644 --- a/apps/renderer/src/components/ui/modal/stacked/provider.tsx +++ b/apps/renderer/src/components/ui/modal/stacked/provider.tsx @@ -4,7 +4,15 @@ import type { FC, PropsWithChildren } from "react" import { useEffect } from "react" import { modalStackAtom } from "./atom" +import { useModalStack } from "./hooks" import { ModalInternal } from "./modal" +import type { ModalProps } from "./types" + +declare global { + interface Window { + presentModal: (modal: ModalProps) => void + } +} export const ModalStackProvider: FC = ({ children }) => ( <> @@ -14,6 +22,9 @@ export const ModalStackProvider: FC = ({ children }) => ( ) const ModalStack = () => { + const { present } = useModalStack() + window.presentModal = present + const stack = useAtomValue(modalStackAtom) const topModalIndex = stack.findLastIndex((item) => item.modal) diff --git a/apps/renderer/src/constants/shortcuts.ts b/apps/renderer/src/constants/shortcuts.ts index 153126649..a92ba8d00 100644 --- a/apps/renderer/src/constants/shortcuts.ts +++ b/apps/renderer/src/constants/shortcuts.ts @@ -32,6 +32,10 @@ export const shortcuts: Shortcuts = { name: "keys.layout.toggleWideMode", key: "Meta+[", }, + zenMode: { + name: "keys.layout.zenMode", + key: "Control+Shift+Z", + }, }, entries: { refetch: { diff --git a/apps/renderer/src/database/db.test.ts b/apps/renderer/src/database/db.test.ts new file mode 100644 index 000000000..f17167f8e --- /dev/null +++ b/apps/renderer/src/database/db.test.ts @@ -0,0 +1,36 @@ +import { afterEach } from "node:test" + +import { describe, expect, it } from "vitest" + +import { browserDB } from "./db" + +describe("upgradeToV8", () => { + afterEach(async () => { + await browserDB.delete() + }) + + it("should set tipUsers to an empty array if tipUsers is not an array", async () => { + const insertFeeds = [ + { id: 1, tipUsers: {} }, + { id: 2, tipUsers: null }, + { id: 3, tipUsers: [{ name: "user1" }] }, + ] + // @ts-expect-error + await browserDB.feeds.bulkAdd(insertFeeds) + + const feeds = await browserDB.feeds.toArray() + expect(feeds.length).toEqual(3) + expect(feeds[0].tipUsers).toEqual(insertFeeds[0].tipUsers) + expect(feeds[1].tipUsers).toEqual(insertFeeds[1].tipUsers) + expect(feeds[2].tipUsers).toEqual(insertFeeds[2].tipUsers) + + await browserDB.transaction("rw", [browserDB.feeds], async (tx) => { + await browserDB.upgradeToV8(tx) + }) + const feedsAfterMigrate = await browserDB.feeds.toArray() + expect(feedsAfterMigrate.length).toEqual(3) + expect(feedsAfterMigrate[0].tipUsers).toEqual([]) + expect(feedsAfterMigrate[1].tipUsers).toEqual(null) + expect(feedsAfterMigrate[2].tipUsers).toEqual([{ name: "user1" }]) + }) +}) diff --git a/apps/renderer/src/database/db.ts b/apps/renderer/src/database/db.ts index 1940677aa..0706c31bd 100644 --- a/apps/renderer/src/database/db.ts +++ b/apps/renderer/src/database/db.ts @@ -1,3 +1,5 @@ +import "dexie-export-import" + import type { Transaction } from "dexie" import Dexie from "dexie" @@ -10,6 +12,7 @@ import { dbSchemaV5, dbSchemaV6, dbSchemaV7, + dbSchemaV8, } from "./db_schema" import type { DB_Cleaner } from "./schemas/cleaner" import type { DB_Entry, DB_EntryRelated } from "./schemas/entry" @@ -49,6 +52,7 @@ class BrowserDB extends Dexie { this.version(5).stores(dbSchemaV5) this.version(6).stores(dbSchemaV6) this.version(7).stores(dbSchemaV7) + this.version(8).stores(dbSchemaV8).upgrade(this.upgradeToV8) this.entries = this.table("entries") this.feeds = this.table("feeds") @@ -64,10 +68,28 @@ class BrowserDB extends Dexie { const session = trans.table("feedUnreads") session.delete("feedId") } + + async upgradeToV8(trans: Transaction) { + // Fix https://github.com/RSSNext/Follow/issues/1308 + const session = trans.table("feeds") + return session.toCollection().modify((feed) => { + if (!feed.tipUsers || Array.isArray(feed.tipUsers)) return + feed.tipUsers = [] + }) + } } export const browserDB = new BrowserDB() +export const exportDB = async () => { + const blob = await browserDB.export({ prettyJson: true }) + const url = URL.createObjectURL(blob) + const a = document.createElement("a") + a.href = url + a.download = `${LOCAL_DB_NAME}.json` + a.click() +} + // ================================================ // // ================================================ // // ================================================ // diff --git a/apps/renderer/src/database/db_schema.ts b/apps/renderer/src/database/db_schema.ts index 079089555..49ff4cc50 100644 --- a/apps/renderer/src/database/db_schema.ts +++ b/apps/renderer/src/database/db_schema.ts @@ -38,3 +38,5 @@ export const dbSchemaV7 = { ...dbSchemaV6, inboxes: "&id", } + +export const dbSchemaV8 = dbSchemaV7 diff --git a/apps/renderer/src/errors/CustomSafeError.ts b/apps/renderer/src/errors/CustomSafeError.ts new file mode 100644 index 000000000..d494ac4ed --- /dev/null +++ b/apps/renderer/src/errors/CustomSafeError.ts @@ -0,0 +1,12 @@ +import { nextFrame } from "@follow/utils/dom" + +import { createErrorToaster } from "~/lib/error-parser" + +export class CustomSafeError extends Error { + constructor(message: string, toast?: boolean) { + super(message) + if (toast) { + nextFrame(() => createErrorToaster(message)(this)) + } + } +} diff --git a/apps/renderer/src/hooks/biz/useEntryActions.tsx b/apps/renderer/src/hooks/biz/useEntryActions.tsx index 3deefa91b..07ddae239 100644 --- a/apps/renderer/src/hooks/biz/useEntryActions.tsx +++ b/apps/renderer/src/hooks/biz/useEntryActions.tsx @@ -1,32 +1,20 @@ -import { - SimpleIconsEagle, - SimpleIconsInstapaper, - SimpleIconsObsidian, - SimpleIconsOmnivore, - SimpleIconsOutline, - SimpleIconsReadwise, -} from "@follow/components/ui/platform-icon/icons.js" import { FeedViewType } from "@follow/constants" import type { CombinedEntryModel } from "@follow/models/types" import { IN_ELECTRON } from "@follow/shared/constants" import { nextFrame } from "@follow/utils/dom" import { getOS } from "@follow/utils/utils" -import { useMutation, useQuery } from "@tanstack/react-query" -import type { FetchError } from "ofetch" -import { ofetch } from "ofetch" +import { useMutation } from "@tanstack/react-query" import type { ReactNode } from "react" import { useCallback, useMemo } from "react" import { useTranslation } from "react-i18next" import { toast } from "sonner" import { - getReadabilityContent, getReadabilityStatus, ReadabilityStatus, setReadabilityContent, setReadabilityStatus, } from "~/atoms/readability" -import { useIntegrationSettingValue } from "~/atoms/settings/integration" import { setShowSourceContent, toggleShowSourceContent, @@ -37,7 +25,6 @@ import { whoami } from "~/atoms/user" import { mountLottie } from "~/components/ui/lottie-container" import { shortcuts } from "~/constants/shortcuts" import { tipcClient } from "~/lib/client" -import { parseHtml } from "~/lib/parse-html" import StarAnimationUri from "~/lottie/star.lottie?url" import { useTipModal } from "~/modules/wallet/hooks" import type { FlatEntryModel } from "~/store/entry" @@ -45,6 +32,7 @@ import { entryActions } from "~/store/entry" import { getFeedById, useFeedById } from "~/store/feed" import { useInboxById } from "~/store/inbox" +import { useIntegrationActions } from "./useIntegrationActions" import { navigateEntry } from "./useNavigateEntry" const absoluteStarAnimationUri = new URL(StarAnimationUri, import.meta.url).href @@ -170,7 +158,7 @@ export const useEntryActions = ({ id: feed.id, } }) - + const integrationActions = useIntegrationActions({ entry, view }) const inbox = useInboxById(entry?.inboxId) const isInbox = !!inbox @@ -198,81 +186,11 @@ export const useEntryActions = ({ const uncollect = useUnCollect(populatedEntry) const read = useRead() const unread = useUnread() - - const { - enableEagle, - enableReadwise, - enableInstapaper, - enableOmnivore, - enableObsidian, - enableOutline, - readwiseToken, - instapaperUsername, - instapaperPassword, - omnivoreToken, - omnivoreEndpoint, - obsidianVaultPath, - outlineToken, - outlineEndpoint, - outlineCollection, - } = useIntegrationSettingValue() - const isObsidianEnabled = enableObsidian && !!obsidianVaultPath - - const saveToObsidian = useMutation({ - mutationKey: ["save-to-obsidian"], - mutationFn: async (data: { - url: string - title: string - content: string - author: string - publishedAt: string - vaultPath: string - }) => { - return await tipcClient?.saveToObsidian(data) - }, - onSuccess: (data) => { - if (data?.success) { - toast.success(t("entry_actions.saved_to_obsidian"), { - duration: 3000, - }) - } else { - toast.error(`${t("entry_actions.failed_to_save_to_obsidian")}: ${data?.error}`, { - duration: 3000, - }) - } - }, - }) - - const checkEagle = useQuery({ - queryKey: ["check-eagle"], - enabled: ELECTRON && enableEagle && !!entry?.entries.url && view !== undefined, - queryFn: async () => { - try { - await ofetch("http://localhost:41595") - return true - } catch (error: unknown) { - return (error as FetchError).data?.code === 401 - } - }, - refetchOnMount: false, - refetchOnWindowFocus: false, - }) - const deleteInboxEntry = useDeleteInboxEntry() const items = useMemo(() => { if (!populatedEntry || view === undefined) return [] - const getEntryContentAsMarkdown = () => { - const isReadabilityReady = - getReadabilityStatus()[populatedEntry.entries.id] === ReadabilityStatus.SUCCESS - const content = - (isReadabilityReady - ? getReadabilityContent()[populatedEntry.entries.id].content - : populatedEntry.entries.content) || "" - return parseHtml(content).toMarkdown() - } - const items: { key: string className?: string @@ -284,265 +202,7 @@ export const useEntryActions = ({ disabled?: boolean onClick: (e: React.MouseEvent) => void }[] = [ - { - name: t("entry_actions.save_media_to_eagle"), - icon: , - key: "saveToEagle", - hide: - !enableEagle || - (checkEagle.isLoading ? true : !checkEagle.data) || - !populatedEntry.entries.media?.length, - onClick: async () => { - if (!populatedEntry.entries.url || !populatedEntry.entries.media?.length) { - return - } - window.analytics?.capture("integration", { - type: "eagle", - event: "save", - }) - const response = await tipcClient?.saveToEagle({ - url: populatedEntry.entries.url, - mediaUrls: populatedEntry.entries.media.map((m) => m.url), - }) - - if (response?.status === "success") { - toast.success(t("entry_actions.saved_to_eagle"), { - duration: 3000, - }) - } else { - toast.error(t("entry_actions.failed_to_save_to_eagle"), { - duration: 3000, - }) - } - }, - }, - { - name: t("entry_actions.save_to_readwise"), - icon: , - key: "saveToReadwise", - hide: !enableReadwise || !readwiseToken || !populatedEntry.entries.url, - onClick: async () => { - try { - window.analytics?.capture("integration", { - type: "readwise", - event: "save", - }) - const data = await ofetch("https://readwise.io/api/v3/save/", { - method: "POST", - headers: { - Authorization: `Token ${readwiseToken}`, - }, - body: { - url: populatedEntry.entries.url, - html: populatedEntry.entries.content || undefined, - title: populatedEntry.entries.title || undefined, - author: populatedEntry.entries.author || undefined, - summary: populatedEntry.entries.description || undefined, - published_date: populatedEntry.entries.publishedAt || undefined, - image_url: populatedEntry.entries.media?.[0]?.url || undefined, - saved_using: "Follow", - }, - }) - - toast.success( - <> - {t("entry_actions.saved_to_readwise")},{" "} - - view - - , - { - duration: 3000, - }, - ) - } catch { - toast.error(t("entry_actions.failed_to_save_to_readwise"), { - duration: 3000, - }) - } - }, - }, - { - name: t("entry_actions.save_to_instapaper"), - icon: , - key: "saveToInstapaper", - hide: - !enableInstapaper || - !instapaperPassword || - !instapaperUsername || - !populatedEntry.entries.url, - onClick: async () => { - try { - window.analytics?.capture("integration", { - type: "instapaper", - event: "save", - }) - const data = await ofetch("https://www.instapaper.com/api/add", { - query: { - url: populatedEntry.entries.url, - title: populatedEntry.entries.title, - }, - method: "POST", - headers: { - Authorization: `Basic ${btoa(`${instapaperUsername}:${instapaperPassword}`)}`, - }, - parseResponse: JSON.parse, - }) - - toast.success( - <> - {t("entry_actions.saved_to_instapaper")},{" "} - - view - - , - { - duration: 3000, - }, - ) - } catch { - toast.error(t("entry_actions.failed_to_save_to_instapaper"), { - duration: 3000, - }) - } - }, - }, - { - name: t("entry_actions.save_to_omnivore"), - icon: , - key: "saveToomnivore", - hide: !enableOmnivore || !omnivoreToken || !omnivoreEndpoint || !populatedEntry.entries.url, - onClick: async () => { - const saveUrlQuery = ` - mutation SaveUrl($input: SaveUrlInput!) { - saveUrl(input: $input) { - ... on SaveSuccess { - url - clientRequestId - } - ... on SaveError { - errorCodes - message - } - } - } -` - - window.analytics?.capture("integration", { - type: "omnivore", - event: "save", - }) - try { - const data = await ofetch(omnivoreEndpoint, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: omnivoreToken, - }, - body: { - query: saveUrlQuery, - variables: { - input: { - url: populatedEntry.entries.url, - source: "Follow", - clientRequestId: globalThis.crypto.randomUUID(), - publishedAt: new Date(populatedEntry.entries.publishedAt), - }, - }, - }, - }) - toast.success( - <> - {t("entry_actions.saved_to_omnivore")},{" "} - - view - - , - { - duration: 3000, - }, - ) - } catch { - toast.error(t("entry_actions.failed_to_save_to_omnivore"), { - duration: 3000, - }) - } - }, - }, - { - name: t("entry_actions.save_to_obsidian"), - icon: , - key: "saveToObsidian", - hide: !isObsidianEnabled || !populatedEntry?.entries?.url || !IN_ELECTRON, - onClick: () => { - if (!isObsidianEnabled || !populatedEntry?.entries?.url || !IN_ELECTRON) return - - const markdownContent = getEntryContentAsMarkdown() - window.analytics?.capture("integration", { - type: "obsidian", - event: "save", - }) - saveToObsidian.mutate({ - url: populatedEntry.entries.url, - title: populatedEntry.entries.title || "", - content: markdownContent, - author: populatedEntry.entries.author || "", - publishedAt: populatedEntry.entries.publishedAt || "", - vaultPath: obsidianVaultPath, - }) - }, - }, - { - name: t("entry_actions.save_to_outline"), - icon: , - key: "saveTooutline", - hide: - !IN_ELECTRON || - !enableOutline || - !outlineToken || - !outlineEndpoint || - !outlineCollection || - !populatedEntry.entries.title, - onClick: async () => { - try { - const request = async (method: string, params: Record) => { - return await ofetch(`${outlineEndpoint.replace(/\/$/, "")}/${method}`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${outlineToken}`, - }, - body: params, - }) - } - let collectionId = outlineCollection - if (!/^[a-f\d]{8}(?:-[a-f\d]{4}){3}-[a-f\d]{12}$/i.test(collectionId)) { - const collection = await request("collections.info", { - id: collectionId, - }) - collectionId = collection.data.id - } - const markdownContent = getEntryContentAsMarkdown() - await request("documents.create", { - title: populatedEntry.entries.title, - text: markdownContent, - collectionId, - publish: true, - }) - toast.success(t("entry_actions.saved_to_outline"), { - duration: 3000, - }) - } catch { - toast.error(t("entry_actions.failed_to_save_to_outline"), { - duration: 3000, - }) - } - }, - }, + ...integrationActions.items, { key: "tip", shortcut: shortcuts.entry.tip.key, @@ -707,30 +367,13 @@ export const useEntryActions = ({ }, [ populatedEntry, view, + integrationActions.items, t, - enableEagle, - checkEagle.isLoading, - checkEagle.data, - enableReadwise, - readwiseToken, - enableInstapaper, - instapaperPassword, - instapaperUsername, - enableOmnivore, - omnivoreToken, - omnivoreEndpoint, - isObsidianEnabled, - enableOutline, - outlineToken, - outlineEndpoint, - outlineCollection, isInbox, feed?.ownerUserId, type, showSourceContent, inList, - saveToObsidian, - obsidianVaultPath, openTipModal, collect, uncollect, diff --git a/apps/renderer/src/hooks/biz/useFeedActions.tsx b/apps/renderer/src/hooks/biz/useFeedActions.tsx index 668154019..d702bd084 100644 --- a/apps/renderer/src/hooks/biz/useFeedActions.tsx +++ b/apps/renderer/src/hooks/biz/useFeedActions.tsx @@ -7,9 +7,9 @@ import { isBizId } from "@follow/utils/utils" import { useMemo } from "react" import { useTranslation } from "react-i18next" +import type { FollowMenuItem, MenuItemInput } from "~/atoms/context-menu" import { whoami } from "~/atoms/user" import { useModalStack } from "~/components/ui/modal/stacked/hooks" -import type { NativeMenuItem, NullableNativeMenuItem } from "~/lib/native-menu" import { useBoostModal } from "~/modules/boost/hooks" import { useFeedClaimModal } from "~/modules/claim" import { FeedForm } from "~/modules/discover/feed-form" @@ -21,9 +21,10 @@ import { useAddFeedToFeedList, useFeedById, useRemoveFeedFromFeedList, + useResetFeed, } from "~/store/feed" import { useInboxById } from "~/store/inbox" -import { useListById, useOwnedList } from "~/store/list" +import { useListById, useOwnedListByView } from "~/store/list" import { subscriptionActions, useSubscriptionByFeedId } from "~/store/subscription" import { useNavigateEntry } from "./useNavigateEntry" @@ -65,6 +66,8 @@ export const useFeedActions = ({ type: feed.type, ownerUserId: feed.ownerUserId, id: feed.id, + url: feed.url, + siteUrl: feed.siteUrl, } }) const inbox = useInboxById(feedId) @@ -81,9 +84,10 @@ export const useFeedActions = ({ const { mutateAsync: addFeedToListMutation } = useAddFeedToFeedList() const { mutateAsync: removeFeedFromListMutation } = useRemoveFeedFromFeedList() + const { mutateAsync: resetFeed } = useResetFeed() const openBoostModal = useBoostModal() - const listByView = useOwnedList(view!) + const listByView = useOwnedListByView(view!) const isMultipleSelection = feedIds && feedIds.length > 0 @@ -91,7 +95,9 @@ export const useFeedActions = ({ const related = feed || inbox if (!related) return [] - const items: NullableNativeMenuItem[] = [ + const isFeedOwner = related.ownerUserId === whoami()?.id + + const items: MenuItemInput[] = [ { type: "text" as const, label: t("sidebar.feed_actions.mark_all_as_read"), @@ -115,12 +121,19 @@ export const useFeedActions = ({ claimFeed() }, }, - ...(related.ownerUserId === whoami()?.id + ...(isFeedOwner ? [ { type: "text" as const, label: t("sidebar.feed_actions.feed_owned_by_you"), }, + { + type: "text" as const, + label: t("sidebar.feed_actions.reset_feed"), + click: () => { + resetFeed(feedId) + }, + }, ] : []), { @@ -273,10 +286,10 @@ export const useFeedActions = ({ disabled: isEntryList, shortcut: "Meta+C", click: () => { - // @ts-expect-error - const { url } = feed || {} - if (!url) return - navigator.clipboard.writeText(url) + const { url, siteUrl } = feed || {} + const copied = url || siteUrl + if (!copied) return + navigator.clipboard.writeText(copied) }, }, { @@ -328,7 +341,7 @@ export const useListActions = ({ listId, view }: { listId: string; view: FeedVie const items = useMemo(() => { if (!list) return [] - const items: NullableNativeMenuItem[] = [ + const items: MenuItemInput[] = [ list.ownerUserId === whoami()?.id && { type: "text" as const, label: t("sidebar.feed_actions.list_owned_by_you"), @@ -416,7 +429,7 @@ export const useInboxActions = ({ inboxId }: { inboxId: string }) => { const items = useMemo(() => { if (!inbox) return [] - const items: NativeMenuItem[] = [ + const items: FollowMenuItem[] = [ { type: "text" as const, label: t("sidebar.feed_actions.edit"), diff --git a/apps/renderer/src/hooks/biz/useFollow.tsx b/apps/renderer/src/hooks/biz/useFollow.tsx index bd531b9f3..348399204 100644 --- a/apps/renderer/src/hooks/biz/useFollow.tsx +++ b/apps/renderer/src/hooks/biz/useFollow.tsx @@ -4,9 +4,9 @@ import { useCallback } from "react" import { useEventCallback } from "usehooks-ts" import { useUserRole } from "~/atoms/user" -import { CustomSafeError } from "~/components/errors/helper" import { useModalStack } from "~/components/ui/modal/stacked/hooks" import { MAX_TRIAL_USER_FEED_SUBSCRIPTION } from "~/constants/limit" +import { CustomSafeError } from "~/errors/CustomSafeError" import { useActivationModal } from "~/modules/activation" import type { FeedFormDataValuesType } from "~/modules/discover/feed-form" import { FeedForm } from "~/modules/discover/feed-form" diff --git a/apps/renderer/src/hooks/biz/useIntegrationActions.tsx b/apps/renderer/src/hooks/biz/useIntegrationActions.tsx new file mode 100644 index 000000000..76c9596df --- /dev/null +++ b/apps/renderer/src/hooks/biz/useIntegrationActions.tsx @@ -0,0 +1,429 @@ +import { + SimpleIconsEagle, + SimpleIconsInstapaper, + SimpleIconsObsidian, + SimpleIconsOmnivore, + SimpleIconsOutline, + SimpleIconsReadwise, +} from "@follow/components/ui/platform-icon/icons.js" +import type { CombinedEntryModel } from "@follow/models/types" +import { IN_ELECTRON } from "@follow/shared/constants" +import { useMutation, useQuery } from "@tanstack/react-query" +import type { FetchError } from "ofetch" +import { ofetch } from "ofetch" +import type { ReactNode } from "react" +import { useMemo } from "react" +import { useTranslation } from "react-i18next" +import { toast } from "sonner" + +import { getReadabilityContent, getReadabilityStatus, ReadabilityStatus } from "~/atoms/readability" +import { useIntegrationSettingValue } from "~/atoms/settings/integration" +import { tipcClient } from "~/lib/client" +import { parseHtml } from "~/lib/parse-html" +import type { FlatEntryModel } from "~/store/entry" +import { getFeedById, useFeedById } from "~/store/feed" +import { useInboxById } from "~/store/inbox" + +export const useIntegrationActions = ({ + view, + entry, +}: { + view?: number + entry?: FlatEntryModel | null +}) => { + const { t } = useTranslation() + + const feed = useFeedById(entry?.feedId, (feed) => { + return { + type: feed.type, + ownerUserId: feed.ownerUserId, + id: feed.id, + } + }) + + const inbox = useInboxById(entry?.inboxId) + + const populatedEntry = useMemo(() => { + if (!entry) return null + if (!feed?.id && !inbox?.id) return null + + return { + ...entry, + feeds: feed ? getFeedById(feed.id) : undefined, + inboxes: inbox, + } as CombinedEntryModel + }, [entry, feed, inbox]) + + const { + enableEagle, + enableReadwise, + enableInstapaper, + enableOmnivore, + enableObsidian, + enableOutline, + readwiseToken, + instapaperUsername, + instapaperPassword, + omnivoreToken, + omnivoreEndpoint, + obsidianVaultPath, + outlineToken, + outlineEndpoint, + outlineCollection, + } = useIntegrationSettingValue() + const isObsidianEnabled = enableObsidian && !!obsidianVaultPath + + const saveToObsidian = useMutation({ + mutationKey: ["save-to-obsidian"], + mutationFn: async (data: { + url: string + title: string + content: string + author: string + publishedAt: string + vaultPath: string + }) => { + return await tipcClient?.saveToObsidian(data) + }, + onSuccess: (data) => { + if (data?.success) { + toast.success(t("entry_actions.saved_to_obsidian"), { + duration: 3000, + }) + } else { + toast.error(`${t("entry_actions.failed_to_save_to_obsidian")}: ${data?.error}`, { + duration: 3000, + }) + } + }, + }) + + const checkEagle = useQuery({ + queryKey: ["check-eagle"], + enabled: ELECTRON && enableEagle && !!entry?.entries.url && view !== undefined, + queryFn: async () => { + try { + await ofetch("http://localhost:41595") + return true + } catch (error: unknown) { + return (error as FetchError).data?.code === 401 + } + }, + refetchOnMount: false, + refetchOnWindowFocus: false, + }) + + const items = useMemo(() => { + if (!populatedEntry || view === undefined) return [] + + const getEntryContentAsMarkdown = () => { + const isReadabilityReady = + getReadabilityStatus()[populatedEntry.entries.id] === ReadabilityStatus.SUCCESS + const content = + (isReadabilityReady + ? getReadabilityContent()[populatedEntry.entries.id].content + : populatedEntry.entries.content) || "" + return parseHtml(content).toMarkdown() + } + + const items: { + key: string + className?: string + shortcut?: string + name: string + icon?: ReactNode + hide?: boolean + active?: boolean + disabled?: boolean + onClick: (e: React.MouseEvent) => void + }[] = [ + { + name: t("entry_actions.save_media_to_eagle"), + icon: , + key: "saveToEagle", + hide: + !enableEagle || + (checkEagle.isLoading ? true : !checkEagle.data) || + !populatedEntry.entries.media?.length, + onClick: async () => { + if (!populatedEntry.entries.url || !populatedEntry.entries.media?.length) { + return + } + window.analytics?.capture("integration", { + type: "eagle", + event: "save", + }) + const response = await tipcClient?.saveToEagle({ + url: populatedEntry.entries.url, + mediaUrls: populatedEntry.entries.media.map((m) => m.url), + }) + + if (response?.status === "success") { + toast.success(t("entry_actions.saved_to_eagle"), { + duration: 3000, + }) + } else { + toast.error(t("entry_actions.failed_to_save_to_eagle"), { + duration: 3000, + }) + } + }, + }, + { + name: t("entry_actions.save_to_readwise"), + icon: , + key: "saveToReadwise", + hide: !enableReadwise || !readwiseToken || !populatedEntry.entries.url, + onClick: async () => { + try { + window.analytics?.capture("integration", { + type: "readwise", + event: "save", + }) + const data = await ofetch("https://readwise.io/api/v3/save/", { + method: "POST", + headers: { + Authorization: `Token ${readwiseToken}`, + }, + body: { + url: populatedEntry.entries.url, + html: populatedEntry.entries.content || undefined, + title: populatedEntry.entries.title || undefined, + author: populatedEntry.entries.author || undefined, + summary: populatedEntry.entries.description || undefined, + published_date: populatedEntry.entries.publishedAt || undefined, + image_url: populatedEntry.entries.media?.[0]?.url || undefined, + saved_using: "Follow", + }, + }) + + toast.success( + <> + {t("entry_actions.saved_to_readwise")},{" "} + + view + + , + { + duration: 3000, + }, + ) + } catch { + toast.error(t("entry_actions.failed_to_save_to_readwise"), { + duration: 3000, + }) + } + }, + }, + { + name: t("entry_actions.save_to_instapaper"), + icon: , + key: "saveToInstapaper", + hide: + !enableInstapaper || + !instapaperPassword || + !instapaperUsername || + !populatedEntry.entries.url, + onClick: async () => { + try { + window.analytics?.capture("integration", { + type: "instapaper", + event: "save", + }) + const data = await ofetch("https://www.instapaper.com/api/add", { + query: { + url: populatedEntry.entries.url, + title: populatedEntry.entries.title, + }, + method: "POST", + headers: { + Authorization: `Basic ${btoa(`${instapaperUsername}:${instapaperPassword}`)}`, + }, + parseResponse: JSON.parse, + }) + + toast.success( + <> + {t("entry_actions.saved_to_instapaper")},{" "} + + view + + , + { + duration: 3000, + }, + ) + } catch { + toast.error(t("entry_actions.failed_to_save_to_instapaper"), { + duration: 3000, + }) + } + }, + }, + { + name: t("entry_actions.save_to_omnivore"), + icon: , + key: "saveToomnivore", + hide: !enableOmnivore || !omnivoreToken || !omnivoreEndpoint || !populatedEntry.entries.url, + onClick: async () => { + const saveUrlQuery = ` + mutation SaveUrl($input: SaveUrlInput!) { + saveUrl(input: $input) { + ... on SaveSuccess { + url + clientRequestId + } + ... on SaveError { + errorCodes + message + } + } + } +` + + window.analytics?.capture("integration", { + type: "omnivore", + event: "save", + }) + try { + const data = await ofetch(omnivoreEndpoint, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: omnivoreToken, + }, + body: { + query: saveUrlQuery, + variables: { + input: { + url: populatedEntry.entries.url, + source: "Follow", + clientRequestId: globalThis.crypto.randomUUID(), + publishedAt: new Date(populatedEntry.entries.publishedAt), + }, + }, + }, + }) + toast.success( + <> + {t("entry_actions.saved_to_omnivore")},{" "} + + view + + , + { + duration: 3000, + }, + ) + } catch { + toast.error(t("entry_actions.failed_to_save_to_omnivore"), { + duration: 3000, + }) + } + }, + }, + { + name: t("entry_actions.save_to_obsidian"), + icon: , + key: "saveToObsidian", + hide: !isObsidianEnabled || !populatedEntry?.entries?.url || !IN_ELECTRON, + onClick: () => { + if (!isObsidianEnabled || !populatedEntry?.entries?.url || !IN_ELECTRON) return + + const markdownContent = getEntryContentAsMarkdown() + window.analytics?.capture("integration", { + type: "obsidian", + event: "save", + }) + saveToObsidian.mutate({ + url: populatedEntry.entries.url, + title: populatedEntry.entries.title || "", + content: markdownContent, + author: populatedEntry.entries.author || "", + publishedAt: populatedEntry.entries.publishedAt || "", + vaultPath: obsidianVaultPath, + }) + }, + }, + { + name: t("entry_actions.save_to_outline"), + icon: , + key: "saveToOutline", + hide: + !IN_ELECTRON || + !enableOutline || + !outlineToken || + !outlineEndpoint || + !outlineCollection || + !populatedEntry.entries.title, + onClick: async () => { + try { + const request = async (method: string, params: Record) => { + return await ofetch(`${outlineEndpoint.replace(/\/$/, "")}/${method}`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${outlineToken}`, + }, + body: params, + }) + } + let collectionId = outlineCollection + if (!/^[a-f\d]{8}(?:-[a-f\d]{4}){3}-[a-f\d]{12}$/i.test(collectionId)) { + const collection = await request("collections.info", { + id: collectionId, + }) + collectionId = collection.data.id + } + const markdownContent = getEntryContentAsMarkdown() + await request("documents.create", { + title: populatedEntry.entries.title, + text: markdownContent, + collectionId, + publish: true, + }) + toast.success(t("entry_actions.saved_to_outline"), { + duration: 3000, + }) + } catch { + toast.error(t("entry_actions.failed_to_save_to_outline"), { + duration: 3000, + }) + } + }, + }, + ] + + return items + }, [ + populatedEntry, + view, + t, + enableEagle, + checkEagle.isLoading, + checkEagle.data, + enableReadwise, + readwiseToken, + enableInstapaper, + instapaperPassword, + instapaperUsername, + enableOmnivore, + omnivoreToken, + omnivoreEndpoint, + isObsidianEnabled, + enableOutline, + outlineToken, + outlineEndpoint, + outlineCollection, + saveToObsidian, + obsidianVaultPath, + ]) + + return { + items, + } +} diff --git a/apps/renderer/src/hooks/biz/useSubscriptionActions.tsx b/apps/renderer/src/hooks/biz/useSubscriptionActions.tsx index a1ef02a14..91b0416fb 100644 --- a/apps/renderer/src/hooks/biz/useSubscriptionActions.tsx +++ b/apps/renderer/src/hooks/biz/useSubscriptionActions.tsx @@ -26,14 +26,14 @@ export const useDeleteSubscription = ({ onSuccess }: { onSuccess?: () => void }) feedIdList?: string[] }) => { if (feedIdList) { - await subscriptionActions.unfollowMany(feedIdList) + await subscriptionActions.unfollow(feedIdList) toast.success(t("notify.unfollow_feed_many")) return } if (!subscription) return - subscriptionActions.unfollow(subscription.feedId).then((feed) => { + subscriptionActions.unfollow([subscription.feedId]).then(([feed]) => { subscriptionQuery.byView(subscription.view).invalidate() feedUnreadActions.updateByFeedId(subscription.feedId, 0) @@ -106,3 +106,23 @@ const UnfollowInfo = ({ title, undo }: { title: string; undo: () => any }) => { ) } + +export const useBatchUpdateSubscription = () => { + return useMutation({ + mutationFn: async ({ + feedIdList, + category, + view, + }: { + feedIdList: string[] + category: string + view: number + }) => { + await subscriptionActions.batchUpdateSubscription({ + category, + feedIdList, + view, + }) + }, + }) +} diff --git a/apps/renderer/src/hooks/biz/useTraySetting.ts b/apps/renderer/src/hooks/biz/useTraySetting.ts new file mode 100644 index 000000000..a27369d0f --- /dev/null +++ b/apps/renderer/src/hooks/biz/useTraySetting.ts @@ -0,0 +1,27 @@ +import { IN_ELECTRON } from "@follow/shared/constants" +import { atom, useAtomValue, useSetAtom } from "jotai" +import { useCallback } from "react" + +import { tipcClient } from "~/lib/client" + +const minimizeToTrayAtom = atom(false) + +minimizeToTrayAtom.onMount = (setAtom) => { + tipcClient?.getMinimizeToTray().then((proxy: boolean) => { + setAtom(proxy) + }) +} + +export const useMinimizeToTrayValue = () => useAtomValue(minimizeToTrayAtom) + +export const useSetMinimizeToTray = () => { + const setMinimizeToTray = useSetAtom(minimizeToTrayAtom) + return useCallback( + (value: boolean) => { + if (!IN_ELECTRON) return + setMinimizeToTray(value) + tipcClient?.setMinimizeToTray(value) + }, + [setMinimizeToTray], + ) +} diff --git a/apps/renderer/src/initialize/global-shortcuts.ts b/apps/renderer/src/initialize/global-shortcuts.ts new file mode 100644 index 000000000..27aef7784 --- /dev/null +++ b/apps/renderer/src/initialize/global-shortcuts.ts @@ -0,0 +1,80 @@ +import { callWindowExposeRenderer } from "@follow/shared/bridge" + +interface ShortcutDefinition { + accelerator: string + action: () => void +} + +const parseAccelerator = ( + accelerator: string, +): { key: string; ctrl?: boolean; meta?: boolean; shift?: boolean } => { + const parts = accelerator.toLowerCase().split("+") + return { + key: parts.at(-1) ?? "", + ctrl: parts.includes("ctrl") || parts.includes("cmdorctrl"), + meta: parts.includes("cmd") || parts.includes("cmdorctrl"), + shift: parts.includes("shift"), + } +} + +export const registerAppGlobalShortcuts = () => { + // @see apps/main/menu.ts + const shortcuts: ShortcutDefinition[] = [ + { + accelerator: "CmdOrCtrl+,", + action: () => window.router.showSettings(), + }, + { + accelerator: "Ctrl+Shift+Z", + action: () => { + const caller = callWindowExposeRenderer() + caller.zenMode() + }, + }, + { + accelerator: "CmdOrCtrl+T", + action: () => { + const caller = callWindowExposeRenderer() + caller.goToDiscover() + }, + }, + { + accelerator: "CmdOrCtrl+N", + action: () => { + const caller = callWindowExposeRenderer() + caller.quickAdd() + }, + }, + ] + + const handleKeydown = (e: KeyboardEvent) => { + // Prevent on input, textarea, [contenteditable] + if ( + ["INPUT", "TEXTAREA"].includes((e.target as HTMLElement)?.tagName) || + (e.target as HTMLElement)?.contentEditable === "true" + ) { + return + } + + shortcuts.forEach(({ accelerator, action }) => { + const { key, ctrl, meta, shift } = parseAccelerator(accelerator) + + const matchesKey = e.key.toLowerCase() === key.toLowerCase() + const matchesModifier = ctrl + ? e.ctrlKey || e.metaKey + : !ctrl && !e.ctrlKey && !meta && !e.metaKey + const matchesShift = shift ? e.shiftKey : !e.shiftKey + + if (matchesKey && matchesModifier && matchesShift) { + action() + e.preventDefault() + } + }) + } + + document.addEventListener("keydown", handleKeydown, true) + + return () => { + document.removeEventListener("keydown", handleKeydown, true) + } +} diff --git a/apps/renderer/src/initialize/migrates/index.ts b/apps/renderer/src/initialize/migrates/index.ts index 035b8e6ee..c2b910ccc 100644 --- a/apps/renderer/src/initialize/migrates/index.ts +++ b/apps/renderer/src/initialize/migrates/index.ts @@ -9,14 +9,17 @@ declare global { __app_is_upgraded__: boolean } } -export const doMigration = () => { - const lastVersion = localStorage.getItem(appVersionKey) - if (lastVersion && lastVersion !== APP_VERSION) { - appLog(`Upgrade from ${lastVersion} to ${APP_VERSION}`) - window.__app_is_upgraded__ = true - - // NOTE: Add migration logic here - } +export const doMigration = async () => { + const lastVersion = localStorage.getItem(appVersionKey) || APP_VERSION localStorage.setItem(appVersionKey, APP_VERSION) + + if (lastVersion === APP_VERSION) return + + // NOTE: Add migration logic here + + if (!APP_VERSION.includes("nightly")) { + window.__app_is_upgraded__ = true + } + appLog(`Upgrade from ${lastVersion} to ${APP_VERSION}`) } diff --git a/apps/renderer/src/configs.ts b/apps/renderer/src/initialize/sentry.config.ts similarity index 87% rename from apps/renderer/src/configs.ts rename to apps/renderer/src/initialize/sentry.config.ts index 5d279f006..04f566048 100644 --- a/apps/renderer/src/configs.ts +++ b/apps/renderer/src/initialize/sentry.config.ts @@ -2,7 +2,7 @@ import { env } from "@follow/shared/env" import type { BrowserOptions } from "@sentry/react" import { FetchError } from "ofetch" -import { CustomSafeError } from "./components/errors/helper" +import { CustomSafeError } from "../errors/CustomSafeError" const ERROR_PATTERNS = [ /Network Error/i, @@ -49,6 +49,14 @@ export const SentryConfig: BrowserOptions = { if (isPassthroughError || isAbortError) { return null } + + if (error instanceof Error && "traceId" in error && error.traceId) { + event.tags = { + ...event.tags, + traceId: error.traceId as string, + } + } + return event }, } diff --git a/apps/renderer/src/initialize/sentry.ts b/apps/renderer/src/initialize/sentry.ts index dc2b5f2d9..081a923fd 100644 --- a/apps/renderer/src/initialize/sentry.ts +++ b/apps/renderer/src/initialize/sentry.ts @@ -1,5 +1,7 @@ import { env } from "@follow/shared/env" +import { appSessionTraceId } from "@follow/utils/environment" import { version } from "@pkg" +import { nanoid } from "nanoid" import { useEffect } from "react" import { createRoutesFromChildren, @@ -10,8 +12,16 @@ import { import { whoami } from "~/atoms/user" -import { SentryConfig } from "../configs" +import { SentryConfig } from "./sentry.config" +Object.defineProperty(window.Error.prototype, "traceId", { + get() { + if (!this._traceId) { + this._traceId = nanoid() + } + return this._traceId + }, +}) export const initSentry = async () => { if (!window.SENTRY_RELEASE) return if (import.meta.env.DEV) return @@ -42,5 +52,6 @@ export const initSentry = async () => { Sentry.setTag("user_name", user.name) } + Sentry.setTag("session_trace_id", appSessionTraceId) Sentry.setTag("appVersion", version) } diff --git a/apps/renderer/src/lib/error-parser.ts b/apps/renderer/src/lib/error-parser.ts index 50ff42d71..ffeaf0b1e 100644 --- a/apps/renderer/src/lib/error-parser.ts +++ b/apps/renderer/src/lib/error-parser.ts @@ -42,7 +42,10 @@ export const toastFetchError = ( if (error instanceof FetchError) { try { - const json = JSON.parse(error.response?._data) + const json = + typeof error.response?._data === "string" + ? JSON.parse(error.response?._data) + : error.response?._data const { reason, code, message: _message } = json message = _message diff --git a/apps/renderer/src/lib/issues.ts b/apps/renderer/src/lib/issues.ts index a459b836a..e058b1bd6 100644 --- a/apps/renderer/src/lib/issues.ts +++ b/apps/renderer/src/lib/issues.ts @@ -5,16 +5,21 @@ interface IssueOptions { title: string body: string label: string + error?: Error } -export const getNewIssueUrl = ({ body, label, title }: Partial = {}) => { +export const getNewIssueUrl = ({ body, label, title, error }: Partial = {}) => { const baseUrl = `${repository.url}/issues/new` const searchParams = new URLSearchParams() - const nextBody = [body || "", "", ...getCurrentEnvironment()].join("\n") - searchParams.set("body", nextBody) + let nextBody = [body || "", "", ...getCurrentEnvironment()].join("\n") if (label) searchParams.set("label", label) if (title) searchParams.set("title", title) + if (error && "traceId" in error && error.traceId) { + nextBody += `\n\n### Sentry Trace ID\n${error.traceId}` + } + + searchParams.set("body", nextBody) return `${baseUrl}?${searchParams.toString()}` } diff --git a/apps/renderer/src/lib/native-menu.ts b/apps/renderer/src/lib/native-menu.ts index 76f155d71..c922a9fa9 100644 --- a/apps/renderer/src/lib/native-menu.ts +++ b/apps/renderer/src/lib/native-menu.ts @@ -1,165 +1,54 @@ -import { IN_ELECTRON } from "@follow/shared/constants" -import { getOS } from "@follow/utils/utils" -import { get } from "lodash-es" +import type { MenuItemConstructorOptions } from "electron" import { tipcClient } from "./client" -type MenuItemWithHide = T & { - hide?: boolean -} - -type BaseMenuItemText = MenuItemWithHide<{ - type: "text" - label: string +export type ElectronMenuItem = Omit & { click?: () => void - /** only work in web app */ - icon?: React.ReactNode - shortcut?: string - disabled?: boolean - checked?: boolean - supportMultipleSelection?: boolean -}> - -type BaseMenuItemSeparator = MenuItemWithHide<{ - type: "separator" - disabled?: boolean -}> - -type BaseMenuItem = BaseMenuItemText | BaseMenuItemSeparator - -export type NativeMenuItem = BaseMenuItem & { - submenu?: NativeMenuItem[] + submenu?: ElectronMenuItem[] } -export type NullableNativeMenuItem = - | (BaseMenuItemText & { submenu?: NullableNativeMenuItem[] }) - | BaseMenuItemSeparator - | null - | undefined - | false - | "" - -function sortShortcutsString(shortcut: string) { - const order = ["Shift", "Ctrl", "Meta", "Alt"] - let nextShortcut = shortcut - if (getOS() === "Windows") { - nextShortcut = shortcut.replace("Meta", "Ctrl").replace("meta", "ctrl") - } - const arr = nextShortcut.split("+") - - const sortedModifiers = arr - .filter((key) => order.includes(key)) - .sort((a, b) => order.indexOf(a) - order.indexOf(b)) - - const otherKeys = arr.filter((key) => !order.includes(key)) - - return [...sortedModifiers, ...otherKeys].join("+") +export const showElectronContextMenu = async (items: Array) => { + if (!window.electron) throw new Error("electron is not available") + const dispose = window.electron.ipcRenderer.on( + "menu-click", + (_, { path }: { path: number[] }) => { + const targetMenu = getMenuItemByPath(items, path) + if (targetMenu && typeof targetMenu.click === "function") { + targetMenu.click() + } else { + console.warn(`Menu item not found or click handler missing for path: ${path}`) + } + }, + ) + const itemsWithoutClick = removeClick(items) + await tipcClient?.showContextMenu({ items: itemsWithoutClick }) + dispose() } -function processMenuItems(items: NullableNativeMenuItem[]): NativeMenuItem[] { - return (items.filter((item) => item && !item.hide) as NativeMenuItem[]).map((item) => { - if (item.type === "text") { +const removeClick = (item: ElectronMenuItem[]): ElectronMenuItem[] => + item.map(({ click, ...rest }) => { + if (rest.submenu) return { - ...item, - shortcut: item.shortcut ? sortShortcutsString(item.shortcut) : undefined, - submenu: item.submenu ? processMenuItems(item.submenu) : undefined, + ...rest, + submenu: removeClick(rest.submenu), } - } - return item + return rest }) + +// Function to retrieve the menu item based on the provided path +const getMenuItemByPath = (items: ElectronMenuItem[], path: number[]): ElectronMenuItem | null => { + let currentItems = items + let currentItem: ElectronMenuItem | null = null + + for (const index of path) { + if (!currentItems || index >= currentItems.length) return null + currentItem = currentItems[index] + + if (currentItem.submenu && Array.isArray(currentItem.submenu)) { + currentItems = currentItem.submenu + } else { + currentItems = [] + } + } + return currentItem } -export const showNativeMenu = async ( - items: Array, - e?: MouseEvent | React.MouseEvent, -) => { - const nextItems = processMenuItems(items) - - const el = e && e.currentTarget - - if (el instanceof HTMLElement) { - el.dataset.contextMenuOpen = "true" - } - - // only show native menu on macOS electron, because in other platform, the native ui is not good - if (!IN_ELECTRON || getOS() !== "macOS") { - document.dispatchEvent( - new CustomEvent(CONTEXT_MENU_SHOW_EVENT_KEY, { - detail: { - items: nextItems, - x: e?.clientX, - y: e?.clientY, - }, - }), - ) - return - } else { - if (import.meta.env.DEV && e) { - nextItems.push( - { - type: "separator" as const, - }, - { - type: "text" as const, - label: "Inspect Element", - click: () => { - tipcClient?.inspectElement({ - x: e.pageX, - y: e.pageY, - }) - }, - }, - ) - } - } - - const dispose = window.electron?.ipcRenderer.on("menu-click", (_, combinedIndex: string) => { - const arr = combinedIndex.split("-") - const accessors = [] as string[] - for (let i = 0; i < arr.length; i++) { - accessors.push(arr[i]) - - if (i !== arr.length - 1) { - accessors.push("submenu") - } - } - const item = get(nextItems, accessors) - - if (item && item.type === "text") { - item.click?.() - } - }) - - window.electron?.ipcRenderer.once("menu-closed", () => { - dispose?.() - if (el instanceof HTMLElement) { - delete el.dataset.contextMenuOpen - } - - // dispatch mouse move event - // NOTE: in order to remove the highlight of the trigger item - // e.g. https://vscode.dev/github/RSSNext/follow/blob/dev/apps/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx#L80 - document.dispatchEvent(new PointerEvent("pointerdown", { bubbles: true })) - }) - - await tipcClient?.showContextMenu({ - items: transformMenuItemsForNative(nextItems), - }) - - function transformMenuItemsForNative(nextItems: NativeMenuItem[]) { - return nextItems.map((item) => { - if (item.type === "text") { - return { - ...item, - icon: undefined, - enabled: item.click !== undefined || (!!item.submenu && item.submenu.length > 0), - click: undefined, - submenu: item.submenu ? transformMenuItemsForNative(item.submenu) : undefined, - shortcut: item.shortcut?.replace("Meta", "CmdOrCtrl"), - } - } - return item - }) - } -} - -export const CONTEXT_MENU_SHOW_EVENT_KEY = "contextmenu-show" diff --git a/apps/renderer/src/lib/parse-html.ts b/apps/renderer/src/lib/parse-html.ts index 051e8fa11..33849ccbc 100644 --- a/apps/renderer/src/lib/parse-html.ts +++ b/apps/renderer/src/lib/parse-html.ts @@ -18,13 +18,13 @@ import rehypeStringify from "rehype-stringify" import { unified } from "unified" import type { Node } from "unist" import { visit } from "unist-util-visit" +import { visitParents } from "unist-util-visit-parents" import { VFile } from "vfile" import { ShadowDOM } from "~/components/common/ShadowDOM" import { ShikiHighLighter } from "~/components/ui/code-highlighter" import { LazyKateX } from "~/components/ui/katex/lazy" import { MarkdownBlockImage, MarkdownLink, MarkdownP } from "~/components/ui/markdown/renderers" -import { BlockError } from "~/components/ui/markdown/renderers/BlockErrorBoundary" import { useIsInParagraphContext } from "~/components/ui/markdown/renderers/ctx" import { createHeadingRenderer } from "~/components/ui/markdown/renderers/Heading" import { MarkdownInlineImage } from "~/components/ui/markdown/renderers/InlineImage" @@ -100,10 +100,7 @@ export const parseHtml = ( const tree = pipeline.parse(content) - // NOTE: disable for now, it introduces some issues - // 1. It may convert parts beyond the actual link into links - // 2. It cannot correctly handle the situation in the code block - // rehypeUrlToAnchor(tree) + rehypeUrlToAnchor(tree) // console.log("tree", tree) @@ -134,12 +131,30 @@ export const parseHtml = ( }, img: Img, - h1: createHeadingRenderer(1), - h2: createHeadingRenderer(2), - h3: createHeadingRenderer(3), - h4: createHeadingRenderer(4), - h5: createHeadingRenderer(5), - h6: createHeadingRenderer(6), + h1: (props) => { + markInlineImage(props.node) + return createHeadingRenderer(1)(props) + }, + h2: (props) => { + markInlineImage(props.node) + return createHeadingRenderer(2)(props) + }, + h3: (props) => { + markInlineImage(props.node) + return createHeadingRenderer(3)(props) + }, + h4: (props) => { + markInlineImage(props.node) + return createHeadingRenderer(4)(props) + }, + h5: (props) => { + markInlineImage(props.node) + return createHeadingRenderer(5)(props) + }, + h6: (props) => { + markInlineImage(props.node) + return createHeadingRenderer(6)(props) + }, style: Style, video: ({ node, ...props }) => @@ -158,6 +173,14 @@ export const parseHtml = ( markInlineImage(node) return createElement("span", props, props.children) }, + b: ({ node, ...props }) => { + markInlineImage(node) + return createElement("b", props, props.children) + }, + i: ({ node, ...props }) => { + markInlineImage(node) + return createElement("i", props, props.children) + }, // @ts-expect-error math: Math, hr: ({ node, ...props }) => @@ -209,10 +232,8 @@ export const parseHtml = ( try { codeString = extractCodeFromHtml(renderToString(code)) } catch (error) { - return createElement(BlockError, { - error, - message: "Code Block Render Error", - }) + console.error("Code Block Render Error", error) + return createElement("pre", props, props.children) } } @@ -251,7 +272,9 @@ const Img: Components["img"] = ({ node, ...props }) => { const widthPx = Number.parseInt(props.width as string) return createElement( - node?.properties.inline && widthPx < 600 ? MarkdownInlineImage : MarkdownBlockImage, + node?.properties.inline && (Number.isNaN(widthPx) || widthPx < 600) + ? MarkdownInlineImage + : MarkdownBlockImage, nextProps, ) } @@ -328,9 +351,21 @@ const Style: Components["style"] = ({ node, ...props }) => { return null } -function _rehypeUrlToAnchor(tree: Node) { +function rehypeUrlToAnchor(tree: Node) { + const tagsShouldNotBeWrapped = new Set(["a", "pre", "code"]) // https://chatgpt.com/share/37e0ceec-5c9e-4086-b9d6-5afc1af13bb0 - visit(tree, "text", (node: Text, index, parent: Node) => { + visitParents(tree, "text", (node: Text, ancestors: Node[]) => { + if ( + ancestors.some( + (ancestor) => + "tagName" in ancestor && tagsShouldNotBeWrapped.has((ancestor as Element).tagName), + ) + ) { + return + } + + const parent = ancestors.at(-1) + const urlRegex = /https?:\/\/\S+/g const text = node.value const matches = [...text.matchAll(urlRegex)] @@ -372,6 +407,7 @@ function _rehypeUrlToAnchor(tree: Node) { }) } + const index = (parent.children as (Text | Element)[]).indexOf(node) ;(parent.children as (Text | Element)[]).splice(index, 1, ...newNodes) }) } diff --git a/apps/renderer/src/lib/query-client.ts b/apps/renderer/src/lib/query-client.ts index 38fa34f8d..23ac59129 100644 --- a/apps/renderer/src/lib/query-client.ts +++ b/apps/renderer/src/lib/query-client.ts @@ -6,12 +6,14 @@ import { FetchError } from "ofetch" import { QUERY_PERSIST_KEY } from "../constants/app" +const defaultStaleTime = 600_000 // 10min const DO_NOT_RETRY_CODES = new Set([400, 401, 403, 404, 422]) const queryClient = new QueryClient({ defaultOptions: { queries: { refetchOnWindowFocus: false, retryDelay: 1000, + staleTime: defaultStaleTime, retry(failureCount, error) { console.error(error) if ( diff --git a/apps/renderer/src/main.tsx b/apps/renderer/src/main.tsx index 72080d1ff..1315f223a 100644 --- a/apps/renderer/src/main.tsx +++ b/apps/renderer/src/main.tsx @@ -12,6 +12,7 @@ import { RouterProvider } from "react-router-dom" import { setAppIsReady } from "./atoms/app" import { ElECTRON_CUSTOM_TITLEBAR_HEIGHT } from "./constants" import { initializeApp } from "./initialize" +import { registerAppGlobalShortcuts } from "./initialize/global-shortcuts" import { router } from "./router" initializeApp().finally(() => { @@ -20,8 +21,22 @@ initializeApp().finally(() => { const $container = document.querySelector("#root") as HTMLElement -if (IN_ELECTRON && getOS() === "Windows") { - document.body.style.cssText += `--fo-window-padding-top: ${ElECTRON_CUSTOM_TITLEBAR_HEIGHT}px;` +if (IN_ELECTRON) { + const os = getOS() + + switch (os) { + case "Windows": { + document.body.style.cssText += `--fo-window-padding-top: ${ElECTRON_CUSTOM_TITLEBAR_HEIGHT}px;` + break + } + case "macOS": { + document.body.style.cssText += `--fo-macos-traffic-light-width: 100px; --fo-macos-traffic-light-height: 30px;` + break + } + } + document.documentElement.dataset.os = getOS() +} else { + registerAppGlobalShortcuts() } ReactDOM.createRoot($container).render( diff --git a/apps/renderer/src/modules/boost/query.tsx b/apps/renderer/src/modules/boost/query.tsx index 0dcc5284e..54c73ff3c 100644 --- a/apps/renderer/src/modules/boost/query.tsx +++ b/apps/renderer/src/modules/boost/query.tsx @@ -5,6 +5,7 @@ import { useAuthQuery, useI18n } from "~/hooks/common" import { apiClient } from "~/lib/api-fetch" import { defineQuery } from "~/lib/defineQuery" import { toastFetchError } from "~/lib/error-parser" +import { userActions } from "~/store/user" import { updateFeedBoostStatus } from "./atom" @@ -20,12 +21,7 @@ const query = { }), getBoosters: ({ feedId }: { feedId: string }) => defineQuery(["boosters", feedId], async () => { - const res = await apiClient.boosts.boosters.$get({ - query: { - feedId, - }, - }) - return res.data + return userActions.getBoosters(feedId) }), } diff --git a/apps/renderer/src/modules/discover/constants.ts b/apps/renderer/src/modules/discover/constants.ts new file mode 100644 index 000000000..7e87e410d --- /dev/null +++ b/apps/renderer/src/modules/discover/constants.ts @@ -0,0 +1,101 @@ +export const RSSHubCategoryOptions: { + name: string + value: string +}[] = [ + { + name: "All", + value: "all", + }, + { + name: "Social Media", + value: "social-media", + }, + { + name: "New Media", + value: "new-media", + }, + { + name: "News", + value: "traditional-media", + }, + { + name: "BBS", + value: "bbs", + }, + { + name: "Blog", + value: "blog", + }, + { + name: "Programming", + value: "programming", + }, + { + name: "Design", + value: "design", + }, + { + name: "Live", + value: "live", + }, + { + name: "Multimedia", + value: "multimedia", + }, + { + name: "Picture", + value: "picture", + }, + { + name: "ACG", + value: "anime", + }, + { + name: "Application Updates", + value: "program-update", + }, + { + name: "University", + value: "university", + }, + { + name: "Forecast", + value: "forecast", + }, + { + name: "Travel", + value: "travel", + }, + { + name: "Shopping", + value: "shopping", + }, + { + name: "Gaming", + value: "game", + }, + { + name: "Reading", + value: "reading", + }, + { + name: "Government", + value: "government", + }, + { + name: "Study", + value: "study", + }, + { + name: "Scientific Journal", + value: "journal", + }, + { + name: "Finance", + value: "finance", + }, +] + +export const RSSHubCategoryMap: Record = Object.fromEntries( + RSSHubCategoryOptions.map((item) => [item.value, item.name]), +) diff --git a/apps/renderer/src/modules/discover/inbox-list-form.tsx b/apps/renderer/src/modules/discover/inbox-list-form.tsx index 960331ee2..a4a6fd4db 100644 --- a/apps/renderer/src/modules/discover/inbox-list-form.tsx +++ b/apps/renderer/src/modules/discover/inbox-list-form.tsx @@ -16,10 +16,10 @@ import { toast } from "sonner" import { useEventCallback } from "usehooks-ts" import { useUserRole } from "~/atoms/user" -import { CustomSafeError } from "~/components/errors/helper" import { CopyButton } from "~/components/ui/code-highlighter" import { useModalStack } from "~/components/ui/modal/stacked/hooks" import { MAX_TRIAL_USER_INBOX_SUBSCRIPTION } from "~/constants/limit" +import { CustomSafeError } from "~/errors/CustomSafeError" import { createErrorToaster } from "~/lib/error-parser" import { useInboxList } from "~/queries/inboxes" import { inboxActions } from "~/store/inbox" diff --git a/apps/renderer/src/modules/discover/list-form.tsx b/apps/renderer/src/modules/discover/list-form.tsx index 073b15125..b06d1e5fd 100644 --- a/apps/renderer/src/modules/discover/list-form.tsx +++ b/apps/renderer/src/modules/discover/list-form.tsx @@ -327,7 +327,7 @@ const ListInnerForm = ({ {t("feed_form.fee_description")}
)} -
+
{isSubscribed && ( - - ))} - - - - ) -}) + + + ))} + + +
+
+ + + + {maintainers.map((m) => ( + + @{m} + + ))} + +
+
+ + + {categories.map((c) => ( + + ))} + +
+
+ + + ) + }, +) diff --git a/apps/renderer/src/modules/discover/recommendations.module.css b/apps/renderer/src/modules/discover/recommendations.module.css new file mode 100644 index 000000000..9701f20fe --- /dev/null +++ b/apps/renderer/src/modules/discover/recommendations.module.css @@ -0,0 +1,24 @@ +.recommendations-grid { + --rows: 4; + --max-item-width: 280px; + --gap: 1em; + display: grid; + grid-template-columns: repeat( + auto-fill, + minmax( + max(var(--max-item-width), calc((100% - var(--gap) * (var(--rows) - 1)) / var(--rows))), + 1fr + ) + ); + + gap: 1em; +} + +.recommendations-card { + border-radius: 8px; + box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.06) inset; + border: 0; + overflow: hidden; + display: flex; + flex-direction: column; +} diff --git a/apps/renderer/src/modules/discover/recommendations.tsx b/apps/renderer/src/modules/discover/recommendations.tsx index b0e447204..cef38ed25 100644 --- a/apps/renderer/src/modules/discover/recommendations.tsx +++ b/apps/renderer/src/modules/discover/recommendations.tsx @@ -1,59 +1,133 @@ +import { LoadingCircle } from "@follow/components/ui/loading/index.js" +import { ScrollArea } from "@follow/components/ui/scroll-area/index.js" +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "@follow/components/ui/select/index.jsx" +import { Tabs, TabsList, TabsTrigger } from "@follow/components/ui/tabs/index.js" import { cn, isASCII } from "@follow/utils/utils" -import { useMemo } from "react" +import { keepPreviousData } from "@tanstack/react-query" +import { useMemo, useRef, useState } from "react" +import { flushSync } from "react-dom" import { useTranslation } from "react-i18next" +import { useEventCallback } from "usehooks-ts" +import { useGeneralSettingKey } from "~/atoms/settings/general" import { useAuthQuery } from "~/hooks/common" import { Queries } from "~/queries" +import { RSSHubCategoryOptions } from "./constants" +import styles from "./recommendations.module.css" import { RecommendationCard } from "./recommendations-card" +const LanguageOptions = [ + { + name: "English", + value: "en", + }, + { + name: "简体中文", + value: "zh-CN", + }, +] as const + +type Language = (typeof LanguageOptions)[number]["value"] +type DiscoverCategories = (typeof RSSHubCategoryOptions)[number]["value"] + +const fetchRsshubPopular = (category: DiscoverCategories, lang: Language) => { + return Queries.discover.rsshubCategory({ + category: "popular", + categories: category === "all" ? "popular" : `popular,${category}`, + lang, + }) +} export function Recommendations({ hideTitle, className, + headerClassName, }: { hideTitle?: boolean className?: string + headerClassName?: string }) { - const rsshubPopular = useAuthQuery( - Queries.discover.rsshubCategory({ - category: "popular", - }), - { - meta: { - persist: true, - }, - }, - ) + const { t } = useTranslation() + const lang = useGeneralSettingKey("language") - const { data } = rsshubPopular + const defaultLang = ["zh-CN", "zh-HK", "zh-TW"].includes(lang ?? "") ? "zh-CN" : "en" + const [category, setCategory] = useState("all") + const [selectedLang, setSelectedLang] = useState(defaultLang) + + const rsshubPopular = useAuthQuery(fetchRsshubPopular(category, selectedLang), { + meta: { + persist: true, + }, + placeholderData: keepPreviousData, + }) + + const { data, isLoading, isFetching } = rsshubPopular const keys = useMemo(() => { - if (data) { - return Object.keys(data).sort((a, b) => { - const aname = data[a].name - const bname = data[b].name - - const aRouteName = data[a].routes[Object.keys(data[a].routes)[0]].name - const bRouteName = data[b].routes[Object.keys(data[b].routes)[0]].name - - const ia = isASCII(aname) && isASCII(aRouteName) - const ib = isASCII(bname) && isASCII(bRouteName) - - if (ia && ib) { - return aname.toLowerCase() < bname.toLowerCase() ? -1 : 1 - } else if (ia || ib) { - return ia > ib ? -1 : 1 - } else { - return 0 - } - }) - } else { + if (!data) { return [] } + return Object.keys(data).sort((a, b) => { + const aname = data[a].name + const bname = data[b].name + + const aRouteName = data[a].routes[Object.keys(data[a].routes)[0]].name + const bRouteName = data[b].routes[Object.keys(data[b].routes)[0]].name + + const ia = isASCII(aname) && isASCII(aRouteName) + const ib = isASCII(bname) && isASCII(bRouteName) + + if (ia && ib) { + return aname.toLowerCase() < bname.toLowerCase() ? -1 : 1 + } else if (ia || ib) { + return ia > ib ? -1 : 1 + } else { + return 0 + } + }) }, [data]) - const { t } = useTranslation() - if (rsshubPopular.isLoading) { + const handleCategoryChange = (value: DiscoverCategories) => { + flushSync(() => { + setCategory(value) + }) + rsshubPopular.refetch() + } + + const handleLangChange = (value: string) => { + flushSync(() => { + setSelectedLang(value as Language) + }) + rsshubPopular.refetch() + } + + const tabRef = useRef(null) + const handleChangeCategoryAndJumpTo = useEventCallback((category: DiscoverCategories) => { + handleCategoryChange(category) + + if (tabRef.current) { + const tab = tabRef.current.querySelector(`[data-value="${category}"]`) + if (tab) { + const tabRect = tab.getBoundingClientRect() + const containerRect = tabRef.current.getBoundingClientRect() + const scrollLeft = + tabRect.left - + containerRect.left + + tabRef.current.scrollLeft - + (containerRect.width - tabRect.width) / 2 + + tabRef.current.scrollTo({ left: scrollLeft, behavior: "smooth" }) + } + } + }) + + if (isLoading) { return null } @@ -62,12 +136,71 @@ export function Recommendations({ } return ( -
- {!hideTitle &&
{t("discover.popular")}
} +
+ {!hideTitle && ( +
+ {t("discover.popular")} -
+ {isFetching && ( +
+ + {t("discover.popular")} + + +
+ )} +
+ )} + +
+ + + + {RSSHubCategoryOptions.map((category) => ( + + {category.name} + + ))} + + + + +
+ +
{keys.map((key) => ( - + ))}
diff --git a/apps/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx b/apps/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx index 6872f5a85..83ef9a838 100644 --- a/apps/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx +++ b/apps/renderer/src/modules/entry-column/EntryColumnShortcutHandler.tsx @@ -67,7 +67,7 @@ export const EntryColumnShortcutHandler: FC<{ entryId: nextId, }) }, - { scopes: HotKeyScopeMap.Home, enabled: enabledArrowKey }, + { scopes: HotKeyScopeMap.Home, enabled: enabledArrowKey, preventDefault: true }, ) useHotkeys( shortcuts.entries.previous.key, @@ -87,7 +87,7 @@ export const EntryColumnShortcutHandler: FC<{ entryId: nextId, }) }, - { scopes: HotKeyScopeMap.Home, enabled: enabledArrowKey }, + { scopes: HotKeyScopeMap.Home, enabled: enabledArrowKey, preventDefault: true }, ) return null }) diff --git a/apps/renderer/src/modules/entry-column/Items/picture-item.tsx b/apps/renderer/src/modules/entry-column/Items/picture-item.tsx index 59251d459..a05ee65fa 100644 --- a/apps/renderer/src/modules/entry-column/Items/picture-item.tsx +++ b/apps/renderer/src/modules/entry-column/Items/picture-item.tsx @@ -1,3 +1,9 @@ +import { + MasonryIntersectionContext, + useMasonryItemRatio, + useMasonryItemWidth, + useSetStableMasonryItemRatio, +} from "@follow/components/ui/masonry/contexts.jsx" import { Skeleton } from "@follow/components/ui/skeleton/index.jsx" import { FeedViewType } from "@follow/constants" import { cn } from "@follow/utils/utils" @@ -22,12 +28,6 @@ import { usePreviewMedia } from "../../../components/ui/media/hooks" import { EntryItemWrapper } from "../layouts/EntryItemWrapper" import { GridItem, GridItemFooter } from "../templates/grid-item-template" import type { EntryItemStatelessProps, UniversalItemProps } from "../types" -import { - MasonryIntersectionContext, - useMasonryItemRatio, - useMasonryItemWidth, - useSetStableMasonryItemRatio, -} from "./contexts/picture-masonry-context" export function PictureItem({ entryId, entryPreview, translation }: UniversalItemProps) { const entry = useEntry(entryId) || entryPreview @@ -75,7 +75,8 @@ export const PictureWaterFallItem = memo(function PictureWaterFallItem({ entryPreview, translation, index, -}: UniversalItemProps & { index: number }) { + className, +}: UniversalItemProps & { index: number; className?: string }) { const entry = useEntry(entryId) || entryPreview const isActive = useRouteParamsSelector(({ entryId }) => entryId === entry?.entries.id) @@ -97,6 +98,7 @@ export const PictureWaterFallItem = memo(function PictureWaterFallItem({ }, [ref, intersectionObserver]) const [isMouseEnter, setIsMouseEnter] = useState(false) + if (!entry) return null const media = filterSmallMedia(entry.entries.media) @@ -108,6 +110,7 @@ export const PictureWaterFallItem = memo(function PictureWaterFallItem({ data-index={index} onMouseEnter={() => setIsMouseEnter(true)} onMouseLeave={() => setIsMouseEnter(false)} + className={className} > 32 * 16= 512 - 512: 2, - // 48rem => 48 * 16= 768 - 768: 3, - // 72rem => 72 * 16= 1152 - 1152: 4, - // 80rem => 80 * 16= 1280 - 1280: 5, - 1536: 6, - 1792: 7, - 2048: 8, -} -const getCurrentColumn = (w: number) => { - // Initialize column count with the minimum number of columns - let columns = 1 - - // Iterate through each breakpoint and determine the column count - for (const [breakpoint, cols] of Object.entries(breakpoints)) { - if (w >= Number.parseInt(breakpoint)) { - columns = cols - } else { - break - } - } - - return columns -} +const FirstScreenItemCount = 20 +const FirstScreenReadyCountDown = 150 +const FirstScreenReadyContext = createContext(false) const gutter = 24 export const PictureMasonry: FC = (props) => { @@ -62,7 +47,7 @@ export const PictureMasonry: FC = (props) => { const cacheMap = useState(() => new Map())[0] const [isInitDim, setIsInitDim] = useState(false) const [isInitLayout, setIsInitLayout] = useState(false) - const [currentItemWidth, setCurrentItemWidth] = useState(0) + const deferIsInitLayout = useDeferredValue(isInitLayout) const restoreDimensions = useEventCallback(async () => { const images = [] as string[] data.forEach((entryId) => { @@ -73,48 +58,18 @@ export const PictureMasonry: FC = (props) => { }) return imageActions.fetchDimensionsFromDb(images) }) - useEffect(() => { - restoreDimensions().finally(() => { - setIsInitDim(true) - }) - }, []) - const containerRef = useRef(null) - const [currentColumn, setCurrentColumn] = useState(1) - useLayoutEffect(() => { - const $warpper = containerRef.current - if (!$warpper) return - const handler = () => { - const column = getCurrentColumn($warpper.clientWidth) - setCurrentItemWidth(Math.trunc($warpper.clientWidth / column - gutter)) - - setCurrentColumn(column) - - nextFrame(() => { - setIsInitLayout(true) + restoreDimensions().finally(() => { + startTransition(() => { + setIsInitDim(true) }) - } - const recal = throttle(handler, 1000 / 12) - - let previousWidth = $warpper.offsetWidth - const resizeObserver = new ResizeObserver((entries) => { - for (const entry of entries) { - const newWidth = entry.contentRect.width - - if (newWidth !== previousWidth) { - previousWidth = newWidth - - recal() - } - } }) - recal() - resizeObserver.observe($warpper) - return () => { - resizeObserver.disconnect() - } }, []) + const { containerRef, currentColumn, currentItemWidth } = useMasonryColumn(gutter, () => { + setIsInitLayout(true) + }) + const items = useMemo(() => { const result = data.map((entryId) => { const cache = cacheMap.get(entryId) @@ -228,24 +183,37 @@ export const PictureMasonry: FC = (props) => { } }, [scrollElement, renderMarkRead, scrollMarkRead, dataRef]) + const [firstScreenReady, setFirstScreenReady] = useState(false) + useEffect(() => { + if (firstScreenReady) return + const timer = setTimeout(() => { + setFirstScreenReady(true) + }, FirstScreenReadyCountDown) + return () => { + clearTimeout(timer) + } + }, []) + return (
- {isInitDim && isInitLayout && ( + {isInitDim && deferIsInitLayout && ( - + + + @@ -257,16 +225,26 @@ export const PictureMasonry: FC = (props) => { } const itemKey = (item: { entryId: string }) => item.entryId -const render: React.ComponentType< +const MasonryRender: React.ComponentType< RenderComponentProps<{ entryId: string }> > = ({ data, index }) => { + const firstScreenReady = useContext(FirstScreenReadyContext) if (data.entryId.startsWith("placeholder")) { return } - return + return ( + + ) } interface MasonryProps { data: string[] diff --git a/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx b/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx index 83e0494aa..c1e76e793 100644 --- a/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx +++ b/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx @@ -1,6 +1,7 @@ import { useViewport } from "@follow/components/hooks/useViewport.js" import { ActionButton, Button, IconButton } from "@follow/components/ui/button/index.js" import { RootPortal } from "@follow/components/ui/portal/index.jsx" +import { useCountdown } from "@follow/hooks" import { cn, getOS } from "@follow/utils/utils" import { AnimatePresence, m } from "framer-motion" import type { FC, ReactNode } from "react" @@ -86,7 +87,7 @@ export const MarkAllReadWithOverlay = forwardRef< {commonT(`words.which.${which}` as any)}, }} /> {shortcut && ( @@ -162,7 +163,7 @@ const Popup = ({ which, containerRef, setPopoverRef, setShow, handleMarkAllAsRea {commonT(`words.which.${which}` as any)}, }} /> @@ -186,14 +187,19 @@ const Popup = ({ which, containerRef, setPopoverRef, setShow, handleMarkAllAsRea const ConfirmMarkAllReadInfo = ({ undo }: { undo: () => any }) => { const { t } = useTranslation() + const [countdown] = useCountdown({ countStart: 3 }) + useHotkeys("ctrl+z,meta+z", undo, { scopes: HotKeyScopeMap.Home, preventDefault: true, }) + return (

{t("mark_all_read_button.confirm_mark_all_info")}

- {t("mark_all_read_button.auto_confirm_info")} + + {t("mark_all_read_button.auto_confirm_info", { countdown })} +
) } diff --git a/apps/renderer/src/modules/entry-column/hooks.ts b/apps/renderer/src/modules/entry-column/hooks.ts index ab8c1130e..21d36de71 100644 --- a/apps/renderer/src/modules/entry-column/hooks.ts +++ b/apps/renderer/src/modules/entry-column/hooks.ts @@ -1,4 +1,5 @@ import { views } from "@follow/constants" +import { useMutation } from "@tanstack/react-query" import { useCallback, useEffect, useMemo, useRef, useState } from "react" import type { ListRange } from "react-virtuoso" import { useDebounceCallback } from "usehooks-ts" @@ -6,8 +7,9 @@ import { useDebounceCallback } from "usehooks-ts" import { useGeneralSettingKey } from "~/atoms/settings/general" import { useRouteParams, useRouteParamsSelector } from "~/hooks/biz/useRouteParams" import { useAuthQuery } from "~/hooks/common" +import { apiClient, apiFetch } from "~/lib/api-fetch" import { entries, useEntries } from "~/queries/entries" -import { entryActions, useEntryIdsByFeedIdOrView } from "~/store/entry" +import { entryActions, getEntry, useEntryIdsByFeedIdOrView } from "~/store/entry" import { useFolderFeedsByFeedId } from "~/store/subscription" import { feedUnreadActions } from "~/store/unread" @@ -50,6 +52,7 @@ export const useEntryMarkReadHandler = (entriesIds: string[]) => { }, [feedView, handleMarkReadInRange, handleRenderAsRead, renderAsRead, scrollMarkUnread]) } const anyString = [] as string[] + export const useEntriesByView = ({ onReset, isArchived, @@ -114,6 +117,8 @@ export const useEntriesByView = ({ ] as string[] }, [query.data?.pages]) + useFetchEntryContentByStream(remoteEntryIds) + const currentEntries = useEntryIdsByFeedIdOrView(isAllFeeds ? view : folderIds || feedId!, { unread: unreadOnly, view, @@ -273,3 +278,82 @@ function sortEntriesIdByEntryInsertedAt(entries: string[]) { entriesId2Map[b]?.entries.insertedAt.localeCompare(entriesId2Map[a]?.entries.insertedAt), ) } + +const useFetchEntryContentByStream = (remoteEntryIds?: string[]) => { + const { mutate: updateEntryContent } = useMutation({ + mutationKey: ["stream-entry-content", remoteEntryIds], + mutationFn: async (remoteEntryIds: string[]) => { + const onlyNoStored = true + + const nextIds = [] as string[] + if (onlyNoStored) { + for (const id of remoteEntryIds) { + const entry = getEntry(id) + if (entry.entries.content) { + continue + } + + nextIds.push(id) + } + } + + if (nextIds.length === 0) return + + const readStream = async () => { + const response = await apiFetch(apiClient.entries.stream.$url().toString(), { + method: "post", + body: JSON.stringify({ + ids: nextIds, + }), + responseType: "stream", + }) + + const reader = response.getReader() + if (!reader) return + + const decoder = new TextDecoder() + let buffer = "" + + try { + while (true) { + const { done, value } = await reader.read() + if (done) break + + buffer += decoder.decode(value, { stream: true }) + const lines = buffer.split("\n") + + // Process all complete lines + for (let i = 0; i < lines.length - 1; i++) { + if (lines[i].trim()) { + const json = JSON.parse(lines[i]) + // Handle each JSON line here + entryActions.updateEntryContent(json.id, json.content) + } + } + + // Keep the last incomplete line in the buffer + buffer = lines.at(-1) || "" + } + + // Process any remaining data + if (buffer.trim()) { + const json = JSON.parse(buffer) + + entryActions.updateEntryContent(json.id, json.content) + } + } catch (error) { + console.error("Error reading stream:", error) + } finally { + reader.releaseLock() + } + } + + readStream() + }, + }) + + useEffect(() => { + if (!remoteEntryIds) return + updateEntryContent(remoteEntryIds) + }, [remoteEntryIds, updateEntryContent]) +} diff --git a/apps/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx b/apps/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx index 5d200f008..f02d2ffc2 100644 --- a/apps/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx +++ b/apps/renderer/src/modules/entry-column/layouts/EntryItemWrapper.tsx @@ -1,19 +1,18 @@ import type { FeedViewType } from "@follow/constants" import { views } from "@follow/constants" -import { useAnyPointDown } from "@follow/hooks" import { cn } from "@follow/utils/utils" import type { FC, PropsWithChildren } from "react" import { useCallback, useState } from "react" import { useTranslation } from "react-i18next" import { useDebounceCallback } from "usehooks-ts" +import { useShowContextMenu } from "~/atoms/context-menu" import { useGeneralSettingKey } from "~/atoms/settings/general" import { useAsRead } from "~/hooks/biz/useAsRead" import { useEntryActions } from "~/hooks/biz/useEntryActions" import { useFeedActions } from "~/hooks/biz/useFeedActions" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" import { useRouteParamsSelector } from "~/hooks/biz/useRouteParams" -import { showNativeMenu } from "~/lib/native-menu" import type { FlatEntryModel } from "~/store/entry" import { entryActions } from "~/store/entry" @@ -76,12 +75,12 @@ export const EntryItemWrapper: FC< [entry.entries.url], ) const [isContextMenuOpen, setIsContextMenuOpen] = useState(false) - useAnyPointDown(() => isContextMenuOpen && setIsContextMenuOpen(false)) + const showContextMenu = useShowContextMenu() const handleContextMenu: React.MouseEventHandler = useCallback( - (e) => { + async (e) => { e.preventDefault() setIsContextMenuOpen(true) - showNativeMenu( + await showContextMenu( [ ...items .filter((item) => !item.hide) @@ -109,8 +108,9 @@ export const EntryItemWrapper: FC< ], e, ) + setIsContextMenuOpen(false) }, - [items, feedItems, t, entry.entries.id], + [showContextMenu, items, feedItems, t, entry.entries.id], ) return ( diff --git a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx b/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx index bb219b42b..2db164dde 100644 --- a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx +++ b/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx @@ -1,3 +1,4 @@ +import { MdiMeditation } from "@follow/components/icons/Meditation.jsx" import { ActionButton } from "@follow/components/ui/button/index.js" import { DividerVertical } from "@follow/components/ui/divider/index.js" import { RotatingRefreshIcon } from "@follow/components/ui/loading/index.jsx" @@ -12,7 +13,13 @@ import * as React from "react" import { useTranslation } from "react-i18next" import { setGeneralSetting, useGeneralSettingKey } from "~/atoms/settings/general" -import { setUISetting, useUISettingKey } from "~/atoms/settings/ui" +import { + setUISetting, + useIsZenMode, + useRealInWideMode, + useSetZenMode, + useUISettingKey, +} from "~/atoms/settings/ui" import { useWhoami } from "~/atoms/user" import { ImpressionView } from "~/components/common/ImpressionTracker" import { FEED_COLLECTION_LIST, ROUTE_ENTRY_PENDING, ROUTE_FEED_IN_LIST } from "~/constants" @@ -234,9 +241,11 @@ const SwitchToMasonryButton = () => { } const WideModeButton = () => { - const isWideMode = useUISettingKey("wideMode") + const isWideMode = useRealInWideMode() + const isZenMode = useIsZenMode() const { t } = useTranslation() + const setIsZenMode = useSetZenMode() return ( { { - setUISetting("wideMode", !isWideMode) - // TODO: Remove this after useMeasure can get bounds in time - window.dispatchEvent(new Event("resize")) + if (isZenMode) { + setIsZenMode(false) + } else { + setUISetting("wideMode", !isWideMode) + // TODO: Remove this after useMeasure can get bounds in time + window.dispatchEvent(new Event("resize")) + } window.analytics?.capture("Switch to Wide Mode", { wideMode: !isWideMode ? 1 : 0, click: 1, }) }} tooltip={ - !isWideMode - ? t("entry_list_header.switch_to_widemode") - : t("entry_list_header.switch_to_normalmode") + isZenMode + ? t("zen.exit") + : !isWideMode + ? t("entry_list_header.switch_to_widemode") + : t("entry_list_header.switch_to_normalmode") } > - + {isZenMode ? ( + + ) : ( + + )} ) diff --git a/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx b/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx index 1570786dd..e00168058 100644 --- a/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx +++ b/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx @@ -1,9 +1,8 @@ import { EllipsisHorizontalTextWithTooltip } from "@follow/components/ui/typography/index.js" import { cn, isSafari } from "@follow/utils/utils" -import { useDebounceCallback } from "usehooks-ts" import { AudioPlayer, useAudioPlayerAtomSelector } from "~/atoms/player" -import { useUISettingKeys } from "~/atoms/settings/ui" +import { useRealInWideMode, useUISettingKey } from "~/atoms/settings/ui" import { RelativeTime } from "~/components/ui/datetime" import { Media } from "~/components/ui/media" import { FEED_COLLECTION_LIST } from "~/constants" @@ -12,7 +11,6 @@ import { useRouteParamsSelector } from "~/hooks/biz/useRouteParams" import { EntryTranslation } from "~/modules/entry-column/translation" import { FeedIcon } from "~/modules/feed/feed-icon" import { FeedTitle } from "~/modules/feed/feed-title" -import { Queries } from "~/queries" import { useEntry } from "~/store/entry/hooks" import { getPreferredTitle, useFeedById } from "~/store/feed" import { useInboxById } from "~/store/inbox" @@ -52,17 +50,18 @@ export function ListItem({ const inbox = useInboxById(entry?.inboxId) - const handlePrefetchEntry = useDebounceCallback( - () => { - inbox - ? Queries.entries.byInboxId(entryId).prefetch() - : Queries.entries.byId(entryId).prefetch() - }, - 300, - { leading: false }, - ) + // const handlePrefetchEntry = useDebounceCallback( + // () => { + // inbox + // ? Queries.entries.byInboxId(entryId).prefetch() + // : Queries.entries.byId(entryId).prefetch() + // }, + // 300, + // { leading: false }, + // ) - const [settingWideMode, thumbnailRatio] = useUISettingKeys(["wideMode", "thumbnailRatio"]) + const settingWideMode = useRealInWideMode() + const thumbnailRatio = useUISettingKey("thumbnailRatio") const rid = `list-item-${entryId}` // NOTE: prevent 0 height element, react virtuoso will not stop render any more @@ -75,8 +74,8 @@ export function ListItem({ return (
+> = ({ data }) => { + const { url, type, height, width, blurhash } = data + + const itemWidth = useMasonryItemWidth() + + return ( + + + + ) +} +export const ImageGallery = ({ images }: { images: MediaModel[] }) => { + const { containerRef, currentColumn, currentItemWidth } = useMasonryColumn(gutter) + + const [masonryItemsRadio, setMasonryItemsRadio] = useState>({}) + return ( +
+ + + + + + items={images} + columnGutter={gutter} + columnWidth={currentItemWidth} + columnCount={currentColumn} + overscanBy={2} + render={Render as any} + /> + + + + +
+ ) +} + +const MasonryItemFixedDimensionWrapper = ( + props: PropsWithChildren<{ + url: string + }>, +) => { + const { url, children } = props + const dim = useImageDimensions(url) + const itemWidth = useMasonryItemWidth() + + const itemHeight = dim ? itemWidth / dim.ratio : itemWidth + const stableRadio = useState(() => itemWidth / itemHeight || 1)[0] + const setItemStableRatio = useSetStableMasonryItemRatio() + + const stableRadioCtx = useMasonryItemRatio(url) + + useEffect(() => { + setItemStableRatio(url, stableRadio) + }, [setItemStableRatio, stableRadio, url]) + + const style = useMemo( + () => ({ + width: itemWidth, + height: itemWidth / stableRadioCtx, + }), + [itemWidth, stableRadioCtx], + ) + + if (!style.height) return null + + return ( +
+ {children} +
+ ) +} diff --git a/apps/renderer/src/modules/entry-content/components/EntryTitle.tsx b/apps/renderer/src/modules/entry-content/components/EntryTitle.tsx index 172e701af..bc7625bbc 100644 --- a/apps/renderer/src/modules/entry-content/components/EntryTitle.tsx +++ b/apps/renderer/src/modules/entry-content/components/EntryTitle.tsx @@ -77,13 +77,20 @@ export const EntryTitle = ({ entryId, compact }: EntryLinkProps) => { { + if (window.getSelection()?.toString()) { + e.preventDefault() + } + }} >
diff --git a/apps/renderer/src/modules/entry-content/header.tsx b/apps/renderer/src/modules/entry-content/header.tsx index 57555e7ab..fd8f8369f 100644 --- a/apps/renderer/src/modules/entry-content/header.tsx +++ b/apps/renderer/src/modules/entry-content/header.tsx @@ -1,7 +1,7 @@ import { ActionButton } from "@follow/components/ui/button/index.js" import { DividerVertical } from "@follow/components/ui/divider/index.js" import { FeedViewType, views } from "@follow/constants" -import type { CombinedEntryModel } from "@follow/models/types" +import type { CombinedEntryModel, MediaModel } from "@follow/models/types" import { IN_ELECTRON } from "@follow/shared/constants" import { cn } from "@follow/utils/utils" import { Slot } from "@radix-ui/react-slot" @@ -17,15 +17,18 @@ import { useEntryInReadabilityStatus, } from "~/atoms/readability" import { useUISettingKey } from "~/atoms/settings/ui" +import { useModalStack } from "~/components/ui/modal/stacked/hooks" import { shortcuts } from "~/constants/shortcuts" import { useEntryActions, useEntryReadabilityToggle } from "~/hooks/biz/useEntryActions" import { useRouteParamsSelector } from "~/hooks/biz/useRouteParams" import { tipcClient } from "~/lib/client" import { parseHtml } from "~/lib/parse-html" +import { filterSmallMedia } from "~/lib/utils" import type { FlatEntryModel } from "~/store/entry" import { useEntry } from "~/store/entry/hooks" import { useFeedById } from "~/store/feed" +import { ImageGallery } from "./actions/picture-gallery" import { useEntryContentScrollToTop, useEntryTitleMeta } from "./atoms" import { EntryReadHistory } from "./components/EntryReadHistory" @@ -62,7 +65,7 @@ function EntryHeaderImpl({ return (
{!compact && } + {items .filter((item) => !item.hide) .map((item) => ( @@ -228,3 +232,26 @@ const ElectronAdditionActions = IN_ELECTRON : noop export const EntryHeader = memo(EntryHeaderImpl) + +const SpecialActions = ({ id }: { id: string }) => { + const images = useEntry(id, (entry) => entry.entries.media) + const { present } = useModalStack() + const filteredImages = filterSmallMedia(images) + if (filteredImages?.length && filteredImages.length > 5) { + return ( + { + window.analytics?.capture("entry_content_header_image_gallery_click") + present({ + title: "Image Gallery", + content: () => , + max: true, + }) + }} + icon={} + tooltip={`Image Gallery`} + /> + ) + } + return null +} diff --git a/apps/renderer/src/modules/entry-content/index.tsx b/apps/renderer/src/modules/entry-content/index.tsx index 1338e4fff..503e022e0 100644 --- a/apps/renderer/src/modules/entry-content/index.tsx +++ b/apps/renderer/src/modules/entry-content/index.tsx @@ -6,7 +6,7 @@ import { ScrollArea } from "@follow/components/ui/scroll-area/index.js" import { useTitle } from "@follow/hooks" import type { FeedModel, InboxModel } from "@follow/models/types" import { IN_ELECTRON } from "@follow/shared/constants" -import { stopPropagation } from "@follow/utils/dom" +import { clearSelection, stopPropagation } from "@follow/utils/dom" import { EventBus } from "@follow/utils/event-bus" import { cn } from "@follow/utils/utils" import type { FallbackRender } from "@sentry/react" @@ -210,6 +210,7 @@ export const EntryContentRender: Component<{ ref={scrollerRef} >
subscriptionActions.deleteCategory(feedIdList), + onError: createErrorToaster(t("sidebar.category_remove_dialog.error")), + onSuccess: () => { + toast.success(t("sidebar.category_remove_dialog.success")) + }, }) const { dismiss } = useCurrentModal() diff --git a/apps/renderer/src/modules/feed-column/category.tsx b/apps/renderer/src/modules/feed-column/category.tsx index f37ec7356..0e7112dd2 100644 --- a/apps/renderer/src/modules/feed-column/category.tsx +++ b/apps/renderer/src/modules/feed-column/category.tsx @@ -1,9 +1,10 @@ +import { useDroppable } from "@dnd-kit/core" import { MotionButtonBase } from "@follow/components/ui/button/index.js" import { LoadingCircle } from "@follow/components/ui/loading/index.jsx" import { useScrollViewElement } from "@follow/components/ui/scroll-area/hooks.js" import type { FeedViewType } from "@follow/constants" import { views } from "@follow/constants" -import { useAnyPointDown, useInputComposition, useRefValue } from "@follow/hooks" +import { useInputComposition, useRefValue } from "@follow/hooks" import { stopPropagation } from "@follow/utils/dom" import { cn, sortByAlphabet } from "@follow/utils/utils" import { useMutation } from "@tanstack/react-query" @@ -11,15 +12,17 @@ import { AnimatePresence, m } from "framer-motion" import type { FC } from "react" import { Fragment, memo, useCallback, useEffect, useMemo, useRef, useState } from "react" import { useTranslation } from "react-i18next" +import { toast } from "sonner" import { useOnClickOutside } from "usehooks-ts" +import type { MenuItemInput } from "~/atoms/context-menu" +import { useShowContextMenu } from "~/atoms/context-menu" import { ROUTE_FEED_IN_FOLDER } from "~/constants" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" import { getRouteParams, useRouteParamsSelector } from "~/hooks/biz/useRouteParams" -import type { NullableNativeMenuItem } from "~/lib/native-menu" -import { showNativeMenu } from "~/lib/native-menu" +import { createErrorToaster } from "~/lib/error-parser" import { getPreferredTitle, useAddFeedToFeedList, useFeedStore } from "~/store/feed" -import { useOwnedList } from "~/store/list" +import { useOwnedListByView } from "~/store/list" import { subscriptionActions, subscriptionCategoryExist, @@ -144,22 +147,33 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego const [isCategoryEditing, setIsCategoryEditing] = useState(false) const [isContextMenuOpen, setIsContextMenuOpen] = useState(false) - useAnyPointDown(() => { - isContextMenuOpen && setIsContextMenuOpen(false) - }) const isCategoryIsWaiting = isChangePending const addMutation = useAddFeedToFeedList() - const listList = useOwnedList(view!) + const listList = useOwnedListByView(view!) + const showContextMenu = useShowContextMenu() + + const isAutoGroupedCategory = !!folderName && !subscriptionCategoryExist(folderName) + + const { isOver, setNodeRef } = useDroppable({ + id: `category-${folderName}`, + disabled: isAutoGroupedCategory, + data: { + category: folderName, + view, + }, + }) return (
{!!showCollapse && (
{ @@ -168,10 +182,10 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego setCategoryActive() } }} - onContextMenu={(e) => { + onContextMenu={async (e) => { setIsContextMenuOpen(true) - showNativeMenu( + await showContextMenu( [ { type: "text", @@ -199,7 +213,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego listId: list.id, }) }, - }) as NullableNativeMenuItem, + }) as MenuItemInput, ) .concat(listList?.length > 0 ? [{ type: "separator" as const }] : []) .concat([ @@ -242,7 +256,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego { type: "text", label: t("sidebar.feed_column.context_menu.delete_category"), - hide: !folderName || !subscriptionCategoryExist(folderName), + hide: !folderName || isAutoGroupedCategory, click: () => { present({ title: t("sidebar.feed_column.context_menu.delete_category_confirmation", { @@ -255,6 +269,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego ], e, ) + setIsContextMenuOpen(false) }} >
@@ -303,7 +318,7 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego {open && ( void }> = ({ currentCategory, onFinished }) => { const navigate = useNavigateEntry() + const { t } = useTranslation() const renameMutation = useMutation({ mutationFn: async ({ lastCategory, @@ -357,6 +373,10 @@ const RenameCategoryForm: FC<{ onFinished() }, + onError: createErrorToaster(t("sidebar.feed_column.context_menu.rename_category_error")), + onSuccess: () => { + toast.success(t("sidebar.feed_column.context_menu.rename_category_success")) + }, }) const formRef = useRef(null) useOnClickOutside( diff --git a/apps/renderer/src/modules/feed-column/context.ts b/apps/renderer/src/modules/feed-column/context.ts new file mode 100644 index 000000000..d19d76464 --- /dev/null +++ b/apps/renderer/src/modules/feed-column/context.ts @@ -0,0 +1,9 @@ +import type { DraggableAttributes, DraggableSyntheticListeners } from "@dnd-kit/core" +import type { CSSProperties } from "react" +import { createContext } from "react" + +export const DraggableContext = createContext<{ + attributes: DraggableAttributes + listeners: DraggableSyntheticListeners + style?: CSSProperties | undefined +} | null>(null) diff --git a/apps/renderer/src/modules/feed-column/header.tsx b/apps/renderer/src/modules/feed-column/header.tsx index c02e296ec..f5191cc1c 100644 --- a/apps/renderer/src/modules/feed-column/header.tsx +++ b/apps/renderer/src/modules/feed-column/header.tsx @@ -1,4 +1,5 @@ import { Logo } from "@follow/components/icons/logo.jsx" +import { MdiMeditation } from "@follow/components/icons/Meditation.js" import { ActionButton } from "@follow/components/ui/button/index.js" import { Popover, PopoverContent, PopoverTrigger } from "@follow/components/ui/popover/index.jsx" import { stopPropagation } from "@follow/utils/dom" @@ -13,6 +14,7 @@ import { toast } from "sonner" import { setAppSearchOpen } from "~/atoms/app" import { useGeneralSettingKey } from "~/atoms/settings/general" +import { useIsZenMode, useSetZenMode } from "~/atoms/settings/ui" import { setFeedColumnShow, useFeedColumnShow, useSidebarActiveView } from "~/atoms/sidebar" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" import { useI18n } from "~/hooks/common" @@ -81,7 +83,8 @@ const LayoutActionButton = () => { const [animation, setAnimation] = useState({ width: !feedColumnShow ? "auto" : 0, }) - + const isZenMode = useIsZenMode() + const setIsZenMode = useSetZenMode() useEffect(() => { setAnimation({ width: !feedColumnShow ? "auto" : 0, @@ -95,18 +98,28 @@ const LayoutActionButton = () => { return ( + isZenMode ? ( + + ) : ( + + ) } - onClick={() => setFeedColumnShow(!feedColumnShow)} + onClick={() => { + if (isZenMode) { + setIsZenMode(false) + } else { + setFeedColumnShow(!feedColumnShow) + } + }} /> ) diff --git a/apps/renderer/src/modules/feed-column/index.tsx b/apps/renderer/src/modules/feed-column/index.tsx index 553ad94a3..1df6df5a1 100644 --- a/apps/renderer/src/modules/feed-column/index.tsx +++ b/apps/renderer/src/modules/feed-column/index.tsx @@ -1,14 +1,16 @@ +import { DndContext, pointerWithin, useDroppable } from "@dnd-kit/core" import { ActionButton } from "@follow/components/ui/button/index.js" +import type { FeedViewType } from "@follow/constants" import { Routes, views } from "@follow/constants" import { useTypeScriptHappyCallback } from "@follow/hooks" -import { useSubscribeElectronEvent } from "@follow/shared/event" +import { useRegisterGlobalContext } from "@follow/shared/bridge" import { stopPropagation } from "@follow/utils/dom" import { clamp, cn } from "@follow/utils/utils" import { useWheel } from "@use-gesture/react" import { AnimatePresence, m } from "framer-motion" import { Lethargy } from "lethargy" import type { FC, PropsWithChildren } from "react" -import { useCallback, useLayoutEffect, useRef, useState } from "react" +import { startTransition, useCallback, useLayoutEffect, useRef, useState } from "react" import { isHotkeyPressed, useHotkeys } from "react-hotkeys-hook" import { useTranslation } from "react-i18next" @@ -19,13 +21,14 @@ import { shortcuts } from "~/constants/shortcuts" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" import { useReduceMotion } from "~/hooks/biz/useReduceMotion" import { getRouteParams } from "~/hooks/biz/useRouteParams" +import { useBatchUpdateSubscription } from "~/hooks/biz/useSubscriptionActions" import { useAuthQuery } from "~/hooks/common" import { Queries } from "~/queries" import { useSubscriptionStore } from "~/store/subscription" import { useFeedUnreadStore } from "~/store/unread" import { WindowUnderBlur } from "../../components/ui/background" -import { getSelectedFeedIds, setSelectedFeedIds } from "./atom" +import { getSelectedFeedIds, setSelectedFeedIds, useSelectedFeedIds } from "./atom" import { FeedColumnHeader } from "./header" import { FeedList } from "./list" @@ -87,27 +90,6 @@ export function FeedColumn({ children, className }: PropsWithChildren<{ classNam } }, [setActive_]) - const [useHotkeysSwitch, setUseHotkeysSwitch] = useState(false) - useHotkeys( - shortcuts.feeds.switchBetweenViews.key, - (e) => { - e.preventDefault() - setUseHotkeysSwitch(true) - if (isHotkeyPressed("Left")) { - setActive((i) => { - if (i === 0) { - return views.length - 1 - } else { - return i - 1 - } - }) - } else { - setActive((i) => (i + 1) % views.length) - } - }, - { scopes: HotKeyScopeMap.Home }, - ) - useWheel( ({ event, last, memo: wait = false, direction: [dx], delta: [dex] }) => { if (!last) { @@ -131,88 +113,157 @@ export function FeedColumn({ children, className }: PropsWithChildren<{ classNam }, ) - const unreadByView = useUnreadByView() - const { t } = useTranslation() + const [useHotkeysSwitch, setUseHotkeysSwitch] = useState(false) + useHotkeys( + shortcuts.feeds.switchBetweenViews.key, + (e) => { + e.preventDefault() + setUseHotkeysSwitch(true) + if (isHotkeyPressed("Left")) { + setActive((i) => { + if (i === 0) { + return views.length - 1 + } else { + return i - 1 + } + }) + } else { + setActive((i) => (i + 1) % views.length) + } + }, + { scopes: HotKeyScopeMap.Home }, + ) - const showSidebarUnreadCount = useUISettingKey("sidebarShowUnreadCount") - - useSubscribeElectronEvent("Discover", () => { + useRegisterGlobalContext("goToDiscover", () => { window.router.navigate(Routes.Discover) }) + const [selectedIds, setSelectedIds] = useSelectedFeedIds() + + const { mutate } = useBatchUpdateSubscription() + return ( - navigateBackHome(), [navigateBackHome])} + { + if (!event.over) { + return + } + + const { category, view } = event.over.data.current as { + category: string + view: FeedViewType + } + + mutate({ category, view, feedIdList: selectedIds }) + + setSelectedIds([]) + }} > - + navigateBackHome(), [navigateBackHome])} + > + -
- {views.map((item, index) => ( - { - setActive(index) - setUseHotkeysSwitch(false) - e.stopPropagation() - }} - > - {item.icon} - {showSidebarUnreadCount ? ( -
- {unreadByView[index] > 99 ? ( - 99+ - ) : ( - unreadByView[index] - )} -
- ) : ( - - )} -
- ))} -
-
{ - if (!(e.target instanceof HTMLElement) || !e.target.closest("[data-feed-id]")) { - const nextSelectedFeedIds = getSelectedFeedIds() - setSelectedFeedIds(nextSelectedFeedIds.length === 0 ? nextSelectedFeedIds : []) - } - }, [])} - > - +
{views.map((item, index) => ( -
- -
+ ))} - -
+
+
{ + if (!(e.target instanceof HTMLElement) || !e.target.closest("[data-feed-id]")) { + const nextSelectedFeedIds = getSelectedFeedIds() + setSelectedFeedIds(nextSelectedFeedIds.length === 0 ? nextSelectedFeedIds : []) + } + }, [])} + > + + {views.map((item, index) => ( +
+ +
+ ))} +
+
- {children} -
+ {children} +
+ + ) +} + +const ViewSwitchButton: FC<{ + item: (typeof views)[number] + index: number + + active: number + setActive: (next: number | ((prev: number) => number)) => void + + useHotkeysSwitch: boolean + setUseHotkeysSwitch: (next: boolean) => void +}> = ({ item, index, active, setActive, useHotkeysSwitch, setUseHotkeysSwitch }) => { + const unreadByView = useUnreadByView() + const { t } = useTranslation() + const showSidebarUnreadCount = useUISettingKey("sidebarShowUnreadCount") + + const { isOver, setNodeRef } = useDroppable({ + id: `view-${item.name}`, + data: { + category: "", + view: item.view, + }, + }) + + return ( + { + startTransition(() => { + setActive(index) + setUseHotkeysSwitch(false) + }) + e.stopPropagation() + }} + > + {item.icon} + {showSidebarUnreadCount ? ( +
+ {unreadByView[index] > 99 ? 99+ : unreadByView[index]} +
+ ) : ( + + )} +
) } diff --git a/apps/renderer/src/modules/feed-column/item.tsx b/apps/renderer/src/modules/feed-column/item.tsx index cf88e5f61..0cdb12fbe 100644 --- a/apps/renderer/src/modules/feed-column/item.tsx +++ b/apps/renderer/src/modules/feed-column/item.tsx @@ -7,20 +7,19 @@ import { } from "@follow/components/ui/tooltip/index.jsx" import { EllipsisHorizontalTextWithTooltip } from "@follow/components/ui/typography/index.js" import type { FeedViewType } from "@follow/constants" -import { useAnyPointDown } from "@follow/hooks" import { nextFrame } from "@follow/utils/dom" import { UrlBuilder } from "@follow/utils/url-builder" import { cn } from "@follow/utils/utils" import dayjs from "dayjs" -import { memo, useCallback, useState } from "react" +import { memo, useCallback, useContext, useState } from "react" import { useTranslation } from "react-i18next" +import { useShowContextMenu } from "~/atoms/context-menu" import { getMainContainerElement } from "~/atoms/dom" import { useFeedActions, useInboxActions, useListActions } from "~/hooks/biz/useFeedActions" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" import { useRouteParamsSelector } from "~/hooks/biz/useRouteParams" import { getNewIssueUrl } from "~/lib/issues" -import { showNativeMenu } from "~/lib/native-menu" import { FeedIcon } from "~/modules/feed/feed-icon" import { FeedTitle } from "~/modules/feed/feed-title" import { getPreferredTitle, useFeedById } from "~/store/feed" @@ -30,6 +29,7 @@ import { subscriptionActions, useSubscriptionByFeedId } from "~/store/subscripti import { useFeedUnreadStore } from "~/store/unread" import { useSelectedFeedIds } from "./atom" +import { DraggableContext } from "./context" import { feedColumnStyles } from "./styles" import { UnreadNumber } from "./unread-number" @@ -52,10 +52,14 @@ const FeedItemImpl = ({ view, feedId, className }: FeedItemProps) => { url: feed.url, image: feed.image, siteUrl: feed.siteUrl, + ownerUserId: feed.ownerUserId, + owner: feed.owner, } }) const [selectedFeedIds, setSelectedFeedIds] = useSelectedFeedIds() + const draggableContext = useContext(DraggableContext) + const isInMultipleSelection = selectedFeedIds.includes(feedId) const handleClick: React.MouseEventHandler = useCallback( (e) => { @@ -91,9 +95,7 @@ const FeedItemImpl = ({ view, feedId, className }: FeedItemProps) => { }) const [isContextMenuOpen, setIsContextMenuOpen] = useState(false) - useAnyPointDown(() => { - isContextMenuOpen && setIsContextMenuOpen(false) - }) + const showContextMenu = useShowContextMenu() if (!feed) return null const isFeed = feed.type === "feed" || !feed.type @@ -101,8 +103,15 @@ const FeedItemImpl = ({ view, feedId, className }: FeedItemProps) => { return ( <>
{ onDoubleClick={() => { window.open(UrlBuilder.shareFeed(feedId, view), "_blank") }} - onContextMenu={(e) => { - setIsContextMenuOpen(true) + onContextMenu={async (e) => { const nextItems = items.concat() if (isFeed && feed.errorAt && feed.errorMessage) { nextItems.push( @@ -139,7 +147,8 @@ const FeedItemImpl = ({ view, feedId, className }: FeedItemProps) => { }, ) } - showNativeMenu( + setIsContextMenuOpen(true) + await showContextMenu( nextItems.filter( (item) => selectedFeedIds.length === 0 || @@ -150,6 +159,7 @@ const FeedItemImpl = ({ view, feedId, className }: FeedItemProps) => { ), e, ) + setIsContextMenuOpen(false) }} >
state.data[listId] || 0) const [isContextMenuOpen, setIsContextMenuOpen] = useState(false) - useAnyPointDown(() => { - isContextMenuOpen && setIsContextMenuOpen(false) - }) const subscription = useSubscriptionByFeedId(listId) const navigate = useNavigateEntry() const handleNavigate = useCallback( @@ -240,6 +247,7 @@ const ListItemImpl: Component<{ }, [listId, navigate, view], ) + const showContextMenu = useShowContextMenu() const { t } = useTranslation() if (!list) return null return ( @@ -256,10 +264,10 @@ const ListItemImpl: Component<{ onDoubleClick={() => { window.open(UrlBuilder.shareList(listId, view), "_blank") }} - onContextMenu={(e) => { + onContextMenu={async (e) => { setIsContextMenuOpen(true) - - showNativeMenu(items, e) + await showContextMenu(items, e) + setIsContextMenuOpen(false) }} >
@@ -299,9 +307,6 @@ const InboxItemImpl: Component<{ const inboxUnread = useFeedUnreadStore((state) => state.data[inboxId] || 0) const [isContextMenuOpen, setIsContextMenuOpen] = useState(false) - useAnyPointDown(() => { - isContextMenuOpen && setIsContextMenuOpen(false) - }) const navigate = useNavigateEntry() const handleNavigate = useCallback( (e: React.MouseEvent) => { @@ -315,6 +320,8 @@ const InboxItemImpl: Component<{ }, [inboxId, navigate, view], ) + const showContextMenu = useShowContextMenu() + if (!inbox) return null return (
{ + onContextMenu={async (e) => { setIsContextMenuOpen(true) - showNativeMenu(items, e) + await showContextMenu(items, e) + setIsContextMenuOpen(false) }} >
diff --git a/apps/renderer/src/modules/feed-column/list.tsx b/apps/renderer/src/modules/feed-column/list.tsx index 0d8f08394..13ea8b558 100644 --- a/apps/renderer/src/modules/feed-column/list.tsx +++ b/apps/renderer/src/modules/feed-column/list.tsx @@ -1,3 +1,4 @@ +import { useDraggable } from "@dnd-kit/core" import { ScrollArea } from "@follow/components/ui/scroll-area/index.js" import type { FeedViewType } from "@follow/constants" import { views } from "@follow/constants" @@ -28,8 +29,9 @@ import { setFeedListSortBy, setFeedListSortOrder, useFeedListSort, - useSetSelectedFeedIds, + useSelectedFeedIds, } from "./atom" +import { DraggableContext } from "./context" import { SortableFeedList, SortByAlphabeticalInbox, SortByAlphabeticalList } from "./sort-by" import { feedColumnStyles } from "./styles" import { UnreadNumber } from "./unread-number" @@ -110,19 +112,6 @@ function FeedListImpl({ className, view }: { className?: string; view: number }) const listsData = useListsGroupedData(view) const inboxesData = useInboxesGroupedData(view) const categoryOpenStateData = useCategoryOpenStateByView(view) - const expansion = Object.values(categoryOpenStateData).every((value) => value === true) - useUpdateUnreadCount() - - const totalUnread = useFeedUnreadStore((state) => { - let unread = 0 - - for (const category in feedsData) { - for (const feedId of feedsData[category]) { - unread += state.data[feedId] || 0 - } - } - return unread - }) const hasData = Object.keys(feedsData).length > 0 || @@ -142,48 +131,45 @@ function FeedListImpl({ className, view }: { className?: string; view: number }) const scrollerRef = useRef(null) const selectoRef = useRef(null) - const setSelectedFeedIds = useSetSelectedFeedIds() + const [selectedFeedIds, setSelectedFeedIds] = useSelectedFeedIds() + + const { attributes, listeners, setNodeRef, transform, isDragging } = useDraggable({ + id: "selected-feed", + disabled: selectedFeedIds.length === 0, + }) + const style = useMemo( + () => + transform + ? ({ + transform: `translate3d(${transform.x}px, ${transform.y}px, 0)`, + transitionDuration: "0", + transition: "none", + } as React.CSSProperties) + : undefined, + [transform], + ) + + const draggableContextValue = useMemo( + () => ({ + attributes, + listeners, + style: { + ...style, + willChange: "transform", + }, + }), + [attributes, listeners, style], + ) return (
-
-
{ - e.stopPropagation() - if (!document.hasFocus()) return - if (view !== undefined) { - navigateEntry({ - entryId: null, - feedId: null, - view, - }) - } - }} - > - {view !== undefined && t(views[view].name)} -
-
- - {expansion ? ( - subscriptionActions.expandCategoryOpenStateByView(view, false)} - /> - ) : ( - subscriptionActions.expandCategoryOpenStateByView(view, true)} - /> - )} - -
-
+ !(selectedFeedIds.length > 0 && isDragging)} selectableTargets={["[data-feed-id]"]} continueSelect hitRate={10} @@ -221,8 +207,11 @@ function FeedListImpl({ className, view }: { className?: string; view: number }) }} mask={false} flex - viewportClassName="!px-3" - rootClassName="h-full" + viewportClassName={cn( + "!px-3 [&>[data-radix-scroll-area-content]]:h-full", + isDragging && "!overflow-visible", + )} + rootClassName={cn("h-full", isDragging && "overflow-visible")} >
)} -
- {(hasListData || hasInboxData) && ( -
- {t("words.feeds")} -
- )} - {hasData ? ( - - ) : ( -
- +
+ {(hasListData || hasInboxData) && ( +
- - {t("sidebar.add_more_feeds")} - -
- )} -
+ {t("words.feeds")} +
+ )} + {hasData ? ( + + ) : ( +
+ + + {t("sidebar.add_more_feeds")} + +
+ )} +
+
) } -const LIST = [ +const ListHeader = ({ view }: { view: number }) => { + const { t } = useTranslation() + const feedsData = useFeedsGroupedData(view) + const categoryOpenStateData = useCategoryOpenStateByView(view) + const expansion = Object.values(categoryOpenStateData).every((value) => value === true) + useUpdateUnreadCount() + + const totalUnread = useFeedUnreadStore((state) => { + let unread = 0 + + for (const category in feedsData) { + for (const feedId of feedsData[category]) { + unread += state.data[feedId] || 0 + } + } + return unread + }) + + const navigateEntry = useNavigateEntry() + + return ( +
+
{ + e.stopPropagation() + if (!document.hasFocus()) return + if (view !== undefined) { + navigateEntry({ + entryId: null, + feedId: null, + view, + }) + } + }} + > + {view !== undefined && t(views[view].name)} +
+
+ + {expansion ? ( + subscriptionActions.expandCategoryOpenStateByView(view, false)} + /> + ) : ( + subscriptionActions.expandCategoryOpenStateByView(view, true)} + /> + )} + +
+
+ ) +} + +const SORT_LIST = [ { icon: "i-mgc-sort-ascending-cute-re", by: "count", order: "asc" }, { icon: "i-mgc-sort-descending-cute-re", by: "count", order: "desc" }, @@ -311,6 +359,7 @@ const LIST = [ order: "desc", }, ] as const + const SortButton = () => { const { by, order } = useFeedListSort() const { t } = useTranslation() @@ -353,7 +402,7 @@ const SortButton = () => {
{t("sidebar.select_sort_method")}
- {LIST.map(({ icon, by, order }) => { + {SORT_LIST.map(({ icon, by, order }) => { const current = getFeedListSort() const active = by === current.by && order === current.order return ( diff --git a/apps/renderer/src/modules/feed/feed-icon.tsx b/apps/renderer/src/modules/feed/feed-icon.tsx index c35ca6e23..b4abb75c0 100644 --- a/apps/renderer/src/modules/feed/feed-icon.tsx +++ b/apps/renderer/src/modules/feed/feed-icon.tsx @@ -73,6 +73,10 @@ type FeedIconFeed = | FeedOrListRespModel type FeedIconEntry = Pick +const fadeInVariant = { + initial: { opacity: 0 }, + animate: { opacity: 1 }, +} export function FeedIcon({ feed, entry, @@ -82,6 +86,7 @@ export function FeedIcon({ fallback = true, siteUrl, useMedia, + disableFadeIn, }: { feed?: FeedIconFeed | null entry?: FeedIconEntry | null @@ -95,6 +100,7 @@ export function FeedIcon({ fallback?: boolean useMedia?: boolean + disableFadeIn?: boolean }) { const image = (useMedia @@ -122,8 +128,8 @@ export function FeedIcon({ const colorfulStyle: React.CSSProperties = useMemo(() => { const [, , , bgAccent, bgAccentLight, bgAccentUltraLight] = colors return { - // Create a bottom-left to top-right avatar fallback background gradient - backgroundImage: `linear-gradient(to top right, ${bgAccent} 20%, ${bgAccentLight} 80%, ${bgAccentUltraLight} 95%)`, + backgroundImage: `linear-gradient(to top, ${bgAccent} 0%, ${bgAccentLight} 99%, ${bgAccentUltraLight} 100%)`, + ...sizeStyle, } }, [colors, sizeStyle]) @@ -157,7 +163,7 @@ export function FeedIcon({ ImageElement = ( - + ) break @@ -173,8 +179,7 @@ export function FeedIcon({ ) diff --git a/apps/renderer/src/modules/new-user-guide/guide-modal-content.tsx b/apps/renderer/src/modules/new-user-guide/guide-modal-content.tsx index 5e3d5b5f0..5ac67d8af 100644 --- a/apps/renderer/src/modules/new-user-guide/guide-modal-content.tsx +++ b/apps/renderer/src/modules/new-user-guide/guide-modal-content.tsx @@ -6,7 +6,7 @@ import type { ComponentProps, FunctionComponentElement } from "react" import { createElement, useCallback, useMemo, useState } from "react" import { Trans, useTranslation } from "react-i18next" -import RSSHubIcon from "~/assets/rsshub-icon.png" +import { useGeneralSettingKey } from "~/atoms/settings/general" import { Kbd } from "~/components/ui/kbd/Kbd" import { mountLottie } from "~/components/ui/lottie-container" import { Markdown } from "~/components/ui/markdown/Markdown" @@ -23,6 +23,7 @@ import { LanguageSelector } from "../settings/tabs/general" import { BehaviorGuide } from "./steps/behavior" import { RSSHubGuide } from "./steps/rsshub" +const RSSHubIcon = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEIAAABCCAYAAADjVADoAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAQqADAAQAAAABAAAAQgAAAADorYEXAAAUX0lEQVR4AbWcXYxd11XH97lzZ8bO+DNuWjm1TVI3RGkjp3YMSYqMPBUFhCw/tHHEEy+kKoS+ViDlgfIQKSFvKAJBUx4AqVIjeCgWUsXHuFhpncaxiUP6kdZtYpvmy47jr/F83Xv4/9Ze69x9r+/M+HPL56y11/daZ+999jlzrqt0la3+1rdGEK0ee6wDrF/9h4m0MLerm9JkVVU7xdkq8oZUVbcJtgQRyy1wI3GqJQ50mYbvfbSWoqWqK9VpCZ2Rp+N1XR9utaqpdGnmYPXAH1xCva493irHC22pVngeLiYnVTrwFyPV5NcWkKgP/+2Obmo9LsU9CmTzkgFHMigGbh45FcVoaIVcn44JQMmtsSV64HCq1klZ3a+r8Hx1zxePQKqnptpp9+6OLpZYi7cBD/2CjIJmBLzy9W11p35KV0IFUMsBkI2ujnUqh9lIBBiwpyMV6+hUFKOPX4QV+gGRo+V+LZgPRiGWjW76+6uR9GT1iUePIc4IqZYYHSgPbfXU19pRhM5Lf/d03em+KnN7ZJHKLjiUx3pEeA7CWG4u8ICQA7drwwl1oBGQyC3k6AUe0EWcXgm2dDBtyb4WrpFrwnvqTnq187MXnkGFItjooDOkWekG6Rr+o9XOL8/Xh76+qa463xZ/u8lUFdOj7bgBvzLCZSquWkAkAg/YR7OOTiqE8T2ckA3YpzMQcsgAA8/yirXyWNPRqq72arqcitwQKduAVYUURfje32xXrackvFbHnJyMCvrQcxPhOODNKkZjD49FiIEH9DAaGeglz9aFal5iYzrOiTtZ3fPo0cgx1IGFFxWB6aBFsf7+czvq1Pq++GMyjCGK0HPS78xYvQCKYJaUK+2ZcZ1uycjAUc6hquaqun7YiqFFtJqctBtAeAemWBjrQ3+1qe6O/K9Ia5VcngpXnRB19dqGTkCcBB6wj2YdnYpimKkBe306zoNGC7vAwBt65KKRUVf32zQpFlCbQ9wi1fL+oDPybeXCdJjXmjNqBll7wnDgAXEUuEEIalK5Nl3kTcntYYNE3Xf4EKXfX1GMkAHS+mJmbdPIqNPauqpZ93bYAppzt9U+sU9Ar/Pic0/Ly3Y5mlM3T4cwGhDBwAPeNJoZ0knJmW1PKPwEXMzfIP0KeV1Y1rs6bY+7STpwIG8Ue1Pir7fVCx3dItXy5mOZhdHkTLypfNYdoBXDNK7QUDkRg28XmZOPBgrT0Aq5xewM0sNupofRpH3GA+wz2GM0+4i603kKOTXtEbLb5spDpbp2aFPd4EFbDJpilg8bQFpcrYB9NOvopOyNj/3ldBAoWtgFBg6bnXJir6FzJ0XOOeH6v3WXqLqvwNNVsdojaNxKtYLUQOM4MwB8DudZTGUAwXeBwkVvFIQyNkMOe+CyZTThxgq+QxMbQhukh91MN6Ma9g+yHbfFslt1/tB34iyY7dTStAmlroq3oLvPvJaN+dmMd9TvIGoZS1bFGpGptm7XY+NaXVakNA5Uf8RtdcvCSDXsc7XAAxJk4Ji/dQtoR0Vta3w/Li9PVPV3np2oV47/SMFsTi157XSqNDeT0uXz+Zi5qAJcVuJKvuvTIoI1qBOBc9AsQRWmrWKsmEhp1fqUVnPoRrRipZ4IVBjscCAbBRmEjS1sWkcnLxqEkC/lSrzkD9Izz8rMg1o1vfq+dlq9elfqzG1OM5fqdOlslS6eSWn2ggJlGuHQp0ZLC27LIupPHCeYtKvoOEl2NILO60n5w3cyf0xP52vuSOkjG1NaL7hChULHCuJ6BGh2Cj9GE/+KkSEabVGdKFoWa+z2LhhO9GzS3Zwmzu1qd8+cnKwun0vp0ulu6nZ0ufSPq9Zi1sgYiqYsSLO+IU734E3Gcdg2XVS8EU0PVCns6bdSeu8XKsLqlD76Kylt3KIRI9z4to1ZIjFsIug+BAw35aAZMcc1WCDEiTHopq4nZ0XY7daT7er9n+40ZqtdWfIxl3FqSeNcDR+O9uHGLE7ImJxOVpzoywDThTantebN11I69RMVY2tKm3VQEEZHrYMiRtDIB47dwWLc2KbLtgi6P+xspZHRrfnqkx5B4My8cxJunYzH2RKNzjA4KBB9QZJtKdFxTRUSPvHDlH7w7ykd/7EWYo0aFt2mgKEnHw0Nf9AVl9FcpuEP0ylopt7o8BhP2lv1LK/XaxiOvUP4odLDigB/SG0g99owAXx4AAhSEBprBwbfOKyCTGn6vJeLAQ/5UidwM8NJekYzAgpoLaITMlnE7eZCpHqDLkkiEm8kIIWmAKXyIC90hsFSL/gEjfmCB85UoI2vSmlaa9XLGh1v6JkPHiPHZAZ0kDcSp6IYdMN+QJN1/ZJW0lUD3u7okLFYE8iXo2xNYUriELx0ZHgZpAeDWikXiXS1WDItxnSLZXS88qLuXrqNsw9BvtQJ3ExyKvxYWO4r5EqfJS3oqkEuAkwrhlnJJ4oxSCvYV6BRvEFHJuhMeFFUk4sE3Bqjg8V6xZqU3j+R0qH/1C1Yo6Tt60ZpO3DLmVPYEk634ZtAdjCMBkd0vfBFkUBRwFgGOt/ENiQYrBdkcxZ9Rgdrx2XtZw5pqnxw+tqLUUYfBTCf7qSkic4aoSZmWQz6ceWygJ8p2DW0cIZv8+/6Rvfig1sfgcK+TRXtQTq6kxz6j5TOXEcxGtv4twBy8IEHFJXVKPs3JQViIyTLW1xWIPUpjMVZGHSx4aBIChVzWugWQZi+yYScW6QYbOyQ/cF/6a3jh73ba6kfuJnnJN9GMwJGs8GQoxe4w7xGNII9HStIOSrCZjZ55Rn+kjJeGHNc4uhJsRmR3jcPkuM2yyK6oC37y9/VdNG2/RbcTfKIIAFii0Q8ToslAuqj9XV6YoFZYt7xivcZb2iSMbxwHjEYXR1YjIy2nmYvnk3pf17KxYmLdIUtbOKbk5TDjpHc+BAd/xtlBCLBmApuxwLBSNOQLZsbL0mGh1N1wnFA+A0ewUIzhkNwNeSIiWKM62n27Z/p9vojv636HqSx5fKmF6ewH3FGXNHPOuwj+kcD0eBY/3JEhtARzfGCZPQykCxo516y6ppfKZayhntABvANAgRwwhlQjWJwa/2x9hnv6ql2RA91sUO9wq7kTc1tXGEXvtsVqkK4gi2G6kRfZGvEYQcncBcwedHoRoFMQKfCQZD6DMNHj+bmDAk947lMQ4u+dFgzXns5P7zFemG2TBFM5hw3wIlYgU4P6HJ5jQgiBsgXZkwRz78xbAIIDjZ3FAHANr/hGD40O2Xlsh96Jq6TwSzWw6FrVPBof/btlH7+U58i0F0hIKqBG4uTx4hBug2fDRUNgh1kjYQDR3Pu8JZqIewy4YRu2A91ijzINzk/hSnTK2imI12mA88mb7yqW6p2noPb8KVsl8WIeARzIdxXLoIXI5xaYZYrggxE8IXxXrKub4lJMAKNfuk/7IR/k3GBpoAS4hF+VrfSn78hvIivtB2xNLRwJHmjeSzC82JpCh4BAmE3DMA3mjMQtUOnBjpuFXc+eiU/+gaRh6nWyOSu9csrZ3wXDNmORsWY7iK/0HsMRsWwtSLsm2rhyxwUxRBfZQ2CeqFodw0pmlPxbYHEmhp/ChnTE6EdWrSAozraOqhTvOEKWzkrU21QeB5XhtGRmKHwndb04UF3GXBGwpxGxYk3+wshkZ6+GYBS0KyjU+Re69U9chgMwwYRJCs1EhsRTsILWqgu6tH4nJxfEJzXcwBtTAWZ0Gu4CW16wLExL1kg9kuYM800Uw4ZOo4biqK30KcLTiM8nlZ5ODuhRXPrPVo35B9+TJXAA6IXOGbsAufciRpKPkKoDGhUInPzmovvpvT6KS1Q2tC8pQLobb+psspoEU8f0bHl9pQ+uSmluz+mz8q0mDGyKEhjT77YA+GH1sACb2QLGuKukq+POtHnRfMFvXl/X/FtuSu/7pP4tRZDWapZQAraKikPBMure6YBBZjS6nxAUG/hk3JNm6UWVVfXomIlf/cDFUuHpm767L0pfeZu/T1DI2XWi2GingE+HW2QsjBREGQUSi6AYMhgi0afYvzyZEqbtmRa0CNGZMADlnyzb1PDPcUwoQgUgCnxoray3ziS0l2ibdNlZ2fHX7h4NB7WxuVss4LC4QG9oX5dx+/tSunjqh7TCFeRoOmLYDTIgTsMOkWAF63EjSYef2F77//0qk9fFt6mqULsiybuPHSxZXK2WBrFTJoBRgJrwb+pABThATmZUGHm9PRnf+bLokPPGOZNNAXbqFEjkP7+oN5Qsx2WDfj6l4/AgeXhfApgRUMB1GVyz21A18Gj+rTm6od6KIsCIE8LWOJDaPn22TjBmTSmXk/pX3R//owWn1kKoGFigWFtmRZyjAD9qSRt1PHNl/Q3DM3jGGn4a+4usgfOSMS3NSERbBObGPDjyIL5bDSdeHljzYVKG87ps1vQdJmIXAfBtNV9XXPtmyrEAyrCjP4Q4+zQuWqIHjZprC3f+Z4WWP0NlRFnyYlWFiMyjMQDou95gfY1o+uELA9gvNJjRNLgcYJnqMMSD55oeUQQEFfrrG6L+19M6T5x+GsUydxIi2Kwz9CoTa+9mQMrC2DBeMDgdkiWuOMQ2rRGxmWxxULNl4Tn5WSWuHGMsjfzITwg5MAd+s5SSugyGk4JtlXdwg56192wy5rDn1COHtfw1V/X2QXa47OcEIgdkgtozoLu0BIGF7PELWnRuHPMaLG8rP1N3zqBgtvAricO2uCiqRCanQTGRunID7XqS4DvIUjgpjYZ1HKT3tJtmI1QJORxNq6sGCKyZsS6ETJRKBKNqx7yxMs3HLzKi+JgFH60wANCz3iXETFtiu9p1f2JhtW4hlihGzZuCBIkdxL9nTedeFvDV4WmEQRHXGFL3vsWoPMDz0o9vdKGRK3AM7qgJT1wS8rtNTSTxN40I+KMBfPOhzVfBFgj8FvRRmX4ff2t4qIKTqMAloAHaAlnVt8Z+mJHCAafNaK0E3hAHAaevyvHwhnNifq47Q9On6+TdsXNq69wcDMhQ5YLdmngqhHYjR7EiX2mR5ks9F7i9NSaYvARO/3jrbpqHU4ddaZnav+y0kRv2Qm/TI0y8eWckeByR9hgEcYHLQpQ4g1NQj4iBPTDl9SZcgW90Tb1W38iUCtEQAvKaTeCu70ygybxgtfQ7CcOvIuYaqXpVQdV7ZNp5VjFR8eljWXxa5PO5uTVrm4sjIxGjmbBvE6cWLDB1bQiC4+EAxJB4Hk0IHxSzyoHW9VX//FSPVLtT+u0pJ/V0wFD8GrbNYiaSeLUTSmt0D7FhjDBqn+1x6JDlnywoxMviMrWS7xHzbQO8tLYz+/AuD6pdfvK59M6PTt3dd+gEBi9FY3kV8v+Cj3IxSiwoOQQ2HcQgNMiIONnspGI0w5ONEG+7TQ0aJAdD5j5VrFW6j5Pt1Xv0/un3/+nI2nNyv3pPj1Hz2qzfq1XGkvLNQrMXfOjemnD2y6eZCPxmBbE2xxCmD60khY6JUQgkhzX+w9TAKDoLfAMeSDRZ0MaDTu/fITv0Vtp3z6TrD6+/sm06U7d2jR4+Si9sBG2rhtii0JwZ7tTr7J4A217CDEYJYMHwTaBSwd9owUe0K9Y8Hne4PtNWyskQws7PZxbJhNUH6VXTwJpreqxFzr1bj0wP/HPx+o1t/1lWivjXX207T6y2A2cCZInzjklfKc2KneszY/1ZhInxREFiPUjChT0MinTp2BCeCWILJ8drVQhQm4QolPXtq3Vt+nPVA9+6Vj8iI8osNWsDN1fW3Uknb+4XfcU7iH64QoSN9AIlD/AnNVU+Py2lD62Pj+EYRhe2fp8FUyLzqMEj9bgovHZwDqNts/9VvZHEYLfgxSBH+McbT30Rzswo5uHPrOs8g9XCIm1AkbVGturVeOcF4GfLFx/Q5fvn86oCDvu1voQRcARB8Fy4EIQeRIAZgGHIpAMvBglJUSBB8V1eiWIP3hlyyODn2jqdsVPmUb2wrbfquTfprCXyK16Qes4U+SlD05V7fbnFAe/dNF6oZFBs+Cy7LLnkLUiaF361Ea949iS1Ugokgoc4+DW4AvBRk5AUASzCa84rGhiwOPb7w36ZNRsm6GevjbessW6MKePjierh790KqaES/YKAaE6kBbqB9NodWz+SDU6+ojm9jmt3KNyNCfcQskBhfoAzBL5JQ+sd1WEbZtTevCevE5A45E/kolErC/lGB1hBzqNflOUAm/saASMan24XSOifzSwMLJE55GQuo9Un/3j/HNH/4m3eNaaERGE6pU03xRj9fr70+pVR1WEsXRRl6WrX/ewYSmTiWCgsRYwKs/qBPz8pzUlPjl8zqKHDs2S9CtN1uTvNbAiWF8nKwgKAzjrwwbdlldpMaYQyPOLYPu1jv7qUusHsK3O/dUjXzky7DefWGS4XNGsGEyTAx+cEnNH59F7n64uTP9pevuddjo1z+ucjr7XHWH7ZcpaAlS+bOcOmfzUXSndpcD46xdvp2CROAmXEA2KQfCDxYhkLSkEzYgnSZ+GPenz+5I7NfJG27X+bMDumI2h5SaJZ0Z+40/+zKT5Xat+4WyqA6ecyAAxurbZ0tpBv35277b6l6efSudn9qRzeiV2XsfMLPuNblqhjdiaiSpt0LaRHaptoRUCb78jQYMY8oTMqPCSDm6FMmbGHQVIWP8Uci9qjCl5xfG7e1tpne799sZdAq1KP5IfebJ6+Iljpln84J/+YOuZHOR4n9DSbt1HtH5Aqp/7wo7u+dnHq4WFPXKqy+DBRwIEwhF0kisfhswI8dPkPgpBtxkZsIInaFFKhyJYMRBWYzTN6NXcJ+5N6aGH5DedrFv1v7bqkW9Uv/kV/VFG0hoFafef39h/m4ChaPW+fVoAXkjcXaDVz/72RLpU7dKvXSa1xu1UQluVsG7kaaVwReiNRMk74CA9Ei4LYrJSiuKaAQqCIUFGod5OCj2t77WP17++63Dr0786lU5fOFj9zlc1VCUy8B9/QFuq/T+asPUbUqsceQAAAABJRU5ErkJggg==` const containerWidth = 600 const variants = { enter: (direction: number) => { @@ -68,10 +69,13 @@ function Outtro() { ) } const absoluteConfettiUrl = new URL(confettiUrl, import.meta.url).href + export function GuideModalContent({ onClose }: { onClose: () => void }) { const t = useI18n() const [step, setStep] = useState(0) const [direction, setDirection] = useState(1) + const lang = useGeneralSettingKey("language") + const defaultLang = ["zh-CN", "zh-HK", "zh-TW"].includes(lang ?? "") ? "zh-CN" : "en" const guideSteps = useMemo( () => @@ -106,7 +110,10 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) { { title: t.app("new_user_guide.step.rsshub.title"), description: t.app("new_user_guide.step.rsshub.info"), - content: createElement(RSSHubGuide), + content: createElement(RSSHubGuide, { + categories: "popular", + lang: defaultLang, + }), icon: , }, { @@ -132,7 +139,7 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) { content: FunctionComponentElement description?: string }[], - [t], + [t, defaultLang], ) const totalSteps = useMemo(() => guideSteps.length, [guideSteps]) @@ -170,7 +177,7 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) { x: { type: "spring", stiffness: 300, damping: 30 }, opacity: { duration: 0.1 }, }} - className="mt-12 px-20 pb-24" + className="mt-12 min-w-0 px-20 pb-24" > {!!title && (
diff --git a/apps/renderer/src/modules/new-user-guide/steps/rsshub.tsx b/apps/renderer/src/modules/new-user-guide/steps/rsshub.tsx index b48920b1b..f96ce2e87 100644 --- a/apps/renderer/src/modules/new-user-guide/steps/rsshub.tsx +++ b/apps/renderer/src/modules/new-user-guide/steps/rsshub.tsx @@ -6,10 +6,12 @@ import { useAuthQuery } from "~/hooks/common" import { Recommendations } from "~/modules/discover/recommendations" import { Queries } from "~/queries" -export function RSSHubGuide() { +export function RSSHubGuide({ categories, lang }: { categories?: string; lang?: string }) { const rsshubPopular = useAuthQuery( Queries.discover.rsshubCategory({ category: "popular", + categories, + lang, }), { meta: { @@ -30,9 +32,13 @@ export function RSSHubGuide() { return ( - +
- +
diff --git a/apps/renderer/src/modules/panel/cmdf.tsx b/apps/renderer/src/modules/panel/cmdf.tsx index 46eaf5e23..0e0926cb2 100644 --- a/apps/renderer/src/modules/panel/cmdf.tsx +++ b/apps/renderer/src/modules/panel/cmdf.tsx @@ -19,6 +19,8 @@ const CmdFImpl: FC<{ onClose: () => void }> = ({ onClose }) => { const [value, setValue] = useState("") + const [activeMatchOrdinal, setActiveMatchOrdinal] = useState(0) + const [matches, setMatches] = useState(0) const currentValue = useRefValue(value) const inputRef = useRef(null) @@ -88,6 +90,10 @@ const CmdFImpl: FC<{ forward: dir === "forward", }, }) + .then((result) => { + setMatches(result?.matches || 0) + setActiveMatchOrdinal(result?.activeMatchOrdinal || 0) + }) .finally(() => { if (searchId === searchIdRef.current) { setIsSearching(false) @@ -148,6 +154,11 @@ const CmdFImpl: FC<{ />
+ {!!value && matches > 0 && activeMatchOrdinal > 0 && ( + + {activeMatchOrdinal}/{matches} + + )} +
+ + ), + }) + }, + description: t("general.rebuild_database.description"), + buttonText: t("general.rebuild_database.button"), + }, + { + label: t("general.export_database.label"), + description: t("general.export_database.description"), + buttonText: t("general.export_database.button"), + action: () => { + exportDB() + }, + }, + { + label: t("general.export.label"), + description: t("general.export.description"), + buttonText: t("general.export.button"), + action: () => { + const link = document.createElement("a") + link.href = `${env.VITE_API_URL}/subscriptions/export` + link.download = "follow.opml" + link.click() + }, + }, + + isElectronBuild && { + type: "title", + value: t("general.cache"), + }, + isElectronBuild && AppCacheLimit, + isElectronBuild && { + label: t("data_control.clean_cache.button"), + description: t("data_control.clean_cache.description"), + buttonText: t("data_control.clean_cache.button"), + action: async () => { + await tipcClient?.clearCache() + queryClient.invalidateQueries({ queryKey: ["app", "cache", "size"] }) + }, + }, + ]} + /> + + ) +} +const AppCacheLimit = () => { + const { t } = useTranslation("settings") + const { data: cacheSize, isLoading: isLoadingCacheSize } = useQuery({ + queryKey: ["app", "cache", "size"], + queryFn: async () => { + const byteSize = (await tipcClient?.getCacheSize()) ?? 0 + return Math.round(byteSize / 1024 / 1024) + }, + }) + const { + data: cacheLimit, + isLoading: isLoadingCacheLimit, + refetch: refetchCacheLimit, + } = useQuery({ + queryKey: ["app", "cache", "limit"], + queryFn: async () => { + const size = (await tipcClient?.getCacheLimit()) ?? 0 + return size + }, + }) + + const onChange = (value: number[]) => { + tipcClient?.limitCacheSize(value[0]) + refetchCacheLimit() + } + + if (isLoadingCacheSize || isLoadingCacheLimit) return null + + const InfinitySymbol = + return ( + +
+ + +
+ +
{InfinitySymbol}
+
500M
+
+
+ {t("data_control.app_cache_limit.description")} +
+ ) +} diff --git a/apps/renderer/src/modules/settings/tabs/general.tsx b/apps/renderer/src/modules/settings/tabs/general.tsx index 3411c6f16..141918ee5 100644 --- a/apps/renderer/src/modules/settings/tabs/general.tsx +++ b/apps/renderer/src/modules/settings/tabs/general.tsx @@ -1,4 +1,3 @@ -import { Button } from "@follow/components/ui/button/index.js" import { LoadingCircle } from "@follow/components/ui/loading/index.jsx" import { Select, @@ -8,7 +7,6 @@ import { SelectValue, } from "@follow/components/ui/select/index.jsx" import { IN_ELECTRON } from "@follow/shared/constants" -import { env } from "@follow/shared/env" import { cn } from "@follow/utils/utils" import { useQuery } from "@tanstack/react-query" import { useAtom } from "jotai" @@ -24,14 +22,12 @@ import { useGeneralSettingSelector, useGeneralSettingValue, } from "~/atoms/settings/general" -import { useModalStack } from "~/components/ui/modal/stacked/hooks" import { useProxyValue, useSetProxy } from "~/hooks/biz/useProxySetting" +import { useMinimizeToTrayValue, useSetMinimizeToTray } from "~/hooks/biz/useTraySetting" import { fallbackLanguage } from "~/i18n" -import { initAnalytics } from "~/initialize/analytics" import { tipcClient } from "~/lib/client" -import { clearLocalPersistStoreData } from "~/store/utils/clear" -import { SettingDescription, SettingInput } from "../control" +import { SettingDescription, SettingInput, SettingSwitch } from "../control" import { createSetting } from "../helper/builder" import { SettingItemGroup } from "../section" @@ -53,8 +49,6 @@ export const SettingGeneral = () => { setGeneralSetting("appLaunchOnStartup", checked) }, []) - const { present } = useModalStack() - return (
{ saveLoginSetting(value) }, }), + IN_ELECTRON && MinimizeToTraySetting, LanguageSelector, { type: "title", @@ -85,6 +80,10 @@ export const SettingGeneral = () => { description: t("general.group_by_date.description"), }), + defineSettingItem("reduceRefetch", { + label: t("general.reduce_refetch.label"), + description: t("general.reduce_refetch.description"), + }), { type: "title", value: t("general.unread") }, defineSettingItem("scrollMarkUnread", { @@ -104,74 +103,6 @@ export const SettingGeneral = () => { IN_ELECTRON && VoiceSelector, - // { type: "title", value: "Secure" }, - // defineSettingItem("jumpOutLinkWarn", { - // label: "Warn when opening external links", - // description: "When you open an untrusted external link, you need to make sure that you open the link.", - // }), - { - type: "title", - value: t("general.privacy_data"), - }, - - defineSettingItem("dataPersist", { - label: t("general.data_persist.label"), - description: t("general.data_persist.description"), - }), - - defineSettingItem("sendAnonymousData", { - label: t("general.send_anonymous_data.label"), - description: t("general.send_anonymous_data.description"), - onChange(value) { - setGeneralSetting("sendAnonymousData", value) - if (value) { - initAnalytics() - } else { - window.analytics?.reset() - delete window.analytics - } - }, - }), - { - label: t("general.rebuild_database.label"), - action: () => { - present({ - title: t("general.rebuild_database.title"), - clickOutsideToDismiss: true, - content: () => ( -
-

{t("general.rebuild_database.warning.line1")}

-

{t("general.rebuild_database.warning.line2")}

-
- -
-
- ), - }) - }, - description: t("general.rebuild_database.description"), - buttonText: t("general.rebuild_database.button"), - }, - { - label: t("general.export.label"), - description: t("general.export.description"), - buttonText: t("general.export.button"), - action: () => { - const link = document.createElement("a") - link.href = `${env.VITE_API_URL}/subscriptions/export` - link.download = "follow.opml" - link.click() - }, - }, - { type: "title", value: t("general.network"), disabled: !IN_ELECTRON }, IN_ELECTRON && NettingSetting, ]} @@ -180,7 +111,7 @@ export const SettingGeneral = () => { ) } -export const VoiceSelector = () => { +const VoiceSelector = () => { const { t } = useTranslation("settings") const { data } = useQuery({ @@ -306,3 +237,20 @@ const NettingSetting = () => { ) } + +const MinimizeToTraySetting = () => { + const { t } = useTranslation("settings") + const minimizeToTray = useMinimizeToTrayValue() + const setMinimizeToTray = useSetMinimizeToTray() + return ( + + + {t("general.minimize_to_tray.description")} + + ) +} diff --git a/apps/renderer/src/modules/settings/tabs/lists/index.tsx b/apps/renderer/src/modules/settings/tabs/lists/index.tsx index 289f0cd57..f3bc7f373 100644 --- a/apps/renderer/src/modules/settings/tabs/lists/index.tsx +++ b/apps/renderer/src/modules/settings/tabs/lists/index.tsx @@ -21,43 +21,33 @@ import { views } from "@follow/constants" import { UrlBuilder } from "@follow/utils/url-builder" import { cn } from "@follow/utils/utils" import { useMutation } from "@tanstack/react-query" +import { useMemo } from "react" import { toast } from "sonner" -import { useModalStack } from "~/components/ui/modal/stacked/hooks" +import { useCurrentModal, useModalStack } from "~/components/ui/modal/stacked/hooks" import { useAuthQuery, useI18n } from "~/hooks/common" -import { apiClient } from "~/lib/api-fetch" import { Balance } from "~/modules/wallet/balance" import { Queries } from "~/queries" -import { listActions } from "~/store/list" +import { listActions, useOwnedLists } from "~/store/list" import { ListCreationModalContent, ListFeedsModalContent } from "./modals" -const ConfirmDestroyModalContent = ({ - listId, - onSuccess, -}: { - listId: string - onSuccess: () => void -}) => { +const ConfirmDestroyModalContent = ({ listId }: { listId: string }) => { const t = useI18n() + const currentModal = useCurrentModal() const deleteFeedList = useMutation({ - mutationFn: async (payload: { listId: string }) => { - listActions.deleteList(payload.listId) - await apiClient.lists.$delete({ - json: { - listId: payload.listId, - }, - }) - }, + mutationFn: (payload: { listId: string }) => listActions.deleteList(payload.listId), onSuccess: () => { toast.success(t.settings("lists.delete.success")) Queries.lists.list().invalidate() - onSuccess() }, - async onError() { + onError() { toast.error(t.settings("lists.delete.error")) }, + onMutate() { + currentModal?.dismiss() + }, }) return ( @@ -77,7 +67,26 @@ const ConfirmDestroyModalContent = ({ export const SettingLists = () => { const t = useI18n() - const listList = useAuthQuery(Queries.lists.list()) + const { isLoading, data } = useAuthQuery(Queries.lists.list()) + const listDataMap = useMemo(() => { + if (!data) return {} + return data?.reduce( + (acc, curr) => { + acc[curr.id] = { + id: curr.id, + subscriptionCount: curr.subscriptionCount, + purchaseAmount: curr.purchaseAmount, + } + return acc + }, + {} as Record< + string, + { id: string; subscriptionCount: number | undefined; purchaseAmount: number | undefined } + >, + ) + }, [data]) + + const ownedLists = useOwnedLists() const { present } = useModalStack() @@ -99,140 +108,144 @@ export const SettingLists = () => {
- - {listList.data?.length ? ( -
- - - - {t.settings("lists.title")} - {t.settings("lists.view")} - {t.settings("lists.fee.label")} - {t.settings("lists.subscriptions")} - {t.settings("lists.earnings")} - - {t.common("words.actions")} - - - - - {listList.data?.map((row) => ( - - - - {row.image && ( - - - - )} - {row.title} - - - - - - - {views[row.view].icon} - - - - {t(views[row.view].name)} - - - - -
- {row.fee} - -
-
- {row.subscriptionCount} - - {BigInt(row.purchaseAmount || 0n)} - - - - - - - - {t.common("words.manage")} - - - - - - - - {t.common("words.edit")} - - - - - - present({ - title: t.settings("lists.delete.confirm"), - content: ({ dismiss }) => ( - { - listList.refetch() - dismiss() - }} - /> - ), - }) - } - > - - - - - {t.common("words.delete")} - - - + {isLoading && ownedLists.length === 0 && ( + + )} + + {isLoading && ownedLists.length > 0 && ( + + )} + {!!ownedLists && ( + + {ownedLists.length > 0 ? ( +
+
+ + + {t.settings("lists.title")} + {t.settings("lists.view")} + {t.settings("lists.fee.label")} + {t.settings("lists.subscriptions")} + {t.settings("lists.earnings")} + + {t.common("words.actions")} + - ))} - -
-
- ) : listList.isLoading ? ( - - ) : ( -
-

{t.settings("lists.noLists")}

-
- )} -
+ + + {ownedLists.map((row) => ( + + + + {row.image && ( + + + + )} + {row.title} + + + + + + + {views[row.view].icon} + + + + {t(views[row.view].name)} + + + + +
+ {row.fee} + +
+
+ + {listDataMap[row.id]?.subscriptionCount} + + + {BigInt(listDataMap[row.id]?.purchaseAmount || 0n)} + + + + + + + + {t.common("words.manage")} + + + + + + + + {t.common("words.edit")} + + + + + + present({ + title: t.settings("lists.delete.confirm"), + content: () => , + }) + } + > + + + + + {t.common("words.delete")} + + + +
+ ))} +
+ +
+ ) : ( +
+

{t.settings("lists.noLists")}

+
+ )} + + )}
) diff --git a/apps/renderer/src/modules/settings/title.tsx b/apps/renderer/src/modules/settings/title.tsx index 7abe847ee..1e3c5536e 100644 --- a/apps/renderer/src/modules/settings/title.tsx +++ b/apps/renderer/src/modules/settings/title.tsx @@ -1,5 +1,6 @@ import { EllipsisHorizontalTextWithTooltip } from "@follow/components/ui/typography/index.js" import { cn } from "@follow/utils/utils" +import { Slot } from "@radix-ui/react-slot" import { useContext } from "react" import { useTranslation } from "react-i18next" import { useLoaderData } from "react-router-dom" @@ -18,7 +19,11 @@ export const SettingsSidebarTitle = ({ path, className }: { path: string; classN return (
- + {typeof tab.icon === "string" ? ( + + ) : ( + {tab.icon} + )} {t(tab.name as any)}
) @@ -33,11 +38,12 @@ export const SettingsTitle = ({ }) => { const { t } = useTranslation("settings") const { - iconName, + icon: iconName, name: title, headerIcon, - } = (useLoaderData() || loader?.() || {}) as SettingPageConfig + } = (useLoaderData() || loader || {}) as SettingPageConfig + const usedIcon = headerIcon || iconName const isInSettingIndependentWindow = useContext(IsInSettingIndependentWindowContext) if (!title) { return null @@ -51,7 +57,7 @@ export const SettingsTitle = ({ className, )} > - + {typeof usedIcon === "string" ? : usedIcon} {t(title as any)} ) diff --git a/apps/renderer/src/modules/settings/utils.ts b/apps/renderer/src/modules/settings/utils.ts index c97f2907a..52803b8ea 100644 --- a/apps/renderer/src/modules/settings/utils.ts +++ b/apps/renderer/src/modules/settings/utils.ts @@ -10,13 +10,13 @@ export enum DisableWhy { } export interface SettingPageConfig { - iconName: string + icon: string | React.ReactNode name: I18nKeysForSettings priority: number - headerIcon?: string + headerIcon?: string | React.ReactNode hideIf?: (ctx: SettingPageContext) => boolean disableIf?: (ctx: SettingPageContext) => [boolean, DisableWhy] } -export const defineSettingPageData = (config: SettingPageConfig) => () => ({ +export const defineSettingPageData = (config: SettingPageConfig) => ({ ...config, }) diff --git a/apps/renderer/src/modules/upgrade/container.tsx b/apps/renderer/src/modules/upgrade/container.tsx index aa02ea2d0..0e8094b8a 100644 --- a/apps/renderer/src/modules/upgrade/container.tsx +++ b/apps/renderer/src/modules/upgrade/container.tsx @@ -56,11 +56,18 @@ const AppNotificationContainer: FC = () => { toast.success(
App is upgraded to{" "} - {APP_VERSION}, enjoy the new - features! 🎉 + + {APP_VERSION} + + , enjoy the new features! 🎉
, { - duration: 10e8, + closeButton: true, + duration: 5000, action: CHANGELOG_CONTENT ? { label: "What's new?", @@ -98,6 +105,6 @@ export default AppNotificationContainer const Changelog = () => ( - {CHANGELOG_CONTENT} + {CHANGELOG_CONTENT} ) diff --git a/apps/renderer/src/modules/user/UserAvatar.tsx b/apps/renderer/src/modules/user/UserAvatar.tsx index 3be8ef650..e8ffe27fd 100644 --- a/apps/renderer/src/modules/user/UserAvatar.tsx +++ b/apps/renderer/src/modules/user/UserAvatar.tsx @@ -4,11 +4,11 @@ import { cn } from "@follow/utils/utils" import { forwardRef } from "react" import { useAuthQuery } from "~/hooks/common" -import { apiClient } from "~/lib/api-fetch" import { defineQuery } from "~/lib/defineQuery" import { replaceImgUrlIfNeed } from "~/lib/img-proxy" import { usePresentUserProfileModal } from "~/modules/profile/hooks" import { useSession } from "~/queries/auth" +import { userActions } from "~/store/user" import type { LoginProps } from "./LoginButton" import { LoginButton } from "./LoginButton" @@ -35,10 +35,7 @@ export const UserAvatar = forwardRef< const profile = useAuthQuery( defineQuery(["profiles", userId], async () => { - const res = await apiClient.profiles.$get({ - query: { id: userId! }, - }) - return res.data + return userActions.getOrFetchProfile(userId!) }), { enabled: !!userId, diff --git a/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx b/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx index 2ae212c67..05483cde4 100644 --- a/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx +++ b/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx @@ -76,7 +76,7 @@ export function Component() { }) return ( -
+
{t("words.discover")}
{ const view = useRouteView() const navigate = useNavigateEntry() - const settingWideMode = useUISettingKey("wideMode") + const settingWideMode = useRealInWideMode() const realEntryId = entryId === ROUTE_ENTRY_PENDING ? "" : entryId const showEntryContent = !(views[view].wideMode || (settingWideMode && !realEntryId)) const wideMode = !!(settingWideMode && realEntryId) @@ -45,7 +45,6 @@ export const Component = () => { ) const { feedId } = useRouteParams() - const enableEntryWideMode = useUISettingKey("wideMode") if (!showEntryContent) { return null @@ -56,7 +55,7 @@ export const Component = () => { {wideMode && ( navigate({ entryId: null })} /> )} @@ -71,7 +70,7 @@ export const Component = () => { : "", }} /> - ) : !enableEntryWideMode ? ( + ) : !settingWideMode ? ( getUISettings().entryColWidth, []) const { view } = useRouteParams() const inWideMode = (view ? views[view].wideMode : false) || settingWideMode diff --git a/apps/renderer/src/pages/(main)/layout.tsx b/apps/renderer/src/pages/(main)/layout.tsx index fd4a6f474..b993d3e31 100644 --- a/apps/renderer/src/pages/(main)/layout.tsx +++ b/apps/renderer/src/pages/(main)/layout.tsx @@ -16,7 +16,7 @@ import { useResizable } from "react-resizable-layout" import { Outlet } from "react-router-dom" import { setMainContainerElement } from "~/atoms/dom" -import { getUISettings, setUISetting, useUISettingKey } from "~/atoms/settings/ui" +import { getIsZenMode, getUISettings, setUISetting, useUISettingKey } from "~/atoms/settings/ui" import { getFeedColumnTempShow, setFeedColumnShow, @@ -30,13 +30,14 @@ import { ErrorComponentType } from "~/components/errors/enum" import { Kbd } from "~/components/ui/kbd/Kbd" import { PlainModal } from "~/components/ui/modal/stacked/custom-modal" import { DeclarativeModal } from "~/components/ui/modal/stacked/declarative-modal" -import { HotKeyScopeMap } from "~/constants" +import { HotKeyScopeMap, isDev } from "~/constants" import { shortcuts } from "~/constants/shortcuts" import { useDailyTask } from "~/hooks/biz/useDailyTask" import { useAuthQuery, useI18n } from "~/hooks/common" import { EnvironmentIndicator } from "~/modules/app/EnvironmentIndicator" import { NetworkStatusIndicator } from "~/modules/app/NetworkStatusIndicator" import { LoginModalContent } from "~/modules/auth/LoginModalContent" +import { DebugRegistry } from "~/modules/debug/registry" import { FeedColumn } from "~/modules/feed-column" import { AutoUpdater } from "~/modules/feed-column/auto-updater" import { CornerPlayer } from "~/modules/feed-column/corner-player" @@ -214,8 +215,8 @@ const FeedResponsiveResizerContainer = ({ const uiSettings = getUISettings() const feedColumnTempShow = getFeedColumnTempShow() - const isInEntryContentWideMode = uiSettings.wideMode - if (mouseY < 100 && isInEntryContentWideMode) return + const isInEntryContentWideMode = uiSettings.wideMode || getIsZenMode() + if (mouseY < 200 && isInEntryContentWideMode) return const threshold = feedColumnTempShow ? uiSettings.feedColWidth : 100 if (mouseX < threshold) { @@ -356,3 +357,27 @@ const NotSupport = () => {
) } + +if (isDev) { + DebugRegistry.add("New User Guide", () => { + import("~/modules/new-user-guide/guide-modal-content").then((m) => { + window.presentModal({ + title: "New User Guide", + content: ({ dismiss }) => ( + { + dismiss() + }} + /> + ), + + CustomModalComponent: PlainModal, + modalContainerClassName: "flex items-center justify-center", + + canClose: false, + clickOutsideToDismiss: false, + overlay: true, + }) + }) + }) +} diff --git a/apps/renderer/src/pages/settings/(settings)/about.tsx b/apps/renderer/src/pages/settings/(settings)/about.tsx index 1f964c7bf..faba9f76f 100644 --- a/apps/renderer/src/pages/settings/(settings)/about.tsx +++ b/apps/renderer/src/pages/settings/(settings)/about.tsx @@ -3,7 +3,7 @@ import { SettingsTitle } from "~/modules/settings/title" import { defineSettingPageData } from "~/modules/settings/utils" export const loader = defineSettingPageData({ - iconName: "i-mgc-information-cute-re", + icon: "i-mgc-information-cute-re", name: "titles.about", priority: 9999, }) diff --git a/apps/renderer/src/pages/settings/(settings)/actions.tsx b/apps/renderer/src/pages/settings/(settings)/actions.tsx index e92968640..14c732e0e 100644 --- a/apps/renderer/src/pages/settings/(settings)/actions.tsx +++ b/apps/renderer/src/pages/settings/(settings)/actions.tsx @@ -8,7 +8,7 @@ const iconName = "i-mgc-magic-2-cute-re" const priority = 1020 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.actions", priority, disableIf: (ctx) => [ctx.role === UserRole.Trial, DisableWhy.NotActivation], diff --git a/apps/renderer/src/pages/settings/(settings)/appearance.tsx b/apps/renderer/src/pages/settings/(settings)/appearance.tsx index bdc3fc615..d29265461 100644 --- a/apps/renderer/src/pages/settings/(settings)/appearance.tsx +++ b/apps/renderer/src/pages/settings/(settings)/appearance.tsx @@ -6,7 +6,7 @@ const iconName = "i-mgc-palette-cute-re" const priority = 1010 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.appearance", priority, }) diff --git a/apps/renderer/src/pages/settings/(settings)/data-control.tsx b/apps/renderer/src/pages/settings/(settings)/data-control.tsx new file mode 100644 index 000000000..b9f1604ea --- /dev/null +++ b/apps/renderer/src/pages/settings/(settings)/data-control.tsx @@ -0,0 +1,22 @@ +import { MaterialSymbolsDatabaseOutline } from "@follow/components/icons/Database.js" + +import { SettingDataControl } from "~/modules/settings/tabs/data-control" +import { SettingsTitle } from "~/modules/settings/title" +import { defineSettingPageData } from "~/modules/settings/utils" + +const priority = 1025 + +export const loader = defineSettingPageData({ + icon: , + name: "titles.data_control", + priority, +}) + +export function Component() { + return ( + <> + + + + ) +} diff --git a/apps/renderer/src/pages/settings/(settings)/feeds.tsx b/apps/renderer/src/pages/settings/(settings)/feeds.tsx index 5d81f184e..6467cb1c7 100644 --- a/apps/renderer/src/pages/settings/(settings)/feeds.tsx +++ b/apps/renderer/src/pages/settings/(settings)/feeds.tsx @@ -6,7 +6,7 @@ const iconName = "i-mgc-certificate-cute-re" const priority = 1060 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.feeds", priority, }) diff --git a/apps/renderer/src/pages/settings/(settings)/general.tsx b/apps/renderer/src/pages/settings/(settings)/general.tsx index 23f2998d3..1540cff38 100644 --- a/apps/renderer/src/pages/settings/(settings)/general.tsx +++ b/apps/renderer/src/pages/settings/(settings)/general.tsx @@ -6,7 +6,7 @@ const iconName = "i-mgc-settings-7-cute-re" const priority = 1000 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.general", priority, }) diff --git a/apps/renderer/src/pages/settings/(settings)/integration.tsx b/apps/renderer/src/pages/settings/(settings)/integration.tsx index b90bc1fb2..657612cb3 100644 --- a/apps/renderer/src/pages/settings/(settings)/integration.tsx +++ b/apps/renderer/src/pages/settings/(settings)/integration.tsx @@ -6,7 +6,7 @@ const iconName = "i-mgc-department-cute-re" const priority = 1030 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.integration", priority, }) diff --git a/apps/renderer/src/pages/settings/(settings)/invitations.tsx b/apps/renderer/src/pages/settings/(settings)/invitations.tsx index 6d5963f9a..b3c900fc4 100644 --- a/apps/renderer/src/pages/settings/(settings)/invitations.tsx +++ b/apps/renderer/src/pages/settings/(settings)/invitations.tsx @@ -8,7 +8,7 @@ const iconName = "i-mgc-love-cute-re" const priority = 1070 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.invitations", priority, disableIf: (ctx) => [ctx.role === UserRole.Trial, DisableWhy.NotActivation], diff --git a/apps/renderer/src/pages/settings/(settings)/list.tsx b/apps/renderer/src/pages/settings/(settings)/list.tsx index a98ab68ed..5c8a42b97 100644 --- a/apps/renderer/src/pages/settings/(settings)/list.tsx +++ b/apps/renderer/src/pages/settings/(settings)/list.tsx @@ -8,7 +8,7 @@ const iconName = "i-mgc-rada-cute-re" const priority = 1050 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.lists", priority, disableIf: (ctx) => [ctx.role === UserRole.Trial, DisableWhy.NotActivation], diff --git a/apps/renderer/src/pages/settings/(settings)/profile.tsx b/apps/renderer/src/pages/settings/(settings)/profile.tsx index fa1603f6f..510dfac7c 100644 --- a/apps/renderer/src/pages/settings/(settings)/profile.tsx +++ b/apps/renderer/src/pages/settings/(settings)/profile.tsx @@ -5,7 +5,7 @@ import { defineSettingPageData } from "~/modules/settings/utils" const iconName = "i-mgc-user-setting-cute-re" const priority = 1090 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.profile", priority, }) diff --git a/apps/renderer/src/pages/settings/(settings)/shortcuts.tsx b/apps/renderer/src/pages/settings/(settings)/shortcuts.tsx index 41eab9f21..303ba576a 100644 --- a/apps/renderer/src/pages/settings/(settings)/shortcuts.tsx +++ b/apps/renderer/src/pages/settings/(settings)/shortcuts.tsx @@ -10,7 +10,7 @@ const iconName = "i-mgc-hotkey-cute-re" const priority = 1080 export const loader = defineSettingPageData({ - iconName, + icon: iconName, name: "titles.shortcuts", priority, }) diff --git a/apps/renderer/src/providers/context-menu-provider.tsx b/apps/renderer/src/providers/context-menu-provider.tsx index 0751a4b28..fd877b46d 100644 --- a/apps/renderer/src/providers/context-menu-provider.tsx +++ b/apps/renderer/src/providers/context-menu-provider.tsx @@ -1,9 +1,10 @@ import { nextFrame } from "@follow/utils/dom" import { cn } from "@follow/utils/utils" -import type { ReactNode } from "react" -import { Fragment, memo, useCallback, useEffect, useRef, useState } from "react" +import { Fragment, memo, useCallback, useEffect, useRef } from "react" import { useHotkeys } from "react-hotkeys-hook" +import type { FollowMenuItem } from "~/atoms/context-menu" +import { useContextMenuState } from "~/atoms/context-menu" import { ContextMenu, ContextMenuCheckboxItem, @@ -19,80 +20,66 @@ import { import { KbdCombined } from "~/components/ui/kbd/Kbd" import { HotKeyScopeMap } from "~/constants" import { useSwitchHotKeyScope } from "~/hooks/common" -import type { NativeMenuItem } from "~/lib/native-menu" -import { CONTEXT_MENU_SHOW_EVENT_KEY } from "~/lib/native-menu" export const ContextMenuProvider: Component = ({ children }) => ( <> {children} - ) const Handler = () => { const ref = useRef(null) - - const [node, setNode] = useState([] as ReactNode[] | ReactNode) - - const [open, setOpen] = useState(false) + const [contextMenuState, setContextMenuState] = useContextMenuState() const switchHotkeyScope = useSwitchHotKeyScope() useEffect(() => { - if (!open) return + if (!contextMenuState.open) return switchHotkeyScope("Menu") return () => { switchHotkeyScope("Home") } - }, [open, switchHotkeyScope]) + }, [contextMenuState.open, switchHotkeyScope]) useEffect(() => { - const fakeElement = ref.current - if (!fakeElement) return - const handler = (e: unknown) => { - const bizEvent = e as { - detail?: { - items: NativeMenuItem[] - x: number - y: number - } - } - if (!bizEvent.detail) return + if (!contextMenuState.open) return + const triggerElement = ref.current + if (!triggerElement) return + // [ContextMenu] Add ability to control + // https://github.com/radix-ui/primitives/issues/1307#issuecomment-1689754796 + triggerElement.dispatchEvent( + new MouseEvent("contextmenu", { + bubbles: true, + cancelable: true, + clientX: contextMenuState.position.x, + clientY: contextMenuState.position.y, + }), + ) + }, [contextMenuState]) - if (!("items" in bizEvent.detail) || !("x" in bizEvent.detail) || !("y" in bizEvent.detail)) { - return - } - if (!Array.isArray(bizEvent.detail?.items)) return - - setNode(bizEvent.detail.items.map((item, index) => )) - - fakeElement.dispatchEvent( - new MouseEvent("contextmenu", { - bubbles: true, - cancelable: true, - clientX: bizEvent.detail.x, - clientY: bizEvent.detail.y, - }), - ) - } - - // eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener - document.addEventListener(CONTEXT_MENU_SHOW_EVENT_KEY, handler) - return () => { - document.removeEventListener(CONTEXT_MENU_SHOW_EVENT_KEY, handler) - } - }, []) + const handleOpenChange = useCallback( + (state: boolean) => { + if (state) return + if (!contextMenuState.open) return + setContextMenuState({ open: false }) + contextMenuState.abortController.abort() + }, + [contextMenuState, setContextMenuState], + ) return ( - + - {node} + + {contextMenuState.open && + contextMenuState.menuItems.map((item, index) => )} + ) } -const Item = memo(({ item }: { item: NativeMenuItem }) => { +const Item = memo(({ item }: { item: FollowMenuItem }) => { const onClick = useCallback(() => { if ("click" in item) { // Here we need to delay one frame, @@ -110,10 +97,6 @@ const Item = memo(({ item }: { item: NativeMenuItem }) => { preventDefault: true, }) - if (item.hide) { - return null - } - switch (item.type) { case "separator": { return @@ -131,7 +114,7 @@ const Item = memo(({ item }: { item: NativeMenuItem }) => { { }, }) }, [follow, present, presentDiscoverRSSHubRoute, presentUserProfile, t]) + + const toggleZenMode = useToggleZenMode() + useEffect(() => { + registerGlobalContext({ + zenMode: toggleZenMode, + }) + }, [toggleZenMode]) return null } diff --git a/apps/renderer/src/providers/invalidate-query-provider.tsx b/apps/renderer/src/providers/invalidate-query-provider.tsx index e2abf9fab..e385d313a 100644 --- a/apps/renderer/src/providers/invalidate-query-provider.tsx +++ b/apps/renderer/src/providers/invalidate-query-provider.tsx @@ -3,9 +3,11 @@ import { IN_ELECTRON } from "@follow/shared/constants" import { useQueryClient } from "@tanstack/react-query" import { useEffect, useRef } from "react" +import { useGeneralSettingKey } from "~/atoms/settings/general" import { appLog } from "~/lib/log" -const slateTime = 600000 // 10min +const defaultStaleTime = 600_000 // 10min +const maxStaleTime = 6 * 60 * (60 * 1000) // 6hr export class ElectronCloseEvent extends Event { static type = "electron-close" @@ -20,6 +22,10 @@ export class ElectronShowEvent extends Event { } } +const useSlateTime = () => { + const reduceRefetch = useGeneralSettingKey("reduceRefetch") + return reduceRefetch ? maxStaleTime : defaultStaleTime +} /** * Add a event listener to invalidate all queries */ @@ -42,6 +48,8 @@ const InvalidateQueryProviderElectron = () => { } }, [queryClient]) + const slateTime = useSlateTime() + useEffect(() => { const handler = () => { const now = Date.now() @@ -82,6 +90,8 @@ const InvalidateQueryProviderWebApp = () => { const pageVisibility = usePageVisibility() + const slateTime = useSlateTime() + useEffect(() => { if (currentVisibilityRef.current === pageVisibility) { return diff --git a/apps/renderer/src/providers/root-providers.tsx b/apps/renderer/src/providers/root-providers.tsx index 91b178f0e..78d50c859 100644 --- a/apps/renderer/src/providers/root-providers.tsx +++ b/apps/renderer/src/providers/root-providers.tsx @@ -34,6 +34,7 @@ export const RootProviders: FC = ({ children }) => ( + @@ -52,7 +53,6 @@ export const RootProviders: FC = ({ children }) => ( - diff --git a/apps/renderer/src/queries/auth.ts b/apps/renderer/src/queries/auth.ts index 85abd2d09..fe6f74d13 100644 --- a/apps/renderer/src/queries/auth.ts +++ b/apps/renderer/src/queries/auth.ts @@ -1,5 +1,5 @@ import type { Session } from "@auth/core/types" -import type { GetSessionParams } from "@hono/auth-js/react" +import type { getSession as getSessionReact } from "@hono/auth-js/react" import { authConfigManager } from "@hono/auth-js/react" import type { FetchError } from "ofetch" import { ofetch } from "ofetch" @@ -7,6 +7,7 @@ import { ofetch } from "ofetch" import { useAuthQuery } from "~/hooks/common" import { defineQuery } from "~/lib/defineQuery" +type GetSessionParams = Parameters[0] export const auth = { getSession: () => defineQuery(["auth", "session"], () => getSession()), } diff --git a/apps/renderer/src/queries/discover.ts b/apps/renderer/src/queries/discover.ts index 8b57f0041..e39c6d51b 100644 --- a/apps/renderer/src/queries/discover.ts +++ b/apps/renderer/src/queries/discover.ts @@ -2,11 +2,21 @@ import { apiClient } from "~/lib/api-fetch" import { defineQuery } from "~/lib/defineQuery" export const discover = { - rsshubCategory: ({ category }: { category: string }) => - defineQuery(["discover", "rsshub", "category", category], async () => { + rsshubCategory: ({ + category, + categories, + lang, + }: { + category?: string + categories?: string + lang?: string + }) => + defineQuery(["discover", "rsshub", "category", category, categories, lang], async () => { const res = await apiClient.discover.rsshub.$get({ query: { category, + categories, + lang, }, }) return res.data diff --git a/apps/renderer/src/queries/entries.ts b/apps/renderer/src/queries/entries.ts index 19c21a496..50d7f42ab 100644 --- a/apps/renderer/src/queries/entries.ts +++ b/apps/renderer/src/queries/entries.ts @@ -1,3 +1,4 @@ +import { useGeneralSettingKey } from "~/atoms/settings/general" import { useAuthInfiniteQuery, useAuthQuery } from "~/hooks/common" import { apiClient } from "~/lib/api-fetch" import { defineQuery } from "~/lib/defineQuery" @@ -125,6 +126,9 @@ export const entries = { ), } +const maxStaleTime = 6 * 60 * (60 * 1000) // 6 hours +const defaultStaleTime = 10 * (60 * 1000) // 10 minutes + export const useEntries = ({ feedId, inboxId, @@ -139,17 +143,24 @@ export const useEntries = ({ view?: number read?: boolean isArchived?: boolean -}) => - useAuthInfiniteQuery(entries.entries({ feedId, inboxId, listId, view, read, isArchived }), { - enabled: feedId !== undefined || inboxId !== undefined || listId !== undefined, - getNextPageParam: (lastPage) => - inboxId || listId - ? lastPage.data?.at(-1)?.entries.insertedAt - : lastPage.data?.at(-1)?.entries.publishedAt, - initialPageParam: undefined, - refetchOnWindowFocus: false, - refetchOnReconnect: false, - }) +}) => { + const reduceRefetch = useGeneralSettingKey("reduceRefetch") + return useAuthInfiniteQuery( + entries.entries({ feedId, inboxId, listId, view, read, isArchived }), + { + enabled: feedId !== undefined || inboxId !== undefined || listId !== undefined, + getNextPageParam: (lastPage) => + inboxId || listId + ? lastPage.data?.at(-1)?.entries.insertedAt + : lastPage.data?.at(-1)?.entries.publishedAt, + initialPageParam: undefined, + refetchOnWindowFocus: false, + refetchOnReconnect: false, + + staleTime: reduceRefetch ? maxStaleTime : defaultStaleTime, + }, + ) +} export const useEntriesPreview = ({ id }: { id?: string }) => useAuthQuery(entries.preview(id!), { diff --git a/apps/renderer/src/services/subscription.ts b/apps/renderer/src/services/subscription.ts index 6673a9560..a7e9f3678 100644 --- a/apps/renderer/src/services/subscription.ts +++ b/apps/renderer/src/services/subscription.ts @@ -50,6 +50,16 @@ class SubscriptionServiceStatic extends BaseService imp async changeView(feedId: string, view: number) { return this.table.where("feedId").equals(feedId).modify({ view }) } + async changeViews(feedIdList: string[], view: number) { + return this.table.where("feedId").anyOf(feedIdList).modify({ view }) + } + + async updateCategory(feedId: string, category: string) { + return this.table.where("feedId").equals(feedId).modify({ category }) + } + async updateCategories(feedIdList: string[], category: string) { + return this.table.where("feedId").anyOf(feedIdList).modify({ category }) + } async removeSubscription(userId: string, feedId: string): Promise // @ts-expect-error diff --git a/apps/renderer/src/store/entry/store.ts b/apps/renderer/src/store/entry/store.ts index e24040686..4ca0eac63 100644 --- a/apps/renderer/src/store/entry/store.ts +++ b/apps/renderer/src/store/entry/store.ts @@ -20,7 +20,7 @@ import { imageActions } from "../image" import { inboxActions } from "../inbox" import { getSubscriptionByFeedId } from "../subscription" import { feedUnreadActions } from "../unread" -import { createZustandStore, doMutationAndTransaction } from "../utils/helper" +import { createTransaction, createZustandStore } from "../utils/helper" import { internal_batchMarkRead } from "./helper" import type { EntryState, FlatEntryModel } from "./types" @@ -59,6 +59,15 @@ class EntryActions { runTransactionInScope(() => EntryService.deleteEntries(entryIds)) } + updateEntryContent(entryId: string, content: string) { + set((state) => + produce(state, (draft) => { + if (!draft.flatMapEntries[entryId]) return + draft.flatMapEntries[entryId].entries.content = content + }), + ) + } + async fetchEntryById(entryId: string) { const { data } = await apiClient.entries.$get({ query: { @@ -415,81 +424,112 @@ class EntryActions { return } - feedUnreadActions.incrementByFeedId(feedId, read ? -1 : 1) + const tx = createTransaction({}) - this.patch(entryId, { - read, + tx.optimistic(async (_, ctx) => { + const prevUnread = feedUnreadActions.incrementByFeedId(feedId, read ? -1 : 1) + ctx.prevUnread = prevUnread + + this.patch(entryId, { + read, + }) }) - - await doMutationAndTransaction( - // Send api request - async () => { - if (read) { - await internal_batchMarkRead({ + tx.execute(async (_) => { + if (read) { + await internal_batchMarkRead({ + entryId, + isInbox, + isPrivate: subscription?.isPrivate, + }) + } else { + await apiClient.reads.$delete({ + json: { entryId, isInbox, - isPrivate: subscription?.isPrivate, - }) - } else { - await apiClient.reads.$delete({ - json: { - entryId, - isInbox, - }, - }) - } - }, - async () => - EntryService.bulkStoreReadStatus({ - [entryId]: read, - }), - ) + }, + }) + } + }) + + tx.persist(async () => { + EntryService.bulkStoreReadStatus({ + [entryId]: read, + }) + }) + + tx.rollback(async (_, ctx) => { + feedUnreadActions.updateByFeedId(feedId, ctx.prevUnread) + this.patch(entryId, { + read: !read, + }) + }) + + await tx.run() } async markStar(entryId: string, star: boolean) { - this.patch(entryId, { - collections: star - ? { - createdAt: new Date().toISOString(), - } - : (null as unknown as undefined), + const tx = createTransaction({}) + + tx.optimistic(async (_, ctx) => { + ctx.prevIsStar = !!get().flatMapEntries[entryId]?.collections?.createdAt + this.patch(entryId, { + collections: star + ? { + createdAt: new Date().toISOString(), + } + : (null as unknown as undefined), + }) + + set((state) => + produce(state, (state) => { + star ? state.starIds.add(entryId) : state.starIds.delete(entryId) + }), + ) + }) + tx.execute(async () => { + if (star) { + await apiClient.collections.$post({ + json: { + entryId, + }, + }) + } else { + await apiClient.collections.$delete({ + json: { + entryId, + }, + }) + } }) - set((state) => - produce(state, (state) => { - star ? state.starIds.add(entryId) : state.starIds.delete(entryId) - }), - ) - - await doMutationAndTransaction( - // Send api request - async () => { - if (star) { - apiClient.collections.$post({ - json: { - entryId, - }, - }) - } else { - await apiClient.collections.$delete({ - json: { - entryId, - }, - }) - } - }, - async () => { - if (star) { - return EntryService.bulkStoreCollection({ - [entryId]: { + tx.rollback(async (_, ctx) => { + set((state) => + produce(state, (state) => { + ctx.prevIsStar ? state.starIds.add(entryId) : state.starIds.delete(entryId) + }), + ) + this.patch(entryId, { + collections: ctx.prevIsStar + ? { createdAt: new Date().toISOString(), - }, - }) - } else { - return EntryService.deleteCollection(entryId) - } - }, - ) + } + : (null as unknown as undefined), + }) + }) + + tx.persist(async () => { + if (star) { + await EntryService.bulkStoreCollection({ + [entryId]: { + createdAt: new Date().toISOString(), + }, + }) + } else { + await EntryService.deleteCollection(entryId) + } + }) + + await tx.run() } updateReadHistory(entryId: string, readHistory: Omit) { @@ -505,26 +545,64 @@ class EntryActions { async deleteInboxEntry(entryId: string) { const entry = get().flatMapEntries[entryId] if (!entry) return + const tx = createTransaction(entry, { + deletedIndex: -1, + }) - set((state) => - produce(state, (draft) => { - delete draft.flatMapEntries[entryId] - for (const feedId in draft.entries) { - const index = draft.entries[feedId].indexOf(entryId) - if (index !== -1) { - draft.entries[feedId].splice(index, 1) - } + tx.optimistic(async (entry, ctx) => { + const { inboxId } = entry + const fullInboxId = `inbox-${inboxId}` + + set((state) => { + const nextFlatMapEntries = { ...state.flatMapEntries } + + delete nextFlatMapEntries[entryId] + + const index = state.entries[fullInboxId].indexOf(entryId) + + const nextState = { + ...state, + flatMapEntries: nextFlatMapEntries, } - }), - ) - await doMutationAndTransaction( - async () => { - await apiClient.entries.inbox.$delete({ json: { entryId } }) - }, - async () => { - await EntryService.deleteEntries([entryId]) - }, - ) + if (index !== -1) { + ctx.deletedIndex = index + + const nextFeedEntries = { + ...state.entries, + + [fullInboxId]: state.entries[fullInboxId].filter((id) => id !== entryId), + } + + nextState.entries = nextFeedEntries + } + + return nextState + }) + }) + + tx.execute(async () => { + await apiClient.entries.inbox.$delete({ json: { entryId } }) + }) + + tx.persist(async () => { + await EntryService.deleteEntries([entryId]) + }) + + tx.rollback(async (entry, ctx) => { + set((state) => ({ + ...state, + entries: { + ...state.entries, + [entry.feedId]: state.entries[entry.feedId].splice(ctx.deletedIndex, 0, entryId), + }, + flatMapEntries: { + ...state.flatMapEntries, + [entryId]: entry, + }, + })) + }) + + await tx.run() } } diff --git a/apps/renderer/src/store/feed/hooks.ts b/apps/renderer/src/store/feed/hooks.ts index d7cc850bd..7dfef90e6 100644 --- a/apps/renderer/src/store/feed/hooks.ts +++ b/apps/renderer/src/store/feed/hooks.ts @@ -1,6 +1,7 @@ import { views } from "@follow/constants" import type { FeedModel, FeedOrListRespModel, InboxModel, ListModel } from "@follow/models/types" import { useMutation } from "@tanstack/react-query" +import { useRef } from "react" import { useTranslation } from "react-i18next" import { toast } from "sonner" import { useShallow } from "zustand/react/shallow" @@ -8,6 +9,7 @@ import { useShallow } from "zustand/react/shallow" import { FEED_COLLECTION_LIST, ROUTE_FEED_IN_FOLDER, ROUTE_FEED_PENDING } from "~/constants" import { useRouteParams } from "~/hooks/biz/useRouteParams" import { apiClient } from "~/lib/api-fetch" +import { entries } from "~/queries/entries" import { useInboxStore } from "../inbox" import { listActions, useListStore } from "../list" @@ -137,3 +139,28 @@ export const useRemoveFeedFromFeedList = (options?: { }, }) } + +export const useResetFeed = () => { + const { t } = useTranslation() + const toastIDRef = useRef(null) + + return useMutation({ + mutationFn: async (feedId: string) => { + toastIDRef.current = toast.loading(t("sidebar.feed_actions.resetting_feed")) + await apiClient.feeds.reset.$get({ query: { id: feedId } }) + }, + onSuccess: (_, feedId) => { + entries.entries({ feedId }).invalidateRoot() + toast.success( + t("sidebar.feed_actions.reset_feed_success"), + toastIDRef.current ? { id: toastIDRef.current } : undefined, + ) + }, + onError: () => { + toast.error( + t("sidebar.feed_actions.reset_feed_error"), + toastIDRef.current ? { id: toastIDRef.current } : undefined, + ) + }, + }) +} diff --git a/apps/renderer/src/store/list/hooks.ts b/apps/renderer/src/store/list/hooks.ts index 2bd892189..e95c9739c 100644 --- a/apps/renderer/src/store/list/hooks.ts +++ b/apps/renderer/src/store/list/hooks.ts @@ -13,7 +13,7 @@ export const useListByView = (view: FeedViewType) => { return useListStore((state) => Object.values(state.lists).filter((list) => list.view === view)) } -export const useOwnedList = (view: FeedViewType) => { +export const useOwnedListByView = (view: FeedViewType) => { const whoami = useWhoami() const viewLists = useListByView(view) return useMemo( @@ -21,3 +21,10 @@ export const useOwnedList = (view: FeedViewType) => { [viewLists, whoami], ) } + +export const useOwnedLists = () => { + const whoami = useWhoami() + return useListStore((state) => + Object.values(state.lists).filter((list) => list.ownerUserId === whoami?.id), + ) +} diff --git a/apps/renderer/src/store/list/store.ts b/apps/renderer/src/store/list/store.ts index 2cd485dfb..4e2b8758f 100644 --- a/apps/renderer/src/store/list/store.ts +++ b/apps/renderer/src/store/list/store.ts @@ -1,11 +1,12 @@ import type { FeedModel, ListModel, ListModelPoplutedFeeds } from "@follow/models/types" +import { sleep } from "@follow/utils/utils" import { runTransactionInScope } from "~/database" import { apiClient } from "~/lib/api-fetch" import { ListService } from "~/services/list" import { feedActions } from "../feed" -import { createImmerSetter, createZustandStore } from "../utils/helper" +import { createImmerSetter, createTransaction, createZustandStore } from "../utils/helper" import type { ListState } from "./types" export const useListStore = createZustandStore("list")(() => ({ @@ -78,13 +79,37 @@ class ListActionStatic { }) } - deleteList(listId: string) { - immerSet((state) => { - delete state.lists[listId] - return state + async deleteList(listId: string) { + const deletedList = get().lists[listId] + if (!deletedList) return + const tx = createTransaction(deletedList) + + tx.optimistic(async () => { + immerSet((state) => { + delete state.lists[listId] + return state + }) + }) + tx.execute(async () => { + await sleep(1000) + + await apiClient.lists.$delete({ + json: { + listId, + }, + }) + }) + tx.rollback(async (s) => { + immerSet((state) => { + state.lists[listId] = s + return state + }) }) - runTransactionInScope(() => ListService.bulkDelete([listId])) + tx.persist(async () => { + ListService.bulkDelete([listId]) + }) + await tx.run() } async fetchListById(id: string) { diff --git a/apps/renderer/src/store/search/index.ts b/apps/renderer/src/store/search/index.ts index b8b5df779..dbe3bc696 100644 --- a/apps/renderer/src/store/search/index.ts +++ b/apps/renderer/src/store/search/index.ts @@ -16,7 +16,7 @@ import type { SearchResult, SearchState } from "./types" const searchTypeAtom = atomWithStorage( getStorageNS("search-type"), - SearchType.All, + SearchType.Feed, undefined, { getOnInit: true }, ) diff --git a/apps/renderer/src/store/subscription/store.ts b/apps/renderer/src/store/subscription/store.ts index 72a0b9f22..5b8931b43 100644 --- a/apps/renderer/src/store/subscription/store.ts +++ b/apps/renderer/src/store/subscription/store.ts @@ -14,6 +14,7 @@ import { whoami } from "~/atoms/user" import { ROUTE_FEED_IN_LIST } from "~/constants" import { runTransactionInScope } from "~/database" import { apiClient } from "~/lib/api-fetch" +import { queryClient } from "~/lib/query-client" import { updateFeedBoostStatus } from "~/modules/boost/atom" import { SubscriptionService } from "~/services" @@ -22,7 +23,7 @@ import { feedActions, getFeedById } from "../feed" import { inboxActions } from "../inbox" import { listActions } from "../list" import { feedUnreadActions } from "../unread" -import { createImmerSetter, createZustandStore, doMutationAndTransaction } from "../utils/helper" +import { createImmerSetter, createTransaction, createZustandStore } from "../utils/helper" import { subscriptionCategoryExistSelector } from "./selector" export type SubscriptionFlatModel = Omit & { @@ -241,28 +242,36 @@ class SubscriptionActions { } async markReadByView(view: FeedViewType, filter?: MarkReadFilter) { - doMutationAndTransaction( - () => - apiClient.reads.all.$post({ - json: { - view, - ...filter, - }, - }), - async () => { - const state = get() - for (const feedId in state.data) { - if (state.data[feedId].view === view) { - // We can not process this logic in local, so skip it. and then we will fetch the unread count from server. - !filter && feedUnreadActions.updateByFeedId(feedId, 0) - entryActions.patchManyByFeedId(feedId, { read: true }, filter) - } + const tx = createTransaction() + + tx.execute(async () => { + await apiClient.reads.all.$post({ + json: { + view, + ...filter, + }, + }) + }) + + tx.optimistic(async () => { + const state = get() + for (const feedId in state.data) { + if (state.data[feedId].view === view) { + // We can not process this logic in local, so skip it. and then we will fetch the unread count from server. + !filter && feedUnreadActions.updateByFeedId(feedId, 0) + entryActions.patchManyByFeedId(feedId, { read: true }, filter) } - if (filter) { - feedUnreadActions.fetchUnreadByView(view) - } - }, - ) + } + if (filter) { + feedUnreadActions.fetchUnreadByView(view) + } + }) + + tx.rollback(async () => { + // TODO handle this local? + await feedUnreadActions.fetchUnreadByView(view) + }) + await tx.run() } async markReadByFeedIds({ @@ -280,42 +289,50 @@ class SubscriptionActions { }) { const stableFeedIds = feedIds?.concat() || [] - doMutationAndTransaction( - () => - apiClient.reads.all.$post({ - json: { - ...(listId + const tx = createTransaction() + + tx.execute(async () => { + await apiClient.reads.all.$post({ + json: { + ...(listId + ? { + listId, + } + : inboxId ? { - listId, + inboxId, } - : inboxId - ? { - inboxId, - } - : { - feedIdList: stableFeedIds, - }), - ...filter, - }, - }), - async () => { - if (listId) { - feedUnreadActions.updateByFeedId(listId, 0) - } else if (inboxId) { - feedUnreadActions.updateByFeedId(inboxId, 0) - entryActions.patchManyByFeedId(inboxId, { read: true }, filter) - } else { - for (const feedId of stableFeedIds) { - // We can not process this logic in local, so skip it. and then we will fetch the unread count from server. - !filter && feedUnreadActions.updateByFeedId(feedId, 0) - entryActions.patchManyByFeedId(feedId, { read: true }, filter) - } + : { + feedIdList: stableFeedIds, + }), + ...filter, + }, + }) + }) + tx.optimistic(async () => { + if (listId) { + feedUnreadActions.updateByFeedId(listId, 0) + } else if (inboxId) { + feedUnreadActions.updateByFeedId(inboxId, 0) + entryActions.patchManyByFeedId(inboxId, { read: true }, filter) + } else { + for (const feedId of stableFeedIds) { + // We can not process this logic in local, so skip it. and then we will fetch the unread count from server. + !filter && feedUnreadActions.updateByFeedId(feedId, 0) + entryActions.patchManyByFeedId(feedId, { read: true }, filter) } - if (filter) { - feedUnreadActions.fetchUnreadByView(view) - } - }, - ) + } + if (filter) { + feedUnreadActions.fetchUnreadByView(view) + } + }) + + tx.rollback(async () => { + // TODO handle this local? + await feedUnreadActions.fetchUnreadByView(view) + }) + + await tx.run() } clear() { @@ -326,102 +343,127 @@ class SubscriptionActions { }) } - deleteCategory(ids: string[]) { + async deleteCategory(ids: string[]) { const idSet = new Set(ids) + const tx = createTransaction(get()) - return doMutationAndTransaction( - () => - apiClient.categories.$delete({ - json: { - feedIdList: ids, - deleteSubscriptions: false, - }, + tx.execute(async () => { + await apiClient.categories.$delete({ + json: { + feedIdList: ids, + deleteSubscriptions: false, + }, + }) + }) + + tx.optimistic(async () => { + immerSet((state) => + Object.keys(state.data).forEach((id) => { + if (!idSet.has(id)) { + return + } + const subscription = state.data[id] + const feed = getFeedById(subscription.feedId) + if (!feed || feed.type !== "feed") return + const { siteUrl } = feed + if (!siteUrl) return + const parsed = parse(siteUrl) + subscription.category = null + // The logic for removing Category here is to use domain as the default category name. + parsed.domain && (subscription.defaultCategory = capitalizeFirstLetter(parsed.domain)) }), - async () => { - immerSet((state) => - Object.keys(state.data).forEach((id) => { - if (idSet.has(id)) { - const subscription = state.data[id] - const feed = getFeedById(subscription.feedId) - if (!feed || feed.type !== "feed") return - const { siteUrl } = feed - if (!siteUrl) return - const parsed = parse(siteUrl) - subscription.category = null - // The logic for removing Category here is to use domain as the default category name. - parsed.domain && (subscription.defaultCategory = capitalizeFirstLetter(parsed.domain)) - } - }), - ) - const { data } = get() - return ids.map((id) => data[id] && SubscriptionService.upsert(data[id])) - }, + ) + }) + + tx.rollback(async (snapshot) => { + immerSet((state) => { + Object.keys(snapshot.data).forEach((id) => { + state.data[id] = snapshot.data[id] + }) + }) + }) + + tx.persist(async () => { + const { data } = get() + ids.map((id) => data[id] && SubscriptionService.upsert(data[id])) + }) + await tx.run() + } + + async unfollow(feedIds: string[]) { + // const feed = getFeedById(feedId) + const feeds = feedIds.map((feedId) => getFeedById(feedId)) + const tx = createTransaction< + ReturnType, { - doTranscationWhenMutationFail: false, - waitMutation: true, - }, - ) - } + subscription: Record + viewDeleted: Record + } + >(get(), { + viewDeleted: {}, + subscription: {}, + }) - async unfollow(feedId: string) { - const feed = getFeedById(feedId) - // Remove feed and subscription - set((state) => - produce(state, (draft) => { - delete draft.data[feedId] - for (const view in draft.feedIdByView) { - const currentViewFeedIds = draft.feedIdByView[view] as string[] - currentViewFeedIds.splice(currentViewFeedIds.indexOf(feedId), 1) - } - }), - ) - - // Remove feed's entries - entryActions.clearByFeedId(feedId) - // Clear feed's unread count - feedUnreadActions.updateByFeedId(feedId, 0) - - return doMutationAndTransaction( - () => - apiClient.subscriptions - .$delete({ - json: { - feedId, - }, - }) - .then(() => feed), - () => SubscriptionService.removeSubscription(whoami()!.id, feedId), - ).then(() => feed) - } - - async unfollowMany(feedIdList: string[]) { - for (const feedId of feedIdList) { + tx.optimistic(async (_, ctx) => { // Remove feed and subscription set((state) => produce(state, (draft) => { - delete draft.data[feedId] - for (const view in draft.feedIdByView) { - const currentViewFeedIds = draft.feedIdByView[view] as string[] - currentViewFeedIds.splice(currentViewFeedIds.indexOf(feedId), 1) + for (const feedId of feedIds) { + const subscription = state.data[feedId] + ctx.subscription[feedId] = subscription + + delete draft.data[feedId] + + for (const view in draft.feedIdByView) { + const currentViewFeedIds = draft.feedIdByView[view] as string[] + + const idx = currentViewFeedIds.indexOf(feedId) + + if (idx !== -1) { + currentViewFeedIds.splice(idx, 1) + ctx.viewDeleted[feedId] = ctx.viewDeleted[feedId] || [] + ctx.viewDeleted[feedId].push(Number.parseInt(view)) + } + } } }), ) + }) + tx.rollback(async (_, ctx) => { + set((state) => + produce(state, (draft) => { + for (const feedId of feedIds) { + if (!ctx.subscription[feedId]) return + draft.data[feedId] = ctx.subscription[feedId] - // Remove feed's entries - entryActions.clearByFeedId(feedId) - // Clear feed's unread count - feedUnreadActions.updateByFeedId(feedId, 0) - } - - return doMutationAndTransaction( - () => - apiClient.subscriptions.$delete({ - json: { - feedIdList, - }, + for (const view of ctx.viewDeleted[feedId]) { + draft.feedIdByView[view].push(feedId) + } + } }), - () => SubscriptionService.removeSubscriptionMany(whoami()!.id, feedIdList), - ) + ) + }) + + tx.persist(async () => { + for (const feedId of feedIds) { + // Remove feed's entries + entryActions.clearByFeedId(feedId) + // Clear feed's unread count + feedUnreadActions.updateByFeedId(feedId, 0) + + SubscriptionService.removeSubscription(whoami()!.id, feedId) + } + }) + tx.execute(async () => { + await apiClient.subscriptions.$delete({ + json: { + feedIdList: feedIds, + }, + }) + }) + + await tx.run() + return feeds } async changeCategoryView( @@ -467,6 +509,101 @@ class SubscriptionActions { ) } + async batchUpdateSubscription({ + feedIdList, + category, + view, + }: { + feedIdList: string[] + category: string + view: FeedViewType + }) { + const tx = createTransaction< + ReturnType, + { + subscription: Record + feedIdByView: Record + } + >(get(), { + subscription: {}, + feedIdByView: { + [FeedViewType.Articles]: [], + [FeedViewType.Audios]: [], + [FeedViewType.Notifications]: [], + [FeedViewType.Pictures]: [], + [FeedViewType.SocialMedia]: [], + [FeedViewType.Videos]: [], + }, + }) + + tx.execute(async (snapshot) => { + await apiClient.subscriptions.batch.$patch({ + json: { + feedIds: feedIdList, + category, + view, + }, + }) + const oldView = snapshot.data[feedIdList[0]].view + + queryClient.invalidateQueries({ + predicate(query) { + return ( + query.queryKey[0] === "entries" && + [oldView, view].includes(query.queryKey[2] as FeedViewType) + ) + }, + }) + }) + + tx.optimistic(async (_, ctx) => { + set((state) => + produce(state, (draft) => { + for (let i = 0; i < 6; i++) { + ctx.feedIdByView[i] = state.feedIdByView[i] + } + + for (const feedId of feedIdList) { + const subscription = draft.data[feedId] + if (!subscription) return + + subscription.category = category + + if (subscription.view !== view) { + const currentViewFeedIds = draft.feedIdByView[subscription.view] as string[] + currentViewFeedIds.splice(currentViewFeedIds.indexOf(feedId), 1) + subscription.view = view + const changeToViewFeedIds = draft.feedIdByView[view] as string[] + changeToViewFeedIds.push(feedId) + } + + ctx.subscription[feedId] = state.data[feedId] + } + }), + ) + }) + + tx.rollback(async (_, ctx) => { + set((state) => + produce(state, (draft) => { + for (const feedId of feedIdList) { + draft.data[feedId] = ctx.subscription[feedId] + } + for (let i = 0; i < 6; i++) { + draft.feedIdByView[i] = ctx.feedIdByView[i] + } + }), + ) + }) + + tx.persist(async () => { + SubscriptionService.updateCategories(feedIdList, category) + SubscriptionService.changeViews(feedIdList, view) + }) + + await tx.run() + } + async changeListView(listId: string, currentView: FeedViewType, toView: FeedViewType) { const state = get() @@ -482,6 +619,17 @@ class SubscriptionActions { } async renameCategory(lastCategory: string, newCategory: string) { + const tx = createTransaction< + unknown, + { + subscription: Record + } + >( + {}, + { + subscription: {}, + }, + ) const subscriptionIds = [] as string[] const state = get() for (const feedId in state.data) { @@ -491,30 +639,45 @@ class SubscriptionActions { } } - set((state) => - produce(state, (state) => { - for (const feedId of subscriptionIds) { - const subscription = state.data[feedId] - if (subscription) { - subscription.category = newCategory - subscription.defaultCategory = undefined - } - } - }), - ) + tx.execute(async () => { + await apiClient.categories.$patch({ + json: { + feedIdList: subscriptionIds, + category: newCategory, + }, + }) + }) - return doMutationAndTransaction( - () => - apiClient.categories.$patch({ - json: { - feedIdList: subscriptionIds, - category: newCategory, - }, + tx.persist(async () => { + SubscriptionService.renameCategory(whoami()!.id, subscriptionIds, newCategory) + }) + + tx.optimistic(async (_, ctx) => { + set((state) => + produce(state, (draft) => { + for (const feedId of subscriptionIds) { + const subscription = draft.data[feedId] + if (subscription) { + subscription.category = newCategory + subscription.defaultCategory = undefined + + ctx.subscription[feedId] = state.data[feedId] + } + } }), - async () => - // Db - SubscriptionService.renameCategory(whoami()!.id, subscriptionIds, newCategory), - ) + ) + }) + tx.rollback(async (_, ctx) => { + set((state) => + produce(state, (draft) => { + for (const feedId of Object.keys(ctx.subscription)) { + draft.data[feedId] = ctx.subscription[feedId] + } + }), + ) + }) + + await tx.run() } } diff --git a/apps/renderer/src/store/unread/index.ts b/apps/renderer/src/store/unread/index.ts index ee169962e..985ce6d42 100644 --- a/apps/renderer/src/store/unread/index.ts +++ b/apps/renderer/src/store/unread/index.ts @@ -63,11 +63,16 @@ class FeedUnreadActions { return data } + /** + * @returns previous value + */ incrementByFeedId(feedId: string, inc: number) { const state = get() const cur = state.data[feedId] + const nextValue = Math.max(0, (cur || 0) + inc) - this.internal_setValue([[feedId, Math.max(0, (cur || 0) + inc)]]) + this.internal_setValue([[feedId, nextValue]]) + return cur } updateByFeedId(feedId: string, unread: number) { diff --git a/apps/renderer/src/store/user/store.ts b/apps/renderer/src/store/user/store.ts index 72e7c04f0..bfe264a4e 100644 --- a/apps/renderer/src/store/user/store.ts +++ b/apps/renderer/src/store/user/store.ts @@ -1,6 +1,9 @@ import type { UserModel } from "@follow/models/types" +import { create, keyResolver, windowScheduler } from "@yornaath/batshit" import { produce } from "immer" +import { apiClient } from "~/lib/api-fetch" + import { createZustandStore } from "../utils/helper" interface UserStoreState { @@ -9,8 +12,23 @@ interface UserStoreState { export const useUserStore = createZustandStore("user")(() => ({ users: {}, })) +const avatarBatcher = create({ + fetcher: async (ids: string[]) => { + const { data: res } = await apiClient.profiles.batch.$post({ + json: { ids }, + }) -const { getState: _get, setState: set } = useUserStore + const result = Array.from({ length: ids.length }).fill(null) as (typeof res)[string][] + for (const [i, id] of ids.entries()) { + result[i] = res[id] + } + return result + }, + resolver: keyResolver("id"), + scheduler: windowScheduler(1000), +}) + +const { getState: get, setState: set } = useUserStore class UserActions { upsert(user: UserModel | UserModel[] | Record) { if (!user) return @@ -45,6 +63,27 @@ class UserActions { } } } + + async getOrFetchProfile(id: string) { + const user = get().users[id] + if (user) return user + const result = (await avatarBatcher.fetch(id)) as UserModel + if (!result) return null + this.upsert(result) + return result + } + + async getBoosters(feedId: string) { + const res = await apiClient.boosts.boosters.$get({ + query: { + feedId, + }, + }) + + this.upsert(res.data) + + return res.data + } } export const userActions = new UserActions() diff --git a/apps/renderer/src/store/utils/helper.test.ts b/apps/renderer/src/store/utils/helper.test.ts new file mode 100644 index 000000000..fddc5054f --- /dev/null +++ b/apps/renderer/src/store/utils/helper.test.ts @@ -0,0 +1,156 @@ +import { fail } from "node:assert" + +import { describe, expect, it, vi } from "vitest" + +import { createTransaction } from "./helper" + +describe("createTransaction", () => { + it("should execute all steps in correct order", async () => { + const executionOrder: string[] = [] + const snapshot = { value: 1 } + + const transaction = createTransaction(snapshot) + .optimistic(async () => { + executionOrder.push("optimistic") + }) + .execute(async () => { + executionOrder.push("execute") + }) + .persist(async () => { + executionOrder.push("persist") + }) + + await transaction.run() + + expect(executionOrder).toEqual(["optimistic", "execute", "persist"]) + }) + + it("should handle rollback when execution fails", async () => { + const snapshot = { value: 1 } + const rollbackMock = vi.fn() + const error = new Error("Execution failed") + const persistMock = vi.fn() + + const transaction = createTransaction(snapshot) + .rollback(rollbackMock) + .execute(async () => { + throw error + }) + .persist(persistMock) + + await expect(transaction.run()).rejects.toThrow(error) + expect(rollbackMock).toHaveBeenCalledWith(snapshot, {}) + expect(persistMock).not.toHaveBeenCalled() + }) + + it("should continue if optimistic update fails", async () => { + const executionOrder: string[] = [] + const snapshot = { value: 1 } + const rollbackMock = vi.fn() + + const transaction = createTransaction(snapshot) + .rollback(rollbackMock) + .optimistic(async () => { + throw new Error("Optimistic update failed") + }) + .execute(async () => { + executionOrder.push("execute") + }) + .persist(async () => { + executionOrder.push("persist") + }) + + await transaction.run() + + expect(executionOrder).toEqual(["execute", "persist"]) + expect(rollbackMock).not.toHaveBeenCalled() + }) + + it("should maintain method chaining", () => { + const snapshot = { value: 1 } + const transaction = createTransaction(snapshot) + + expect(transaction.optimistic(() => Promise.resolve())).toBe(transaction) + expect(transaction.execute(() => Promise.resolve())).toBe(transaction) + expect(transaction.rollback(() => Promise.resolve())).toBe(transaction) + expect(transaction.persist(() => Promise.resolve())).toBe(transaction) + }) + + it("should pass context to all functions", async () => { + const snapshot = { value: 1 } + const ctx = { someContext: "test" } + const optimisticMock = vi.fn() + const executeMock = vi.fn() + const persistMock = vi.fn() + + const transaction = createTransaction(snapshot, ctx) + .optimistic(optimisticMock) + .execute(executeMock) + .persist(persistMock) + + await transaction.run() + + expect(optimisticMock).toHaveBeenCalledWith(snapshot, ctx) + expect(executeMock).toHaveBeenCalledWith(snapshot, ctx) + expect(persistMock).toHaveBeenCalledWith(snapshot, ctx) + }) + + it("should pass context to rollback function when execution fails", async () => { + const snapshot = { value: 1 } + const ctx = { someContext: "test" } + const rollbackMock = vi.fn() + const error = new Error("Execution failed") + + const transaction = createTransaction(snapshot, ctx) + .rollback(rollbackMock) + .execute(async () => { + throw error + }) + + await expect(transaction.run()).rejects.toThrow(error) + expect(rollbackMock).toHaveBeenCalledWith(snapshot, ctx) + }) + + it("should allow modifying context in optimistic phase for later consumption", async () => { + const snapshot = { value: 1 } + const ctx = { someValue: "initial" } + const executionOrder: string[] = [] + + const transaction = createTransaction(snapshot, ctx) + .optimistic(async (_, context: any) => { + context.someValue = "modified" + executionOrder.push(`optimistic: ${context.someValue}`) + }) + .execute(async (_, context: any) => { + executionOrder.push(`execute: ${context.someValue}`) + }) + .persist(async (_, context: any) => { + executionOrder.push(`persist: ${context.someValue}`) + }) + + await transaction.run() + + expect(executionOrder).toEqual([ + "optimistic: modified", + "execute: modified", + "persist: modified", + ]) + expect(ctx.someValue).toBe("modified") + }) + + it("should propagate the exact same error instance from execute to run", async () => { + const snapshot = { value: 1 } + const specificError = new Error("Specific error message") + + const transaction = createTransaction(snapshot).execute(async () => { + throw specificError + }) + + try { + await transaction.run() + fail("Expected an error to be thrown") + } catch (error) { + expect(error).toBe(specificError) + } + }) +}) diff --git a/apps/renderer/src/store/utils/helper.ts b/apps/renderer/src/store/utils/helper.ts index a3b4b49aa..d34be28cd 100644 --- a/apps/renderer/src/store/utils/helper.ts +++ b/apps/renderer/src/store/utils/helper.ts @@ -1,6 +1,4 @@ -/* eslint-disable no-unsafe-finally */ import { isDraft, original, produce } from "immer" -import { unstable_batchedUpdates } from "react-dom" import type { StateCreator, StoreApi, UseBoundStore } from "zustand" import type { PersistStorage } from "zustand/middleware" import { devtools } from "zustand/middleware" @@ -19,7 +17,11 @@ export const localStorage: PersistStorage = { return null } - return JSON.parse(data) + try { + return JSON.parse(data) + } catch { + return data + } }, setItem: (name, value) => { window.localStorage.setItem(name, JSON.stringify(value)) @@ -88,54 +90,6 @@ export const getStoreActions = any }>( return actions as any } -export type MutationAndTranscationOptions = { - /** - * If true, will wait for the mutation to finish before running the transaction - */ - waitMutation?: boolean - /** - * If true, will run the transaction even if the mutation fails, useful in network offline - */ - doTranscationWhenMutationFail?: boolean -} -export const doMutationAndTransaction = async ( - mutationFn: () => Promise, - transaction: () => Promise, - options?: MutationAndTranscationOptions, -): Promise<[M | null | void, T | null | void]> => { - const isOnline = navigator.onLine - const { waitMutation = false, doTranscationWhenMutationFail = !isOnline } = options || {} - const wrappedTransaction = () => { - const ret = runTransactionInScope(() => unstable_batchedUpdates(() => transaction())) - - if (ret instanceof Promise) { - return ret - } - return null - } - const wrappedMutation = () => (isOnline ? mutationFn() : Promise.resolve()) - - if (waitMutation) { - let runTransactionOnce = false - - try { - const mutationRet = await wrappedMutation() - runTransactionOnce = true - const transactionRet = await wrappedTransaction() - return [mutationRet, transactionRet] - } finally { - if (!runTransactionOnce && doTranscationWhenMutationFail) { - const transactionRet = await wrappedTransaction() - - return [null, transactionRet] - } - return [null, null] - } - } else { - return await Promise.all([wrappedMutation(), wrappedTransaction()]) - } -} - export function createImmerSetter(useStore: UseBoundStore>) { return (updater: (state: T) => void) => useStore.setState((state) => @@ -149,3 +103,69 @@ type MayBeDraft = T export const toRaw = (draft: MayBeDraft): T => { return isDraft(draft) ? original(draft)! : draft } + +class Transaction { + private _snapshot: S + private _ctx: Ctx + private onRollback?: (snapshot: S, ctx: Ctx) => Promise + private executorFn?: (snapshot: S, ctx: Ctx) => Promise + private optimisticExecutor?: (snapshot: S, ctx: Ctx) => Promise + private onPersist?: (snapshot: S, ctx: Ctx) => Promise + + constructor(snapshot?: S, ctx?: Ctx) { + this._snapshot = snapshot || ({} as S) + this._ctx = ctx || ({} as Ctx) + } + + rollback(fn: (snapshot: S, ctx: Ctx) => Promise): this { + this.onRollback = fn + return this + } + + execute(executor: (snapshot: S, ctx: Ctx) => Promise): this { + this.executorFn = executor + return this + } + + optimistic(executor: (snapshot: S, ctx: Ctx) => Promise): this { + this.optimisticExecutor = executor + return this + } + + persist(fn: (snapshot: S, ctx: Ctx) => Promise): this { + this.onPersist = fn + return this + } + + async run(): Promise { + let isOptimisticFailed = false + + if (this.optimisticExecutor) { + try { + await this.optimisticExecutor(this._snapshot, this._ctx) + } catch (error) { + isOptimisticFailed = true + console.error(error) + } + } + + if (this.executorFn) { + try { + await this.executorFn(this._snapshot, this._ctx) + } catch (err) { + if (this.onRollback && !isOptimisticFailed) { + await this.onRollback(this._snapshot, this._ctx) + } + throw err + } + } + + if (this.onPersist) { + await runTransactionInScope(() => this.onPersist!(this._snapshot, this._ctx)) + } + } +} + +export const createTransaction = (snapshot?: S, ctx?: Ctx): Transaction => { + return new Transaction(snapshot, ctx) +} diff --git a/apps/renderer/vitest.config.ts b/apps/renderer/vitest.config.ts index 76c64051b..07e54b4ac 100644 --- a/apps/renderer/vitest.config.ts +++ b/apps/renderer/vitest.config.ts @@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url" import tsconfigPath from "vite-tsconfig-paths" import { defineProject } from "vitest/config" -import { twMacro } from "../../plugins/vite/tw-macro" +import { astPlugin } from "../../plugins/vite/ast" const pkg = JSON.parse(readFileSync("package.json", "utf8")) const __dirname = fileURLToPath(new URL(".", import.meta.url)) @@ -31,11 +31,9 @@ export default defineProject({ }, plugins: [ - twMacro(), + astPlugin, tsconfigPath({ projects: ["./tsconfig.json"], }), - - twMacro(), ], }) diff --git a/apps/server/client/atoms/settings/general.ts b/apps/server/client/atoms/settings/general.ts index a73925500..d81c273a2 100644 --- a/apps/server/client/atoms/settings/general.ts +++ b/apps/server/client/atoms/settings/general.ts @@ -1,9 +1,8 @@ import type { GeneralSettings } from "@follow/shared/interface/settings" -import { jotaiStore } from "../../lib/store" import { createSettingAtom } from "./helper" -const createDefaultSettings = (): GeneralSettings => ({ +const createDefaultSettings = (): Partial => ({ // App appLaunchOnStartup: false, language: "en", @@ -22,6 +21,7 @@ const createDefaultSettings = (): GeneralSettings => ({ groupByDate: true, // Secure jumpOutLinkWarn: true, + voice: "", }) export const { @@ -36,9 +36,6 @@ export const { settingAtom: __generalSettingAtom, } = createSettingAtom("general", createDefaultSettings) -export const subscribeShouldUseIndexedDB = (callback: (value: boolean) => void) => - jotaiStore.sub(__generalSettingAtom, () => callback(getGeneralSettings().dataPersist)) - export const generalServerSyncWhiteListKeys: (keyof GeneralSettings)[] = [ "appLaunchOnStartup", "dataPersist", diff --git a/apps/server/client/components/items/normal.tsx b/apps/server/client/components/items/normal.tsx index 7e71fca76..d123d3720 100644 --- a/apps/server/client/components/items/normal.tsx +++ b/apps/server/client/components/items/normal.tsx @@ -51,7 +51,7 @@ function NormalListItemImpl({
{withDetails && (
-
+
{entry.entries.description}
diff --git a/apps/server/client/components/items/picture-masonry-context.ts b/apps/server/client/components/items/picture-masonry-context.ts deleted file mode 100644 index ce611c3aa..000000000 --- a/apps/server/client/components/items/picture-masonry-context.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { noop } from "foxact/noop" -import type { Dispatch, SetStateAction } from "react" -import { createContext, useCallback, useContext } from "react" -import { createContext as createContextSelector, useContextSelector } from "use-context-selector" - -export const MasonryItemWidthContext = createContext(0) - -export const useMasonryItemWidth = () => useContext(MasonryItemWidthContext) - -export const MasonryItemsAspectRatioContext = createContextSelector({} as Record) - -export const MasonryIntersectionContext = createContext(null!) - -export const useMasonryItemRatio = (url: string) => - useContextSelector(MasonryItemsAspectRatioContext, (ctx) => ctx[url]) - -export const MasonryItemsAspectRatioSetterContext = - createContext>>>(noop) - -export const useSetStableMasonryItemRatio = () => { - const ctx = useContext(MasonryItemsAspectRatioSetterContext) - return useCallback( - (url: string, ratio: number) => { - ctx((prev) => { - // Skip if the ratio is already set, make it stable - if (prev[url]) return prev - - return { ...prev, [url]: ratio } - }) - }, - [ctx], - ) -} diff --git a/apps/server/client/components/items/picture.tsx b/apps/server/client/components/items/picture.tsx index 31eb8e68f..c3a14328d 100644 --- a/apps/server/client/components/items/picture.tsx +++ b/apps/server/client/components/items/picture.tsx @@ -1,8 +1,3 @@ -import { - MasonryItemsAspectRatioContext, - MasonryItemsAspectRatioSetterContext, - MasonryItemWidthContext, -} from "@client/components/items/picture-masonry-context" import { TeleportalTakeOff } from "@client/components/layout/main/teleportal" import { LazyImage } from "@client/components/ui/image" import { getPreferredTitle } from "@client/lib/helper" @@ -11,6 +6,14 @@ import type { Feed } from "@client/query/feed" import { MemoedDangerousHTMLStyle } from "@follow/components/common/MemoedDangerousHTMLStyle.jsx" import { FeedIcon } from "@follow/components/ui/feed-icon/index.jsx" import { TitleMarquee } from "@follow/components/ui/marquee/index.jsx" +import { + MasonryItemsAspectRatioContext, + MasonryItemsAspectRatioSetterContext, + MasonryItemWidthContext, + useMasonryItemRatio, + useMasonryItemWidth, + useSetStableMasonryItemRatio, +} from "@follow/components/ui/masonry/contexts.jsx" import { Masonry } from "@follow/components/ui/masonry/index.jsx" import type { EntryModel } from "@follow/models/types" import { nextFrame } from "@follow/utils/dom" @@ -24,12 +27,6 @@ import { memo, useEffect, useLayoutEffect, useMemo, useRef, useState } from "rea import { PhotoProvider, PhotoView } from "react-photo-view" import inlineStyle from "react-photo-view/dist/react-photo-view.css?raw" -import { - useMasonryItemRatio, - useMasonryItemWidth, - useSetStableMasonryItemRatio, -} from "./picture-masonry-context" - const MasonryItemFixedDimensionWrapper = ( props: PropsWithChildren<{ url: string diff --git a/apps/server/client/lib/helper.ts b/apps/server/client/lib/helper.ts index 427198567..f714c1d83 100644 --- a/apps/server/client/lib/helper.ts +++ b/apps/server/client/lib/helper.ts @@ -2,6 +2,9 @@ import { setOpenInAppDeeplink } from "@client/atoms/app" import type { FeedOrListRespModel } from "@follow/models/types" import { DEEPLINK_SCHEME } from "@follow/shared/constants" +import type { ApiClient } from "~/lib/api-client" +import type { defineMetadata } from "~/meta-handler" + export const getPreferredTitle = (feed?: FeedOrListRespModel | null) => { if (!feed?.id) { return feed?.title @@ -14,6 +17,44 @@ export const getHydrateData = (key: string) => { return window.__HYDRATE__?.[key] } +// type ExtractHydrateData = T extends readonly (infer Item)[] +// ? Item extends { readonly type: "hydrate"; readonly data: infer D } +// ? D +// : never +// : never + +// export type GetHydrateData = T extends (...args: any[]) => Promise +// ? ExtractHydrateData +// : T extends Promise +// ? ExtractHydrateData +// : ExtractHydrateData + +type ExtractHydrateData = T extends readonly (infer Item)[] + ? Item extends { readonly type: "hydrate"; readonly data: infer D } + ? D + : never + : never + +type UnwrapMetadataFn = + T extends

>(args: { + params: P + apiClient: ApiClient + origin: string + throwError: (status: number, message: any) => never + }) => Promise | infer R + ? R + : never + +export type GetHydrateData = T extends (...args: any[]) => Promise + ? ExtractHydrateData + : T extends (...args: any[]) => infer R + ? ExtractHydrateData + : T extends Promise + ? ExtractHydrateData + : T extends typeof defineMetadata + ? ExtractHydrateData[0]>> + : ExtractHydrateData + export const askOpenInFollowApp = (deeplink: string, fallback?: () => string): Promise => { return new Promise(() => { const deeplinkUrl = `${DEEPLINK_SCHEME}${deeplink}` diff --git a/apps/server/client/pages/(main)/share/feeds/[id]/metadata.ts b/apps/server/client/pages/(main)/share/feeds/[id]/metadata.ts new file mode 100644 index 000000000..a5fa424f0 --- /dev/null +++ b/apps/server/client/pages/(main)/share/feeds/[id]/metadata.ts @@ -0,0 +1,36 @@ +import type { GetHydrateData } from "@client/lib/helper" + +import { defineMetadata } from "~/meta-handler" + +const meta = defineMetadata(async ({ params, apiClient, origin, throwError }) => { + const feedId = params.id + + const feed = await apiClient.feeds.$get({ query: { id: feedId } }).catch((e) => { + throwError(e.response?.status || 500, "Feed not found") + throw e + }) + + const { title, description } = feed.data.feed + + return [ + { + type: "openGraph", + title: title || "", + description: description || "", + image: `${origin}/og/feed/${feedId}`, + }, + { + type: "title", + title: title || "", + }, + { + type: "hydrate", + data: feed.data, + path: apiClient.feeds.$url({ query: { id: feedId } }).pathname, + key: `feeds.$get,query:id=${feedId}`, + }, + ] as const +}) + +export type FeedHydrateData = GetHydrateData +export default meta diff --git a/apps/server/client/pages/(main)/share/lists/[id]/metadata.ts b/apps/server/client/pages/(main)/share/lists/[id]/metadata.ts new file mode 100644 index 000000000..8c9ed4cdd --- /dev/null +++ b/apps/server/client/pages/(main)/share/lists/[id]/metadata.ts @@ -0,0 +1,28 @@ +import { defineMetadata } from "~/meta-handler" + +export default defineMetadata(async ({ params, apiClient, origin, throwError }) => { + const listId = params.id + const list = await apiClient.lists + .$get({ query: { listId } }) + .catch((e) => throwError(e.response?.status || 500, "List not found")) + + const { title, description } = list.data.list + return [ + { + type: "openGraph", + title: title || "", + description: description || "", + image: `${origin}/og/list/${listId}`, + }, + { + type: "title", + title: title || "", + }, + { + type: "hydrate", + data: list.data, + path: apiClient.lists.$url({ query: { listId } }).pathname, + key: `lists.$get,query:listId=${listId}`, + }, + ] +}) diff --git a/apps/server/client/pages/(main)/share/users/[id]/metadata.ts b/apps/server/client/pages/(main)/share/users/[id]/metadata.ts new file mode 100644 index 000000000..56403604a --- /dev/null +++ b/apps/server/client/pages/(main)/share/users/[id]/metadata.ts @@ -0,0 +1,40 @@ +import { isBizId } from "@follow/utils/utils" + +import { defineMetadata } from "~/meta-handler" + +export default defineMetadata(async ({ params, apiClient, origin, throwError }) => { + const userId = params.id + + const handle = isBizId(userId || "") + ? userId + : `${userId}`.startsWith("@") + ? `${userId}`.slice(1) + : userId + + const res = await apiClient.profiles + .$get({ + query: { + handle, + id: isBizId(handle || "") ? handle : undefined, + }, + }) + .catch((e) => throwError(e.response?.status || 500, "User not found")) + const { name } = res.data + return [ + { + type: "title", + title: name || "", + }, + { + type: "openGraph", + title: name || "", + image: `${origin}/og/user/${userId}`, + }, + { + type: "hydrate", + data: res.data, + path: apiClient.profiles.$url({ query: { id: userId } }).pathname, + key: `profiles.$get,query:id=${userId}`, + }, + ] +}) diff --git a/apps/server/client/query/feed.ts b/apps/server/client/query/feed.ts index d347ff0ee..29de0c907 100644 --- a/apps/server/client/query/feed.ts +++ b/apps/server/client/query/feed.ts @@ -1,5 +1,6 @@ import { apiClient } from "@client/lib/api-fetch" import { getHydrateData } from "@client/lib/helper" +import type { FeedHydrateData } from "@client/pages/(main)/share/feeds/[id]/metadata" import { useQuery } from "@tanstack/react-query" async function fetchFeedById(id: string) { @@ -14,9 +15,7 @@ export const useFeed = ({ id }: { id: string }) => useQuery({ queryKey: ["feed", id], queryFn: () => fetchFeedById(id), - initialData: getHydrateData(`feeds.$get,query:id=${id}`) as any as Awaited< - ReturnType - >, + initialData: getHydrateData(`feeds.$get,query:id=${id}`) as FeedHydrateData, }) export type Feed = Awaited> diff --git a/apps/server/helper/meta-map.ts b/apps/server/helper/meta-map.ts new file mode 100644 index 000000000..ba9af11ce --- /dev/null +++ b/apps/server/helper/meta-map.ts @@ -0,0 +1,83 @@ +import * as fs from "node:fs/promises" +import * as path from "node:path" +import { dirname } from "node:path" +import { fileURLToPath } from "node:url" + +import chokidar from "chokidar" +import { glob } from "glob" + +const __dirname = dirname(fileURLToPath(import.meta.url)) + +async function generateMetaMap() { + const files = await glob("./client/pages/(main)/**/metadata.ts", { + cwd: path.resolve(__dirname, ".."), + }) + + const imports: string[] = [] + const routes: Record = {} + + files.forEach((file, index) => { + const routePath = file + .replace("client/pages/(main)", "") + .replace("/metadata.ts", "") + .replaceAll(/\[([^\]]+)\]/g, ":$1") + + const importName = `i${index}` + imports.push(`import ${importName} from "../${file.replace(".ts", "")}"`) + routes[routePath] = importName + }) + + const content = + "// This file is generated by `pnpm run meta`\n" + + `${imports.join("\n")}\n +export default { +${Object.entries(routes) + .map(([route, imp]) => ` "${route}": ${imp},`) + .join("\n")} +} +` + + const originalContent = await fs.readFile( + path.resolve(__dirname, "../src/meta-handler.map.ts"), + "utf-8", + ) + if (originalContent === content) return + await fs.writeFile(path.resolve(__dirname, "../src/meta-handler.map.ts"), content, "utf-8") + console.info("Meta map generated successfully!") +} + +async function watch() { + const watchPath = path.resolve(__dirname, "..", "./client/pages/(main)") + console.info("Watching metadata files...") + + await generateMetaMap() + const watcher = chokidar.watch(watchPath, { + ignoreInitial: false, + }) + + watcher.on("add", () => { + console.info("Metadata file added/changed, regenerating map...") + generateMetaMap() + }) + + watcher.on("unlink", () => { + console.info("Metadata file removed, regenerating map...") + generateMetaMap() + }) + + watcher.on("change", () => { + console.info("Metadata file changed, regenerating map...") + generateMetaMap() + }) + + process.on("SIGINT", () => { + watcher.close() + process.exit(0) + }) +} + +if (process.argv.includes("--watch")) { + watch().catch(console.error) +} else { + generateMetaMap().catch(console.error) +} diff --git a/apps/server/index.ts b/apps/server/index.ts index 5cf62fe43..6f30c0250 100644 --- a/apps/server/index.ts +++ b/apps/server/index.ts @@ -5,8 +5,11 @@ import { fastifyRequestContext } from "@fastify/request-context" import { env } from "@follow/shared/env" import type { FastifyRequest } from "fastify" import Fastify from "fastify" +import { nanoid } from "nanoid" +import { FetchError } from "ofetch" import { isDev } from "~/lib/env" +import { MetaError } from "~/meta-handler" import { globalRoute } from "./src/router/global" import { ogRoute } from "./src/router/og" @@ -30,6 +33,24 @@ export const createApp = async () => { hook: "onRequest", }) + app.setErrorHandler(function (err, req, reply) { + this.log.error(err) + + const traceId = nanoid(8) + + if (err instanceof FetchError) { + reply + .status((err as FetchError).response?.status || 500) + .send({ ok: false, traceId, message: err.message }) + } else if (err instanceof MetaError) { + reply.status(err.status).send({ ok: false, traceId, message: err.metaMessage }) + } else { + const message = err.message || "Internal Server Error" + const status = Number.parseInt(err.code as string) || 500 + reply.status(status).send({ ok: false, message, traceId }) + } + }) + app.addHook("onRequest", (req, reply, done) => { req.requestContext.set("req", req) diff --git a/apps/server/package.json b/apps/server/package.json index f9999b1b4..07c779eb8 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -3,23 +3,24 @@ "scripts": { "build": "cross-env NODE_ENV=production vite build && tsx scripts/prepare-vercel-build.ts && tsup && tsx scripts/cleanup-vercel-build.ts", "dev": "cross-env NODE_ENV=development tsx watch --include \"src/**/*.ts\" --exclude \"./*.ts\" --exclude \"./*.mjs\" index.ts", + "meta": "tsx helper/meta-map.ts --watch", "start": "tsx index.ts" }, "dependencies": { "@fastify/middie": "9.0.2", "@fastify/request-context": "6.0.1", "@fontsource/sn-pro": "5.1.0", - "@hono/auth-js": "1.0.11", + "@hono/auth-js": "1.0.13", "@openpanel/web": "1.0.1", "@resvg/resvg-js": "2.6.2", - "@sentry/react": "8.34.0", - "@tanstack/react-query": "5.59.14", + "@sentry/react": "8.36.0", + "@tanstack/react-query": "5.59.19", "blurhash": "2.0.5", "click-to-react-component": "1.1.0", "dayjs": "1.11.13", - "fastify": "5.0.0", - "framer-motion": "11.11.9", - "i18next": "^23.16.0", + "fastify": "5.1.0", + "framer-motion": "11.11.11", + "i18next": "^23.16.4", "jotai": "2.10.1", "kose-font": "1.0.0", "linkedom": "^0.18.5", @@ -27,12 +28,12 @@ "rc-modal-sheet": "0.3.2", "react": "^18.3.1", "react-blurhash": "^0.3.0", - "react-hotkeys-hook": "4.5.1", - "react-i18next": "^15.0.3", + "react-hotkeys-hook": "4.6.1", + "react-i18next": "^15.1.0", "react-photo-view": "1.2.6", "react-router-dom": "6.27.0", "satori": "0.11.2", - "sonner": "^1.5.0", + "sonner": "1.5.0", "tailwindcss": "3.4.14", "use-context-selector": "2.0.0", "xss": "1.0.15" @@ -46,15 +47,19 @@ "@follow/types": "workspace:*", "@follow/utils": "workspace:*", "@radix-ui/react-avatar": "1.1.1", - "daisyui": "4.12.13", - "foxact": "0.2.39", + "chokidar": "4.0.1", + "daisyui": "4.12.14", + "foxact": "0.2.41", + "glob": "11.0.0", "lightningcss": "1.27.0", "lodash-es": "4.17.21", "masonic": "4.0.1", + "nanoid": "5.0.8", + "path-to-regexp": "8.2.0", "react-dom": "^18.3.1", "tailwindcss": "3.4.14", - "tsup": "8.3.0", - "tsx": "4.19.1", - "vite": "5.4.9" + "tsup": "8.3.5", + "tsx": "4.19.2", + "vite": "5.4.10" } } diff --git a/apps/server/scripts/prepare-vercel-build.ts b/apps/server/scripts/prepare-vercel-build.ts index 627236e09..b9a34ec7a 100644 --- a/apps/server/scripts/prepare-vercel-build.ts +++ b/apps/server/scripts/prepare-vercel-build.ts @@ -2,30 +2,7 @@ import { mkdirSync } from "node:fs" import fs from "node:fs/promises" import path from "node:path" -// const fontDepsPath = require.resolve("@fontsource/sn-pro") -// const fontsDirPath = resolve(fontDepsPath, "../files") -// const fontsDir = readdirSync(fontsDirPath).filter( -// (name) => !name.endsWith(".woff2") && !name.includes("italic"), -// ) - mkdirSync(path.join(__dirname, "../.generated"), { recursive: true }) -// async function generateFontData() { -// const files = {} as Record -// await Promise.all( -// fontsDir.map(async (file) => { -// const r = await fs.readFile(path.join(fontsDirPath, file)) - -// const base64 = r.toString("base64") - -// files[file] = base64 -// }), -// ) - -// writeFileSync( -// path.join(__dirname, "../.generated/fonts-data.ts"), -// `export default ${JSON.stringify(files, null, 2)}`, -// ) -// } async function generateIndexHtmlData() { const indexHtml = await fs.readFile(path.join(__dirname, "../dist/index.html"), "utf-8") diff --git a/apps/server/src/meta-handler.map.ts b/apps/server/src/meta-handler.map.ts new file mode 100644 index 000000000..52b725b99 --- /dev/null +++ b/apps/server/src/meta-handler.map.ts @@ -0,0 +1,10 @@ +// This file is generated by `pnpm run meta` +import i1 from "../client/pages/(main)/share/feeds/[id]/metadata" +import i2 from "../client/pages/(main)/share/lists/[id]/metadata" +import i0 from "../client/pages/(main)/share/users/[id]/metadata" + +export default { + "/share/users/:id": i0, + "/share/feeds/:id": i1, + "/share/lists/:id": i2, +} diff --git a/apps/server/src/meta-handler.ts b/apps/server/src/meta-handler.ts index 5e8c46a59..5ee2d29e3 100644 --- a/apps/server/src/meta-handler.ts +++ b/apps/server/src/meta-handler.ts @@ -1,7 +1,9 @@ -import { isBizId } from "@follow/utils/utils" -import type { FastifyRequest } from "fastify" +import type { FastifyReply, FastifyRequest } from "fastify" +import { match } from "path-to-regexp" +import type { ApiClient } from "./lib/api-client" import { createApiClient } from "./lib/api-client" +import importer from "./meta-handler.map" interface MetaTagdata { type: "meta" @@ -29,109 +31,63 @@ interface MetaHydrateData { } export type MetaTag = MetaTagdata | MetaOpenGraph | MetaTitle | MetaHydrateData -export async function injectMetaHandler(req: FastifyRequest): Promise { - const metaArr = [] as MetaTag[] - +export async function injectMetaHandler( + req: FastifyRequest, + res: FastifyReply, +): Promise { const apiClient = createApiClient() - const upstreamOrigin = req.requestContext.get("upstreamOrigin") - const url = req.originalUrl - switch (true) { - case url.startsWith("/share/feeds"): { + for (const [pattern, handler] of Object.entries(importer)) { + const matchFn = match(pattern, { decode: decodeURIComponent }) + const result = matchFn(url) + + if (result) { const parsedUrl = new URL(url, upstreamOrigin) - const feedId = parsedUrl.pathname.split("/")[3] - const feed = await apiClient.feeds.$get({ query: { id: feedId } }) - - const { title, description } = feed.data.feed - metaArr.push( - { - type: "openGraph", - title: title || "", - description: description || "", - image: `${upstreamOrigin}/og/feed/${feedId}`, + return (await handler({ + params: result.params as Record, + url: parsedUrl, + req, + apiClient, + origin: upstreamOrigin || "", + setStatus(status) { + res.status(status) }, - { - type: "title", - title: title || "", + setStatusText(statusText) { + res.raw.statusMessage = statusText }, - { - type: "hydrate", - data: feed.data, - path: apiClient.feeds.$url({ query: { id: feedId } }).pathname, - key: `feeds.$get,query:id=${feedId}`, + throwError(status, message) { + throw new MetaError(status, message) }, - ) - break - } - case url.startsWith("/share/lists"): { - const parsedUrl = new URL(url, upstreamOrigin) - const listId = parsedUrl.pathname.split("/")[3] - - const list = await apiClient.lists.$get({ query: { listId } }) - - const { title, description } = list.data.list - metaArr.push( - { - type: "openGraph", - title: title || "", - description: description || "", - image: `${upstreamOrigin}/og/list/${listId}`, - }, - { - type: "title", - title: title || "", - }, - { - type: "hydrate", - data: list.data, - path: apiClient.lists.$url({ query: { listId } }).pathname, - key: `lists.$get,query:listId=${listId}`, - }, - ) - break - } - case url.startsWith("/share/users"): { - const parsedUrl = new URL(url, upstreamOrigin) - const userId = parsedUrl.pathname.split("/")[3] - - const handle = isBizId(userId || "") - ? userId - : `${userId}`.startsWith("@") - ? `${userId}`.slice(1) - : userId - - const res = await apiClient.profiles.$get({ - query: { - handle, - id: isBizId(handle || "") ? handle : undefined, - }, - }) - const { name } = res.data - - metaArr.push( - { - type: "title", - title: name || "", - }, - { - type: "openGraph", - title: name || "", - image: `${upstreamOrigin}/og/user/${userId}`, - }, - { - type: "hydrate", - data: res.data, - path: apiClient.profiles.$url({ query: { id: userId } }).pathname, - key: `profiles.$get,query:id=${userId}`, - }, - ) - - break + })) as MetaTag[] } } - return metaArr + return [] +} + +export function defineMetadata, T extends readonly MetaTag[]>( + fn: (args: { + req: FastifyRequest + url: URL + params: Params + apiClient: ApiClient + origin: string + setStatus: (status: number) => void + setStatusText: (statusText: string) => void + throwError: (status: number, message: any) => never + }) => Promise | T, +) { + return fn +} +export class MetaError extends Error { + status: number + metaMessage: object + constructor(status: number, message: object) { + super("Meta Error") + this.status = status + this.metaMessage = message + } } diff --git a/apps/server/src/router/global.ts b/apps/server/src/router/global.ts index 895d5e72b..c5fa5bdd8 100644 --- a/apps/server/src/router/global.ts +++ b/apps/server/src/router/global.ts @@ -11,7 +11,7 @@ import xss from "xss" import { isDev } from "~/lib/env" import { buildSeoMetaTags } from "~/lib/seo" -import { injectMetaHandler } from "../meta-handler" +import { injectMetaHandler, MetaError } from "../meta-handler" const devHandler = (app: FastifyInstance) => { app.get("*", async (req, reply) => { @@ -88,7 +88,7 @@ async function safeInjectMetaToTemplate( res: FastifyReply, ) { try { - return await injectMetaToTemplate(document, req) + return await injectMetaToTemplate(document, req, res) } catch (e) { console.error("inject meta error", e) @@ -96,11 +96,15 @@ async function safeInjectMetaToTemplate( res.code(e.response.status) } + if (e instanceof MetaError) { + throw e + } return document } } -async function injectMetaToTemplate(document: Document, req: FastifyRequest) { - const injectMetadata = await injectMetaHandler(req).catch((err) => { + +async function injectMetaToTemplate(document: Document, req: FastifyRequest, res: FastifyReply) { + const injectMetadata = await injectMetaHandler(req, res).catch((err) => { if (isDev) { throw err } diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json index 613217936..84e79a3b6 100644 --- a/apps/server/tsconfig.json +++ b/apps/server/tsconfig.json @@ -34,7 +34,8 @@ "./client/**/*.ts", "./client/**/*.tsx", "vite.config.mts", - "./tailwind.config.ts" + "./tailwind.config.ts", + "./helper/**/*.ts" ], "exclude": ["node_modules"] } diff --git a/apps/server/vite.config.mts b/apps/server/vite.config.mts index cbdd5eb6f..1489b428e 100644 --- a/apps/server/vite.config.mts +++ b/apps/server/vite.config.mts @@ -4,7 +4,7 @@ import react from "@vitejs/plugin-react" import { defineConfig } from "vite" import { viteRenderBaseConfig } from "../../configs/vite.render.config" -import { twMacro } from "../../plugins/vite/tw-macro" +import { astPlugin } from "../../plugins/vite/ast" export default () => { return defineConfig({ @@ -27,12 +27,12 @@ export default () => { }, }, }, - plugins: [react(), twMacro()], + plugins: [react(), astPlugin], server: { proxy: { "/api": { - target: "https://api.dev.follow.is", + target: "https://api.follow.is", changeOrigin: true, rewrite(path) { return path.replace("/api", "") diff --git a/changelog/0.2.0-beta.0.md b/changelog/0.2.0-beta.0.md new file mode 100644 index 000000000..880e11f1f --- /dev/null +++ b/changelog/0.2.0-beta.0.md @@ -0,0 +1,22 @@ +# What's new in v0.2.0-beta.0 + +## New Features + +- Feed owners can now reset their feeds. +- Image Gallery: Clicking on the image button in the entry opens the Image gallery modal (only if there are multiple large images in the entry!). +- Now you can export the data from the local database. +- App: In consideration of your hard drive, now it supports clearing cache and limiting the size of cache. +- Added a new feature to allow minimizing to the system tray by enabling a switch in the settings. +- Discover Page: Enhance RSSHub recommendations with filters +- Quickly update views or categories at once by dragging and dropping. + +## Improvements + +- Optimized the Zen mode experience on macOS. +- Improvement web app global shortcuts. +- Optimized the Timeline's data cache, reducing data reloads within a short period of time. You can go to Settings -> General -> Timeline -> Reduce timeline refetch to control this feature, default is enabled. + +## Bug Fixes + +- Fixed the issue where the Volume of VideoPlayer was not clickable. +- While using arrow keys to switch between entries, the entry view will not scroll unexpexted. diff --git a/configs/tailwind.base.config.ts b/configs/tailwind.base.config.ts index 3ba90b42e..58f961427 100644 --- a/configs/tailwind.base.config.ts +++ b/configs/tailwind.base.config.ts @@ -6,7 +6,6 @@ import { getIconCollections, iconsPlugin } from "@egoist/tailwindcss-icons" import { cleanupSVG, importDirectorySync, isEmptyColor, parseColors, runSVGO } from "@iconify/tools" import { compareColors, stringToColor } from "@iconify/utils/lib/colors" import type { Config } from "tailwindcss" -import plugin from "tailwindcss/plugin" export const baseConfig = { darkMode: ["class", '[data-theme="dark"]'], @@ -22,9 +21,6 @@ export const baseConfig = { }, extend: { - spacing: { - "safe-inset-top": "var(--fo-window-padding-top, 0)", - }, fontFamily: { theme: "var(--fo-font-family)", default: "SN pro, sans-serif, system-ui", @@ -147,37 +143,6 @@ export const baseConfig = { require("tailwindcss-motion"), require(resolve(__dirname, "./tailwind-extend.css")), - - plugin(({ addVariant }) => { - addVariant("f-motion-reduce", '[data-motion-reduce="true"] &') - addVariant("group-motion-reduce", ':merge(.group)[data-motion-reduce="true"] &') - addVariant("peer-motion-reduce", ':merge(.peer)[data-motion-reduce="true"] ~ &') - }), - plugin(({ addUtilities, matchUtilities, theme }) => { - addUtilities({ - ".safe-inset-top": { - top: "var(--fo-window-padding-top, 0)", - }, - }) - - const safeInsetTopVariants = {} - for (let i = 1; i <= 16; i++) { - safeInsetTopVariants[`.safe-inset-top-${i}`] = { - top: `calc(var(--fo-window-padding-top, 0px) + ${theme(`spacing.${i}`)})`, - } - } - addUtilities(safeInsetTopVariants) - - // Add arbitrary value support - matchUtilities( - { - "safe-inset-top": (value) => ({ - top: `calc(var(--fo-window-padding-top, 0px) + ${value})`, - }), - }, - { values: theme("spacing") }, - ) - }), ], } satisfies Config diff --git a/configs/vite.render.config.ts b/configs/vite.render.config.ts index 9937183e0..56ded1550 100644 --- a/configs/vite.render.config.ts +++ b/configs/vite.render.config.ts @@ -7,10 +7,10 @@ import react from "@vitejs/plugin-react" import { prerelease } from "semver" import type { UserConfig } from "vite" +import { astPlugin } from "../plugins/vite/ast" import { circularImportRefreshPlugin } from "../plugins/vite/hmr" import { customI18nHmrPlugin } from "../plugins/vite/i18n-hmr" import { localesPlugin } from "../plugins/vite/locales" -import { twMacro } from "../plugins/vite/tw-macro" import i18nCompleteness from "../plugins/vite/utils/i18n-completeness" import { getGitHash } from "../scripts/lib" @@ -63,12 +63,17 @@ export const viteRenderBaseConfig = { electron: false, }, sourcemaps: { - filesToDeleteAfterUpload: ["out/web/assets/*.js.map", "dist/renderer/assets/*.js.map"], + filesToDeleteAfterUpload: [ + "out/web/assets/*.js.map", + "out/web/vendor/*.js.map", + "dist/renderer/assets/*.js.map", + "dist/renderer/vendor/*.css.map", + ], }, }), localesPlugin(), - twMacro(), + astPlugin, customI18nHmrPlugin(), ], define: { diff --git a/forge.config.ts b/forge.config.ts index 3eea4a775..fa8f10115 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -11,6 +11,7 @@ import { FusesPlugin } from "@electron-forge/plugin-fuses" import type { ForgeConfig } from "@electron-forge/shared-types" import MakerAppImage from "@pengx17/electron-forge-maker-appimage" import setLanguages from "electron-packager-languages" +import yaml from "js-yaml" import { rimraf, rimrafSync } from "rimraf" const artifactRegex = /.*\.(?:exe|dmg|AppImage|zip)$/ @@ -25,7 +26,7 @@ const ymlMapsMap = { win32: "latest.yml", } -const keepModules = new Set(["font-list", "vscode-languagedetection"]) +const keepModules = new Set(["font-list", "vscode-languagedetection", "fast-folder-size"]) const keepLanguages = new Set(["en", "en_GB", "en-US", "en_US"]) // remove folders & files not to be included in the app @@ -125,8 +126,8 @@ const config: ForgeConfig = { new MakerZIP({}, ["darwin"]), new MakerDMG({ overwrite: true, - background: "resources/dmg-background.png", - icon: "resources/dmg-icon.icns", + background: "static/dmg-background.png", + icon: "static/dmg-icon.icns", iconSize: 160, additionalDMGOptions: { window: { @@ -233,20 +234,14 @@ const config: ForgeConfig = { return result }) yml.releaseDate = new Date().toISOString() - const ymlStr = - `version: ${yml.version}\n` + - `files:\n${yml.files - .map( - (file) => - ` - url: ${file.url}\n` + - ` sha512: ${file.sha512}\n` + - ` size: ${file.size}\n`, - ) - .join("")}releaseDate: ${yml.releaseDate}\n` const ymlPath = `${path.dirname(makeResults[0].artifacts[0])}/${ ymlMapsMap[makeResults[0].platform] }` + + const ymlStr = yaml.dump(yml, { + lineWidth: -1, + }) fs.writeFileSync(ymlPath, ymlStr) makeResults.push({ diff --git a/locales/app/ar-DZ.json b/locales/app/ar-DZ.json index 04eb81068..1a711f10f 100644 --- a/locales/app/ar-DZ.json +++ b/locales/app/ar-DZ.json @@ -104,7 +104,7 @@ "feed_view_type.pictures": "صور", "feed_view_type.social_media": "وسائل التواصل الاجتماعي", "feed_view_type.videos": "فيديوهات", - "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.", + "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد {{countdown}} ثوانٍ.", "mark_all_read_button.confirm": "تأكيد", "mark_all_read_button.confirm_mark_all": "هل تريد تحديد كمقروء؟", "mark_all_read_button.confirm_mark_all_info": "تأكيد تحديد الكل كمقروء؟", @@ -128,8 +128,6 @@ "search.group.entries": "إدخالات", "search.group.feeds": "خلاصات", "search.options.all": "الكل", - "search.options.entries": "إدخالات", - "search.options.feeds": "خلاصات", "search.options.search_type": "نوع البحث", "search.placeholder": "بحث...", "search.result_count_local_mode": "(وضع محلي)", diff --git a/locales/app/ar-IQ.json b/locales/app/ar-IQ.json index 49b2357d2..9f9f09b73 100644 --- a/locales/app/ar-IQ.json +++ b/locales/app/ar-IQ.json @@ -108,7 +108,7 @@ "feed_view_type.pictures": "صور", "feed_view_type.social_media": "وسائل التواصل الاجتماعي", "feed_view_type.videos": "فيديوهات", - "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.", + "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد {{countdown}} ثوانٍ.", "mark_all_read_button.confirm": "تأكيد", "mark_all_read_button.confirm_mark_all": "تحديد كمقروء؟", "mark_all_read_button.confirm_mark_all_info": "تأكيد تحديد الكل كمقروء؟", @@ -132,8 +132,6 @@ "search.group.entries": "إدخالات", "search.group.feeds": "خلاصات", "search.options.all": "الكل", - "search.options.entries": "الإدخالات", - "search.options.feeds": "الخلاصات", "search.options.search_type": "نوع البحث", "search.placeholder": "بحث...", "search.result_count_local_mode": "(الوضع المحلي)", diff --git a/locales/app/ar-KW.json b/locales/app/ar-KW.json index 4913cd44d..71a3fbab0 100644 --- a/locales/app/ar-KW.json +++ b/locales/app/ar-KW.json @@ -108,7 +108,7 @@ "feed_view_type.pictures": "صور", "feed_view_type.social_media": "وسائل التواصل الاجتماعي", "feed_view_type.videos": "فيديوهات", - "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.", + "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد {{countdown}} ثوانٍ.", "mark_all_read_button.confirm": "تأكيد", "mark_all_read_button.confirm_mark_all": "وضع علامة كمقروء؟", "mark_all_read_button.confirm_mark_all_info": "تأكيد وضع علامة الجميع كمقروء؟", @@ -132,8 +132,6 @@ "search.group.entries": "إدخالات", "search.group.feeds": "تغذيات", "search.options.all": "الكل", - "search.options.entries": "إدخالات", - "search.options.feeds": "تغذيات", "search.options.search_type": "نوع البحث", "search.placeholder": "بحث...", "search.result_count_local_mode": "(وضع محلي)", diff --git a/locales/app/ar-MA.json b/locales/app/ar-MA.json index 83a9676d7..3f2ace193 100644 --- a/locales/app/ar-MA.json +++ b/locales/app/ar-MA.json @@ -104,7 +104,7 @@ "feed_view_type.pictures": "صور", "feed_view_type.social_media": "وسائل التواصل الاجتماعي", "feed_view_type.videos": "فيديوهات", - "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.", + "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد {{countdown}} ثوانٍ.", "mark_all_read_button.confirm": "تأكيد", "mark_all_read_button.confirm_mark_all": "وضع علامة على كمقروء؟", "mark_all_read_button.confirm_mark_all_info": "تأكيد وضع علامة على الكل كمقروء؟", @@ -128,8 +128,6 @@ "search.group.entries": "إدخالات", "search.group.feeds": "موجزات", "search.options.all": "الكل", - "search.options.entries": "إدخالات", - "search.options.feeds": "موجزات", "search.options.search_type": "نوع البحث", "search.placeholder": "بحث...", "search.result_count_local_mode": "(الوضع المحلي)", diff --git a/locales/app/ar-SA.json b/locales/app/ar-SA.json index 7fb913730..a40fe3e8f 100644 --- a/locales/app/ar-SA.json +++ b/locales/app/ar-SA.json @@ -101,7 +101,7 @@ "feed_view_type.pictures": "صور", "feed_view_type.social_media": "وسائل التواصل الاجتماعي", "feed_view_type.videos": "فيديوهات", - "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.", + "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد {{countdown}} ثوانٍ.", "mark_all_read_button.confirm": "تأكيد", "mark_all_read_button.confirm_mark_all": "تمييز كمقروء؟", "mark_all_read_button.confirm_mark_all_info": "هل ترغب في تأكيد تمييز الكل كمقروء؟", @@ -125,8 +125,6 @@ "search.group.entries": "إدخالات", "search.group.feeds": "خلاصات", "search.options.all": "الكل", - "search.options.entries": "إدخالات", - "search.options.feeds": "خلاصات", "search.options.search_type": "نوع البحث", "search.placeholder": "بحث...", "search.result_count_local_mode": "(الوضع المحلي)", diff --git a/locales/app/ar-TN.json b/locales/app/ar-TN.json index ef1164824..283996225 100644 --- a/locales/app/ar-TN.json +++ b/locales/app/ar-TN.json @@ -105,7 +105,7 @@ "feed_view_type.pictures": "صور", "feed_view_type.social_media": "وسائل التواصل الاجتماعي", "feed_view_type.videos": "مقاطع فيديو", - "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد 3 ثوانٍ.", + "mark_all_read_button.auto_confirm_info": "سيتم التأكيد تلقائيًا بعد {{countdown}} ثوانٍ.", "mark_all_read_button.confirm": "تأكيد", "mark_all_read_button.confirm_mark_all": "وضع علامة كمقروء؟", "mark_all_read_button.confirm_mark_all_info": "تأكيد وضع الجميع كمقروء؟", @@ -129,8 +129,6 @@ "search.group.entries": "إدخالات", "search.group.feeds": "تغذيات", "search.options.all": "الكل", - "search.options.entries": "إدخالات", - "search.options.feeds": "تغذيات", "search.options.search_type": "نوع البحث", "search.placeholder": "بحث...", "search.result_count_local_mode": "(وضع محلي)", diff --git a/locales/app/de.json b/locales/app/de.json index 5fbdc871e..62ea57200 100644 --- a/locales/app/de.json +++ b/locales/app/de.json @@ -108,7 +108,7 @@ "feed_view_type.pictures": "Bilder", "feed_view_type.social_media": "Soziale Medien", "feed_view_type.videos": "Videos", - "mark_all_read_button.auto_confirm_info": "Wird nach 3 Sekunden automatisch bestätigt.", + "mark_all_read_button.auto_confirm_info": "Wird nach {{countdown}} Sekunden automatisch bestätigt.", "mark_all_read_button.confirm": "Bestätigen", "mark_all_read_button.confirm_mark_all": " als gelesen markieren?", "mark_all_read_button.confirm_mark_all_info": "Möchten Sie alle als gelesen markieren?", @@ -132,8 +132,6 @@ "search.group.entries": "Einträge", "search.group.feeds": "Feeds", "search.options.all": "Alle", - "search.options.entries": "Einträge", - "search.options.feeds": "Feeds", "search.options.search_type": "Suchtyp", "search.placeholder": "Suche...", "search.result_count_local_mode": "(Lokaler Modus)", diff --git a/locales/app/en.json b/locales/app/en.json index 4d8d7830e..9e1d58b99 100644 --- a/locales/app/en.json +++ b/locales/app/en.json @@ -195,7 +195,7 @@ "feed_view_type.pictures": "Pictures", "feed_view_type.social_media": "Social Media", "feed_view_type.videos": "Videos", - "mark_all_read_button.auto_confirm_info": "Will be confirmed automatically after 3s.", + "mark_all_read_button.auto_confirm_info": "Will be confirmed automatically after {{countdown}}s.", "mark_all_read_button.confirm": "Confirm", "mark_all_read_button.confirm_mark_all": "Mark as read?", "mark_all_read_button.confirm_mark_all_info": "Confirm mark all as read?", @@ -260,8 +260,8 @@ "search.group.entries": "Entries", "search.group.feeds": "Feeds", "search.options.all": "All", - "search.options.entries": "Entries", - "search.options.feeds": "Feeds", + "search.options.entry": "Entry", + "search.options.feed": "Feed", "search.options.search_type": "Search Type", "search.placeholder": "Search...", "search.result_count_local_mode": "(Local mode)", @@ -271,6 +271,8 @@ "sidebar.category_remove_dialog.cancel": "Cancel", "sidebar.category_remove_dialog.continue": "Continue", "sidebar.category_remove_dialog.description": "This operation will delete your category, but the feeds it contains will be retained and grouped by website.", + "sidebar.category_remove_dialog.error": "Failed to remove category", + "sidebar.category_remove_dialog.success": "Category removed successfully", "sidebar.category_remove_dialog.title": "Remove Category", "sidebar.feed_actions.claim": "Claim", "sidebar.feed_actions.claim_feed": "Claim Feed", @@ -293,6 +295,10 @@ "sidebar.feed_actions.open_feed_in_browser": "Open Feed in {{which}}", "sidebar.feed_actions.open_list_in_browser": "Open List in {{which}}", "sidebar.feed_actions.open_site_in_browser": "Open Site in {{which}}", + "sidebar.feed_actions.reset_feed": "Reset Feed", + "sidebar.feed_actions.reset_feed_error": "Failed to reset feed.", + "sidebar.feed_actions.reset_feed_success": "Feed reset successfully.", + "sidebar.feed_actions.resetting_feed": "Resetting feed...", "sidebar.feed_actions.unfollow": "Unfollow", "sidebar.feed_actions.unfollow_feed": "Unfollow Feed", "sidebar.feed_actions.unfollow_feed_many": "Unfollow all selected feeds", @@ -304,6 +310,8 @@ "sidebar.feed_column.context_menu.delete_category_confirmation": "Delete Category {{folderName}}?", "sidebar.feed_column.context_menu.mark_as_read": "Mark as Read", "sidebar.feed_column.context_menu.rename_category": "Rename Category", + "sidebar.feed_column.context_menu.rename_category_error": "Failed to rename category", + "sidebar.feed_column.context_menu.rename_category_success": "Category renamed successfully", "sidebar.select_sort_method": "Select a sort method", "signin.continue_with_github": "Continue with GitHub", "signin.continue_with_google": "Continue with Google", @@ -369,5 +377,6 @@ "words.unread": "Unread", "words.user": "User", "words.which.all": "all", - "words.zero_items": "Zero items" + "words.zero_items": "Zero items", + "zen.exit": "Exit Zen Mode" } diff --git a/locales/app/es.json b/locales/app/es.json index 4fe26cad1..3d1c1b1b0 100644 --- a/locales/app/es.json +++ b/locales/app/es.json @@ -70,7 +70,7 @@ "feed_view_type.pictures": "Imágenes", "feed_view_type.social_media": "Redes Sociales", "feed_view_type.videos": "Videos", - "mark_all_read_button.auto_confirm_info": "Confirmación automática después de 3 segundos.", + "mark_all_read_button.auto_confirm_info": "Confirmación automática después de {{countdown}} segundos.", "mark_all_read_button.confirm": "Confirmar", "mark_all_read_button.confirm_mark_all": "¿Marcar como leído?", "mark_all_read_button.confirm_mark_all_info": "¿Confirmar marcar todo como leído?", @@ -81,8 +81,6 @@ "search.group.entries": "Entradas", "search.group.feeds": "Feeds", "search.options.all": "Todo", - "search.options.entries": "Entradas", - "search.options.feeds": "Feeds", "search.options.search_type": "Tipo de búsqueda", "search.placeholder": "Buscar...", "search.result_count_local_mode": "(Modo local)", diff --git a/locales/app/fi.json b/locales/app/fi.json index 1a5fa626d..5acff1f2c 100644 --- a/locales/app/fi.json +++ b/locales/app/fi.json @@ -101,7 +101,7 @@ "feed_view_type.pictures": "Kuvat", "feed_view_type.social_media": "Sosiaalinen media", "feed_view_type.videos": "Videot", - "mark_all_read_button.auto_confirm_info": "Vahvistetaan automaattisesti 3 sekunnin kuluttua.", + "mark_all_read_button.auto_confirm_info": "Vahvistetaan automaattisesti {{countdown}} sekunnin kuluttua.", "mark_all_read_button.confirm": "Vahvista", "mark_all_read_button.confirm_mark_all": "Merkitäänkö luetuksi?", "mark_all_read_button.confirm_mark_all_info": "Vahvista kaikki merkinnät luetuiksi?", @@ -125,8 +125,6 @@ "search.group.entries": "Merkinnät", "search.group.feeds": "Syötteet", "search.options.all": "Kaikki", - "search.options.entries": "Merkinnät", - "search.options.feeds": "Syötteet", "search.options.search_type": "Hakutyyppi", "search.placeholder": "Hae...", "search.result_count_local_mode": "(Paikallinen tila)", diff --git a/locales/app/fr.json b/locales/app/fr.json index 7ae8f77b1..0c48bcc09 100644 --- a/locales/app/fr.json +++ b/locales/app/fr.json @@ -101,7 +101,7 @@ "feed_view_type.pictures": "Images", "feed_view_type.social_media": "Réseaux sociaux", "feed_view_type.videos": "Vidéos", - "mark_all_read_button.auto_confirm_info": "Sera confirmé automatiquement après 3s.", + "mark_all_read_button.auto_confirm_info": "Sera confirmé automatiquement après {{countdown}}s.", "mark_all_read_button.confirm": "Confirmer", "mark_all_read_button.confirm_mark_all": "Marquer comme lu ?", "mark_all_read_button.confirm_mark_all_info": "Confirmez que vous voulez tout marquer comme lu ?", @@ -125,8 +125,6 @@ "search.group.entries": "Entrées", "search.group.feeds": "Flux", "search.options.all": "Tous", - "search.options.entries": "Entrées", - "search.options.feeds": "Flux", "search.options.search_type": "Type de recherche", "search.placeholder": "Rechercher...", "search.result_count_local_mode": "(Mode local)", diff --git a/locales/app/it.json b/locales/app/it.json index 9f87b462c..98067abd8 100644 --- a/locales/app/it.json +++ b/locales/app/it.json @@ -101,7 +101,7 @@ "feed_view_type.pictures": "Immagini", "feed_view_type.social_media": "Social Media", "feed_view_type.videos": "Video", - "mark_all_read_button.auto_confirm_info": "Sarà confermato automaticamente dopo 3s.", + "mark_all_read_button.auto_confirm_info": "Sarà confermato automaticamente dopo {{countdown}}s.", "mark_all_read_button.confirm": "Conferma", "mark_all_read_button.confirm_mark_all": "Segna come letto?", "mark_all_read_button.confirm_mark_all_info": "Confermi di segnare tutto come letto?", @@ -125,8 +125,6 @@ "search.group.entries": "Voci", "search.group.feeds": "Feed", "search.options.all": "Tutto", - "search.options.entries": "Voci", - "search.options.feeds": "Feed", "search.options.search_type": "Tipo di ricerca", "search.placeholder": "Cerca...", "search.result_count_local_mode": "(Modalità locale)", diff --git a/locales/app/ja.json b/locales/app/ja.json index a864aea92..facc542ec 100644 --- a/locales/app/ja.json +++ b/locales/app/ja.json @@ -190,7 +190,7 @@ "feed_view_type.pictures": "画像", "feed_view_type.social_media": "ソーシャルメディア", "feed_view_type.videos": "動画", - "mark_all_read_button.auto_confirm_info": "3 秒後に自動的に確認されます。", + "mark_all_read_button.auto_confirm_info": "{{countdown}} 秒後に自動的に確認されます。", "mark_all_read_button.confirm": "確認", "mark_all_read_button.confirm_mark_all": "を既読にしますか?", "mark_all_read_button.confirm_mark_all_info": "すべてを既読にしますか?", @@ -255,8 +255,6 @@ "search.group.entries": "エントリー", "search.group.feeds": "フィード", "search.options.all": "すべて", - "search.options.entries": "エントリー", - "search.options.feeds": "フィード", "search.options.search_type": "検索タイプ", "search.placeholder": "検索...", "search.result_count_local_mode": "(ローカルモード)", diff --git a/locales/app/ko.json b/locales/app/ko.json index 7b2a1fe47..206b666cc 100644 --- a/locales/app/ko.json +++ b/locales/app/ko.json @@ -121,7 +121,7 @@ "feed_view_type.pictures": "사진", "feed_view_type.social_media": "소셜 미디어", "feed_view_type.videos": "비디오", - "mark_all_read_button.auto_confirm_info": "3 초 후 자동으로 확인됩니다.", + "mark_all_read_button.auto_confirm_info": "{{countdown}} 초 후 자동으로 확인됩니다.", "mark_all_read_button.confirm": "확인", "mark_all_read_button.confirm_mark_all": "을 (를) 모두 읽음으로 표시하시겠습니까?", "mark_all_read_button.confirm_mark_all_info": "모두 읽음으로 표시하시겠습니까?", @@ -148,8 +148,6 @@ "search.group.entries": "항목", "search.group.feeds": "피드", "search.options.all": "전체", - "search.options.entries": "항목", - "search.options.feeds": "피드", "search.options.search_type": "검색 유형", "search.placeholder": "검색...", "search.result_count_local_mode": "(로컬 모드)", diff --git a/locales/app/pt.json b/locales/app/pt.json index 22bc2918a..b5934f565 100644 --- a/locales/app/pt.json +++ b/locales/app/pt.json @@ -101,7 +101,7 @@ "feed_view_type.pictures": "画像", "feed_view_type.social_media": "ソーシャルメディア", "feed_view_type.videos": "動画", - "mark_all_read_button.auto_confirm_info": "3 秒後に自動的に確認されます。", + "mark_all_read_button.auto_confirm_info": "{{countdown}} 秒後に自動的に確認されます。", "mark_all_read_button.confirm": "確認", "mark_all_read_button.confirm_mark_all": "を既読にしますか?", "mark_all_read_button.confirm_mark_all_info": "すべてを既読にしますか?", @@ -125,8 +125,6 @@ "search.group.entries": "エントリ", "search.group.feeds": "フィード", "search.options.all": "すべて", - "search.options.entries": "エントリ", - "search.options.feeds": "フィード", "search.options.search_type": "検索タイプ", "search.placeholder": "検索...", "search.result_count_local_mode": "(ローカルモード)", diff --git a/locales/app/ru.json b/locales/app/ru.json index da4b7aa0f..b5b335bea 100644 --- a/locales/app/ru.json +++ b/locales/app/ru.json @@ -101,7 +101,7 @@ "feed_view_type.pictures": "Картинки", "feed_view_type.social_media": "Социальные сети", "feed_view_type.videos": "Видео", - "mark_all_read_button.auto_confirm_info": "Будет автоматически подтверждено через 3 секунды.", + "mark_all_read_button.auto_confirm_info": "Будет автоматически подтверждено через {{countdown}} секунды.", "mark_all_read_button.confirm": "Подтвердить", "mark_all_read_button.confirm_mark_all": "Отметить как прочитанное?", "mark_all_read_button.confirm_mark_all_info": "Подтвердить отметку всего как прочитанное?", @@ -125,8 +125,6 @@ "search.group.entries": "Записи", "search.group.feeds": "Каналы", "search.options.all": "Все", - "search.options.entries": "Записи", - "search.options.feeds": "Каналы", "search.options.search_type": "Тип поиска", "search.placeholder": "Поиск...", "search.result_count_local_mode": "(Локальный режим)", diff --git a/locales/app/tr.json b/locales/app/tr.json index 886b1fca9..bf0941eea 100644 --- a/locales/app/tr.json +++ b/locales/app/tr.json @@ -121,7 +121,7 @@ "feed_view_type.pictures": "Resimler", "feed_view_type.social_media": "Sosyal Medya", "feed_view_type.videos": "Videolar", - "mark_all_read_button.auto_confirm_info": "3 saniye sonra otomatik olarak onaylanacak.", + "mark_all_read_button.auto_confirm_info": "{{countdown}} saniye sonra otomatik olarak onaylanacak.", "mark_all_read_button.confirm": "Onayla", "mark_all_read_button.confirm_mark_all": " okundu olarak işaretlensin mi?", "mark_all_read_button.confirm_mark_all_info": "Tümünü okundu olarak işaretlemeyi onaylıyor musunuz?", @@ -148,8 +148,6 @@ "search.group.entries": "Girişler", "search.group.feeds": "Beslemeler", "search.options.all": "Tümü", - "search.options.entries": "Girişler", - "search.options.feeds": "Beslemeler", "search.options.search_type": "Arama Türü", "search.placeholder": "Ara...", "search.result_count_local_mode": "(Yerel mod)", diff --git a/locales/app/zh-CN.json b/locales/app/zh-CN.json index c3d58e6d7..cd3460a18 100644 --- a/locales/app/zh-CN.json +++ b/locales/app/zh-CN.json @@ -2,6 +2,7 @@ "achievement.all_done": "大功告成!", "achievement.alpha_tester": "Alpha 内测用户", "achievement.alpha_tester_description": "早期 Follow Alpha 版本的内测用户", + "achievement.description": "成为硬核玩家,赚取 NFT。", "achievement.first_claim_feed": "订阅源所有者", "achievement.first_claim_feed_description": "在 Follow 上认证订阅源", "achievement.first_create_list": "列表创作者", @@ -14,6 +15,7 @@ "achievement.list_subscribe_500": "500 个列表关注者", "achievement.list_subscribe_500_description": "创建的列表有 500 人关注", "achievement.list_subscribe_50_description": "创建的列表有 50 人关注", + "achievement.nft_coming_soon": "目前您无法赚取 NFT。一旦我们准备好,它们将自动记入您的帐户。", "achievement.product_hunt_vote": "Product Hunt 支持者", "achievement.product_hunt_vote_description": "在 Product Hunt 上给 Follow 投票", "activation.activate": "激活", @@ -96,12 +98,12 @@ "entry_actions.save_to_omnivore": "保存到 Omnivore", "entry_actions.save_to_outline": "保存到 Outline", "entry_actions.save_to_readwise": "保存到 Readwise", - "entry_actions.saved_to_eagle": "保存到 Eagle", - "entry_actions.saved_to_instapaper": "保存到 Instapaper.", + "entry_actions.saved_to_eagle": "已保存到 Eagle", + "entry_actions.saved_to_instapaper": "已保存到 Instapaper.", "entry_actions.saved_to_obsidian": "已保存到 Obsidian", - "entry_actions.saved_to_omnivore": "保存到 Omnivore.", - "entry_actions.saved_to_outline": "保存到 Outline.", - "entry_actions.saved_to_readwise": "保存到 Readwise.", + "entry_actions.saved_to_omnivore": "已保存到 Omnivore.", + "entry_actions.saved_to_outline": "已保存到 Outline.", + "entry_actions.saved_to_readwise": "已保存到 Readwise.", "entry_actions.share": "分享", "entry_actions.star": "收藏", "entry_actions.starred": "已收藏", @@ -193,7 +195,7 @@ "feed_view_type.pictures": "图片", "feed_view_type.social_media": "社交媒体", "feed_view_type.videos": "视频", - "mark_all_read_button.auto_confirm_info": "3 秒后自动确认", + "mark_all_read_button.auto_confirm_info": "{{countdown}} 秒后自动确认", "mark_all_read_button.confirm": "确认", "mark_all_read_button.confirm_mark_all": "将 标记为已读?", "mark_all_read_button.confirm_mark_all_info": "确认将全部标记为已读?", @@ -258,8 +260,8 @@ "search.group.entries": "条目", "search.group.feeds": "订阅源", "search.options.all": "全部", - "search.options.entries": "条目", - "search.options.feeds": "订阅源", + "search.options.entry": "条目", + "search.options.feed": "订阅源", "search.options.search_type": "搜索类型", "search.placeholder": "搜索...", "search.result_count_local_mode": "(本地模式)", @@ -269,6 +271,8 @@ "sidebar.category_remove_dialog.cancel": "取消", "sidebar.category_remove_dialog.continue": "继续", "sidebar.category_remove_dialog.description": "正在删除分类,操作后仍保留订阅源并按网站分组", + "sidebar.category_remove_dialog.error": "删除分类失败", + "sidebar.category_remove_dialog.success": "分类删除成功", "sidebar.category_remove_dialog.title": "删除分类", "sidebar.feed_actions.claim": "认证", "sidebar.feed_actions.claim_feed": "认证订阅", @@ -291,6 +295,10 @@ "sidebar.feed_actions.open_feed_in_browser": "在{{which}}打开订阅源", "sidebar.feed_actions.open_list_in_browser": "在{{which}}打开列表", "sidebar.feed_actions.open_site_in_browser": "在{{which}}打开网站", + "sidebar.feed_actions.reset_feed": "重置订阅源", + "sidebar.feed_actions.reset_feed_error": "重置订阅源失败。", + "sidebar.feed_actions.reset_feed_success": "订阅源重置成功。", + "sidebar.feed_actions.resetting_feed": "正在重置订阅源…", "sidebar.feed_actions.unfollow": "取消订阅", "sidebar.feed_actions.unfollow_feed": "取消订阅", "sidebar.feed_actions.unfollow_feed_many": "取消订阅选中的订阅源", @@ -302,6 +310,8 @@ "sidebar.feed_column.context_menu.delete_category_confirmation": "删除分类 {{folderName}}?", "sidebar.feed_column.context_menu.mark_as_read": "标记为已读", "sidebar.feed_column.context_menu.rename_category": "重命名分类", + "sidebar.feed_column.context_menu.rename_category_error": "重命名分类失败", + "sidebar.feed_column.context_menu.rename_category_success": "分类重命名成功", "sidebar.select_sort_method": "选择排序方法", "signin.continue_with_github": "使用 GitHub 登录", "signin.continue_with_google": "使用 Google 登录", @@ -367,5 +377,6 @@ "words.unread": "未读", "words.user": "用户", "words.which.all": "全部", - "words.zero_items": "没有内容" + "words.zero_items": "没有内容", + "zen.exit": "退出 Zen 模式" } diff --git a/locales/app/zh-HK.json b/locales/app/zh-HK.json index 6ab44ba23..d2e16d412 100644 --- a/locales/app/zh-HK.json +++ b/locales/app/zh-HK.json @@ -1,24 +1,24 @@ { "achievement.all_done": "全部完成!", - "achievement.alpha_tester": "Alpha 内測用戶", - "achievement.alpha_tester_description": "早期 Follow Alpha 版本的内測用戶", + "achievement.alpha_tester": "Alpha 內部測試使用者", + "achievement.alpha_tester_description": "早期 Follow Alpha 版本的內部測試使用者", "achievement.first_claim_feed": "Feed 擁有者", "achievement.first_claim_feed_description": "你在 Follow 上擁有你的 Feed", - "achievement.first_create_list": "列表創作傢", + "achievement.first_create_list": "列表創作家", "achievement.first_create_list_description": "在 Follow 上創建一個列表", - "achievement.follow_special_feed": "特別的關注", - "achievement.follow_special_feed_description": "在 Follow 上關注一個特別的訂閲源", - "achievement.list_subscribe_100": "100 個列表關注者", - "achievement.list_subscribe_100_description": "創建的列表被 100 人關注", - "achievement.list_subscribe_50": "50 個列表關注者", - "achievement.list_subscribe_500": "500 個列表關注者", - "achievement.list_subscribe_500_description": "創建的列表被 500 人關注", - "achievement.list_subscribe_50_description": "創建的列表被 50 人關注", + "achievement.follow_special_feed": "特別的追隨", + "achievement.follow_special_feed_description": "在 Follow 上追隨一個特別的訂閱源", + "achievement.list_subscribe_100": "100 個列表追隨者", + "achievement.list_subscribe_100_description": "創建的列表被 100 人追隨", + "achievement.list_subscribe_50": "50 個列表追隨者", + "achievement.list_subscribe_500": "500 個列表追隨者", + "achievement.list_subscribe_500_description": "創建的列表被 500 人追隨", + "achievement.list_subscribe_50_description": "創建的列表被 50 人追隨", "achievement.product_hunt_vote": "Product Hunt 支持者", - "achievement.product_hunt_vote_description": "在 Product Hunt 上给 Follow 投票", - "activation.activate": "激活", - "activation.description": "在公測階段,預覽版用戶使用此功能受限", - "activation.title": "邀請碼", + "achievement.product_hunt_vote_description": "在 Product Hunt 上給 Follow 投票", + "activation.activate": "啟動", + "activation.description": "在公測階段,預覽版使用者使用此功能受限", + "activation.title": "邀請代碼", "ai_daily.header": "AI 日報", "ai_daily.no_found": "該期間未找到 AI 新聞", "ai_daily.title": "頭條新聞 - {{title}}", @@ -27,8 +27,8 @@ "app.copy_logo_svg": "複製 Logo SVG", "app.toggle_sidebar": "切換側邊欄", "beta_access": "Beta 版本", - "boost.boost_feed": "助力", - "boost.feed_being_boosted": "已助力", + "boost.boost_feed": "加成", + "boost.feed_being_boosted": "已加成", "discover.any_url_or_keyword": "任何網址或關鍵字", "discover.default_option": " (預設)", "discover.feed_description": "此訂閱源的描述如下,你可以根據相關資訊填寫參數表格。", @@ -38,61 +38,61 @@ "discover.import.noItems": "沒有項目", "discover.import.opml": "OPML 文件", "discover.import.parsedErrorItems": "解析錯誤項目", - "discover.import.result": " 個訂閱源已成功導入, 個已訂閱, 個導入失敗。", + "discover.import.result": " 個訂閱源已成功匯入, 個已訂閱, 個匯入失敗。", "discover.import.successfulItems": "成功項目", - "discover.inbox.actions": "操作", - "discover.inbox.description": "你可以通過電子郵件和 Webhooks 在收件箱接收資訊。", + "discover.inbox.actions": "動作", + "discover.inbox.description": "你可以通過電子郵件和 Webhooks 在收件匣接收資訊。", "discover.inbox.email": "電子郵件", - "discover.inbox.handle": "識別碼", + "discover.inbox.handle": "識別編號", "discover.inbox.secret": "密鑰", "discover.inbox.title": "標題", "discover.inbox.webhooks_docs": "Webhooks 文件", - "discover.inbox_create": "新增收件箱", - "discover.inbox_create_description": "你還沒有收件箱,建立一個收件箱以通過收件箱接收資訊。", - "discover.inbox_create_error": "建立收件箱失敗", - "discover.inbox_create_success": "收件箱建立成功", + "discover.inbox_create": "新增收件匣", + "discover.inbox_create_description": "你還沒有收件匣,建立一個收件匣以通過收件匣接收資訊。", + "discover.inbox_create_error": "建立收件匣失敗", + "discover.inbox_create_success": "收件匣建立成功", "discover.inbox_destroy": "刪除", - "discover.inbox_destroy_confirm": "確認刪除收件箱?", - "discover.inbox_destroy_error": "刪除收件箱失敗", - "discover.inbox_destroy_success": "收件箱刪除成功", - "discover.inbox_destroy_warning": "警告:一旦刪除,電子郵件將不再可用,所有內容將會永久刪除且無法恢復。", - "discover.inbox_handle": "識別碼", + "discover.inbox_destroy_confirm": "確認刪除收件匣?", + "discover.inbox_destroy_error": "刪除收件匣失敗", + "discover.inbox_destroy_success": "收件匣刪除成功", + "discover.inbox_destroy_warning": "警告:一旦刪除,電子郵件將不再可用,所有內容將會永久刪除且無法還原。", + "discover.inbox_handle": "識別編號", "discover.inbox_title": "標題", "discover.inbox_update": "更新", - "discover.inbox_update_error": "更改收件箱失敗", - "discover.inbox_update_success": "收件箱更新成功", + "discover.inbox_update_error": "更改收件匣失敗", + "discover.inbox_update_success": "收件匣更新成功", "discover.popular": "熱門", "discover.preview": "預覽", "discover.rss_hub_route": "RSSHub 路由", "discover.rss_url": "RSS 網址", "discover.select_placeholder": "選擇", - "discover.target.feeds": "資訊流", + "discover.target.feeds": "消息饋流", "discover.target.label": "搜尋", "discover.target.lists": "清單", "entry_actions.copied_notify": "{{which}}已複製到剪貼板", - "entry_actions.copy_link": "複製連結", + "entry_actions.copy_link": "複製鏈結", "entry_actions.copy_title": "複製標題", "entry_actions.delete": "刪除", "entry_actions.deleted": "已刪除", - "entry_actions.failed_to_delete": "刪除失敗", - "entry_actions.failed_to_save_to_eagle": "無法保存至 Eagle", - "entry_actions.failed_to_save_to_instapaper": "無法保存至 Instapaper", - "entry_actions.failed_to_save_to_obsidian": "儲存至 Obsidian 失敗", - "entry_actions.failed_to_save_to_omnivore": "無法保存至 Omnivore", - "entry_actions.failed_to_save_to_readwise": "無法保存至 Readwise", + "entry_actions.failed_to_delete": "無法刪除", + "entry_actions.failed_to_save_to_eagle": "無法儲存至 Eagle", + "entry_actions.failed_to_save_to_instapaper": "無法儲存至 Instapaper", + "entry_actions.failed_to_save_to_obsidian": "無法儲存至 Obsidian ", + "entry_actions.failed_to_save_to_omnivore": "無法儲存至 Omnivore", + "entry_actions.failed_to_save_to_readwise": "無法儲存至 Readwise", "entry_actions.mark_as_read": "標記為已讀", "entry_actions.mark_as_unread": "標記為未讀", "entry_actions.open_in_browser": "在{{which}}中開啟", "entry_actions.recent_reader": "最近閱讀者:", - "entry_actions.save_media_to_eagle": "保存媒體至 Eagle", - "entry_actions.save_to_instapaper": "保存至 Instapaper", + "entry_actions.save_media_to_eagle": "儲存媒體至 Eagle", + "entry_actions.save_to_instapaper": "儲存至 Instapaper", "entry_actions.save_to_obsidian": "儲存至 Obsidian", - "entry_actions.save_to_omnivore": "保存至 Omnivore", + "entry_actions.save_to_omnivore": "儲存至 Omnivore", "entry_actions.save_to_readwise": "儲存至 Readwise", - "entry_actions.saved_to_eagle": "已保存至 Eagle", - "entry_actions.saved_to_instapaper": "已保存至 Instapaper", + "entry_actions.saved_to_eagle": "已儲存至 Eagle", + "entry_actions.saved_to_instapaper": "已儲存至 Instapaper", "entry_actions.saved_to_obsidian": "已儲存至 Obsidian", - "entry_actions.saved_to_omnivore": "已保存至 Omnivore", + "entry_actions.saved_to_omnivore": "已儲存至 Omnivore", "entry_actions.saved_to_readwise": "已儲存至 Readwise", "entry_actions.share": "分享", "entry_actions.star": "收藏", @@ -103,14 +103,14 @@ "entry_actions.view_source_content": "查看原始內容", "entry_column.filtered_content_tip": "你已隱藏篩選內容", "entry_column.filtered_content_tip_2": "除了以上顯示的條目,還有一些已篩選的內容。", - "entry_column.refreshing": "刷新新條目中...", + "entry_column.refreshing": "重新整理新條目中...", "entry_content.ai_summary": "AI 摘要", "entry_content.fetching_content": "正在抓取原始內容並處理中...", "entry_content.header.play_tts": "播放 TTS", "entry_content.header.readability": "Readability", "entry_content.no_content": "無內容", "entry_content.readability_notice": "此內容由 Readability 提供。如果你發現排版異常,請到來源網站查看原始內容。", - "entry_content.render_error": "渲染錯誤:", + "entry_content.render_error": "算繪錯誤:", "entry_content.report_issue": "報告問題", "entry_content.support_amount": "{{amount}} 人支持了此訂閱源的創作者", "entry_content.support_creator": "支持創作者", @@ -121,59 +121,59 @@ "entry_list_header.items": "項目", "entry_list_header.new_entries_available": "有新條目可用", "entry_list_header.refetch": "重新抓取", - "entry_list_header.refresh": "刷新", + "entry_list_header.refresh": "重新整理", "entry_list_header.show_all": "顯示所有", "entry_list_header.show_all_items": "顯示所有條目", "entry_list_header.show_unread_only": "僅顯示未讀", "entry_list_header.switch_to_grid": "切換到網格視圖", "entry_list_header.switch_to_masonry": "切換到 Masonry 視圖", "entry_list_header.switch_to_normalmode": "切換至正常模式", - "entry_list_header.switch_to_widemode": "切換至寬屏模式", + "entry_list_header.switch_to_widemode": "切換至寬螢幕模式", "entry_list_header.unread": "未讀", - "feed.follower_one": "關注者", - "feed.follower_other": "關注者", + "feed.follower_one": "追隨者", + "feed.follower_other": "追隨者", "feed.followsAndFeeds": "在 {{appName}} 上有 {{subscriptionCount}} 個 {{subscriptionNoun}} 和 {{feedsCount}} 個 {{feedsNoun}}", "feed.followsAndReads": "在 {{appName}} 上有 {{subscriptionCount}} 個 {{subscriptionNoun}} 和 {{readCount}} 個 {{readNoun}}", - "feed.read_one": "閲讀", - "feed.read_other": "閲讀", + "feed.read_one": "閱讀", + "feed.read_other": "閱讀", "feed_claim_modal.choose_verification_method": "有三種驗證方法可選,你可以選擇其中一種進行驗證。", "feed_claim_modal.claim_button": "認領", "feed_claim_modal.content_instructions": "複製以下內容並貼到你最新的 RSS 訂閱源中", "feed_claim_modal.description_current": "當前描述:", "feed_claim_modal.description_instructions": "複製以下內容並貼到你的 RSS 訂閱源中的 欄位", - "feed_claim_modal.failed_to_load": "無法加載認領信息", + "feed_claim_modal.failed_to_load": "無法載入認領資訊", "feed_claim_modal.rss_format_choice": "RSS 生成器通常有兩種格式可選。請根據需要複製以下的 XML 和 JSON 格式。", - "feed_claim_modal.rss_instructions": "複製以下代碼並貼到你的 RSS 生成器中", + "feed_claim_modal.rss_instructions": "複製以下編號並貼到你的 RSS 生成器中", "feed_claim_modal.rss_json_format": "JSON 格式", "feed_claim_modal.rss_xml_format": "XML 格式", - "feed_claim_modal.rsshub_notice": "此訂閱源由 RSSHub 提供,緩存時間為 1 小時。發布內容後,請等待最多 1 小時更改才能生效。", + "feed_claim_modal.rsshub_notice": "此訂閱源由 RSSHub 提供,緩存時間為 1 小時。發佈內容後,請等待最多 1 小時更改才能生效。", "feed_claim_modal.tab_content": "內容", "feed_claim_modal.tab_description": "描述", "feed_claim_modal.tab_rss": "RSS 標籤", "feed_claim_modal.title": "認領訂閱源", "feed_claim_modal.verify_ownership": "要認領這個訂閱源,你需要驗證所有權。", - "feed_form.add_follow": "新增關注", + "feed_form.add_follow": "新增追隨", "feed_form.category": "分類", - "feed_form.category_description": "默認情況下,你的關注會按網站分組。", + "feed_form.category_description": "默認情況下,你的追隨會按網站分組。", "feed_form.error_fetching_feed": "獲取訂閱源時出錯", - "feed_form.fee": "跟隨費用", - "feed_form.fee_description": "要跟隨此清單,您必須向清單創建者支付費用。", + "feed_form.fee": "追隨費用", + "feed_form.fee_description": "要追隨此清單,您必須向清單創建者支付費用。", "feed_form.feed_not_found": "未找到相關資訊流", "feed_form.feedback": "反饋", - "feed_form.follow": "關注", - "feed_form.follow_with_fee": "跟隨需要 {{fee}} Power", - "feed_form.followed": "🎉 已關注", - "feed_form.private_follow": "私人關注", - "feed_form.private_follow_description": "此關注是否在你的個人資料頁面上公開可見", + "feed_form.follow": "追隨", + "feed_form.follow_with_fee": "追隨需要 {{fee}} Power", + "feed_form.followed": "🎉 已追隨", + "feed_form.private_follow": "私人追隨", + "feed_form.private_follow_description": "此追隨是否在你的個人資料頁面上公開可見", "feed_form.retry": "重試", "feed_form.title": "標題", "feed_form.title_description": "此資訊流的自定義標題。留空則使用默認標題。", - "feed_form.unfollow": "取消關注", + "feed_form.unfollow": "取消追隨", "feed_form.update": "更新", - "feed_form.update_follow": "更新關注", + "feed_form.update_follow": "更新追隨", "feed_form.updated": "🎉 已更新", "feed_form.view": "視圖", - "feed_item.claimed_by_owner": "訂閲源所有者", + "feed_item.claimed_by_owner": "訂閱源所有者", "feed_item.claimed_by_unknown": "未知所有者", "feed_item.claimed_by_you": "由你認領", "feed_item.claimed_feed": "已認領訂閱源", @@ -184,8 +184,8 @@ "feed_view_type.notifications": "通知", "feed_view_type.pictures": "圖片", "feed_view_type.social_media": "社交媒體", - "feed_view_type.videos": "視頻", - "mark_all_read_button.auto_confirm_info": "將在 3 秒後自動確認", + "feed_view_type.videos": "影片", + "mark_all_read_button.auto_confirm_info": "將在 {{countdown}} 秒後自動確認", "mark_all_read_button.confirm": "確認", "mark_all_read_button.confirm_mark_all": "確定將 標記為已讀?", "mark_all_read_button.confirm_mark_all_info": "確定將所有標記為已讀?", @@ -197,45 +197,45 @@ "new_user_guide.outro.description": "你已完成指南,祝你使用愉快!", "new_user_guide.outro.title": "一切就緒!", "new_user_guide.step.activation.description": "別擔心,繼續使用 Follow 無需邀請碼", - "new_user_guide.step.activation.title": "激活賬戶", - "new_user_guide.step.automation.description": "- Follow 利用先進的 AI 來協助你的操作\n- 自動化幫助你處理符合特定條件的來源\n- 集成幫助你將條目保存到其他服務中", + "new_user_guide.step.activation.title": "啟動賬戶", + "new_user_guide.step.automation.description": "- Follow 利用先進的 AI 來協助你的動作\n- 自動化幫助你處理符合特定條件的來源\n- 集成幫助你將條目儲存到其他服務中", "new_user_guide.step.behavior.title": "使用偏好", "new_user_guide.step.behavior.unread_question.content": "希望如何標記為已讀", "new_user_guide.step.behavior.unread_question.description": "別擔心,你可以在設定中再次更改", "new_user_guide.step.behavior.unread_question.option1": "主動:顯示時自動標記為已讀", "new_user_guide.step.behavior.unread_question.option2": "平衡:懸停或滾出視野時自動標記為已讀", "new_user_guide.step.behavior.unread_question.option3": "被動:僅在點擊時標記為已讀", - "new_user_guide.step.features.actions.description": "自動化規則允許你對不同的訂閲執行不同的操作\n- 使用 AI 進行摘要或翻譯\n- 配置閱讀條目的方式\n- 啟用新條目的通知或靜音\n- 重寫或屏蔽特定條目\n- 將新條目發送到 webhook 地址", - "new_user_guide.step.features.integration.description": "集成允許你將條目保存到其他服務。目前支持的服務有:\n- Eagle\n- Readwise\n- Instapaper\n- Obsidian", + "new_user_guide.step.features.actions.description": "自動化規則允許你對不同的訂閱執行不同的動作\n- 使用 AI 進行摘要或翻譯\n- 配置閱讀條目的方式\n- 啟用新條目的通知或靜音\n- 重寫或封鎖特定條目\n- 將新條目發送到 webhook 地址", + "new_user_guide.step.features.integration.description": "集成允許你將條目儲存到其他服務。目前支持的服務有:\n- Eagle\n- Readwise\n- Instapaper\n- Obsidian", "new_user_guide.step.migrate.profile": "設定你的個人資料", - "new_user_guide.step.migrate.title": "從 OPML 檔案導入", - "new_user_guide.step.migrate.wallet": "檢查你的錢包", - "new_user_guide.step.power.description": "Follow 使用區塊鏈技術作為活躍用戶和優秀創作者的激勵機制。用戶可以通過持有和使用 Power 來獲得更多服務和福利。創作者可以通過提供高質量的內容和服務來獲得更多獎勵。", - "new_user_guide.step.rsshub.info": "一切皆可 RSS。我們的 RSSHub 社區由超過 1,000 名開發者組成,經過六年的努力,適配了近千個網站,以提供幾乎所有你需要的內容。這包括 X(Twitter)、Instagram、PlayStation、Spotify、Telegram、YouTube 等平台。你還可以編寫自己的腳本來適配其他網站。", + "new_user_guide.step.migrate.title": "從 OPML 檔案匯入", + "new_user_guide.step.migrate.wallet": "檢查你的銀包", + "new_user_guide.step.power.description": "Follow 使用區塊鏈技術作為活躍使用者和優秀創作者的激勵機制。使用者可以通過持有和使用 Power 來獲得更多服務和福利。創作者可以通過提供高質量的內容和服務來獲得更多獎勵。", + "new_user_guide.step.rsshub.info": "一切皆可 RSS。我們的 RSSHub 社區由超過 1,000 名開發者組成,經過六年的努力,適用於近千個網站,以提供幾乎所有你需要的內容。這包括 X(Twitter)、Instagram、PlayStation、Spotify、Telegram、YouTube 等平台。你還可以編寫自己的程式碼來支持其他網站。", "new_user_guide.step.rsshub.title": "從 RSSHub 訂閱", "new_user_guide.step.shortcuts.description1": "快捷鍵讓你更方便、高效地使用 Follow", "new_user_guide.step.shortcuts.description2": "隨時按 快速查看所有快捷鍵", "new_user_guide.step.shortcuts.title": "快捷鍵", - "new_user_guide.step.start_question.content": "你以前使用過其它 RSS 閱讀器嗎?", + "new_user_guide.step.start_question.content": "你以前使用過其他 RSS 閱讀器嗎?", "new_user_guide.step.start_question.option1": "是的,我使用過其他 RSS 閱讀器", "new_user_guide.step.start_question.option2": "不,這是我第一次使用 RSS 閱讀器", "new_user_guide.step.start_question.title": "問題", - "new_user_guide.step.trending.title": "熱門訂閲源", + "new_user_guide.step.trending.title": "熱門訂閱源", "new_user_guide.step.views.description": "Follow 針對不同類型的內容使用不同的視圖,以提供與原平台相當或更好的體驗", "new_user_guide.step.views.title": "視圖", "notify.unSupportDisplay": "某些網站無法顯示,請下載桌面應用程式檢視", "notify.unSupportWidth": "{{app_name}} 目前尚未支援流動裝置", "notify.unSupportWidth_1": "您的裝置寬度為 {{width}},低於支援的最小寬度 {{minWidth}}", - "notify.unSupportWidth_2": "請切換至桌面應用程式繼續使用 {{app_name}}
下載連結:", - "notify.unfollow_feed": "已取消關注 ", + "notify.unSupportWidth_2": "請切換至桌面應用程式繼續使用 {{app_name}}
下載鏈結:", + "notify.unfollow_feed": "已取消追隨 ", "notify.update_info": "{{app_name}} 已準備好更新!", "notify.update_info_1": "點擊以重新啟動", "player.back_10s": "倒退 10 秒", "player.close": "關閉", "player.download": "下載", - "player.exit_full_screen": "退出全屏", + "player.exit_full_screen": "退出全螢幕", "player.forward_10s": "快進 10 秒", - "player.full_screen": "全屏", + "player.full_screen": "全螢幕", "player.mute": "靜音", "player.open_entry": "打開條目", "player.pause": "暫停", @@ -249,8 +249,6 @@ "search.group.entries": "條目", "search.group.feeds": "訂閱源", "search.options.all": "所有", - "search.options.entries": "條目", - "search.options.feeds": "訂閱源", "search.options.search_type": "搜尋類型", "search.placeholder": "搜尋...", "search.result_count_local_mode": "(本地模式)", @@ -259,7 +257,7 @@ "sidebar.add_more_feeds": "添加訂閱源", "sidebar.category_remove_dialog.cancel": "取消", "sidebar.category_remove_dialog.continue": "繼續", - "sidebar.category_remove_dialog.description": "此操作將刪除你的分類,但其中的訂閱源將留並按網站分組。", + "sidebar.category_remove_dialog.description": "此動作將刪除你的分類,但其中的訂閱源將留並按網站分組。", "sidebar.category_remove_dialog.title": "刪除分類", "sidebar.feed_actions.claim": "認領", "sidebar.feed_actions.claim_feed": "認領訂閱源", @@ -271,19 +269,19 @@ "sidebar.feed_actions.create_list": "建立清單", "sidebar.feed_actions.edit": "編輯", "sidebar.feed_actions.edit_feed": "編輯訂閱源", - "sidebar.feed_actions.edit_inbox": "編輯收件箱", + "sidebar.feed_actions.edit_inbox": "編輯收件匣", "sidebar.feed_actions.edit_list": "編輯清單", "sidebar.feed_actions.feed_owned_by_you": "此訂閱源由你擁有", "sidebar.feed_actions.list_owned_by_you": "此清單由你擁有", "sidebar.feed_actions.mark_all_as_read": "全部標記為已讀", "sidebar.feed_actions.navigate_to_feed": "導航到訂閱源", "sidebar.feed_actions.navigate_to_list": "導航到清單", - "sidebar.feed_actions.new_inbox": "新收件箱", + "sidebar.feed_actions.new_inbox": "新收件匣", "sidebar.feed_actions.open_feed_in_browser": "在{{which}}中打開訂閱源", "sidebar.feed_actions.open_list_in_browser": "在{{which}}中打開清單", "sidebar.feed_actions.open_site_in_browser": "在{{which}}中打開網站", - "sidebar.feed_actions.unfollow": "取消關注", - "sidebar.feed_actions.unfollow_feed": "取消關注訂閱源", + "sidebar.feed_actions.unfollow": "取消追隨", + "sidebar.feed_actions.unfollow_feed": "取消追隨訂閱源", "sidebar.feed_column.context_menu.add_feeds_to_list": "添加訂閱源到清單", "sidebar.feed_column.context_menu.change_to_other_view": "切換到其他視圖", "sidebar.feed_column.context_menu.delete_category": "刪除分類", @@ -302,7 +300,7 @@ "tip_modal.create_wallet": "免費創建", "tip_modal.feed_owner": "訂閱源擁有者", "tip_modal.low_balance": "你的餘額不足以覆蓋此贊助。請調整金額。", - "tip_modal.no_wallet": "你尚未擁有錢包。請創建一個錢包以進行贊助。", + "tip_modal.no_wallet": "你尚未擁有銀包。請創建一個銀包以進行贊助。", "tip_modal.tip_amount_sent": "已經發送給作者", "tip_modal.tip_now": "立刻贊助", "tip_modal.tip_sent": "贊助成功!感謝你的支持。", @@ -312,10 +310,10 @@ "trending.entry": "熱門條目", "trending.feed": "熱門資訊", "trending.list": "熱門清單", - "trending.user": "熱門用戶", - "user_button.account": "帳戶", + "trending.user": "熱門使用者", + "user_button.account": "帳號", "user_button.achievement": "成就", - "user_button.download_desktop_app": "下載桌面應用", + "user_button.download_desktop_app": "下載桌面應用程式", "user_button.log_out": "登出", "user_button.power": "Power", "user_button.preferences": "偏好設定", @@ -327,18 +325,18 @@ "user_profile.toggle_item_style": "切換條目樣式", "words.achievement": "成就", "words.add": "新增", - "words.boost": "助力", + "words.boost": "加成", "words.browser": "瀏覽器", "words.confirm": "確認", "words.discover": "探索", "words.feeds": "訂閱源", "words.import": "匯入", - "words.inbox": "收件箱", + "words.inbox": "收件匣", "words.items": "項目", "words.language": "語言", - "words.link": "連結", + "words.link": "鏈結", "words.lists": "清單", - "words.load_archived_entries": "加載已存檔的條目", + "words.load_archived_entries": "載入已存檔的條目", "words.login": "登入", "words.mint": "Mint", "words.newTab": "新分頁", @@ -351,9 +349,9 @@ "words.title": "標題", "words.transform": "轉換", "words.trending": "熱門", - "words.undo": "撤銷", + "words.undo": "取消動作", "words.unread": "未讀", - "words.user": "用戶", + "words.user": "使用者", "words.which.all": "所有", "words.zero_items": "沒有項目" } diff --git a/locales/app/zh-TW.json b/locales/app/zh-TW.json index f97db0581..ae1852032 100644 --- a/locales/app/zh-TW.json +++ b/locales/app/zh-TW.json @@ -185,7 +185,7 @@ "feed_view_type.pictures": "圖片", "feed_view_type.social_media": "社交媒體", "feed_view_type.videos": "影片", - "mark_all_read_button.auto_confirm_info": "將在 3 秒後自動確認。", + "mark_all_read_button.auto_confirm_info": "將在 {{countdown}} 秒後自動確認。", "mark_all_read_button.confirm": "確認", "mark_all_read_button.confirm_mark_all": "將 標記為已讀?", "mark_all_read_button.confirm_mark_all_info": "確認將全部標記為已讀?", @@ -250,8 +250,6 @@ "search.group.entries": "項目", "search.group.feeds": "摘要", "search.options.all": "全部", - "search.options.entries": "項目", - "search.options.feeds": "摘要", "search.options.search_type": "搜尋類型", "search.placeholder": "搜尋……", "search.result_count_local_mode": "(本地模式)", diff --git a/locales/common/zh-CN.json b/locales/common/zh-CN.json index cee0d2546..6836f18c2 100644 --- a/locales/common/zh-CN.json +++ b/locales/common/zh-CN.json @@ -18,9 +18,11 @@ "words.copy": "复制", "words.create": "创建", "words.delete": "删除", + "words.download": "下载", "words.edit": "编辑", "words.entry": "条目", "words.expand": "展开", + "words.follow": "关注", "words.id": "ID", "words.items_one": "内容", "words.items_other": "内容", @@ -29,9 +31,11 @@ "words.record": "记录", "words.record_one": "记录", "words.record_other": "记录", + "words.reset": "重置", "words.result": "结果", "words.result_one": "结果", "words.result_other": "结果", + "words.save": "保存", "words.submit": "提交", "words.update": "更新", "words.which.all": "全部" diff --git a/locales/errors/en.json b/locales/errors/en.json index 1bbc4bf88..01498b8c2 100644 --- a/locales/errors/en.json +++ b/locales/errors/en.json @@ -1,6 +1,7 @@ { "1": "Previous operation is not completed", "2": "CSRF Token mismatch", + "3": "Unprocessable content", "1000": "Unauthorized", "1001": "create session failed", "1002": "Invalid parameter", @@ -50,5 +51,6 @@ "10001": "Inbox already exists", "10002": "Inbox limit exceeded", "10003": "Inbox permission denied", - "11000": "RSSHub route not found" + "11000": "RSSHub route not found", + "12000": "Action limit exceeded" } diff --git a/locales/errors/zh-CN.json b/locales/errors/zh-CN.json index 771d67698..8f1800262 100644 --- a/locales/errors/zh-CN.json +++ b/locales/errors/zh-CN.json @@ -1,11 +1,13 @@ { "1": "上一步未完成", "2": "CSRF Token 无效", + "3": "无法处理的内容", "1000": "未授权", "1001": "创建会话失败", "1002": "参数无效", "1003": "邀请码无效", "1004": "暂无权限", + "1005": "内部错误", "1100": "超出预览版订阅源最大数量限制", "1101": "超出预览版订阅列表最大数量限制", "1102": "超出预览版收件箱最大数量限制", @@ -25,6 +27,9 @@ "4004": "目标用户钱包错误", "4005": "每日 power 计算中", "4006": "无效助力数量", + "4010": "空投不符合资格", + "4011": "空投正在发送", + "4012": "空投已发送", "5000": "邀请数量已达上限,请几天后再试", "5001": "邀请已存在", "5002": "邀请码已使用", @@ -46,5 +51,6 @@ "10001": "收件箱已存在", "10002": "收件箱限制已超出", "10003": "收件箱无权限", - "11000": "RSSHub 路由不存在" + "11000": "RSSHub 路由不存在", + "12000": "自动化规则已超限" } diff --git a/locales/native/en.json b/locales/native/en.json index 683ae2ba4..b26e489bf 100644 --- a/locales/native/en.json +++ b/locales/native/en.json @@ -42,6 +42,7 @@ "menu.hide": "Hide {{name}}", "menu.hideOthers": "Hide Others", "menu.minimize": "Minimize", + "menu.open": "Open {{name}}", "menu.openLogFile": "Open log file", "menu.paste": "Paste", "menu.pasteAndMatchStyle": "Paste and Match Style", @@ -62,6 +63,7 @@ "menu.undo": "Undo", "menu.view": "View", "menu.window": "Window", + "menu.zenMode": "Zen Mode", "menu.zoom": "Zoom", "menu.zoomIn": "Zoom In", "menu.zoomOut": "Zoom Out" diff --git a/locales/native/zh-CN.json b/locales/native/zh-CN.json index 4891854d2..759e5c5a5 100644 --- a/locales/native/zh-CN.json +++ b/locales/native/zh-CN.json @@ -42,6 +42,7 @@ "menu.hide": "隐藏 {{name}}", "menu.hideOthers": "隐藏其他", "menu.minimize": "最小化", + "menu.open": "打开 {{name}}", "menu.openLogFile": "打开日志文件", "menu.paste": "粘贴", "menu.pasteAndMatchStyle": "粘贴并匹配样式", @@ -62,6 +63,7 @@ "menu.undo": "撤销", "menu.view": "视图", "menu.window": "窗口", + "menu.zenMode": "Zen 模式", "menu.zoom": "缩放", "menu.zoomIn": "放大", "menu.zoomOut": "缩小" diff --git a/locales/settings/ar-DZ.json b/locales/settings/ar-DZ.json index f5d2e7176..83ffc9959 100644 --- a/locales/settings/ar-DZ.json +++ b/locales/settings/ar-DZ.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "تحديد كمقروءة عند العرض", "general.mark_as_read.scroll.description": "تحديد الإدخالات تلقائيًا كمقروءة عند التمرير خارج العرض.", "general.mark_as_read.scroll.label": "تحديد كمقروءة عند التمرير", - "general.privacy_data": "الخصوصية والبيانات", "general.rebuild_database.button": "إعادة بناء", "general.rebuild_database.description": "إذا كنت تواجه مشاكل في العرض، قد تحل إعادة بناء قاعدة البيانات هذه المشاكل.", "general.rebuild_database.label": "إعادة بناء قاعدة البيانات", diff --git a/locales/settings/ar-IQ.json b/locales/settings/ar-IQ.json index 14226a1e2..f0b354616 100644 --- a/locales/settings/ar-IQ.json +++ b/locales/settings/ar-IQ.json @@ -92,7 +92,6 @@ "general.mark_as_read.render.label": "تحديد كمقروءة عند العرض", "general.mark_as_read.scroll.description": "تحديد الإدخالات تلقائيًا كمقروءة عند التمرير خارج العرض.", "general.mark_as_read.scroll.label": "تحديد كمقروءة عند التمرير", - "general.privacy_data": "الخصوصية والبيانات", "general.rebuild_database.button": "إعادة بناء", "general.rebuild_database.description": "إذا كنت تواجه مشاكل في العرض، قد تحل إعادة بناء قاعدة البيانات هذه المشاكل.", "general.rebuild_database.label": "إعادة بناء قاعدة البيانات", diff --git a/locales/settings/ar-KW.json b/locales/settings/ar-KW.json index f37844167..b9e9e2a2a 100644 --- a/locales/settings/ar-KW.json +++ b/locales/settings/ar-KW.json @@ -92,7 +92,6 @@ "general.mark_as_read.render.label": "تحديد كمقروءة عند العرض", "general.mark_as_read.scroll.description": "تحديد المشاركات كمقروءة تلقائيًا عند التمرير خارج العرض.", "general.mark_as_read.scroll.label": "تحديد كمقروءة عند التمرير", - "general.privacy_data": "الخصوصية والبيانات", "general.rebuild_database.button": "إعادة بناء", "general.rebuild_database.description": "إذا كنت تواجه مشاكل في العرض، قد تحل إعادة بناء قاعدة البيانات هذه المشاكل.", "general.rebuild_database.label": "إعادة بناء قاعدة البيانات", diff --git a/locales/settings/ar-MA.json b/locales/settings/ar-MA.json index c15e4203a..02a6f14b1 100644 --- a/locales/settings/ar-MA.json +++ b/locales/settings/ar-MA.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "تحديد كمقروء عند العرض", "general.mark_as_read.scroll.description": "تحديد المدخلات كمقروءة تلقائيًا فاش كتخرج من العرض.", "general.mark_as_read.scroll.label": "تحديد كمقروء عند التمرير", - "general.privacy_data": "الخصوصية والبيانات", "general.rebuild_database.button": "إعادة بناء", "general.rebuild_database.description": "إلى كنتي كتواجه مشاكل فالعرض، إعادة بناء قاعدة البيانات غادي يحلها.", "general.rebuild_database.label": "إعادة بناء قاعدة البيانات", diff --git a/locales/settings/ar-SA.json b/locales/settings/ar-SA.json index 1a3b2c7fa..a8604a075 100644 --- a/locales/settings/ar-SA.json +++ b/locales/settings/ar-SA.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "وضع علامة كمقروء عند العرض", "general.mark_as_read.scroll.description": "وضع علامة على الإدخالات كمقروءة تلقائيًا عند التمرير خارج العرض.", "general.mark_as_read.scroll.label": "وضع علامة كمقروء عند التمرير", - "general.privacy_data": "الخصوصية والبيانات", "general.rebuild_database.button": "إعادة بناء", "general.rebuild_database.description": "إذا كنت تواجه مشكلات في العرض، فقد تحل إعادة بناء قاعدة البيانات هذه المشكلة.", "general.rebuild_database.label": "إعادة بناء قاعدة البيانات", diff --git a/locales/settings/ar-TN.json b/locales/settings/ar-TN.json index c6c50380d..487a0b810 100644 --- a/locales/settings/ar-TN.json +++ b/locales/settings/ar-TN.json @@ -92,7 +92,6 @@ "general.mark_as_read.render.label": "تحديد كمقروء عند العرض", "general.mark_as_read.scroll.description": "تحديد العناصر تلقائيًا كمقروءة عند التمرير خارج العرض.", "general.mark_as_read.scroll.label": "تحديد كمقروء عند التمرير", - "general.privacy_data": "الخصوصية والبيانات", "general.rebuild_database.button": "إعادة بناء", "general.rebuild_database.description": "إذا كنت تواجه مشكلات في العرض، فقد يحل إعادة بناء قاعدة البيانات هذه المشكلات.", "general.rebuild_database.label": "إعادة بناء قاعدة البيانات", diff --git a/locales/settings/de.json b/locales/settings/de.json index d96476bb9..6a2802470 100644 --- a/locales/settings/de.json +++ b/locales/settings/de.json @@ -96,7 +96,6 @@ "general.mark_as_read.scroll.description": "Einträge automatisch als gelesen markieren, wenn sie aus dem Ansichtsbereich gescrollt werden.", "general.mark_as_read.scroll.label": "Als gelesen markieren, wenn gescrollt wird", "general.network": "Netzwerk", - "general.privacy_data": "Datenschutz & Daten", "general.proxy.description": "Proxy für Netzwerkverkehrsrouting einrichten, z.B. socks://proxy.beispiel.de:1080", "general.proxy.label": "Proxy", "general.rebuild_database.button": "Neu aufbauen", diff --git a/locales/settings/en.json b/locales/settings/en.json index 63ccbd2cc..7258f8bd9 100644 --- a/locales/settings/en.json +++ b/locales/settings/en.json @@ -95,6 +95,10 @@ "appearance.zen_mode.description": "Zen mode is an undisturbed reading mode that allows you to focus on the content without any interference. Enabling Zen mode will hide the sidebar.", "appearance.zen_mode.label": "Zen mode", "common.give_star": "Love our product? Give us a star on GitHub!", + "data_control.app_cache_limit.description": "The maximum size of the app cache. Once the cache reaches this size, the oldest items will be deleted to free up space.", + "data_control.app_cache_limit.label": "App Cache Limit", + "data_control.clean_cache.button": "Clean Cache", + "data_control.clean_cache.description": "Clean the app cache to free up space.", "feeds.claimTips": "To claim your feeds and receive tips, right-click on the feed in your subscription list and select Claim.", "feeds.noFeeds": "No claimed feeds", "feeds.tableHeaders.entryCount": "Entries", @@ -102,11 +106,16 @@ "feeds.tableHeaders.subscriptionCount": "Subs", "feeds.tableHeaders.tipAmount": "Tips", "general.app": "App", + "general.cache": "Cache", + "general.data": "Data", "general.data_persist.description": "Persist data locally to enable offline access and local search.", "general.data_persist.label": "Persist data for offline usage", "general.export.button": "Export", "general.export.description": "Export your feeds to an OPML file.", "general.export.label": "Export Feeds", + "general.export_database.button": "Export", + "general.export_database.description": "Export your database to a JSON file.", + "general.export_database.label": "Export Database", "general.group_by_date.description": "Group entries by date.", "general.group_by_date.label": "Group by date", "general.language": "Language", @@ -117,8 +126,10 @@ "general.mark_as_read.render.label": "Mark as read when in the view", "general.mark_as_read.scroll.description": "Automatically mark entries as read when scrolled out of the view.", "general.mark_as_read.scroll.label": "Mark as read when scrolling", + "general.minimize_to_tray.description": "Minimize to system tray when closing window", + "general.minimize_to_tray.label": "Minimize to tray", "general.network": "Network", - "general.privacy_data": "Privacy & Data", + "general.privacy": "Privacy", "general.proxy.description": "Set proxy for network traffic routing, e.g., socks://proxy.example.com:1080", "general.proxy.label": "Proxy", "general.rebuild_database.button": "Rebuild", @@ -127,6 +138,8 @@ "general.rebuild_database.title": "Rebuild Database", "general.rebuild_database.warning.line1": "Rebuilding the database will clear all your local data.", "general.rebuild_database.warning.line2": "Are you sure you want to continue?", + "general.reduce_refetch.description": "Reduce the data refetch of Timeline, to avoid Timeline being refreshed again when switching between different views.", + "general.reduce_refetch.label": "Reduce timeline refetch", "general.send_anonymous_data.description": "By opting to send anonymized telemetry data, you contribute to improving the overall user experience of Follow.", "general.send_anonymous_data.label": "Send anonymous data", "general.show_unread_on_launch.description": "Show unread content on launch", @@ -240,6 +253,7 @@ "titles.about": "About", "titles.actions": "Actions", "titles.appearance": "Appearance", + "titles.data_control": "Data Control", "titles.feeds": "Feeds", "titles.general": "General", "titles.integration": "Integration", diff --git a/locales/settings/es.json b/locales/settings/es.json index 707edd892..5584ecf94 100644 --- a/locales/settings/es.json +++ b/locales/settings/es.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "Marcar como leído cuando está en vista", "general.mark_as_read.scroll.description": "Marcar automáticamente las entradas como leídas al desplazarse fuera de la vista.", "general.mark_as_read.scroll.label": "Marcar como leído al desplazarse", - "general.privacy_data": "Privacidad y Datos", "general.rebuild_database.button": "Reconstruir", "general.rebuild_database.description": "Si experimentas problemas de renderizado, reconstruir la base de datos puede solucionarlos.", "general.rebuild_database.label": "Reconstruir Base de Datos", diff --git a/locales/settings/fi.json b/locales/settings/fi.json index 973e05324..bf8661b8a 100644 --- a/locales/settings/fi.json +++ b/locales/settings/fi.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "Merkitse luetuksi, kun näkyvissä", "general.mark_as_read.scroll.description": "Merkitse merkinnät automaattisesti luetuiksi, kun ne vieritetään pois näkymästä.", "general.mark_as_read.scroll.label": "Merkitse luetuksi vierittäessä", - "general.privacy_data": "Yksityisyys ja data", "general.rebuild_database.button": "Rakenna uudelleen", "general.rebuild_database.description": "Jos kohtaat renderöintiongelmia, tietokannan uudelleenrakentaminen saattaa ratkaista ne.", "general.rebuild_database.label": "Rakenna tietokanta uudelleen", diff --git a/locales/settings/fr.json b/locales/settings/fr.json index e7254c1fd..b858bf450 100644 --- a/locales/settings/fr.json +++ b/locales/settings/fr.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "Marquer comme lu lors de l'affichage", "general.mark_as_read.scroll.description": "Marquer automatiquement les entrées comme lues lorsqu'elles sortent de la vue.", "general.mark_as_read.scroll.label": "Marquer comme lu lors du défilement", - "general.privacy_data": "Confidentialité & Données", "general.rebuild_database.button": "Reconstruire", "general.rebuild_database.description": "Si vous rencontrez des problèmes d'affichage, la reconstruction de la base de données peut les résoudre.", "general.rebuild_database.label": "Reconstruire la base de données", diff --git a/locales/settings/it.json b/locales/settings/it.json index 6805dd2b1..cb7f27e95 100644 --- a/locales/settings/it.json +++ b/locales/settings/it.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "Segna come letto quando è in visualizzazione", "general.mark_as_read.scroll.description": "Segna automaticamente le voci come lette quando scorri fuori dalla visualizzazione.", "general.mark_as_read.scroll.label": "Segna come letto durante lo scorrimento", - "general.privacy_data": "Privacy e Dati", "general.rebuild_database.button": "Ricostruisci", "general.rebuild_database.description": "Se riscontri problemi di visualizzazione, la ricostruzione del database potrebbe risolverli.", "general.rebuild_database.label": "Ricostruisci Database", diff --git a/locales/settings/ja.json b/locales/settings/ja.json index f5c1e9d14..494848e80 100644 --- a/locales/settings/ja.json +++ b/locales/settings/ja.json @@ -118,7 +118,6 @@ "general.mark_as_read.scroll.description": "表示からスクロールアウトしたときにエントリを自動的に既読にします。", "general.mark_as_read.scroll.label": "スクロール時に既読にする", "general.network": "ネットワーク", - "general.privacy_data": "プライバシーとデータ", "general.proxy.description": "ネットワークリクエストを代理します。例: socks://proxy.example.com:1080", "general.proxy.label": "プロキシ", "general.rebuild_database.button": "再構築", diff --git a/locales/settings/ko.json b/locales/settings/ko.json index 5c366de4b..950184733 100644 --- a/locales/settings/ko.json +++ b/locales/settings/ko.json @@ -96,7 +96,6 @@ "general.mark_as_read.scroll.description": "스크롤하여 보기에서 벗어날 때 자동으로 항목을 읽음으로 표시합니다.", "general.mark_as_read.scroll.label": "스크롤 시 읽음으로 표시", "general.network": "네트워크", - "general.privacy_data": "개인정보 및 데이터", "general.proxy.description": "네트워크 트래픽 라우팅을 위한 프록시 설정, 예: socks://proxy.example.com:1080", "general.proxy.label": "프록시", "general.rebuild_database.button": "재구축", diff --git a/locales/settings/pt.json b/locales/settings/pt.json index 96eea1c25..da3688c94 100644 --- a/locales/settings/pt.json +++ b/locales/settings/pt.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "Marcar como lido ao visualizar", "general.mark_as_read.scroll.description": "Marcar automaticamente as entradas como lidas quando saem do campo de visão.", "general.mark_as_read.scroll.label": "Marcar como lido ao rolar a página", - "general.privacy_data": "Privacidade & Dados", "general.rebuild_database.button": "Reconstruir", "general.rebuild_database.description": "Se estiver a ter problemas de renderização, reconstruir a base de dados pode resolver.", "general.rebuild_database.label": "Reconstruir Base de Dados", diff --git a/locales/settings/ru.json b/locales/settings/ru.json index c8aa146c9..004b973f9 100644 --- a/locales/settings/ru.json +++ b/locales/settings/ru.json @@ -86,7 +86,6 @@ "general.mark_as_read.render.label": "Отметить как прочитанное при отображении", "general.mark_as_read.scroll.description": "Автоматически отмечать записи как прочитанные при прокрутке.", "general.mark_as_read.scroll.label": "Отметить как прочитанное при прокрутке", - "general.privacy_data": "Конфиденциальность и данные", "general.rebuild_database.button": "Перестроить", "general.rebuild_database.description": "Если у вас возникают проблемы с отображением, перестроение базы данных может их решить.", "general.rebuild_database.label": "Перестроить базу данных", diff --git a/locales/settings/tr.json b/locales/settings/tr.json index 05ebb6ed5..f11e5fb3e 100644 --- a/locales/settings/tr.json +++ b/locales/settings/tr.json @@ -96,7 +96,6 @@ "general.mark_as_read.scroll.description": "Görünümden kaydırıldığında girdileri otomatik olarak okundu olarak işaretle.", "general.mark_as_read.scroll.label": "Kaydırıldığında okundu olarak işaretle", "general.network": "Ağ", - "general.privacy_data": "Gizlilik ve Veri", "general.proxy.description": "Ağ trafiği yönlendirmesi için proxy ayarla, örn., socks://proxy.example.com:1080", "general.proxy.label": "Proxy", "general.rebuild_database.button": "Yeniden Oluştur", diff --git a/locales/settings/zh-CN.json b/locales/settings/zh-CN.json index 74995cb96..230cf0643 100644 --- a/locales/settings/zh-CN.json +++ b/locales/settings/zh-CN.json @@ -53,11 +53,16 @@ "appearance.code_highlight_theme": "代码高亮主题", "appearance.content": "内容", "appearance.content_font": "正文字体", + "appearance.custom_css.button": "编辑", + "appearance.custom_css.description": "自定义条目渲染中的 CSS 样式", + "appearance.custom_css.label": "自定义 CSS", "appearance.custom_font": "自定义字体", "appearance.fonts": "字体", - "appearance.general": "一般", + "appearance.general": "通用", "appearance.guess_code_language.description": "使用模型推断未标记代码块的编程语言", "appearance.guess_code_language.label": "代码语言检测", + "appearance.hide_extra_badge.description": "将侧边栏中订阅源的特殊徽章隐藏,例如:已助力,已认证", + "appearance.hide_extra_badge.label": "隐藏徽章", "appearance.hide_recent_reader.description": "隐藏条目标题显示的最近阅读者", "appearance.hide_recent_reader.label": "隐藏最近阅读者", "appearance.misc": "杂项", @@ -69,7 +74,8 @@ "appearance.reduce_motion.description": "减少界面动效,提高整体性能并减少电量消耗", "appearance.reduce_motion.label": "减少动效", "appearance.save": "保存", - "appearance.show_dock_badge.label": "显示 Dock 徽章", + "appearance.show_dock_badge.label": "在 App 图标上显示", + "appearance.sidebar": "侧边栏", "appearance.sidebar_show_unread_count.label": "在侧边栏显示", "appearance.sidebar_title": "外观", "appearance.text_size": "字体大小", @@ -77,12 +83,22 @@ "appearance.theme.label": "主题", "appearance.theme.light": "亮色", "appearance.theme.system": "跟随系统", + "appearance.thumbnail_ratio.description": "文章列表缩略图比例", + "appearance.thumbnail_ratio.original": "原始图像", + "appearance.thumbnail_ratio.square": "正方形", + "appearance.thumbnail_ratio.title": "缩略比例", "appearance.title": "外观", "appearance.ui_font": "界面字体", "appearance.unread_count": "未读数", "appearance.use_pointer_cursor.description": "悬停在任何可交互元素上时将光标更改为指针。", "appearance.use_pointer_cursor.label": "使用指针光标", + "appearance.zen_mode.description": "Zen 模式是一种防干扰的阅读模式,你可以专注于内容而不受其他干扰。启用 Zen 模式将会隐藏侧边栏。", + "appearance.zen_mode.label": "Zen 模式", "common.give_star": "喜欢我们的产品吗? 在 GitHub 上给我们 star 吧!", + "data_control.app_cache_limit.description": "应用缓存大小的上限。一旦缓存达到此上限,最早的项目将被删除以释放空间。", + "data_control.app_cache_limit.label": "应用缓存限制", + "data_control.clean_cache.button": "清理缓存", + "data_control.clean_cache.description": "清理应用缓存以释放空间。", "feeds.claimTips": "要认证你的订阅源并接收打赏,请在订阅列表中右键点击订阅源并选择“认证”。", "feeds.noFeeds": "没有已认证的订阅源", "feeds.tableHeaders.entryCount": "条目数", @@ -90,11 +106,16 @@ "feeds.tableHeaders.subscriptionCount": "订阅数", "feeds.tableHeaders.tipAmount": "收到的打赏", "general.app": "应用程序", + "general.cache": "缓存", + "general.data": "数据", "general.data_persist.description": "在本地保留数据以启用离线访问和本地搜索", "general.data_persist.label": "保留数据以供离线使用", "general.export.button": "导出", "general.export.description": "将你的订阅源导出到 OPML 文件。", "general.export.label": "导出订阅源", + "general.export_database.button": "导出", + "general.export_database.description": "将你的数据库导出到 JSON 文件。", + "general.export_database.label": "导出数据库", "general.group_by_date.description": "按日期对条目进行分组", "general.group_by_date.label": "按日期分组", "general.language": "语言", @@ -105,8 +126,10 @@ "general.mark_as_read.render.label": "在窗口中时标记为已读", "general.mark_as_read.scroll.description": "当条目滚动出窗口时自动标记为已读", "general.mark_as_read.scroll.label": "滚动时标记为已读", + "general.minimize_to_tray.description": "关闭窗口时最小化到系统托盘", + "general.minimize_to_tray.label": "最小化到托盘", "general.network": "网络", - "general.privacy_data": "隐私与数据", + "general.privacy": "隐私", "general.proxy.description": "代理网络请求,示例:socks://proxy.example.com:1080", "general.proxy.label": "代理", "general.rebuild_database.button": "重建", @@ -115,6 +138,8 @@ "general.rebuild_database.title": "重建数据库", "general.rebuild_database.warning.line1": "重建数据库将清除所有本地数据,且无法恢复。", "general.rebuild_database.warning.line2": "确定继续?", + "general.reduce_refetch.description": "降低时间线数据的重取频率,以避免在不同视图间切换时时间线被再次刷新。", + "general.reduce_refetch.label": "降低时间线重取频率", "general.send_anonymous_data.description": "发送匿名用户数据,帮助产品改进和功能迭代", "general.send_anonymous_data.label": "发送匿名数据", "general.show_unread_on_launch.description": "启动时显示未读内容", @@ -228,6 +253,7 @@ "titles.about": "关于", "titles.actions": "自动化", "titles.appearance": "外观", + "titles.data_control": "数据控制", "titles.feeds": "订阅源", "titles.general": "通用", "titles.integration": "集成", diff --git a/locales/settings/zh-HK.json b/locales/settings/zh-HK.json index dc5b0d1bc..3c7be4a1b 100644 --- a/locales/settings/zh-HK.json +++ b/locales/settings/zh-HK.json @@ -106,7 +106,6 @@ "general.mark_as_read.scroll.description": "當滾動出視圖時,自動標記條目為已讀。", "general.mark_as_read.scroll.label": "滾動時標記為已讀", "general.network": "網絡", - "general.privacy_data": "隱私與數據", "general.proxy.description": "代理網絡流量,例如:socks://proxy.example.com:1080", "general.proxy.label": "代理", "general.rebuild_database.button": "重建", diff --git a/locales/settings/zh-TW.json b/locales/settings/zh-TW.json index d7a0bfa13..fa8dd1630 100644 --- a/locales/settings/zh-TW.json +++ b/locales/settings/zh-TW.json @@ -106,7 +106,6 @@ "general.mark_as_read.scroll.description": "當條目捲動離開視圖時自動標記為已讀。", "general.mark_as_read.scroll.label": "捲動時標記為已讀", "general.network": "網路", - "general.privacy_data": "隱私與資料", "general.proxy.description": "設定代理伺服器來處理網路流量,例如:socks://proxy.example.com:1080", "general.proxy.label": "代理伺服器", "general.rebuild_database.button": "重置", diff --git a/locales/shortcuts/en.json b/locales/shortcuts/en.json index 00dc5adb2..8a89fc50d 100644 --- a/locales/shortcuts/en.json +++ b/locales/shortcuts/en.json @@ -22,6 +22,7 @@ "keys.layout.showShortcuts": "Show/Hide Shortcuts", "keys.layout.toggleSidebar": "Show/Hide Feed Sidebar", "keys.layout.toggleWideMode": "Toggle Wide Mode", + "keys.layout.zenMode": "Zen Mode", "keys.misc.quickSearch": "Quick Search", "keys.type.audio": "audio", "keys.type.entries": "entries", diff --git a/locales/shortcuts/zh-CN.json b/locales/shortcuts/zh-CN.json index 9a5b318aa..dfc063c97 100644 --- a/locales/shortcuts/zh-CN.json +++ b/locales/shortcuts/zh-CN.json @@ -22,10 +22,13 @@ "keys.layout.showShortcuts": "显示/隐藏快捷键", "keys.layout.toggleSidebar": "显示/隐藏侧边栏", "keys.layout.toggleWideMode": "切换宽屏模式", + "keys.layout.zenMode": "Zen 模式", + "keys.misc.quickSearch": "快速搜索", "keys.type.audio": "音频", "keys.type.entries": "条目列表", "keys.type.entry": "条目", "keys.type.feeds": "订阅源", "keys.type.layout": "布局", + "keys.type.misc": "杂项", "sidebar_title": "快捷键" } diff --git a/package.json b/package.json index d8cbe0033..8ac3c5afc 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "Follow", "type": "module", - "version": "0.1.2-beta.0", + "version": "0.2.0-beta.0", "private": true, - "packageManager": "pnpm@9.11.0", + "packageManager": "pnpm@9.12.3", "description": "Next generation information browser", "author": "Follow Team", "license": "GPL-3.0-only", @@ -16,9 +16,10 @@ "scripts": { "analyze:web": "npx vite-bundle-visualizer", "build": "electron-vite build && electron-forge make", - "build:macos": "electron-vite build && electron-forge make --arch=universal --platform=darwin", + "build:macos": "electron-vite build && electron-forge make --arch=x64 --platform=darwin && electron-forge make --arch=arm64 --platform=darwin && tsx scripts/merge-yml.ts", "build:web": "rm -rf out/web && vite build", "bump": "vv", + "dedupe:locales": "eslint --fix locales/**/*.json", "depcheck": "npx depcheck --quiet", "dev": "electron-vite dev", "dev:debug": "export DEBUG=true && vite --debug", @@ -39,7 +40,7 @@ "typecheck": "turbo typecheck" }, "devDependencies": { - "@babel/generator": "7.25.7", + "@babel/generator": "7.26.2", "@clack/prompts": "0.7.0", "@egoist/tailwindcss-icons": "1.8.1", "@electron-forge/cli": "7.5.0", @@ -50,44 +51,47 @@ "@electron-forge/publisher-github": "7.5.0", "@electron-toolkit/tsconfig": "^1.0.1", "@fontsource/sn-pro": "5.1.0", - "@hono/node-server": "1.13.2", - "@hookform/resolvers": "3.9.0", + "@hono/node-server": "1.13.4", + "@hookform/resolvers": "3.9.1", "@iconify-json/logos": "1.2.3", "@iconify-json/mingcute": "1.2.1", - "@iconify-json/simple-icons": "^1.2.8", + "@iconify-json/simple-icons": "^1.2.10", "@iconify/tools": "4.0.7", - "@microflash/remark-callout-directives": "4.3.1", + "@microflash/remark-callout-directives": "4.3.2", "@mozilla/readability": "^0.5.0", "@pengx17/electron-forge-maker-appimage": "1.2.1", - "@sentry/vite-plugin": "2.22.5", + "@sentry/vite-plugin": "2.22.6", "@t3-oss/env-core": "^0.11.1", "@tailwindcss/container-queries": "0.1.1", "@tailwindcss/typography": "0.5.15", "@types/lodash-es": "4.17.12", - "@types/node": "^22.7.5", - "@types/react": "^18.3.11", + "@types/node": "^22.8.7", + "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "@vitejs/plugin-legacy": "5.4.2", - "@vitejs/plugin-react": "^4.3.2", + "@vercel/node": "3.2.24", + "@vitejs/plugin-legacy": "5.4.3", + "@vitejs/plugin-react": "^4.3.3", "cross-env": "7.0.3", "cssnano": "7.0.6", "dnum": "^2.14.0", "dotenv": "16.4.5", "drizzle-orm": "0.34.1", - "electron": "33.0.0", + "electron": "33.0.2", "electron-devtools-installer": "3.2.0", "electron-packager-languages": "0.5.0", "electron-vite": "^2.3.0", - "eslint": "^9.13.0", + "eslint": "^9.14.0", "eslint-config-hyoban": "^3.1.12", "fake-indexeddb": "6.0.0", - "happy-dom": "15.7.4", - "hono": "4.6.5", + "happy-dom": "15.8.0", + "hono": "4.6.8", + "js-yaml": "4.1.0", "lint-staged": "15.2.10", "nbump": "2.0.7", "postcss": "8.4.47", "postcss-js": "4.0.1", "prettier": "3.3.3", + "raw-body": "3.0.0", "react": "^18.3.1", "react-dom": "^18.3.1", "rimraf": "6.0.1", @@ -96,11 +100,12 @@ "tailwindcss": "3.4.14", "tailwindcss-animate": "1.0.7", "tailwindcss-motion": "0.3.0-beta", - "tsup": "8.3.0", - "tsx": "4.19.1", + "tsup": "8.3.5", + "tsx": "4.19.2", "turbo": "2.2.3", "typescript": "5.6.3", - "vite": "^5.4.9", + "unplugin-ast": "^0.11.0", + "vite": "^5.4.10", "vite-plugin-mkcert": "1.17.6", "vite-tsconfig-paths": "5.0.1", "vitest": "2.0.5" @@ -127,6 +132,10 @@ "*": [ "eslint --fix", "prettier --ignore-unknown --write" + ], + "locales/**/*.json": [ + "npm run dedupe:locales", + "git add locales" ] }, "bump": { diff --git a/packages/components/package.json b/packages/components/package.json index 3367c4da4..7d3425dc3 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -26,7 +26,7 @@ "@follow/shared": "workspace:*", "@follow/types": "workspace:*", "@follow/utils": "workspace:*", - "@headlessui/react": "2.1.10", + "@headlessui/react": "2.2.0", "@radix-ui/react-avatar": "1.1.1", "@radix-ui/react-checkbox": "1.1.2", "@radix-ui/react-context-menu": "2.2.2", @@ -48,16 +48,16 @@ "@react-hook/window-size": "3.1.1", "class-variance-authority": "0.7.0", "dayjs": "1.11.13", - "foxact": "0.2.39", - "framer-motion": "11.11.9", + "foxact": "0.2.41", + "framer-motion": "11.11.11", "jotai": "2.10.1", "lodash-es": "4.17.21", "masonic": "4.0.1", "react-blurhash": "^0.3.0", "react-fast-marquee": "1.6.5", - "react-hook-form": "7.53.0", - "react-i18next": "^15.0.3", - "sonner": "^1.5.0", + "react-hook-form": "7.53.1", + "react-i18next": "^15.1.0", + "sonner": "1.5.0", "use-context-selector": "2.0.0", "usehooks-ts": "3.1.0" } diff --git a/packages/components/src/icons/Database.tsx b/packages/components/src/icons/Database.tsx new file mode 100644 index 000000000..d1d6835ad --- /dev/null +++ b/packages/components/src/icons/Database.tsx @@ -0,0 +1,12 @@ +import type { SVGProps } from "react" + +export function MaterialSymbolsDatabaseOutline(props: SVGProps) { + return ( + + + + ) +} diff --git a/packages/components/src/icons/Meditation.tsx b/packages/components/src/icons/Meditation.tsx new file mode 100644 index 000000000..bc837df20 --- /dev/null +++ b/packages/components/src/icons/Meditation.tsx @@ -0,0 +1,12 @@ +import type { SVGProps } from "react" + +export function MdiMeditation(props: SVGProps) { + return ( + + + + ) +} diff --git a/packages/components/src/icons/infinify.tsx b/packages/components/src/icons/infinify.tsx new file mode 100644 index 000000000..846ef0eb8 --- /dev/null +++ b/packages/components/src/icons/infinify.tsx @@ -0,0 +1,12 @@ +import type { SVGProps } from "react" + +export function CarbonInfinitySymbol(props: SVGProps) { + return ( + + + + ) +} diff --git a/packages/components/src/ui/button/index.tsx b/packages/components/src/ui/button/index.tsx index 9140c1521..34c406e98 100644 --- a/packages/components/src/ui/button/index.tsx +++ b/packages/components/src/ui/button/index.tsx @@ -6,6 +6,7 @@ import type { VariantProps } from "class-variance-authority" import type { HTMLMotionProps } from "framer-motion" import { m } from "framer-motion" import * as React from "react" +import { useState } from "react" import type { Options } from "react-hotkeys-hook" import { useHotkeys } from "react-hotkeys-hook" @@ -27,6 +28,7 @@ interface ActionButtonProps { disabled?: boolean shortcut?: string disableTriggerShortcut?: boolean + enableHoverableContent?: boolean size?: "sm" | "md" | "base" /** @@ -58,8 +60,10 @@ export const ActionButton = React.forwardRef< shortcut, disabled, disableTriggerShortcut, + enableHoverableContent, size = "base", shortcutOnlyFocusWithIn, + onClick, ...rest }, ref, @@ -69,6 +73,8 @@ export const ActionButton = React.forwardRef< const buttonRef = React.useRef(null) React.useImperativeHandle(ref, () => buttonRef.current!) + const [loading, setLoading] = useState(false) + const Trigger = ( @@ -106,7 +129,7 @@ export const ActionButton = React.forwardRef< /> )} {tooltip ? ( - + {Trigger} diff --git a/packages/components/src/ui/input/Input.tsx b/packages/components/src/ui/input/Input.tsx index d2d00d0ca..d705d4ade 100644 --- a/packages/components/src/ui/input/Input.tsx +++ b/packages/components/src/ui/input/Input.tsx @@ -23,7 +23,7 @@ export const Input = forwardRef< "border border-border", "placeholder:text-theme-placeholder-text dark:bg-zinc-700/[0.15] dark:text-zinc-200", "hover:border-accent/60", - props.type === "password" ? "font-mono placeholder:font-sans" : "font-sans", + props.type === "password" && "font-mono placeholder:font-sans", "w-full", className, )} diff --git a/apps/renderer/src/modules/entry-column/Items/contexts/picture-masonry-context.ts b/packages/components/src/ui/masonry/contexts.tsx similarity index 100% rename from apps/renderer/src/modules/entry-column/Items/contexts/picture-masonry-context.ts rename to packages/components/src/ui/masonry/contexts.tsx diff --git a/packages/components/src/ui/masonry/hooks.ts b/packages/components/src/ui/masonry/hooks.ts new file mode 100644 index 000000000..9ee4bdc7c --- /dev/null +++ b/packages/components/src/ui/masonry/hooks.ts @@ -0,0 +1,54 @@ +import { nextFrame } from "@follow/utils/dom" +import { throttle } from "lodash-es" +import { useLayoutEffect, useRef, useState } from "react" + +import { getCurrentColumn } from "./utils" + +export const useMasonryColumn = (gutter: number, onReady?: () => any) => { + const containerRef = useRef(null) + const [currentColumn, setCurrentColumn] = useState(1) + const [currentItemWidth, setCurrentItemWidth] = useState(0) + + useLayoutEffect(() => { + let readyCallOnce = false + const $warpper = containerRef.current + if (!$warpper) return + const handler = () => { + const column = getCurrentColumn($warpper.clientWidth) + setCurrentItemWidth(Math.trunc($warpper.clientWidth / column - gutter)) + + setCurrentColumn(column) + + nextFrame(() => { + if (readyCallOnce) return + readyCallOnce = true + onReady?.() + }) + } + const recal = throttle(handler, 1000 / 12) + + let previousWidth = $warpper.offsetWidth + const resizeObserver = new ResizeObserver((entries) => { + for (const entry of entries) { + const newWidth = entry.contentRect.width + + if (newWidth !== previousWidth) { + previousWidth = newWidth + + recal() + } + } + }) + recal() + resizeObserver.observe($warpper) + return () => { + resizeObserver.disconnect() + } + }, []) + + return { + containerRef, + currentColumn, + currentItemWidth, + } +} diff --git a/packages/components/src/ui/masonry/utils.ts b/packages/components/src/ui/masonry/utils.ts new file mode 100644 index 000000000..377286246 --- /dev/null +++ b/packages/components/src/ui/masonry/utils.ts @@ -0,0 +1,30 @@ +const breakpoints = { + 0: 1, + // 32rem => 32 * 16= 512 + 512: 2, + // 48rem => 48 * 16= 768 + 768: 3, + // 72rem => 72 * 16= 1152 + 1152: 4, + // 80rem => 80 * 16= 1280 + 1280: 5, + 1536: 6, + 1792: 7, + 2048: 8, +} + +export const getCurrentColumn = (w: number) => { + // Initialize column count with the minimum number of columns + let columns = 1 + + // Iterate through each breakpoint and determine the column count + for (const [breakpoint, cols] of Object.entries(breakpoints)) { + if (w >= Number.parseInt(breakpoint)) { + columns = cols + } else { + break + } + } + + return columns +} diff --git a/packages/components/src/ui/scroll-area/ScrollArea.tsx b/packages/components/src/ui/scroll-area/ScrollArea.tsx index 5217ca54f..d2264efcb 100644 --- a/packages/components/src/ui/scroll-area/ScrollArea.tsx +++ b/packages/components/src/ui/scroll-area/ScrollArea.tsx @@ -127,6 +127,7 @@ export const ScrollArea = React.forwardRef< flex?: boolean mask?: boolean onScroll?: (e: React.UIEvent) => void + orientation?: "vertical" | "horizontal" } >( ( @@ -138,6 +139,7 @@ export const ScrollArea = React.forwardRef< scrollbarClassName, mask = false, onScroll, + orientation = "vertical", }, ref, ) => { @@ -156,7 +158,7 @@ export const ScrollArea = React.forwardRef< > {children} - + ) diff --git a/packages/components/src/ui/slider/index.tsx b/packages/components/src/ui/slider/index.tsx new file mode 100644 index 000000000..e01c5e0f7 --- /dev/null +++ b/packages/components/src/ui/slider/index.tsx @@ -0,0 +1,20 @@ +import { cn } from "@follow/utils/utils" +import * as SliderPrimitive from "@radix-ui/react-slider" +import * as React from "react" + +export const Slider = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + + + + + + +)) +Slider.displayName = SliderPrimitive.Root.displayName diff --git a/packages/components/src/ui/toast/index.tsx b/packages/components/src/ui/toast/index.tsx index cb861e620..e22b9b72b 100644 --- a/packages/components/src/ui/toast/index.tsx +++ b/packages/components/src/ui/toast/index.tsx @@ -1,19 +1,23 @@ import { useIsDark } from "@follow/hooks" import { Toaster as Sonner } from "sonner" -type ToasterProps = React.ComponentProps +import { ZIndexProvider } from "../z-index" +type ToasterProps = React.ComponentProps +const TOAST_Z_INDEX = 999999999 export const Toaster = ({ ...props }: ToasterProps) => ( - + + + ) diff --git a/packages/components/src/ui/z-index/ctx.tsx b/packages/components/src/ui/z-index/ctx.tsx new file mode 100644 index 000000000..23b4ff1b7 --- /dev/null +++ b/packages/components/src/ui/z-index/ctx.tsx @@ -0,0 +1,5 @@ +import { createContext, useContext } from "react" + +export const ZIndexContext = createContext(0) + +export const useCorrectZIndex = (zIndex: number) => useContext(ZIndexContext) + zIndex diff --git a/packages/components/src/ui/z-index/index.tsx b/packages/components/src/ui/z-index/index.tsx new file mode 100644 index 000000000..7ecb90f7c --- /dev/null +++ b/packages/components/src/ui/z-index/index.tsx @@ -0,0 +1,7 @@ +import { ZIndexContext } from "./ctx" + +export const ZIndexProvider: Component<{ + zIndex: number +}> = (props) => { + return {props.children} +} diff --git a/packages/hooks/package.json b/packages/hooks/package.json index 2940d07f9..dd1aca8e1 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -17,7 +17,7 @@ "@follow/shared": "workspace:*", "@follow/types": "workspace:*", "@follow/utils": "workspace:*", - "foxact": "0.2.39", + "foxact": "0.2.41", "jotai": "2.10.1", "lodash-es": "4.17.21", "usehooks-ts": "3.1.0" diff --git a/packages/hooks/src/index.ts b/packages/hooks/src/index.ts index a6188977f..cc321c9ba 100644 --- a/packages/hooks/src/index.ts +++ b/packages/hooks/src/index.ts @@ -1,5 +1,6 @@ export type { HTMLMediaState } from "./factory/createHTMLMediaHook" export * from "./useAnyPointDown" +export * from "./useCountDown" export * from "./useDark" export * from "./useInputComposition" export * from "./useInterval" diff --git a/packages/hooks/src/useCountDown.ts b/packages/hooks/src/useCountDown.ts new file mode 100644 index 000000000..460c73d9b --- /dev/null +++ b/packages/hooks/src/useCountDown.ts @@ -0,0 +1,65 @@ +// credits: https://usehooks-ts.com/react-hook/use-countdown + +import { useCallback } from "react" +import { useBoolean, useCounter, useInterval } from "usehooks-ts" + +type CountdownOptions = { + countStart: number + + intervalMs?: number + isIncrement?: boolean + autoStart?: boolean + + countStop?: number +} + +type CountdownControllers = { + startCountdown: () => void + stopCountdown: () => void + resetCountdown: () => void +} + +export function useCountdown({ + countStart, + countStop = 0, + intervalMs = 1000, + isIncrement = false, + autoStart = true, +}: CountdownOptions): [number, CountdownControllers] { + const { count, increment, decrement, reset: resetCounter } = useCounter(countStart) + + /* + * Note: used to control the useInterval + * running: If true, the interval is running + * start: Should set running true to trigger interval + * stop: Should set running false to remove interval. + */ + const { + value: isCountdownRunning, + setTrue: startCountdown, + setFalse: stopCountdown, + } = useBoolean(autoStart) + + // Will set running false and reset the seconds to initial value. + const resetCountdown = useCallback(() => { + stopCountdown() + resetCounter() + }, [stopCountdown, resetCounter]) + + const countdownCallback = useCallback(() => { + if (count === countStop) { + stopCountdown() + return + } + + if (isIncrement) { + increment() + } else { + decrement() + } + }, [count, countStop, decrement, increment, isIncrement, stopCountdown]) + + useInterval(countdownCallback, isCountdownRunning ? intervalMs : null) + + return [count, { startCountdown, stopCountdown, resetCountdown }] +} diff --git a/packages/models/package.json b/packages/models/package.json index c92ed6afd..79c1aa425 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -14,10 +14,10 @@ } }, "dependencies": { - "@auth/core": "0.37.0", + "@auth/core": "0.37.2", "@follow/shared": "workspace:*", "@follow/types": "workspace:*", "@follow/utils": "workspace:*", - "hono": "4.6.5" + "hono": "4.6.8" } } diff --git a/packages/shared/package.json b/packages/shared/package.json index 74ace9c7b..9a1b4bc4d 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -31,14 +31,14 @@ "dependencies": { "@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/tsconfig": "^1.0.1", - "@hono/node-server": "^1.13.2", + "@hono/node-server": "^1.13.4", "@t3-oss/env-core": "^0.11.1", "drizzle-orm": "^0.34.1", - "electron": "^33.0.0", - "hono": "^4.6.5", + "electron": "^33.0.2", + "hono": "^4.6.8", "react": "^18.3.1", "react-dom": "^18.3.1", - "sonner": "^1.5.0", + "sonner": "1.5.0", "zod": "^3.23.8" } } diff --git a/packages/shared/src/bridge.ts b/packages/shared/src/bridge.ts index 080650be2..652a5e7f0 100644 --- a/packages/shared/src/bridge.ts +++ b/packages/shared/src/bridge.ts @@ -1,4 +1,5 @@ import type { BrowserWindow } from "electron" +import { useEffect, useLayoutEffect, useRef } from "react" import type { toast } from "sonner" import type { GeneralSettings, UISettings } from "./interface/settings" @@ -23,7 +24,10 @@ interface RenderGlobalContext { /// Actions follow: (options?: { isList: boolean; id?: string; url?: string }) => void profile: (id: string, variant?: "drawer" | "dialog") => void + quickAdd: () => void rsshubRoute: (route: string) => void + // Navigate + goToDiscover: () => void // user data clearIfLoginOtherAccount: (newUserId: string) => void @@ -33,6 +37,9 @@ interface RenderGlobalContext { // URL getWebUrl: () => string getApiUrl: () => string + + // View + zenMode: () => void } export const registerGlobalContext = (context: Partial) => { @@ -42,6 +49,20 @@ export const registerGlobalContext = (context: Partial) => } } +export const useRegisterGlobalContext = ( + key: K, + fn: RenderGlobalContext[K], +) => { + const eventCallbackRef = useRef(fn) + useLayoutEffect(() => { + eventCallbackRef.current = fn + }, [fn]) + + useEffect(() => { + registerGlobalContext({ [key]: eventCallbackRef.current }) + }, [key]) +} + function createProxy(window: BrowserWindow, path: string[] = []): T { return new Proxy((() => {}) as any, { get(_, prop: string) { @@ -75,3 +96,7 @@ type Fn = { export function callWindowExpose(window: BrowserWindow) { return createProxy(window) as Fn } + +export function callWindowExposeRenderer() { + return globalThis[PREFIX] as Fn +} diff --git a/packages/shared/src/hono.ts b/packages/shared/src/hono.ts index 35400f231..3c969a260 100644 --- a/packages/shared/src/hono.ts +++ b/packages/shared/src/hono.ts @@ -5281,6 +5281,15 @@ declare const _routes: hono_hono_base.HonoBase { } return actualTop } + +export const clearSelection = () => window.getSelection()?.removeAllRanges() diff --git a/packages/utils/src/environment.ts b/packages/utils/src/environment.ts index 0718b8cf1..415035bac 100644 --- a/packages/utils/src/environment.ts +++ b/packages/utils/src/environment.ts @@ -1,8 +1,11 @@ import { IN_ELECTRON } from "@follow/shared/constants" +import { nanoid } from "nanoid" import { detectBrowser, getOS } from "./utils" declare const APP_VERSION: string +export const appSessionTraceId = nanoid() + export const getCurrentEnvironment = () => { const ua = navigator.userAgent const appVersion = APP_VERSION @@ -18,5 +21,6 @@ export const getCurrentEnvironment = () => { `**User Agent**: ${ua}`, `**Env**: ${env}`, `**Browser**: ${browser}`, + `**Session Trace Id**: \`${appSessionTraceId}\``, ] } diff --git a/patches/hono.patch b/patches/hono.patch index c0b8b1141..8d3b80d1e 100644 --- a/patches/hono.patch +++ b/patches/hono.patch @@ -1,8 +1,8 @@ diff --git a/dist/types/client/types.d.ts b/dist/types/client/types.d.ts -index b0853100a2184fa9e0e2ef5033c0adb6591b423a..4d407f5d364516b008c7afb9b862353495cbef49 100644 +index 35e2c7a1dccc9f148c87ba07d71d7f6101106f2d..5c52cd70594e57d8c375f2c048dd337eaa55e906 100644 --- a/dist/types/client/types.d.ts +++ b/dist/types/client/types.d.ts -@@ -43,7 +43,7 @@ type ClientResponseOfEndpoint = T extends { +@@ -52,7 +52,7 @@ type ClientResponseOfEndpoint = T extends { output: infer O; outputFormat: infer F; status: infer S; diff --git a/plugins/vite/ast.ts b/plugins/vite/ast.ts new file mode 100644 index 000000000..33b7f4c1a --- /dev/null +++ b/plugins/vite/ast.ts @@ -0,0 +1,6 @@ +import { RemoveWrapperFunction } from "unplugin-ast/transformers" +import AST from "unplugin-ast/vite" + +export const astPlugin = AST({ + transformer: [RemoveWrapperFunction(["tw", "defineSettingPageData"])], +}) diff --git a/plugins/vite/manifest.ts b/plugins/vite/manifest.ts new file mode 100644 index 000000000..fb42a7648 --- /dev/null +++ b/plugins/vite/manifest.ts @@ -0,0 +1,33 @@ +import fs from "node:fs" +import path from "node:path" + +import type { Plugin } from "vite" + +export default function manifestPlugin(): Plugin { + let config + + return { + name: "manifest", + enforce: "post", + configResolved(resolvedConfig) { + config = resolvedConfig + }, + generateBundle(_options, bundle) { + const outputDir = config.build.outDir + const assetsDir = path.join(outputDir, "assets") + const outputPath = path.join(assetsDir, "manifest.txt") + + if (!fs.existsSync(assetsDir)) { + fs.mkdirSync(assetsDir, { recursive: true }) + } + + const fileStream = fs.createWriteStream(outputPath) + + for (const fileName in bundle) { + fileStream.write(`${fileName}\n`) + } + + fileStream.end() + }, + } +} diff --git a/plugins/vite/tw-macro.ts b/plugins/vite/tw-macro.ts deleted file mode 100644 index 5207e0981..000000000 --- a/plugins/vite/tw-macro.ts +++ /dev/null @@ -1,54 +0,0 @@ -import * as babel from "@babel/core" -import generate from "@babel/generator" -import { parse } from "@babel/parser" -import * as t from "@babel/types" -import type { Plugin } from "vite" - -export function twMacro(): Plugin { - return { - name: "vite-plugin-tw-to-raw-string", - - transform(code, id) { - // Only Process .tsx .ts .jsx .js files - if (!/\.[jt]sx?$/.test(id)) { - return null - } - // Parse the code using Babel's parser with TypeScript support - const ast = parse(code, { - sourceType: "module", - plugins: ["jsx", "typescript"], // Add typescript support - }) - - babel.traverse(ast, { - TaggedTemplateExpression(path) { - if (t.isIdentifier(path.node.tag, { name: "tw" })) { - const { quasi } = path.node - if (t.isTemplateLiteral(quasi)) { - // Create a new template literal by combining quasis and expressions - const quasis = quasi.quasis.map((q) => q.value.raw) - - // Replace the tagged template expression with the new template literal as a string - path.replaceWith( - t.templateLiteral( - quasis.map((q, i) => - t.templateElement({ raw: q, cooked: q }, i === quasis.length - 1), - ), - quasi.expressions, - ), - ) - } - } - }, - }) - - // Generate the transformed code from the modified AST - // @ts-expect-error - const output = generate.default(ast, {}, code) - - return { - code: output.code, - map: null, // Source map generation can be added if necessary - } - }, - } -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c001c9701..9c5f56ad0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ patchedDependencies: hash: c53at4t5fflixuwjz35hmcqdu4 path: patches/electron-context-menu.patch hono: - hash: hhch3aogyxhxjttgmn52vtceyy + hash: qptujxncoai6tukc4qaqsrqk24 path: patches/hono.patch immer@10.1.1: hash: og7mbnoo5vh43tjlw5rbmrdbvu @@ -36,14 +36,14 @@ importers: .: devDependencies: '@babel/generator': - specifier: 7.25.7 - version: 7.25.7 + specifier: 7.26.2 + version: 7.26.2 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 '@egoist/tailwindcss-icons': specifier: 1.8.1 - version: 1.8.1(tailwindcss@3.4.14) + version: 1.8.1(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))) '@electron-forge/cli': specifier: 7.5.0 version: 7.5.0(encoding@0.1.13) @@ -64,16 +64,16 @@ importers: version: 7.5.0(encoding@0.1.13) '@electron-toolkit/tsconfig': specifier: ^1.0.1 - version: 1.0.1(@types/node@22.7.5) + version: 1.0.1(@types/node@22.8.7) '@fontsource/sn-pro': specifier: 5.1.0 version: 5.1.0 '@hono/node-server': - specifier: 1.13.2 - version: 1.13.2(hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy)) + specifier: 1.13.4 + version: 1.13.4(hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24)) '@hookform/resolvers': - specifier: 3.9.0 - version: 3.9.0(react-hook-form@7.53.0(react@18.3.1)) + specifier: 3.9.1 + version: 3.9.1(react-hook-form@7.53.1(react@18.3.1)) '@iconify-json/logos': specifier: 1.2.3 version: 1.2.3 @@ -81,50 +81,53 @@ importers: specifier: 1.2.1 version: 1.2.1 '@iconify-json/simple-icons': - specifier: ^1.2.8 - version: 1.2.8 + specifier: ^1.2.10 + version: 1.2.10 '@iconify/tools': specifier: 4.0.7 version: 4.0.7 '@microflash/remark-callout-directives': - specifier: 4.3.1 - version: 4.3.1 + specifier: 4.3.2 + version: 4.3.2 '@mozilla/readability': specifier: ^0.5.0 version: 0.5.0(patch_hash=43niildbdafdxi7qfcwhpkkxwa) '@pengx17/electron-forge-maker-appimage': specifier: 1.2.1 - version: 1.2.1(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)) + version: 1.2.1(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) '@sentry/vite-plugin': - specifier: 2.22.5 - version: 2.22.5(encoding@0.1.13) + specifier: 2.22.6 + version: 2.22.6(encoding@0.1.13) '@t3-oss/env-core': specifier: ^0.11.1 version: 0.11.1(typescript@5.6.3)(zod@3.23.8) '@tailwindcss/container-queries': specifier: 0.1.1 - version: 0.1.1(tailwindcss@3.4.14) + version: 0.1.1(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))) '@tailwindcss/typography': specifier: 0.5.15 - version: 0.5.15(tailwindcss@3.4.14) + version: 0.5.15(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))) '@types/lodash-es': specifier: 4.17.12 version: 4.17.12 '@types/node': - specifier: ^22.7.5 - version: 22.7.5 + specifier: ^22.8.7 + version: 22.8.7 '@types/react': - specifier: ^18.3.11 - version: 18.3.11 + specifier: ^18.3.12 + version: 18.3.12 '@types/react-dom': specifier: ^18.3.1 version: 18.3.1 + '@vercel/node': + specifier: 3.2.24 + version: 3.2.24(encoding@0.1.13) '@vitejs/plugin-legacy': - specifier: 5.4.2 - version: 5.4.2(terser@5.35.0)(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)) + specifier: 5.4.3 + version: 5.4.3(terser@5.35.0)(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)) '@vitejs/plugin-react': - specifier: ^4.3.2 - version: 4.3.2(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)) + specifier: ^4.3.3 + version: 4.3.3(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)) cross-env: specifier: 7.0.3 version: 7.0.3 @@ -139,10 +142,10 @@ importers: version: 16.4.5 drizzle-orm: specifier: 0.34.1 - version: 0.34.1(@opentelemetry/api@1.9.0)(@types/pg@8.11.10)(@types/react@18.3.11)(react@18.3.1) + version: 0.34.1(@opentelemetry/api@1.9.0)(@types/pg@8.11.10)(@types/react@18.3.12)(react@18.3.1) electron: - specifier: 33.0.0 - version: 33.0.0 + specifier: 33.0.2 + version: 33.0.2 electron-devtools-installer: specifier: 3.2.0 version: 3.2.0 @@ -151,22 +154,25 @@ importers: version: 0.5.0 electron-vite: specifier: ^2.3.0 - version: 2.3.0(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)) + version: 2.3.0(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)) eslint: - specifier: ^9.13.0 - version: 9.13.0(jiti@2.3.3) + specifier: ^9.14.0 + version: 9.14.0(jiti@2.3.3) eslint-config-hyoban: specifier: ^3.1.12 - version: 3.1.12(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(tailwindcss@3.4.14)(typescript@5.6.3) + version: 3.1.12(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)))(typescript@5.6.3) fake-indexeddb: specifier: 6.0.0 version: 6.0.0 happy-dom: - specifier: 15.7.4 - version: 15.7.4 + specifier: 15.8.0 + version: 15.8.0 hono: - specifier: 4.6.5 - version: 4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy) + specifier: 4.6.8 + version: 4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24) + js-yaml: + specifier: 4.1.0 + version: 4.1.0 lint-staged: specifier: 15.2.10 version: 15.2.10 @@ -182,6 +188,9 @@ importers: prettier: specifier: 3.3.3 version: 3.3.3 + raw-body: + specifier: 3.0.0 + version: 3.0.0 react: specifier: ^18.3.1 version: 18.3.1 @@ -199,52 +208,55 @@ importers: version: 2.11.1 tailwindcss: specifier: 3.4.14 - version: 3.4.14 + version: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) tailwindcss-animate: specifier: 1.0.7 - version: 1.0.7(tailwindcss@3.4.14) + version: 1.0.7(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))) tailwindcss-motion: specifier: 0.3.0-beta - version: 0.3.0-beta(tailwindcss@3.4.14) + version: 0.3.0-beta(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))) tsup: - specifier: 8.3.0 - version: 8.3.0(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.1)(typescript@5.6.3)(yaml@2.6.0) + specifier: 8.3.5 + version: 8.3.5(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.2)(typescript@5.6.3)(yaml@2.6.0) tsx: - specifier: 4.19.1 - version: 4.19.1 + specifier: 4.19.2 + version: 4.19.2 turbo: specifier: 2.2.3 version: 2.2.3 typescript: specifier: 5.6.3 version: 5.6.3 + unplugin-ast: + specifier: ^0.11.0 + version: 0.11.0(rollup@4.24.0)(webpack-sources@3.2.3) vite: - specifier: ^5.4.9 - version: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + specifier: ^5.4.10 + version: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) vite-plugin-mkcert: specifier: 1.17.6 - version: 1.17.6(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)) + version: 1.17.6(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)) vite-tsconfig-paths: specifier: 5.0.1 - version: 5.0.1(typescript@5.6.3)(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)) + version: 5.0.1(typescript@5.6.3)(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)) vitest: specifier: 2.0.5 - version: 2.0.5(@types/node@22.7.5)(happy-dom@15.7.4)(lightningcss@1.27.0)(terser@5.35.0) + version: 2.0.5(@edge-runtime/vm@3.2.0)(@types/node@22.8.7)(happy-dom@15.8.0)(lightningcss@1.27.0)(terser@5.35.0) apps/main: dependencies: '@egoist/tipc': specifier: 0.3.2 - version: 0.3.2(electron@33.0.0)(react@18.3.1) + version: 0.3.2(electron@33.0.2)(react@18.3.1) '@electron-toolkit/preload': specifier: ^3.0.1 - version: 3.0.1(electron@33.0.0) + version: 3.0.1(electron@33.0.2) '@electron-toolkit/utils': specifier: ^3.0.0 - version: 3.0.0(electron@33.0.0) + version: 3.0.0(electron@33.0.2) '@eneris/push-receiver': - specifier: 4.2.0 - version: 4.2.0 + specifier: 4.3.0 + version: 4.3.0 '@follow/shared': specifier: workspace:* version: link:../../packages/shared @@ -252,8 +264,8 @@ importers: specifier: ^0.5.0 version: 0.5.0(patch_hash=43niildbdafdxi7qfcwhpkkxwa) '@sentry/electron': - specifier: 5.6.0 - version: 5.6.0 + specifier: 5.7.0 + version: 5.7.0 builder-util-runtime: specifier: 9.2.10 version: 9.2.10 @@ -269,12 +281,15 @@ importers: electron-updater: specifier: ^6.3.9 version: 6.3.9 + fast-folder-size: + specifier: 2.3.0 + version: 2.3.0 font-list: specifier: 1.5.1 version: 1.5.1 i18next: - specifier: ^23.16.0 - version: 23.16.0 + specifier: ^23.16.4 + version: 23.16.4 linkedom: specifier: ^0.18.5 version: 0.18.5 @@ -298,26 +313,29 @@ importers: specifier: 4.17.12 version: 4.17.12 '@types/node': - specifier: ^22.7.5 - version: 22.7.5 + specifier: ^22.8.7 + version: 22.8.7 electron: - specifier: 33.0.0 - version: 33.0.0 + specifier: 33.0.2 + version: 33.0.2 electron-devtools-installer: specifier: 3.2.0 version: 3.2.0 hono: - specifier: 4.6.5 - version: 4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy) + specifier: 4.6.8 + version: 4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24) apps/renderer: dependencies: + '@dnd-kit/core': + specifier: ^6.1.0 + version: 6.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@egoist/tipc': specifier: 0.3.2 - version: 0.3.2(electron@33.0.0)(react@18.3.1) + version: 0.3.2(electron@33.0.2)(react@18.3.1) '@electron-toolkit/preload': specifier: ^3.0.1 - version: 3.0.1(electron@33.0.0) + version: 3.0.1(electron@33.0.2) '@follow/electron-main': specifier: workspace:* version: link:../main @@ -328,68 +346,68 @@ importers: specifier: 5.1.0 version: 5.1.0 '@headlessui/react': - specifier: 2.1.10 - version: 2.1.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 2.2.0 + version: 2.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@hono/auth-js': - specifier: 1.0.11 - version: 1.0.11(@auth/core@0.37.0)(hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy))(react@18.3.1) + specifier: 1.0.13 + version: 1.0.13(@auth/core@0.37.2)(hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24))(react@18.3.1) '@hookform/resolvers': - specifier: 3.9.0 - version: 3.9.0(react-hook-form@7.53.0(react@18.3.1)) + specifier: 3.9.1 + version: 3.9.1(react-hook-form@7.53.1(react@18.3.1)) '@lottiefiles/dotlottie-react': - specifier: 0.9.1 - version: 0.9.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 0.9.3 + version: 0.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@microflash/remark-callout-directives': - specifier: 4.3.1 - version: 4.3.1 + specifier: 4.3.2 + version: 4.3.2 '@openpanel/web': specifier: 1.0.1 version: 1.0.1 '@radix-ui/react-avatar': specifier: 1.1.1 - version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-context-menu': specifier: 2.2.2 - version: 2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-dialog': specifier: 1.1.2 - version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-dropdown-menu': specifier: 2.1.2 - version: 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-hover-card': specifier: 1.1.2 - version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-label': specifier: 2.1.0 - version: 2.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-popover': specifier: 1.1.2 - version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-slider': specifier: ^1.2.1 - version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-slot': specifier: 1.1.0 - version: 1.1.0(@types/react@18.3.11)(react@18.3.1) + version: 1.1.0(@types/react@18.3.12)(react@18.3.1) '@sentry/react': - specifier: 8.34.0 - version: 8.34.0(react@18.3.1) + specifier: 8.36.0 + version: 8.36.0(react@18.3.1) '@shikijs/transformers': - specifier: 1.22.0 - version: 1.22.0 + specifier: 1.22.2 + version: 1.22.2 '@tanstack/query-sync-storage-persister': - specifier: 5.59.13 - version: 5.59.13 + specifier: 5.59.17 + version: 5.59.17 '@tanstack/react-query': - specifier: 5.59.14 - version: 5.59.14(react@18.3.1) + specifier: 5.59.19 + version: 5.59.19(react@18.3.1) '@tanstack/react-query-devtools': - specifier: 5.59.14 - version: 5.59.14(@tanstack/react-query@5.59.14(react@18.3.1))(react@18.3.1) + specifier: 5.59.19 + version: 5.59.19(@tanstack/react-query@5.59.19(react@18.3.1))(react@18.3.1) '@tanstack/react-query-persist-client': - specifier: 5.59.14 - version: 5.59.14(@tanstack/react-query@5.59.14(react@18.3.1))(react@18.3.1) + specifier: 5.59.19 + version: 5.59.19(@tanstack/react-query@5.59.19(react@18.3.1))(react@18.3.1) '@use-gesture/react': specifier: 10.3.1 version: 10.3.1(react@18.3.1) @@ -404,19 +422,22 @@ importers: version: 9.1.3 click-to-react-component: specifier: 1.1.0 - version: 1.1.0(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.0(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) clsx: specifier: 2.1.1 version: 2.1.1 cmdk: - specifier: 1.0.0 - version: 1.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 1.0.3 + version: 1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) dayjs: specifier: 1.11.13 version: 1.11.13 dexie: - specifier: 4.0.8 - version: 4.0.8 + specifier: 4.0.9 + version: 4.0.9 + dexie-export-import: + specifier: ^4.1.2 + version: 4.1.2(dexie@4.0.9) dnum: specifier: ^2.14.0 version: 2.14.0 @@ -427,11 +448,11 @@ importers: specifier: 10.14.1 version: 10.14.1 foxact: - specifier: 0.2.39 - version: 0.2.39(react@18.3.1) + specifier: 0.2.41 + version: 0.2.41(react@18.3.1) framer-motion: - specifier: 11.11.9 - version: 11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 11.11.11 + version: 11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) franc-min: specifier: 6.2.0 version: 6.2.0 @@ -448,8 +469,8 @@ importers: specifier: 4.0.2 version: 4.0.2 i18next: - specifier: ^23.16.0 - version: 23.16.0 + specifier: ^23.16.4 + version: 23.16.4 i18next-browser-languagedetector: specifier: 8.0.0 version: 8.0.0 @@ -461,7 +482,7 @@ importers: version: 10.1.1(patch_hash=og7mbnoo5vh43tjlw5rbmrdbvu) jotai: specifier: 2.10.1 - version: 2.10.1(@types/react@18.3.11)(react@18.3.1) + version: 2.10.1(@types/react@18.3.12)(react@18.3.1) katex: specifier: 0.16.11 version: 0.16.11 @@ -478,11 +499,11 @@ importers: specifier: ^2.0.0 version: 2.0.0 mdast-util-to-markdown: - specifier: ^2.1.0 - version: 2.1.0 + specifier: ^2.1.1 + version: 2.1.1 nanoid: - specifier: 5.0.7 - version: 5.0.7 + specifier: 5.0.8 + version: 5.0.8 ofetch: specifier: 1.4.1 version: 1.4.1 @@ -491,7 +512,7 @@ importers: version: 8.2.0 plain-shiki: specifier: 0.0.12 - version: 0.0.12(shiki@1.22.0) + version: 0.0.12(shiki@1.22.2) re-resizable: specifier: 6.10.0 version: 6.10.0(patch_hash=yitcmpfwcomg2fky72uc3lhk2i)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -505,14 +526,14 @@ importers: specifier: 1.6.5 version: 1.6.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-hook-form: - specifier: 7.53.0 - version: 7.53.0(react@18.3.1) + specifier: 7.53.1 + version: 7.53.1(react@18.3.1) react-hotkeys-hook: - specifier: 4.5.1 - version: 4.5.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 4.6.1 + version: 4.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-i18next: - specifier: ^15.0.3 - version: 15.0.3(i18next@23.16.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^15.1.0 + version: 15.1.0(i18next@23.16.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-intersection-observer: specifier: 9.13.1 version: 9.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -559,20 +580,23 @@ importers: specifier: 11.1.1 version: 11.1.1 shiki: - specifier: 1.22.0 - version: 1.22.0 + specifier: 1.22.2 + version: 1.22.2 sonner: - specifier: ^1.5.0 + specifier: 1.5.0 version: 1.5.0(patch_hash=6s3tquyt5wnkqaogymn3mkivuq)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) swiper: specifier: 11.1.14 version: 11.1.14 tldts: - specifier: 6.1.51 - version: 6.1.51 + specifier: 6.1.58 + version: 6.1.58 unified: specifier: 11.0.5 version: 11.0.5 + unist-util-visit-parents: + specifier: ^6.0.1 + version: 6.0.1 use-context-selector: specifier: 2.0.0 version: 2.0.0(react@18.3.1)(scheduler@0.23.2) @@ -589,12 +613,12 @@ importers: specifier: 3.23.8 version: 3.23.8 zustand: - specifier: 5.0.0 - version: 5.0.0(@types/react@18.3.11)(immer@10.1.1(patch_hash=og7mbnoo5vh43tjlw5rbmrdbvu))(react@18.3.1)(use-sync-external-store@1.2.2(react@18.3.1)) + specifier: 5.0.1 + version: 5.0.1(@types/react@18.3.12)(immer@10.1.1(patch_hash=og7mbnoo5vh43tjlw5rbmrdbvu))(react@18.3.1)(use-sync-external-store@1.2.2(react@18.3.1)) devDependencies: '@babel/generator': - specifier: 7.25.7 - version: 7.25.7 + specifier: 7.26.2 + version: 7.26.2 '@follow/atoms': specifier: workspace:* version: link:../../packages/atoms @@ -617,8 +641,8 @@ importers: specifier: workspace:* version: link:../../packages/utils '@hono/node-server': - specifier: 1.13.2 - version: 1.13.2(hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy)) + specifier: 1.13.4 + version: 1.13.4(hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24)) '@types/katex': specifier: 0.16.7 version: 0.16.7 @@ -626,11 +650,11 @@ importers: specifier: 4.17.12 version: 4.17.12 '@types/node': - specifier: ^22.7.5 - version: 22.7.5 + specifier: ^22.8.7 + version: 22.8.7 '@types/react': - specifier: ^18.3.11 - version: 18.3.11 + specifier: ^18.3.12 + version: 18.3.12 '@types/react-dom': specifier: ^18.3.1 version: 18.3.1 @@ -638,8 +662,8 @@ importers: specifier: 6.0.0 version: 6.0.0 happy-dom: - specifier: 15.7.4 - version: 15.7.4 + specifier: 15.8.0 + version: 15.8.0 react: specifier: ^18.3.1 version: 18.3.1 @@ -659,8 +683,8 @@ importers: specifier: 5.1.0 version: 5.1.0 '@hono/auth-js': - specifier: 1.0.11 - version: 1.0.11(@auth/core@0.37.0)(hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy))(react@18.3.1) + specifier: 1.0.13 + version: 1.0.13(@auth/core@0.37.2)(hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24))(react@18.3.1) '@openpanel/web': specifier: 1.0.1 version: 1.0.1 @@ -668,32 +692,32 @@ importers: specifier: 2.6.2 version: 2.6.2 '@sentry/react': - specifier: 8.34.0 - version: 8.34.0(react@18.3.1) + specifier: 8.36.0 + version: 8.36.0(react@18.3.1) '@tanstack/react-query': - specifier: 5.59.14 - version: 5.59.14(react@18.3.1) + specifier: 5.59.19 + version: 5.59.19(react@18.3.1) blurhash: specifier: 2.0.5 version: 2.0.5 click-to-react-component: specifier: 1.1.0 - version: 1.1.0(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.0(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) dayjs: specifier: 1.11.13 version: 1.11.13 fastify: - specifier: 5.0.0 - version: 5.0.0 + specifier: 5.1.0 + version: 5.1.0 framer-motion: - specifier: 11.11.9 - version: 11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 11.11.11 + version: 11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) i18next: - specifier: ^23.16.0 - version: 23.16.0 + specifier: ^23.16.4 + version: 23.16.4 jotai: specifier: 2.10.1 - version: 2.10.1(@types/react@18.3.11)(react@18.3.1) + version: 2.10.1(@types/react@18.3.12)(react@18.3.1) kose-font: specifier: 1.0.0 version: 1.0.0 @@ -705,7 +729,7 @@ importers: version: 1.4.1 rc-modal-sheet: specifier: 0.3.2 - version: 0.3.2(@radix-ui/react-dialog@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(clsx@2.1.1)(framer-motion@11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(tailwind-merge@2.5.4)(vaul@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)) + version: 0.3.2(@radix-ui/react-dialog@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(clsx@2.1.1)(framer-motion@11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(tailwind-merge@2.5.4)(vaul@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)) react: specifier: ^18.3.1 version: 18.3.1 @@ -713,11 +737,11 @@ importers: specifier: ^0.3.0 version: 0.3.0(blurhash@2.0.5)(react@18.3.1) react-hotkeys-hook: - specifier: 4.5.1 - version: 4.5.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 4.6.1 + version: 4.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-i18next: - specifier: ^15.0.3 - version: 15.0.3(i18next@23.16.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^15.1.0 + version: 15.1.0(i18next@23.16.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-photo-view: specifier: 1.2.6 version: 1.2.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -728,11 +752,11 @@ importers: specifier: 0.11.2 version: 0.11.2 sonner: - specifier: ^1.5.0 + specifier: 1.5.0 version: 1.5.0(patch_hash=6s3tquyt5wnkqaogymn3mkivuq)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwindcss: specifier: 3.4.14 - version: 3.4.14 + version: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) use-context-selector: specifier: 2.0.0 version: 2.0.0(react@18.3.1)(scheduler@0.23.2) @@ -763,13 +787,19 @@ importers: version: link:../../packages/utils '@radix-ui/react-avatar': specifier: 1.1.1 - version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + chokidar: + specifier: 4.0.1 + version: 4.0.1 daisyui: - specifier: 4.12.13 - version: 4.12.13(patch_hash=igsntdatmoaxzwxof4bkkh35fy)(postcss@8.4.47) + specifier: 4.12.14 + version: 4.12.14(patch_hash=igsntdatmoaxzwxof4bkkh35fy)(postcss@8.4.47) foxact: - specifier: 0.2.39 - version: 0.2.39(react@18.3.1) + specifier: 0.2.41 + version: 0.2.41(react@18.3.1) + glob: + specifier: 11.0.0 + version: 11.0.0 lightningcss: specifier: 1.27.0 version: 1.27.0 @@ -779,18 +809,24 @@ importers: masonic: specifier: 4.0.1 version: 4.0.1(react@18.3.1) + nanoid: + specifier: 5.0.8 + version: 5.0.8 + path-to-regexp: + specifier: 8.2.0 + version: 8.2.0 react-dom: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) tsup: - specifier: 8.3.0 - version: 8.3.0(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.1)(typescript@5.6.3)(yaml@2.6.0) + specifier: 8.3.5 + version: 8.3.5(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.2)(typescript@5.6.3)(yaml@2.6.0) tsx: - specifier: 4.19.1 - version: 4.19.1 + specifier: 4.19.2 + version: 4.19.2 vite: - specifier: 5.4.9 - version: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + specifier: 5.4.10 + version: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) packages/atoms: dependencies: @@ -805,7 +841,7 @@ importers: version: link:../utils jotai: specifier: 2.10.1 - version: 2.10.1(@types/react@18.3.11)(react@18.3.1) + version: 2.10.1(@types/react@18.3.12)(react@18.3.1) packages/components: dependencies: @@ -828,62 +864,62 @@ importers: specifier: workspace:* version: link:../utils '@headlessui/react': - specifier: 2.1.10 - version: 2.1.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 2.2.0 + version: 2.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-avatar': specifier: 1.1.1 - version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-checkbox': specifier: 1.1.2 - version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-context-menu': specifier: 2.2.2 - version: 2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-dialog': specifier: 1.1.2 - version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-dropdown-menu': specifier: 2.1.2 - version: 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-hover-card': specifier: 1.1.2 - version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-label': specifier: 2.1.0 - version: 2.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-navigation-menu': specifier: 1.2.1 - version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-popover': specifier: 1.1.2 - version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-radio-group': specifier: 1.2.1 - version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-scroll-area': specifier: 1.2.0 - version: 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-select': specifier: 2.1.2 - version: 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-slider': specifier: ^1.2.1 - version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-slot': specifier: 1.1.0 - version: 1.1.0(@types/react@18.3.11)(react@18.3.1) + version: 1.1.0(@types/react@18.3.12)(react@18.3.1) '@radix-ui/react-switch': specifier: 1.1.1 - version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-tabs': specifier: 1.1.1 - version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-toast': specifier: 1.2.2 - version: 1.2.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.2.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-tooltip': specifier: 1.1.3 - version: 1.1.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 1.1.3(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-hook/window-size': specifier: 3.1.1 version: 3.1.1(react@18.3.1) @@ -894,14 +930,14 @@ importers: specifier: 1.11.13 version: 1.11.13 foxact: - specifier: 0.2.39 - version: 0.2.39(react@18.3.1) + specifier: 0.2.41 + version: 0.2.41(react@18.3.1) framer-motion: - specifier: 11.11.9 - version: 11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 11.11.11 + version: 11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) jotai: specifier: 2.10.1 - version: 2.10.1(@types/react@18.3.11)(react@18.3.1) + version: 2.10.1(@types/react@18.3.12)(react@18.3.1) lodash-es: specifier: 4.17.21 version: 4.17.21 @@ -921,13 +957,13 @@ importers: specifier: 1.6.5 version: 1.6.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-hook-form: - specifier: 7.53.0 - version: 7.53.0(react@18.3.1) + specifier: 7.53.1 + version: 7.53.1(react@18.3.1) react-i18next: - specifier: ^15.0.3 - version: 15.0.3(i18next@23.16.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^15.1.0 + version: 15.1.0(i18next@23.16.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) sonner: - specifier: ^1.5.0 + specifier: 1.5.0 version: 1.5.0(patch_hash=6s3tquyt5wnkqaogymn3mkivuq)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) use-context-selector: specifier: 2.0.0 @@ -957,11 +993,11 @@ importers: specifier: workspace:* version: link:../utils foxact: - specifier: 0.2.39 - version: 0.2.39(react@18.3.1) + specifier: 0.2.41 + version: 0.2.41(react@18.3.1) jotai: specifier: 2.10.1 - version: 2.10.1(@types/react@18.3.11)(react@18.3.1) + version: 2.10.1(@types/react@18.3.12)(react@18.3.1) lodash-es: specifier: 4.17.21 version: 4.17.21 @@ -978,8 +1014,8 @@ importers: packages/models: dependencies: '@auth/core': - specifier: 0.37.0 - version: 0.37.0 + specifier: 0.37.2 + version: 0.37.2 '@follow/shared': specifier: workspace:* version: link:../shared @@ -990,32 +1026,32 @@ importers: specifier: workspace:* version: link:../utils hono: - specifier: 4.6.5 - version: 4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy) + specifier: 4.6.8 + version: 4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24) packages/shared: dependencies: '@electron-toolkit/preload': specifier: ^3.0.1 - version: 3.0.1(electron@33.0.0) + version: 3.0.1(electron@33.0.2) '@electron-toolkit/tsconfig': specifier: ^1.0.1 - version: 1.0.1(@types/node@22.7.5) + version: 1.0.1(@types/node@22.8.7) '@hono/node-server': - specifier: ^1.13.2 - version: 1.13.2(hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy)) + specifier: ^1.13.4 + version: 1.13.4(hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24)) '@t3-oss/env-core': specifier: ^0.11.1 version: 0.11.1(typescript@5.6.3)(zod@3.23.8) drizzle-orm: specifier: ^0.34.1 - version: 0.34.1(@opentelemetry/api@1.9.0)(@types/pg@8.11.10)(@types/react@18.3.11)(react@18.3.1) + version: 0.34.1(@opentelemetry/api@1.9.0)(@types/pg@8.11.10)(@types/react@18.3.12)(react@18.3.1) electron: - specifier: ^33.0.0 - version: 33.0.0 + specifier: ^33.0.2 + version: 33.0.2 hono: - specifier: ^4.6.5 - version: 4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy) + specifier: ^4.6.8 + version: 4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24) react: specifier: ^18.3.1 version: 18.3.1 @@ -1023,7 +1059,7 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) sonner: - specifier: ^1.5.0 + specifier: 1.5.0 version: 1.5.0(patch_hash=6s3tquyt5wnkqaogymn3mkivuq)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) zod: specifier: ^3.23.8 @@ -1043,17 +1079,20 @@ importers: specifier: 2.1.1 version: 2.1.1 framer-motion: - specifier: 11.11.9 - version: 11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 11.11.11 + version: 11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) lodash-es: specifier: 4.17.21 version: 4.17.21 + nanoid: + specifier: 5.0.8 + version: 5.0.8 tailwind-merge: specifier: 2.5.4 version: 2.5.4 tldts: - specifier: 6.1.51 - version: 6.1.51 + specifier: 6.1.58 + version: 6.1.58 uniqolor: specifier: 1.1.1 version: 1.1.1 @@ -1080,8 +1119,8 @@ packages: '@antfu/utils@0.7.10': resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==} - '@auth/core@0.37.0': - resolution: {integrity: sha512-LybAgfFC5dta3Mu3al0UbnzMGVBpZRqLMvvXupQOfETtPNlL7rXgTO13EVRTCdvPqMQrVYjODUDvgVfQM1M3Qg==} + '@auth/core@0.37.2': + resolution: {integrity: sha512-kUvzyvkcd6h1vpeMAojK2y7+PAV5H+0Cc9+ZlKYDFhDY31AlvsB+GW5vNO4qE3Y07KeQgvNO9U0QUx/fN62kBw==} peerDependencies: '@simplewebauthn/browser': ^9.0.1 '@simplewebauthn/server': ^9.0.2 @@ -1102,6 +1141,10 @@ packages: resolution: {integrity: sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==} engines: {node: '>=6.9.0'} + '@babel/code-frame@7.26.2': + resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} + engines: {node: '>=6.9.0'} + '@babel/compat-data@7.25.4': resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==} engines: {node: '>=6.9.0'} @@ -1110,6 +1153,10 @@ packages: resolution: {integrity: sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==} engines: {node: '>=6.9.0'} + '@babel/compat-data@7.26.2': + resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} + engines: {node: '>=6.9.0'} + '@babel/core@7.25.2': resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==} engines: {node: '>=6.9.0'} @@ -1118,16 +1165,20 @@ packages: resolution: {integrity: sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==} engines: {node: '>=6.9.0'} - '@babel/generator@7.25.7': - resolution: {integrity: sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==} + '@babel/generator@7.26.2': + resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} engines: {node: '>=6.9.0'} '@babel/helper-annotate-as-pure@7.24.7': resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==} engines: {node: '>=6.9.0'} - '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7': - resolution: {integrity: sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==} + '@babel/helper-annotate-as-pure@7.25.9': + resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==} + engines: {node: '>=6.9.0'} + + '@babel/helper-builder-binary-assignment-operator-visitor@7.25.9': + resolution: {integrity: sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==} engines: {node: '>=6.9.0'} '@babel/helper-compilation-targets@7.25.2': @@ -1138,18 +1189,34 @@ packages: resolution: {integrity: sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==} engines: {node: '>=6.9.0'} + '@babel/helper-compilation-targets@7.25.9': + resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==} + engines: {node: '>=6.9.0'} + '@babel/helper-create-class-features-plugin@7.25.4': resolution: {integrity: sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + '@babel/helper-create-class-features-plugin@7.25.9': + resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + '@babel/helper-create-regexp-features-plugin@7.25.2': resolution: {integrity: sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + '@babel/helper-create-regexp-features-plugin@7.25.9': + resolution: {integrity: sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + '@babel/helper-define-polyfill-provider@0.6.2': resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==} peerDependencies: @@ -1159,6 +1226,10 @@ packages: resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==} engines: {node: '>=6.9.0'} + '@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.24.7': resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} engines: {node: '>=6.9.0'} @@ -1167,6 +1238,10 @@ packages: resolution: {integrity: sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==} engines: {node: '>=6.9.0'} + '@babel/helper-module-imports@7.25.9': + resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} + engines: {node: '>=6.9.0'} + '@babel/helper-module-transforms@7.25.2': resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==} engines: {node: '>=6.9.0'} @@ -1179,10 +1254,20 @@ packages: peerDependencies: '@babel/core': ^7.0.0 + '@babel/helper-module-transforms@7.26.0': + resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + '@babel/helper-optimise-call-expression@7.24.7': resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==} engines: {node: '>=6.9.0'} + '@babel/helper-optimise-call-expression@7.25.9': + resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==} + engines: {node: '>=6.9.0'} + '@babel/helper-plugin-utils@7.24.8': resolution: {integrity: sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==} engines: {node: '>=6.9.0'} @@ -1191,8 +1276,12 @@ packages: resolution: {integrity: sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==} engines: {node: '>=6.9.0'} - '@babel/helper-remap-async-to-generator@7.25.0': - resolution: {integrity: sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==} + '@babel/helper-plugin-utils@7.25.9': + resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-remap-async-to-generator@7.25.9': + resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -1203,6 +1292,12 @@ packages: peerDependencies: '@babel/core': ^7.0.0 + '@babel/helper-replace-supers@7.25.9': + resolution: {integrity: sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + '@babel/helper-simple-access@7.24.7': resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==} engines: {node: '>=6.9.0'} @@ -1211,18 +1306,34 @@ packages: resolution: {integrity: sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==} engines: {node: '>=6.9.0'} + '@babel/helper-simple-access@7.25.9': + resolution: {integrity: sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==} + engines: {node: '>=6.9.0'} + '@babel/helper-skip-transparent-expression-wrappers@7.24.7': resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==} engines: {node: '>=6.9.0'} + '@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.7': resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.25.9': + resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.25.7': resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==} engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.25.9': + resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-option@7.24.8': resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==} engines: {node: '>=6.9.0'} @@ -1231,8 +1342,12 @@ packages: resolution: {integrity: sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==} engines: {node: '>=6.9.0'} - '@babel/helper-wrap-function@7.25.0': - resolution: {integrity: sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==} + '@babel/helper-validator-option@7.25.9': + resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-wrap-function@7.25.9': + resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==} engines: {node: '>=6.9.0'} '@babel/helpers@7.25.0': @@ -1251,42 +1366,42 @@ packages: resolution: {integrity: sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==} engines: {node: '>=6.9.0'} - '@babel/parser@7.25.6': - resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} - engines: {node: '>=6.0.0'} - hasBin: true - '@babel/parser@7.25.8': resolution: {integrity: sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==} engines: {node: '>=6.0.0'} hasBin: true - '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3': - resolution: {integrity: sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==} + '@babel/parser@7.26.2': + resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} + engines: {node: '>=6.0.0'} + hasBin: true + + '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9': + resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.0': - resolution: {integrity: sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==} + '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9': + resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0': - resolution: {integrity: sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==} + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9': + resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7': - resolution: {integrity: sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==} + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9': + resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.13.0 - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.0': - resolution: {integrity: sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==} + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9': + resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -1304,92 +1419,14 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-async-generators@7.8.4': - resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-class-properties@7.12.13': - resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-class-static-block@7.14.5': - resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} + '@babel/plugin-syntax-import-assertions@7.26.0': + resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-dynamic-import@7.8.3': - resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-export-namespace-from@7.8.3': - resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-import-assertions@7.24.7': - resolution: {integrity: sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-import-attributes@7.24.7': - resolution: {integrity: sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-import-meta@7.10.4': - resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-json-strings@7.8.3': - resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-logical-assignment-operators@7.10.4': - resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3': - resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-numeric-separator@7.10.4': - resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-object-rest-spread@7.8.3': - resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-optional-catch-binding@7.8.3': - resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-optional-chaining@7.8.3': - resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-private-property-in-object@7.14.5': - resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-top-level-await@7.14.5': - resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} + '@babel/plugin-syntax-import-attributes@7.26.0': + resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -1406,224 +1443,230 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-async-generator-functions@7.25.4': - resolution: {integrity: sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==} + '@babel/plugin-transform-arrow-functions@7.25.9': + resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-async-to-generator@7.24.7': - resolution: {integrity: sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==} + '@babel/plugin-transform-async-generator-functions@7.25.9': + resolution: {integrity: sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-block-scoped-functions@7.24.7': - resolution: {integrity: sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==} + '@babel/plugin-transform-async-to-generator@7.25.9': + resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-block-scoping@7.25.0': - resolution: {integrity: sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==} + '@babel/plugin-transform-block-scoped-functions@7.25.9': + resolution: {integrity: sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-class-properties@7.25.4': - resolution: {integrity: sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==} + '@babel/plugin-transform-block-scoping@7.25.9': + resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-class-static-block@7.24.7': - resolution: {integrity: sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==} + '@babel/plugin-transform-class-properties@7.25.9': + resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-class-static-block@7.26.0': + resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.12.0 - '@babel/plugin-transform-classes@7.25.4': - resolution: {integrity: sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==} + '@babel/plugin-transform-classes@7.25.9': + resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-computed-properties@7.24.7': - resolution: {integrity: sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==} + '@babel/plugin-transform-computed-properties@7.25.9': + resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-destructuring@7.24.8': - resolution: {integrity: sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==} + '@babel/plugin-transform-destructuring@7.25.9': + resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-dotall-regex@7.24.7': - resolution: {integrity: sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==} + '@babel/plugin-transform-dotall-regex@7.25.9': + resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-duplicate-keys@7.24.7': - resolution: {integrity: sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==} + '@babel/plugin-transform-duplicate-keys@7.25.9': + resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.0': - resolution: {integrity: sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==} + '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9': + resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/plugin-transform-dynamic-import@7.24.7': - resolution: {integrity: sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==} + '@babel/plugin-transform-dynamic-import@7.25.9': + resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-exponentiation-operator@7.24.7': - resolution: {integrity: sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==} + '@babel/plugin-transform-exponentiation-operator@7.25.9': + resolution: {integrity: sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-export-namespace-from@7.24.7': - resolution: {integrity: sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==} + '@babel/plugin-transform-export-namespace-from@7.25.9': + resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-for-of@7.24.7': - resolution: {integrity: sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==} + '@babel/plugin-transform-for-of@7.25.9': + resolution: {integrity: sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-function-name@7.25.1': - resolution: {integrity: sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==} + '@babel/plugin-transform-function-name@7.25.9': + resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-json-strings@7.24.7': - resolution: {integrity: sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==} + '@babel/plugin-transform-json-strings@7.25.9': + resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-literals@7.25.2': - resolution: {integrity: sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==} + '@babel/plugin-transform-literals@7.25.9': + resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-logical-assignment-operators@7.24.7': - resolution: {integrity: sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==} + '@babel/plugin-transform-logical-assignment-operators@7.25.9': + resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-member-expression-literals@7.24.7': - resolution: {integrity: sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==} + '@babel/plugin-transform-member-expression-literals@7.25.9': + resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-modules-amd@7.24.7': - resolution: {integrity: sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==} + '@babel/plugin-transform-modules-amd@7.25.9': + resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-modules-commonjs@7.24.8': - resolution: {integrity: sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==} + '@babel/plugin-transform-modules-commonjs@7.25.9': + resolution: {integrity: sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-modules-systemjs@7.25.0': - resolution: {integrity: sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==} + '@babel/plugin-transform-modules-systemjs@7.25.9': + resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-modules-umd@7.24.7': - resolution: {integrity: sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==} + '@babel/plugin-transform-modules-umd@7.25.9': + resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-named-capturing-groups-regex@7.24.7': - resolution: {integrity: sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==} + '@babel/plugin-transform-named-capturing-groups-regex@7.25.9': + resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/plugin-transform-new-target@7.24.7': - resolution: {integrity: sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==} + '@babel/plugin-transform-new-target@7.25.9': + resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-nullish-coalescing-operator@7.24.7': - resolution: {integrity: sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==} + '@babel/plugin-transform-nullish-coalescing-operator@7.25.9': + resolution: {integrity: sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-numeric-separator@7.24.7': - resolution: {integrity: sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==} + '@babel/plugin-transform-numeric-separator@7.25.9': + resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-object-rest-spread@7.24.7': - resolution: {integrity: sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==} + '@babel/plugin-transform-object-rest-spread@7.25.9': + resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-object-super@7.24.7': - resolution: {integrity: sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==} + '@babel/plugin-transform-object-super@7.25.9': + resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-optional-catch-binding@7.24.7': - resolution: {integrity: sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==} + '@babel/plugin-transform-optional-catch-binding@7.25.9': + resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-optional-chaining@7.24.8': - resolution: {integrity: sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==} + '@babel/plugin-transform-optional-chaining@7.25.9': + resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-parameters@7.24.7': - resolution: {integrity: sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==} + '@babel/plugin-transform-parameters@7.25.9': + resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-private-methods@7.25.4': - resolution: {integrity: sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==} + '@babel/plugin-transform-private-methods@7.25.9': + resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-private-property-in-object@7.24.7': - resolution: {integrity: sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==} + '@babel/plugin-transform-private-property-in-object@7.25.9': + resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-property-literals@7.24.7': - resolution: {integrity: sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==} + '@babel/plugin-transform-property-literals@7.25.9': + resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -1640,74 +1683,80 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-regenerator@7.24.7': - resolution: {integrity: sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==} + '@babel/plugin-transform-regenerator@7.25.9': + resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-reserved-words@7.24.7': - resolution: {integrity: sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-shorthand-properties@7.24.7': - resolution: {integrity: sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-spread@7.24.7': - resolution: {integrity: sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-sticky-regex@7.24.7': - resolution: {integrity: sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-template-literals@7.24.7': - resolution: {integrity: sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-typeof-symbol@7.24.8': - resolution: {integrity: sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-escapes@7.24.7': - resolution: {integrity: sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-property-regex@7.24.7': - resolution: {integrity: sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-regex@7.24.7': - resolution: {integrity: sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-unicode-sets-regex@7.25.4': - resolution: {integrity: sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==} + '@babel/plugin-transform-regexp-modifiers@7.26.0': + resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/preset-env@7.25.4': - resolution: {integrity: sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==} + '@babel/plugin-transform-reserved-words@7.25.9': + resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-shorthand-properties@7.25.9': + resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-spread@7.25.9': + resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-sticky-regex@7.25.9': + resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-template-literals@7.25.9': + resolution: {integrity: sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-typeof-symbol@7.25.9': + resolution: {integrity: sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-unicode-escapes@7.25.9': + resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-unicode-property-regex@7.25.9': + resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-unicode-regex@7.25.9': + resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-unicode-sets-regex@7.25.9': + resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + + '@babel/preset-env@7.26.0': + resolution: {integrity: sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -1736,6 +1785,10 @@ packages: resolution: {integrity: sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==} engines: {node: '>=6.9.0'} + '@babel/template@7.25.9': + resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} + engines: {node: '>=6.9.0'} + '@babel/traverse@7.25.6': resolution: {integrity: sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==} engines: {node: '>=6.9.0'} @@ -1744,10 +1797,18 @@ packages: resolution: {integrity: sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==} engines: {node: '>=6.9.0'} + '@babel/traverse@7.25.9': + resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} + engines: {node: '>=6.9.0'} + '@babel/types@7.25.8': resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==} engines: {node: '>=6.9.0'} + '@babel/types@7.26.0': + resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} + engines: {node: '>=6.9.0'} + '@cfcs/core@0.0.6': resolution: {integrity: sha512-FxfJMwoLB8MEMConeXUCqtMGqxdtePQxRBOiGip9ULcYYam3WfCgoY6xdnMaSkYvRvmosp5iuG+TiPofm65+Pw==} @@ -1771,6 +1832,10 @@ packages: conventional-commits-parser: optional: true + '@cspotcode/source-map-support@0.8.1': + resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} + engines: {node: '>=12'} + '@daybrush/utils@1.13.0': resolution: {integrity: sha512-ALK12C6SQNNHw1enXK+UO8bdyQ+jaWNQ1Af7Z3FNxeAwjYhQT7do+TRE4RASAJ3ObaS2+TJ7TXR3oz2Gzbw0PQ==} @@ -1778,6 +1843,42 @@ packages: resolution: {integrity: sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==} engines: {node: '>= 8.9.0'} + '@dnd-kit/accessibility@3.1.0': + resolution: {integrity: sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==} + peerDependencies: + react: '>=16.8.0' + + '@dnd-kit/core@6.1.0': + resolution: {integrity: sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==} + peerDependencies: + react: '>=16.8.0' + react-dom: '>=16.8.0' + + '@dnd-kit/utilities@3.2.2': + resolution: {integrity: sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==} + peerDependencies: + react: '>=16.8.0' + + '@edge-runtime/format@2.2.1': + resolution: {integrity: sha512-JQTRVuiusQLNNLe2W9tnzBlV/GvSVcozLl4XZHk5swnRZ/v6jp8TqR8P7sqmJsQqblDZ3EztcWmLDbhRje/+8g==} + engines: {node: '>=16'} + + '@edge-runtime/node-utils@2.3.0': + resolution: {integrity: sha512-uUtx8BFoO1hNxtHjp3eqVPC/mWImGb2exOfGjMLUoipuWgjej+f4o/VP4bUI8U40gu7Teogd5VTeZUkGvJSPOQ==} + engines: {node: '>=16'} + + '@edge-runtime/ponyfill@2.4.2': + resolution: {integrity: sha512-oN17GjFr69chu6sDLvXxdhg0Qe8EZviGSuqzR9qOiKh4MhFYGdBBcqRNzdmYeAdeRzOW2mM9yil4RftUQ7sUOA==} + engines: {node: '>=16'} + + '@edge-runtime/primitives@4.1.0': + resolution: {integrity: sha512-Vw0lbJ2lvRUqc7/soqygUX216Xb8T3WBZ987oywz6aJqRxcwSVWwr9e+Nqo2m9bxobA9mdbWNNoRY6S9eko1EQ==} + engines: {node: '>=16'} + + '@edge-runtime/vm@3.2.0': + resolution: {integrity: sha512-0dEVyRLM/lG4gp1R/Ik5bfPl/1wX00xFwd5KcNH602tzBa09oF7pbTKETEhR1GjZ75K6OJnYFu8II2dyMhONMw==} + engines: {node: '>=16'} + '@egjs/children-differ@1.0.1': resolution: {integrity: sha512-DRvyqMf+CPCOzAopQKHtW+X8iN6Hy6SFol+/7zCUiE5y4P/OB8JP8FtU4NxtZwtafvSL4faD5KoQYPj3JHzPFQ==} @@ -1982,8 +2083,8 @@ packages: '@emotion/memoize@0.9.0': resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==} - '@eneris/push-receiver@4.2.0': - resolution: {integrity: sha512-OGc4dUcy9yvKTIShOpBVHsYGEC7qRo6JNRRlsL7kaa3/uJSJyRoLOUdKsTqH8q76qldViXb8mEdOzCGv8wwK4A==} + '@eneris/push-receiver@4.3.0': + resolution: {integrity: sha512-COn7fZIh1P+3FYEpE87E2KoACW/gYTxwURykYqQ1lKMO1O/vdfrWP4ECsew/Kto9Mec34J46hvD5I/2nNa8kfA==} engines: {node: '>=20'} '@es-joy/jsdoccomment@0.48.0': @@ -2002,6 +2103,12 @@ packages: cpu: [ppc64] os: [aix] + '@esbuild/aix-ppc64@0.24.0': + resolution: {integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [aix] + '@esbuild/android-arm64@0.21.5': resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} engines: {node: '>=12'} @@ -2014,6 +2121,12 @@ packages: cpu: [arm64] os: [android] + '@esbuild/android-arm64@0.24.0': + resolution: {integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==} + engines: {node: '>=18'} + cpu: [arm64] + os: [android] + '@esbuild/android-arm@0.21.5': resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} engines: {node: '>=12'} @@ -2026,6 +2139,12 @@ packages: cpu: [arm] os: [android] + '@esbuild/android-arm@0.24.0': + resolution: {integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==} + engines: {node: '>=18'} + cpu: [arm] + os: [android] + '@esbuild/android-x64@0.21.5': resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} engines: {node: '>=12'} @@ -2038,6 +2157,12 @@ packages: cpu: [x64] os: [android] + '@esbuild/android-x64@0.24.0': + resolution: {integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [android] + '@esbuild/darwin-arm64@0.21.5': resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} engines: {node: '>=12'} @@ -2050,6 +2175,12 @@ packages: cpu: [arm64] os: [darwin] + '@esbuild/darwin-arm64@0.24.0': + resolution: {integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [darwin] + '@esbuild/darwin-x64@0.21.5': resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} engines: {node: '>=12'} @@ -2062,6 +2193,12 @@ packages: cpu: [x64] os: [darwin] + '@esbuild/darwin-x64@0.24.0': + resolution: {integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==} + engines: {node: '>=18'} + cpu: [x64] + os: [darwin] + '@esbuild/freebsd-arm64@0.21.5': resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} engines: {node: '>=12'} @@ -2074,6 +2211,12 @@ packages: cpu: [arm64] os: [freebsd] + '@esbuild/freebsd-arm64@0.24.0': + resolution: {integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==} + engines: {node: '>=18'} + cpu: [arm64] + os: [freebsd] + '@esbuild/freebsd-x64@0.21.5': resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} engines: {node: '>=12'} @@ -2086,6 +2229,12 @@ packages: cpu: [x64] os: [freebsd] + '@esbuild/freebsd-x64@0.24.0': + resolution: {integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [freebsd] + '@esbuild/linux-arm64@0.21.5': resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} engines: {node: '>=12'} @@ -2098,6 +2247,12 @@ packages: cpu: [arm64] os: [linux] + '@esbuild/linux-arm64@0.24.0': + resolution: {integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==} + engines: {node: '>=18'} + cpu: [arm64] + os: [linux] + '@esbuild/linux-arm@0.21.5': resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} engines: {node: '>=12'} @@ -2110,6 +2265,12 @@ packages: cpu: [arm] os: [linux] + '@esbuild/linux-arm@0.24.0': + resolution: {integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==} + engines: {node: '>=18'} + cpu: [arm] + os: [linux] + '@esbuild/linux-ia32@0.21.5': resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} engines: {node: '>=12'} @@ -2122,6 +2283,12 @@ packages: cpu: [ia32] os: [linux] + '@esbuild/linux-ia32@0.24.0': + resolution: {integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==} + engines: {node: '>=18'} + cpu: [ia32] + os: [linux] + '@esbuild/linux-loong64@0.21.5': resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} engines: {node: '>=12'} @@ -2134,6 +2301,12 @@ packages: cpu: [loong64] os: [linux] + '@esbuild/linux-loong64@0.24.0': + resolution: {integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==} + engines: {node: '>=18'} + cpu: [loong64] + os: [linux] + '@esbuild/linux-mips64el@0.21.5': resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} engines: {node: '>=12'} @@ -2146,6 +2319,12 @@ packages: cpu: [mips64el] os: [linux] + '@esbuild/linux-mips64el@0.24.0': + resolution: {integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==} + engines: {node: '>=18'} + cpu: [mips64el] + os: [linux] + '@esbuild/linux-ppc64@0.21.5': resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} engines: {node: '>=12'} @@ -2158,6 +2337,12 @@ packages: cpu: [ppc64] os: [linux] + '@esbuild/linux-ppc64@0.24.0': + resolution: {integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [linux] + '@esbuild/linux-riscv64@0.21.5': resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} engines: {node: '>=12'} @@ -2170,6 +2355,12 @@ packages: cpu: [riscv64] os: [linux] + '@esbuild/linux-riscv64@0.24.0': + resolution: {integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==} + engines: {node: '>=18'} + cpu: [riscv64] + os: [linux] + '@esbuild/linux-s390x@0.21.5': resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} engines: {node: '>=12'} @@ -2182,6 +2373,12 @@ packages: cpu: [s390x] os: [linux] + '@esbuild/linux-s390x@0.24.0': + resolution: {integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==} + engines: {node: '>=18'} + cpu: [s390x] + os: [linux] + '@esbuild/linux-x64@0.21.5': resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} engines: {node: '>=12'} @@ -2194,6 +2391,12 @@ packages: cpu: [x64] os: [linux] + '@esbuild/linux-x64@0.24.0': + resolution: {integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==} + engines: {node: '>=18'} + cpu: [x64] + os: [linux] + '@esbuild/netbsd-x64@0.21.5': resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} engines: {node: '>=12'} @@ -2206,12 +2409,24 @@ packages: cpu: [x64] os: [netbsd] + '@esbuild/netbsd-x64@0.24.0': + resolution: {integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==} + engines: {node: '>=18'} + cpu: [x64] + os: [netbsd] + '@esbuild/openbsd-arm64@0.23.1': resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] + '@esbuild/openbsd-arm64@0.24.0': + resolution: {integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + '@esbuild/openbsd-x64@0.21.5': resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} engines: {node: '>=12'} @@ -2224,6 +2439,12 @@ packages: cpu: [x64] os: [openbsd] + '@esbuild/openbsd-x64@0.24.0': + resolution: {integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==} + engines: {node: '>=18'} + cpu: [x64] + os: [openbsd] + '@esbuild/sunos-x64@0.21.5': resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} engines: {node: '>=12'} @@ -2236,6 +2457,12 @@ packages: cpu: [x64] os: [sunos] + '@esbuild/sunos-x64@0.24.0': + resolution: {integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==} + engines: {node: '>=18'} + cpu: [x64] + os: [sunos] + '@esbuild/win32-arm64@0.21.5': resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} engines: {node: '>=12'} @@ -2248,6 +2475,12 @@ packages: cpu: [arm64] os: [win32] + '@esbuild/win32-arm64@0.24.0': + resolution: {integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==} + engines: {node: '>=18'} + cpu: [arm64] + os: [win32] + '@esbuild/win32-ia32@0.21.5': resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} engines: {node: '>=12'} @@ -2260,6 +2493,12 @@ packages: cpu: [ia32] os: [win32] + '@esbuild/win32-ia32@0.24.0': + resolution: {integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==} + engines: {node: '>=18'} + cpu: [ia32] + os: [win32] + '@esbuild/win32-x64@0.21.5': resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} engines: {node: '>=12'} @@ -2272,6 +2511,12 @@ packages: cpu: [x64] os: [win32] + '@esbuild/win32-x64@0.24.0': + resolution: {integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==} + engines: {node: '>=18'} + cpu: [x64] + os: [win32] + '@eslint-community/eslint-utils@4.4.0': resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -2282,6 +2527,10 @@ packages: resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + '@eslint-community/regexpp@4.12.1': + resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + '@eslint-react/ast@1.15.2': resolution: {integrity: sha512-Dtn6Ai/P74CLoZ4mPR/9Mm4xXuulXULaXNXAzusZSNfa3+4podw6LCxKHpLcLqsvfZN3mciW3cC8CAyH7/MZwg==} @@ -2333,6 +2582,10 @@ packages: resolution: {integrity: sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/js@9.14.0': + resolution: {integrity: sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/object-schema@2.1.4': resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2356,6 +2609,10 @@ packages: '@fastify/ajv-compiler@4.0.1': resolution: {integrity: sha512-DxrBdgsjNLP0YM6W5Hd6/Fmj43S8zMKiFJYgi+Ri3htTGAowPVG/tG1wpnWLMjufEnehRivUCKZ1pLDIoZdTuw==} + '@fastify/busboy@2.1.1': + resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==} + engines: {node: '>=14'} + '@fastify/error@4.0.0': resolution: {integrity: sha512-OO/SA8As24JtT1usTUTKgGH7uLvhfwZPwlptRi2Dp5P4KKmJI3gvsZ8MIHnNwDs4sLf/aai5LzTyl66xr7qMxA==} @@ -2617,38 +2874,38 @@ packages: engines: {node: '>=6'} hasBin: true - '@headlessui/react@2.1.10': - resolution: {integrity: sha512-6mLa2fjMDAFQi+/R10B+zU3edsUk/MDtENB2zHho0lqKU1uzhAfJLUduWds4nCo8wbl3vULtC5rJfZAQ1yqIng==} + '@headlessui/react@2.2.0': + resolution: {integrity: sha512-RzCEg+LXsuI7mHiSomsu/gBJSjpupm6A1qIZ5sWjd7JhARNlMiSA4kKfJpCKwU9tE+zMRterhhrP74PvfJrpXQ==} engines: {node: '>=10'} peerDependencies: - react: ^18 - react-dom: ^18 + react: ^18 || ^19 || ^19.0.0-rc + react-dom: ^18 || ^19 || ^19.0.0-rc - '@hono/auth-js@1.0.11': - resolution: {integrity: sha512-eF5GTIVfwjWTx2YeWMGuEfI6Sgo68aTZP+B0q94Dj0HStF3lGvS0dQhW7D+nYLUQFZ8U6tUt5Nm4UYzodcgDLQ==} + '@hono/auth-js@1.0.13': + resolution: {integrity: sha512-EDA7zm6WBtP+TEv42WmaXFHZl23/4v7OxNE/9ipBxFtIMlgdrbjpOgQw91c868LenCjleuQfD3hyIjen7SnWxA==} engines: {node: '>=18.4.0'} peerDependencies: '@auth/core': 0.* hono: '>=3.*' react: '>=18' - '@hono/node-server@1.13.2': - resolution: {integrity: sha512-0w8nEmAyx0Ul0CQp8BL2VtAG4YVdpzXd/mvvM+l0G5Oq22pUyHS+KeFFPSY+czLOF5NAiV3MUNPD1n14Ol5svg==} + '@hono/node-server@1.13.4': + resolution: {integrity: sha512-3tW9lC0+2mRmoGUEnq0d8Pi3SToWjg8flM9Z+h5Aamy23jjpiFr7n3/HLqXve6EudOsgN2tG2hZusqzNYVRmRw==} engines: {node: '>=18.14.1'} peerDependencies: hono: ^4 - '@hookform/resolvers@3.9.0': - resolution: {integrity: sha512-bU0Gr4EepJ/EQsH/IwEzYLsT/PEj5C0ynLQ4m+GSHS+xKH4TfSelhluTgOaoc4kA5s7eCsQbM4wvZLzELmWzUg==} + '@hookform/resolvers@3.9.1': + resolution: {integrity: sha512-ud2HqmGBM0P0IABqoskKWI6PEf6ZDDBZkFqe2Vnl+mTHCEHzr3ISjjZyCwTjC/qpL25JC9aIDkloQejvMeq0ug==} peerDependencies: react-hook-form: ^7.0.0 - '@humanfs/core@0.19.0': - resolution: {integrity: sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==} + '@humanfs/core@0.19.1': + resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} - '@humanfs/node@0.16.5': - resolution: {integrity: sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==} + '@humanfs/node@0.16.6': + resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==} engines: {node: '>=18.18.0'} '@humanwhocodes/module-importer@1.0.1': @@ -2659,6 +2916,10 @@ packages: resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==} engines: {node: '>=18.18'} + '@humanwhocodes/retry@0.4.0': + resolution: {integrity: sha512-xnRgu9DxZbkWak/te3fcytNyp8MTbuiZIaueg2rgEvBuN55n04nwLYLU9TX/VVlusc9L2ZNXi99nUFNkHXtr5g==} + engines: {node: '>=18.18'} + '@hutson/parse-repository-url@5.0.0': resolution: {integrity: sha512-e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg==} engines: {node: '>=10.13.0'} @@ -2669,8 +2930,8 @@ packages: '@iconify-json/mingcute@1.2.1': resolution: {integrity: sha512-rv682dBsjKUs1/AVg5tOegAunjCLuqyQufXU0D6Kbmgg5jMoUcl/9K2C+9MAiepBP0Eyb05YwXQvGaXMLPu/YA==} - '@iconify-json/simple-icons@1.2.8': - resolution: {integrity: sha512-AzBpj2XAcWQbiy3i0rLq6lFw0pLT8lc/ptdsBc97N8KFKyXW4d62EK/EhAd82Ld0WsO+1exOvnfeIiX2FPsdzw==} + '@iconify-json/simple-icons@1.2.10': + resolution: {integrity: sha512-9OK1dsSjXlH36lhu5n+BlSoXuqFjHUErGLtNdzHpq0vHq4YFBuGYWtZ+vZTHLreRQ8ijPRv/6EsgkV+nf6AReQ==} '@iconify/tools@4.0.7': resolution: {integrity: sha512-zOJxKIfZn96ZRGGvIWzDRLD9vb2CsxjcLuM+QIdvwWbv6SWhm49gECzUnd4d2P0sq9sfodT7yCNobWK8nvavxQ==} @@ -2715,14 +2976,17 @@ packages: '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} - '@lottiefiles/dotlottie-react@0.9.1': - resolution: {integrity: sha512-2KAbT0sUu3fwbjTk1cfny9tVFg/8FTaitz64Dft+QV/Du6VHxWy3I1H83///UzAAU+rbbEN2Vn9s6GpuokJEAQ==} + '@jridgewell/trace-mapping@0.3.9': + resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} + + '@lottiefiles/dotlottie-react@0.9.3': + resolution: {integrity: sha512-x4xQlFFulAF/nG044VNMwaXWk8ehg/KEHXpMxGB+L5gv3qohjxv/I7/erHyfhWY9y6C/VMl+PiWZbT54W8+lUQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - '@lottiefiles/dotlottie-web@0.35.0': - resolution: {integrity: sha512-dXyQzNGaNOovJ23skUaLs0RU1Hpr+e4JKCBW4Wq/HTVnTCqfhV4uYaG1lLloZy50QdPsUB3UyIgd656pcQwTQA==} + '@lottiefiles/dotlottie-web@0.36.1': + resolution: {integrity: sha512-KvxOH5Msk0Ivqpgq4p1DGo1IG2XPX4kEVkhssTaOUEvoeCxDLru+DlbUzwG8b5JcJwEBmrAMzCNzCTmn+uMFxQ==} '@malept/cross-spawn-promise@1.1.1': resolution: {integrity: sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==} @@ -2736,8 +3000,12 @@ packages: resolution: {integrity: sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==} engines: {node: '>= 10.0.0'} - '@microflash/remark-callout-directives@4.3.1': - resolution: {integrity: sha512-ZCS8+6ykJ4AqKPi6w1q3oV8RnRkaU+jOyT8b8LcvF1sNe9aufqgkInXvE93lrYyD7+04cVtmdtiUa07dI7KTNA==} + '@mapbox/node-pre-gyp@1.0.11': + resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} + hasBin: true + + '@microflash/remark-callout-directives@4.3.2': + resolution: {integrity: sha512-RWb9gS5bPMLN7CkBpPrbh6jP4yEzHleF0QHTxE748nh53b4I/YyBchORLchX8OxNdUmXbNa2bazvfv80tgbF7Q==} '@mozilla/readability@0.5.0': resolution: {integrity: sha512-Z+CZ3QaosfFaTqvhQsIktyGrjFjSC0Fa4EMph4mqKnWhmyoGICsV/8QK+8HpXut6zV7zwfWwqDmEjtk1Qf6EgQ==} @@ -2917,14 +3185,14 @@ packages: peerDependencies: '@opentelemetry/api': ^1.3.0 - '@opentelemetry/instrumentation-express@0.42.0': - resolution: {integrity: sha512-YNcy7ZfGnLsVEqGXQPT+S0G1AE46N21ORY7i7yUQyfhGAL4RBjnZUqefMI0NwqIl6nGbr1IpF0rZGoN8Q7x12Q==} + '@opentelemetry/instrumentation-express@0.43.0': + resolution: {integrity: sha512-bxTIlzn9qPXJgrhz8/Do5Q3jIlqfpoJrSUtVGqH+90eM1v2PkPHc+SdE+zSqe4q9Y1UQJosmZ4N4bm7Zj/++MA==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.3.0 - '@opentelemetry/instrumentation-fastify@0.39.0': - resolution: {integrity: sha512-SS9uSlKcsWZabhBp2szErkeuuBDgxOUlllwkS92dVaWRnMmwysPhcEgHKB8rUe3BHg/GnZC1eo1hbTZv4YhfoA==} + '@opentelemetry/instrumentation-fastify@0.40.0': + resolution: {integrity: sha512-74qj4nG3zPtU7g2x4sm2T4R3/pBMyrYstTsqSZwdlhQk1SD4l8OSY9sPRX1qkhfxOuW3U4KZQAV/Cymb3fB6hg==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.3.0 @@ -3125,9 +3393,6 @@ packages: '@radix-ui/number@1.1.0': resolution: {integrity: sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==} - '@radix-ui/primitive@1.0.1': - resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==} - '@radix-ui/primitive@1.1.0': resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==} @@ -3147,8 +3412,8 @@ packages: '@radix-ui/react-avatar@1.1.1': resolution: {integrity: sha512-eoOtThOmxeoizxpX6RiEsQZ2wj5r4+zoeqAwO0cBaFQGjJwIH3dIX0OCxNrCyrrdxG+vBweMETh3VziQG7c1kw==} peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' + '@types/react': npm:types-react@19.0.0-rc.1 + '@types/react-dom': npm:types-react-dom@19.0.0-rc.1 react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc peerDependenciesMeta: @@ -3183,15 +3448,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-compose-refs@1.0.1': - resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-compose-refs@1.1.0': resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==} peerDependencies: @@ -3214,15 +3470,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-context@1.0.1': - resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-context@1.1.0': resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==} peerDependencies: @@ -3241,19 +3488,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-dialog@1.0.5': - resolution: {integrity: sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-dialog@1.1.2': resolution: {integrity: sha512-Yj4dZtqa2o+kG61fzB0H2qUvmwBA2oyQroGLyNtBj1beo1khoQ3q1a2AO8rrQYjd8256CO9+N8L9tvsS+bnIyA==} peerDependencies: @@ -3276,19 +3510,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-dismissable-layer@1.0.5': - resolution: {integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-dismissable-layer@1.1.1': resolution: {integrity: sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==} peerDependencies: @@ -3315,15 +3536,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-focus-guards@1.0.1': - resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-focus-guards@1.1.1': resolution: {integrity: sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==} peerDependencies: @@ -3333,19 +3545,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-focus-scope@1.0.4': - resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-focus-scope@1.1.0': resolution: {integrity: sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==} peerDependencies: @@ -3372,15 +3571,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-id@1.0.1': - resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-id@1.1.0': resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==} peerDependencies: @@ -3455,19 +3645,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-portal@1.0.4': - resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-portal@1.1.2': resolution: {integrity: sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==} peerDependencies: @@ -3481,19 +3658,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-presence@1.0.1': - resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-presence@1.1.1': resolution: {integrity: sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==} peerDependencies: @@ -3507,19 +3671,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-primitive@1.0.3': - resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-primitive@2.0.0': resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==} peerDependencies: @@ -3598,15 +3749,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-slot@1.0.2': - resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-slot@1.1.0': resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==} peerDependencies: @@ -3668,15 +3810,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-use-callback-ref@1.0.1': - resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-callback-ref@1.1.0': resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==} peerDependencies: @@ -3686,15 +3819,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-use-controllable-state@1.0.1': - resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-controllable-state@1.1.0': resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==} peerDependencies: @@ -3704,15 +3828,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-use-escape-keydown@1.0.3': - resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-escape-keydown@1.1.0': resolution: {integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==} peerDependencies: @@ -3722,15 +3837,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-use-layout-effect@1.0.1': - resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-use-layout-effect@1.1.0': resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==} peerDependencies: @@ -3929,6 +4035,19 @@ packages: resolution: {integrity: sha512-xBaJish5OeGmniDj9cW5PRa/PtmuVU3ziqrbr5xJj901ZDN4TosrVaNZpEiLZAxdfnhAe7uQ7QFWfjPe9d9K2Q==} engines: {node: '>= 10'} + '@rollup/pluginutils@4.2.1': + resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} + engines: {node: '>= 8.0.0'} + + '@rollup/pluginutils@5.1.3': + resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + '@rollup/rollup-android-arm-eabi@4.24.0': resolution: {integrity: sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==} cpu: [arm] @@ -4018,52 +4137,52 @@ packages: '@scena/matrix@1.1.1': resolution: {integrity: sha512-JVKBhN0tm2Srl+Yt+Ywqu0oLgLcdemDQlD1OxmN9jaCTwaFPZ7tY8n6dhVgMEaR9qcR7r+kAlMXnSfNyYdE+Vg==} - '@sentry-internal/browser-utils@8.33.1': - resolution: {integrity: sha512-TW6/r+Gl5jiXv54iK1xZ3mlVgTS/jaBp4vcQ0xGMdgiQ3WchEPcFSeYovL+YHT3tSud0GZqVtDQCz+5i76puqA==} + '@sentry-internal/browser-utils@8.35.0': + resolution: {integrity: sha512-uj9nwERm7HIS13f/Q52hF/NUS5Al8Ma6jkgpfYGeppYvU0uSjPkwMogtqoJQNbOoZg973tV8qUScbcWY616wNA==} engines: {node: '>=14.18'} - '@sentry-internal/browser-utils@8.34.0': - resolution: {integrity: sha512-4AcYOzPzD1tL5eSRQ/GpKv5enquZf4dMVUez99/Bh3va8qiJrNP55AcM7UzZ7WZLTqKygIYruJTU5Zu2SpEAPQ==} + '@sentry-internal/browser-utils@8.36.0': + resolution: {integrity: sha512-AVJ9GmQW7jYxaal6hjQnnktsDNype01ajVC4q1RyOn1SfzSnXg6mXwj4xm4ovuJV+aBI7fAZJ55vEX5ASuP0ZA==} engines: {node: '>=14.18'} - '@sentry-internal/feedback@8.33.1': - resolution: {integrity: sha512-qauMRTm3qDaLqZ3ibI03cj4gLF40y0ij65nj+cns6iWxGCtPrO8tjvXFWuQsE7Aye9dGMnBgmv7uN+NTUtC3RA==} + '@sentry-internal/feedback@8.35.0': + resolution: {integrity: sha512-7bjSaUhL0bDArozre6EiIhhdWdT/1AWNWBC1Wc5w1IxEi5xF7nvF/FfvjQYrONQzZAI3HRxc45J2qhLUzHBmoQ==} engines: {node: '>=14.18'} - '@sentry-internal/feedback@8.34.0': - resolution: {integrity: sha512-aYSM2KPUs0FLPxxbJCFSwCYG70VMzlT04xepD1Y/tTlPPOja/02tSv2tyOdZbv8Uw7xslZs3/8Lhj74oYcTBxw==} + '@sentry-internal/feedback@8.36.0': + resolution: {integrity: sha512-aAMTm3uDBj8Ta7FwoohpLmJOpWzpWXvvtTbtmSgkeCtPJLUS8DZDCTZ9uCILUkpuYrv2savRUHsdPkxNjgL8FA==} engines: {node: '>=14.18'} - '@sentry-internal/replay-canvas@8.33.1': - resolution: {integrity: sha512-nsxTFTPCT10Ty/v6+AiST3+yotGP1sUb8xqfKB9fPnS1hZHFryp0NnEls7xFjBsBbZPU1GpFkzrk/E6JFzixDQ==} + '@sentry-internal/replay-canvas@8.35.0': + resolution: {integrity: sha512-TUrH6Piv19kvHIiRyIuapLdnuwxk/Un/l1WDCQfq7mK9p1Pac0FkQ7Uufjp6zY3lyhDDZQ8qvCS4ioCMibCwQg==} engines: {node: '>=14.18'} - '@sentry-internal/replay-canvas@8.34.0': - resolution: {integrity: sha512-x8KhZcCDpbKHqFOykYXiamX6x0LRxv6N1OJHoH+XCrMtiDBZr4Yo30d/MaS6rjmKGMtSRij30v+Uq+YWIgxUrg==} + '@sentry-internal/replay-canvas@8.36.0': + resolution: {integrity: sha512-KJPLf+qYdrQdmouoAqIPZ2KeapIBlHWbzNdQqNxJFWLHFFjpLUtt0b+87ruvbA/q3NYy2fDwD7EB0tGS1RHBaA==} engines: {node: '>=14.18'} - '@sentry-internal/replay@8.33.1': - resolution: {integrity: sha512-fm4coIOjmanU29NOVN9MyaP4fUCOYytbtFqVSKRFNZQ/xAgNeySiBIbUd6IjujMmnOk9bY0WEUMcdm3Uotjdog==} + '@sentry-internal/replay@8.35.0': + resolution: {integrity: sha512-3wkW03vXYMyWtTLxl9yrtkV+qxbnKFgfASdoGWhXzfLjycgT6o4/04eb3Gn71q9aXqRwH17ISVQbVswnRqMcmA==} engines: {node: '>=14.18'} - '@sentry-internal/replay@8.34.0': - resolution: {integrity: sha512-EoMh9NYljNewZK1quY23YILgtNdGgrkzJ9TPsj6jXUG0LZ0Q7N7eFWd0xOEDBvFxrmI3cSXF1i4d1sBb+eyKRw==} + '@sentry-internal/replay@8.36.0': + resolution: {integrity: sha512-lbic98GsSkDeinQDix54tBFEgHUlmBtO+HjXECk9jIE0vOzR4As20/s5ta46t1rKMLlnxOtJuT5jKXeUYogBUw==} engines: {node: '>=14.18'} - '@sentry/babel-plugin-component-annotate@2.22.5': - resolution: {integrity: sha512-+93qwB9vTX1nj4hD8AMWowXZsZVkvmP9OwTqSh5d4kOeiJ+dZftUk4+FKeKkAX9lvY2reyHV8Gms5mo67c27RQ==} + '@sentry/babel-plugin-component-annotate@2.22.6': + resolution: {integrity: sha512-V2g1Y1I5eSe7dtUVMBvAJr8BaLRr4CLrgNgtPaZyMT4Rnps82SrZ5zqmEkLXPumlXhLUWR6qzoMNN2u+RXVXfQ==} engines: {node: '>= 14'} - '@sentry/browser@8.33.1': - resolution: {integrity: sha512-c6zI/igexkLwZuGk+u8Rj26ChjxGgkhe6ZbKFsXCYaKAp5ep5X7HQRkkqgbxApiqlC0LduHdd/ymzh139JLg8w==} + '@sentry/browser@8.35.0': + resolution: {integrity: sha512-WHfI+NoZzpCsmIvtr6ChOe7yWPLQyMchPnVhY3Z4UeC70bkYNdKcoj/4XZbX3m0D8+71JAsm0mJ9s9OC3Ue6MQ==} engines: {node: '>=14.18'} - '@sentry/browser@8.34.0': - resolution: {integrity: sha512-3HHG2NXxzHq1lVmDy2uRjYjGNf9NsJsTPlOC70vbQdOb+S49EdH/XMPy+J3ruIoyv6Cu0LwvA6bMOM6rHZOgNQ==} + '@sentry/browser@8.36.0': + resolution: {integrity: sha512-bLrQNe+wD4DkCfB8OD5TF3Rr8KA2+aTo5wF3t3Bf6KVn8//iX1ia1hhtptYiRnbRkG/0AEPxlqL6XfPZYVPQ5A==} engines: {node: '>=14.18'} - '@sentry/bundler-plugin-core@2.22.5': - resolution: {integrity: sha512-nfvTthV0aNM9/MwgnCi1WjAlCtau1I4kw6+oZIDOwJRDqGNziz517mYRXSsvCUebtGxDZtPcF7hSEBMSHjpncA==} + '@sentry/bundler-plugin-core@2.22.6': + resolution: {integrity: sha512-1esQdgSUCww9XAntO4pr7uAM5cfGhLsgTK9MEwAKNfvpMYJi9NUTYa3A7AZmdA8V6107Lo4OD7peIPrDRbaDCg==} engines: {node: '>= 14'} '@sentry/cli-darwin@2.37.0': @@ -4112,23 +4231,23 @@ packages: engines: {node: '>= 10'} hasBin: true - '@sentry/core@8.33.1': - resolution: {integrity: sha512-3SS41suXLFzxL3OQvTMZ6q92ZapELVq2l2SoWlZopcamWhog2Ru0dp2vkunq97kFHb2TzKRTlFH4+4gbT8SJug==} + '@sentry/core@8.35.0': + resolution: {integrity: sha512-Ci0Nmtw5ETWLqQJGY4dyF+iWh7PWKy6k303fCEoEmqj2czDrKJCp7yHBNV0XYbo00prj2ZTbCr6I7albYiyONA==} engines: {node: '>=14.18'} - '@sentry/core@8.34.0': - resolution: {integrity: sha512-adrXCTK/zsg5pJ67lgtZqdqHvyx6etMjQW3P82NgWdj83c8fb+zH+K79Z47pD4zQjX0ou2Ws5nwwi4wJbz4bfA==} + '@sentry/core@8.36.0': + resolution: {integrity: sha512-cbq1WQyRqc/+YpPhjwQxfniUM3ZxmO3Pm1oisTB8dw6mlbgQfGD6aznEIjXWWJY6k6acewJlMUx09N7DnprtBw==} engines: {node: '>=14.18'} - '@sentry/electron@5.6.0': - resolution: {integrity: sha512-nRxrij5S6NAQtKanGgSmR6If00ra0s4Kg+Posm5XbzKxA/KnnfretECW+Vf+HqwefcusuPtySuI/I+AqRKkFMg==} + '@sentry/electron@5.7.0': + resolution: {integrity: sha512-3Zq9TB9gWoZOIjPXD2msbEb8itS1Tu/+Dr47tweSuhbQDG/vVsVxOyKBqnt+xNdqjgbf/F2avfLwSjk0fa+gsg==} - '@sentry/node@8.33.1': - resolution: {integrity: sha512-0Xmlrl5nU5Bx6YybaIfztyOIiIXW5X64vcK0u94Sg4uHcDO7YvEbhflKjp669ds2I6ZQ/czqxnaAY8gM6P2SCA==} + '@sentry/node@8.35.0': + resolution: {integrity: sha512-B0FLOcZEfYe3CJ2t0l1N0HJcHXcIrLlGENQ2kf5HqR2zcOcOzRxyITJTSV5brCnmzVNgkz9PG8VWo3w0HXZQpA==} engines: {node: '>=14.18'} - '@sentry/opentelemetry@8.33.1': - resolution: {integrity: sha512-D2aE2G0DUHLLnfbOXrTjiNJKAs/RZfOBJMidI4fC2AIwqCmrp55Aex4dRq4hxd8MPLR92Kt/ikHeJxlzWB15KA==} + '@sentry/opentelemetry@8.35.0': + resolution: {integrity: sha512-2mWMpEiIFop/omia9BqTJa+0Khe+tSsiZSUrxbnSpxM0zgw8DFIzJMHbiqw/I7Qaluz9pnO2HZXqgUTwNPsU8A==} engines: {node: '>=14.18'} peerDependencies: '@opentelemetry/api': ^1.9.0 @@ -4137,46 +4256,46 @@ packages: '@opentelemetry/sdk-trace-base': ^1.26.0 '@opentelemetry/semantic-conventions': ^1.27.0 - '@sentry/react@8.34.0': - resolution: {integrity: sha512-gIgzhj7h67C+Sdq2ul4fOSK142Gf0uV99bqHRdtIiUlXw9yjzZQY5TKTtzbOaevn7qBJ0xrRKtIRUbOBMl0clw==} + '@sentry/react@8.36.0': + resolution: {integrity: sha512-YIJZUx7Q5aulK034cRri0p/7MeP3tdLfdP6vMJMwrVlqoWQI9gKZXikmLIqHUQegZdMRYX5tr03gTWJu3dhYwg==} engines: {node: '>=14.18'} peerDependencies: react: ^16.14.0 || 17.x || 18.x || 19.x - '@sentry/types@8.33.1': - resolution: {integrity: sha512-GjoAMvwtpIemoF/IiwZ7A60g4nQv3qwzR21GvJqDVUoKD0e8pv9OLX+HyXoUat4wEDGSuDUcUyUKD2G+od73QA==} + '@sentry/types@8.35.0': + resolution: {integrity: sha512-AVEZjb16MlYPifiDDvJ19dPQyDn0jlrtC1PHs6ZKO+Rzyz+2EX2BRdszvanqArldexPoU1p5Bn2w81XZNXThBA==} engines: {node: '>=14.18'} - '@sentry/types@8.34.0': - resolution: {integrity: sha512-zLRc60CzohGCo6zNsNeQ9JF3SiEeRE4aDCP9fDDdIVCOKovS+mn1rtSip0qd0Vp2fidOu0+2yY0ALCz1A3PJSQ==} + '@sentry/types@8.36.0': + resolution: {integrity: sha512-K1pVFfdGHw115RzGHpwSOqoEPeayn4N1F9IfM0kxrYpQSbFT1X29eak88GBfC8gPiLEF0iFGlSaQ4ERmF7oRcA==} engines: {node: '>=14.18'} - '@sentry/utils@8.33.1': - resolution: {integrity: sha512-uzuYpiiJuFY3N4WNHMBWUQX5oNv2t/TbG0OHRp3Rr7yeu+HSfD542TIp9/gMZ+G0Cxd8AmVO3wkKIFbk0TL4Qg==} + '@sentry/utils@8.35.0': + resolution: {integrity: sha512-MdMb6+uXjqND7qIPWhulubpSeHzia6HtxeJa8jYI09OCvIcmNGPydv/Gx/LZBwosfMHrLdTWcFH7Y7aCxrq7cg==} engines: {node: '>=14.18'} - '@sentry/utils@8.34.0': - resolution: {integrity: sha512-W1KoRlFUjprlh3t86DZPFxLfM6mzjRzshVfMY7vRlJFymBelJsnJ3A1lPeBZM9nCraOSiw6GtOWu6k5BAkiGIg==} + '@sentry/utils@8.36.0': + resolution: {integrity: sha512-oJ3EDPj0I00z+AwC3EWBpSidXYUoKW0Id8MfMQP5Hflniz3gif7UEReblT+FJgPEVo6+6uNzAncY0MuNMxmDKQ==} engines: {node: '>=14.18'} - '@sentry/vite-plugin@2.22.5': - resolution: {integrity: sha512-dFARM360varU+hdU1MCpl0VTL03FkVIC+A9egCE+ureuOryjVNe3cm2mUjv/gnDHHNTOxWC2H2c8BlOkqTGP/w==} + '@sentry/vite-plugin@2.22.6': + resolution: {integrity: sha512-zIieP1VLWQb3wUjFJlwOAoaaJygJhXeUoGd0e/Ha2RLb2eW2S+4gjf6y6NqyY71tZ74LYVZKg/4prB6FAZSMXQ==} engines: {node: '>= 14'} - '@shikijs/core@1.22.0': - resolution: {integrity: sha512-S8sMe4q71TJAW+qG93s5VaiihujRK6rqDFqBnxqvga/3LvqHEnxqBIOPkt//IdXVtHkQWKu4nOQNk0uBGicU7Q==} + '@shikijs/core@1.22.2': + resolution: {integrity: sha512-bvIQcd8BEeR1yFvOYv6HDiyta2FFVePbzeowf5pPS1avczrPK+cjmaxxh0nx5QzbON7+Sv0sQfQVciO7bN72sg==} - '@shikijs/engine-javascript@1.22.0': - resolution: {integrity: sha512-AeEtF4Gcck2dwBqCFUKYfsCq0s+eEbCEbkUuFou53NZ0sTGnJnJ/05KHQFZxpii5HMXbocV9URYVowOP2wH5kw==} + '@shikijs/engine-javascript@1.22.2': + resolution: {integrity: sha512-iOvql09ql6m+3d1vtvP8fLCVCK7BQD1pJFmHIECsujB0V32BJ0Ab6hxk1ewVSMFA58FI0pR2Had9BKZdyQrxTw==} - '@shikijs/engine-oniguruma@1.22.0': - resolution: {integrity: sha512-5iBVjhu/DYs1HB0BKsRRFipRrD7rqjxlWTj4F2Pf+nQSPqc3kcyqFFeZXnBMzDf0HdqaFVvhDRAGiYNvyLP+Mw==} + '@shikijs/engine-oniguruma@1.22.2': + resolution: {integrity: sha512-GIZPAGzQOy56mGvWMoZRPggn0dTlBf1gutV5TdceLCZlFNqWmuc7u+CzD0Gd9vQUTgLbrt0KLzz6FNprqYAxlA==} - '@shikijs/transformers@1.22.0': - resolution: {integrity: sha512-k7iMOYuGQA62KwAuJOQBgH2IQb5vP8uiB3lMvAMGUgAMMurePOx3Z7oNqJdcpxqZP6I9cc7nc4DNqSKduCxmdg==} + '@shikijs/transformers@1.22.2': + resolution: {integrity: sha512-8f78OiBa6pZDoZ53lYTmuvpFPlWtevn23bzG+azpPVvZg7ITax57o/K3TC91eYL3OMJOO0onPbgnQyZjRos8XQ==} - '@shikijs/types@1.22.0': - resolution: {integrity: sha512-Fw/Nr7FGFhlQqHfxzZY8Cwtwk5E9nKDUgeLjZgt3UuhcM3yJR9xj3ZGNravZZok8XmEZMiYkSMTPlPkULB8nww==} + '@shikijs/types@1.22.2': + resolution: {integrity: sha512-NCWDa6LGZqTuzjsGfXOBWfjS/fDIbDdmVDug+7ykVe1IKT4c1gakrvlfFYp5NhAXH/lyqLM8wsAPo5wNy73Feg==} '@shikijs/vscode-textmate@9.3.0': resolution: {integrity: sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==} @@ -4225,25 +4344,28 @@ packages: '@tanstack/query-core@5.59.13': resolution: {integrity: sha512-Oou0bBu/P8+oYjXsJQ11j+gcpLAMpqW42UlokQYEz4dE7+hOtVO9rVuolJKgEccqzvyFzqX4/zZWY+R/v1wVsQ==} - '@tanstack/query-devtools@5.58.0': - resolution: {integrity: sha512-iFdQEFXaYYxqgrv63ots+65FGI+tNp5ZS5PdMU1DWisxk3fez5HG3FyVlbUva+RdYS5hSLbxZ9aw3yEs97GNTw==} + '@tanstack/query-core@5.59.17': + resolution: {integrity: sha512-jWdDiif8kaqnRGHNXAa9CnudtxY5v9DUxXhodgqX2Rwzj+1UwStDHEbBd9IA5C7VYAaJ2s+BxFR6PUBs8ERorA==} - '@tanstack/query-persist-client-core@5.59.13': - resolution: {integrity: sha512-dv6KxeJmHl8x9nCGEZtF+HW8pXYWwBX8DqZT7538RmIn+Y9rW5WSB3bCzFDr1hlaNa4B/5J+dk9L9i0egLFVoQ==} + '@tanstack/query-devtools@5.59.19': + resolution: {integrity: sha512-Gw+3zsADpqiYgx/6MMr9bP1+x2LR8vOuGjo5Un/89qwwP3z7WAHPWFagLFDYkLq68NX7ekUpW/EOYlUMugMXGA==} - '@tanstack/query-sync-storage-persister@5.59.13': - resolution: {integrity: sha512-GLgWyF49tXL4wpVWFVuaZwp6PcUbYUTkQ126Q3GGEl3xzosAhLyEKO9YkLRi8f8C2FfS7ukMbxGGr3NLQMKLCw==} + '@tanstack/query-persist-client-core@5.59.17': + resolution: {integrity: sha512-2buT5Un3fxsdYmfdRvNS62i7z0oDkTsaydAcDhmekl3jeiU/hK+X4OhV8i+jnvjEb9u+0i3aUWm9kvzlh77TXQ==} - '@tanstack/react-query-devtools@5.59.14': - resolution: {integrity: sha512-7hYY59jveDF1thc4mnExfMoz/ySnE22pv3d+tinw+HxDGZFPa5BfCZgr1N3i1OGxxBuZch8k9seUJ2qUhBdJoQ==} + '@tanstack/query-sync-storage-persister@5.59.17': + resolution: {integrity: sha512-JWCj1/Vl7mA/uzO6yXzcZCUg9XHU0O/6DjkCOwM00eJDn18epCYeOlvPWvTapvUDKVFsv4kcAWtyxeSyuPlvtA==} + + '@tanstack/react-query-devtools@5.59.19': + resolution: {integrity: sha512-mYFWTHLtJr2HdyYPZPzzvQ2ksCsSL6L04fCtusPFD3waskXrtmvWvyuDIGeEGdVAYS0Urwxw/0sYvcTVQZH+zQ==} peerDependencies: - '@tanstack/react-query': ^5.59.14 + '@tanstack/react-query': ^5.59.19 react: ^18 || ^19 - '@tanstack/react-query-persist-client@5.59.14': - resolution: {integrity: sha512-xQSOxZQ2ESkcBcJ+4FFXV1bSaB9aFiA+s3x6IJfO4FRBBzeXFfT5rSR/mz99EeQRjSsZ/lTOOTlSTogJJhBNzQ==} + '@tanstack/react-query-persist-client@5.59.19': + resolution: {integrity: sha512-rUq/ITDyW5tulkfczfBaB562+tk0Cfz8VS6GQWTLBBvk6P8Fdg/+R+27YeMnnYVYId99NPI14SCbnsFS9YOnDQ==} peerDependencies: - '@tanstack/react-query': ^5.59.14 + '@tanstack/react-query': ^5.59.19 react: ^18 || ^19 '@tanstack/react-query@5.59.14': @@ -4251,6 +4373,11 @@ packages: peerDependencies: react: ^18 || ^19 + '@tanstack/react-query@5.59.19': + resolution: {integrity: sha512-xLRfyFyQOFcLltKCds0LijfC6/HQJrrTTnZB8ciyn74LIkVAm++vZJ6eUVG20RmJtdP8REdy7vSOYW4M3//XLA==} + peerDependencies: + react: ^18 || ^19 + '@tanstack/react-virtual@3.10.8': resolution: {integrity: sha512-VbzbVGSsZlQktyLrP5nxE+vE1ZR+U0NFAWPbJLoG2+DKPwd2D7dVICTVIIaYlJqX1ZCEnYDbaOpmMwbsyhBoIA==} peerDependencies: @@ -4268,6 +4395,21 @@ packages: resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} + '@ts-morph/common@0.11.1': + resolution: {integrity: sha512-7hWZS0NRpEsNV8vWJzg7FEz6V8MaLNeJOmwmghqUXTpzk16V1LLZhdo+4QvE/+zv4cVci0OviuJFnqhEfoV3+g==} + + '@tsconfig/node10@1.0.11': + resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==} + + '@tsconfig/node12@1.0.11': + resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} + + '@tsconfig/node14@1.0.3': + resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} + + '@tsconfig/node16@1.0.4': + resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} + '@types/appdmg@0.5.5': resolution: {integrity: sha512-G+n6DgZTZFOteITE30LnWj+HRVIGr7wMlAiLWOO02uJFWVEitaPU9JVXm9wJokkgshBawb2O1OykdcsmkkZfgg==} @@ -4340,11 +4482,14 @@ packages: '@types/mysql@2.15.26': resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==} + '@types/node@16.18.11': + resolution: {integrity: sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==} + '@types/node@20.16.11': resolution: {integrity: sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw==} - '@types/node@22.7.5': - resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} + '@types/node@22.8.7': + resolution: {integrity: sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q==} '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -4367,8 +4512,8 @@ packages: '@types/react-dom@18.3.1': resolution: {integrity: sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==} - '@types/react@18.3.11': - resolution: {integrity: sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==} + '@types/react@18.3.12': + resolution: {integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==} '@types/responselike@1.0.3': resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} @@ -4504,15 +4649,32 @@ packages: peerDependencies: react: '>= 16.8.0' - '@vitejs/plugin-legacy@5.4.2': - resolution: {integrity: sha512-hlyyQL+wEIyOWdwsUKX+0g3kBU4AbHmVzHarLvVKiGGGqLIYjttMvvjk6zGY8RD9dab6QuFNhDoxg0YFhQ26xA==} + '@vercel/build-utils@8.4.12': + resolution: {integrity: sha512-pIH0b965wJhd1otROVPndfZenPKFVoYSaRjtSKVOT/oNBT13ifq86UVjb5ZjoVfqUI2TtSTP+68kBqLPeoq30g==} + + '@vercel/error-utils@2.0.2': + resolution: {integrity: sha512-Sj0LFafGpYr6pfCqrQ82X6ukRl5qpmVrHM/191kNYFqkkB9YkjlMAj6QcEsvCG259x4QZ7Tya++0AB85NDPbKQ==} + + '@vercel/nft@0.27.3': + resolution: {integrity: sha512-oySTdDSzUAFDXpsSLk9Q943o+/Yu/+TCFxnehpFQEf/3khi2stMpTHPVNwFdvZq/Z4Ky93lE+MGHpXCRpMkSCA==} + engines: {node: '>=16'} + hasBin: true + + '@vercel/node@3.2.24': + resolution: {integrity: sha512-KEm50YBmcfRNOw5NfdcqMI4BkP4+5TD9kRwAByHHlIZXLj1NTTknvMF+69sHBYzwpK/SUZIkeo7jTrtcl4g+RQ==} + + '@vercel/static-config@3.0.0': + resolution: {integrity: sha512-2qtvcBJ1bGY0dYGYh3iM7yGKkk971FujLEDXzuW5wcZsPr1GSEjO/w2iSr3qve6nDDtBImsGoDEnus5FI4+fIw==} + + '@vitejs/plugin-legacy@5.4.3': + resolution: {integrity: sha512-wsyXK9mascyplcqvww1gA1xYiy29iRHfyciw+a0t7qRNdzX6PdfSWmOoCi74epr87DujM+5J+rnnSv+4PazqVg==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: terser: ^5.4.0 vite: ^5.0.0 - '@vitejs/plugin-react@4.3.2': - resolution: {integrity: sha512-hieu+o05v4glEBucTcKMK3dlES0OeJlD9YVOAPraVMOInBCwzumaIFiUjr4bHK7NPgnAHgiskUoceKercrN8vg==} + '@vitejs/plugin-react@4.3.3': + resolution: {integrity: sha512-NooDe9GpHGqNns1i8XDERg0Vsg5SSYRhRxxyTGogUdkdNt47jal+fbuYi+Yfq6pzRCKXyoPcWisfxE6RIM3GKA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.2.0 || ^5.0.0 @@ -4523,8 +4685,8 @@ packages: '@vitest/pretty-format@2.0.5': resolution: {integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==} - '@vitest/pretty-format@2.1.3': - resolution: {integrity: sha512-XH1XdtoLZCpqV59KRbPrIhFCOO0hErxrQCMcvnQete3Vibb9UeIOX02uFPfVn3Z9ZXsq78etlfyhnkmIZSzIwQ==} + '@vitest/pretty-format@2.1.4': + resolution: {integrity: sha512-L95zIAkEuTDbUX1IsjRl+vyBSLh3PwLLgKpghl37aCK9Jvw0iP+wKwIFhfjdUtA2myLgjrG6VU6JCFLv8q/3Ww==} '@vitest/runner@2.0.5': resolution: {integrity: sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==} @@ -4573,6 +4735,10 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + acorn-walk@8.3.4: + resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==} + engines: {node: '>=0.4.0'} + acorn@8.12.1: resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} engines: {node: '>=0.4.0'} @@ -4626,6 +4792,9 @@ packages: ajv@8.17.1: resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==} + ajv@8.6.3: + resolution: {integrity: sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==} + ansi-escapes@5.0.0: resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==} engines: {node: '>=12'} @@ -4702,11 +4871,19 @@ packages: resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==} engines: {node: '>= 10'} + are-we-there-yet@2.0.0: + resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} + engines: {node: '>=10'} + deprecated: This package is no longer supported. + are-we-there-yet@3.0.1: resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} deprecated: This package is no longer supported. + arg@4.1.3: + resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} + arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} @@ -4735,6 +4912,10 @@ packages: resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} engines: {node: '>=12'} + ast-kit@1.3.1: + resolution: {integrity: sha512-3bIRV4s/cNAee2rKjuvYdoG+0CMqtOIgCvWrJL6zG8R0fDyMwYzStspX5JqXPbdMzM+qxHZ6g2rMHKhr3HkPlQ==} + engines: {node: '>=16.14.0'} + astral-regex@2.0.0: resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} engines: {node: '>=8'} @@ -4743,6 +4924,17 @@ packages: resolution: {integrity: sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==} engines: {node: '>=0.12.0'} + async-listen@3.0.0: + resolution: {integrity: sha512-V+SsTpDqkrWTimiotsyl33ePSjA5/KrithwupuvJ6ztsqPvGv6ge4OredFhPffVXiLN/QUWvE0XcqJaYgt6fOg==} + engines: {node: '>= 14'} + + async-listen@3.0.1: + resolution: {integrity: sha512-cWMaNwUJnf37C/S5TfCkk/15MwbPRwVYALA2jtjkbHjCmAPiDXyNJy2q3p1KAZzDLHAWyarUWSujUoHR4pEgrA==} + engines: {node: '>= 14'} + + async-sema@3.1.1: + resolution: {integrity: sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==} + async@1.5.2: resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==} @@ -4811,9 +5003,15 @@ packages: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} + bindings@1.5.0: + resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} + birecord@0.1.1: resolution: {integrity: sha512-VUpsf/qykW0heRlC8LooCq28Kxn3mAqKohhDG/49rrsQ1dT1CXyj/pgXS+5BSRzFTR/3DyIBOqQOrGyZOh71Aw==} + bl@1.2.3: + resolution: {integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==} + bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} @@ -4891,6 +5089,12 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + buffer-alloc-unsafe@1.1.0: + resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==} + + buffer-alloc@1.2.0: + resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==} + buffer-crc32@0.2.13: resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} @@ -4901,6 +5105,9 @@ packages: resolution: {integrity: sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==} engines: {node: '>=0.4'} + buffer-fill@1.0.0: + resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==} + buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -4941,6 +5148,10 @@ packages: peerDependencies: esbuild: '>=0.18' + bytes@3.1.2: + resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} + engines: {node: '>= 0.8'} + c12@1.11.2: resolution: {integrity: sha512-oBs8a4uvSDO9dm8b7OCFW7+dgtVrwmwnrVXYzLm43ta7ep2jCn/0MhoUFygIWtxhyy6+/MG7/agvpY0U1Iemew==} peerDependencies: @@ -4996,8 +5207,8 @@ packages: ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} - chai@5.1.1: - resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==} + chai@5.1.2: + resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==} engines: {node: '>=12'} chalk@2.4.2: @@ -5039,6 +5250,10 @@ packages: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} + chokidar@4.0.1: + resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} + engines: {node: '>= 14.16.0'} + chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -5064,6 +5279,9 @@ packages: citty@0.1.6: resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==} + cjs-module-lexer@1.2.3: + resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==} + cjs-module-lexer@1.4.1: resolution: {integrity: sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==} @@ -5133,11 +5351,14 @@ packages: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} - cmdk@1.0.0: - resolution: {integrity: sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==} + cmdk@1.0.3: + resolution: {integrity: sha512-2c3uTjwT4YeHj60q2k8S1B0WHSoGR6t5CPnec6PMFD2QF4gwid0t1VSPNeEmL02EwBwNky/A3gwPCOViKTtoPA==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18 || ^19 || ^19.0.0-rc + react-dom: ^18 || ^19 || ^19.0.0-rc + + code-block-writer@10.1.1: + resolution: {integrity: sha512-67ueh2IRGst/51p0n6FvPrnRjAGHY5F8xdjkgrYE7DDzpJe6qA07RYQ9VcoUeo5ATOjSOiWpSL3SWBRRbempMw==} collapse-white-space@2.1.0: resolution: {integrity: sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==} @@ -5301,6 +5522,10 @@ packages: engines: {node: '>=18'} hasBin: true + convert-hrtime@3.0.0: + resolution: {integrity: sha512-7V+KqSvMiHp8yWDuwfww06XleMWVVB9b9tURBx+G7UTADuo5hYPuowKloz4OzOqbPezxgo+fdQ1522WzPG4OeA==} + engines: {node: '>=8'} + convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} @@ -5341,6 +5566,9 @@ packages: create-hmac@1.1.7: resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==} + create-require@1.1.1: + resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} + cross-dirname@0.1.0: resolution: {integrity: sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==} @@ -5454,8 +5682,8 @@ packages: resolution: {integrity: sha512-pHJg+jbuFsCjz9iclQBqyL3B2HLCBF71BwVNujUYEvCeQMvV97R59MNK3R2+jgJ3a1fcZgI9B3vYgz8lzr/BFQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - daisyui@4.12.13: - resolution: {integrity: sha512-BnXyQoOByUF/7wSdIKubyhXxbtL8gxwY3u2cNMkxGP39TSVJqMmlItqtpY903fQnLI/NokC+bc+ZV+PEPsppPw==} + daisyui@4.12.14: + resolution: {integrity: sha512-hA27cdBasdwd4/iEjn+aidoCrRroDuo3G5W9NDKaVCJI437Mm/3eSL/2u7MkZ0pt8a+TrYF3aT2pFVemTS3how==} engines: {node: '>=16.9.0'} dayjs@1.11.13: @@ -5493,6 +5721,26 @@ packages: resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==} engines: {node: '>=10'} + decompress-tar@4.1.1: + resolution: {integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==} + engines: {node: '>=4'} + + decompress-tarbz2@4.1.1: + resolution: {integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==} + engines: {node: '>=4'} + + decompress-targz@4.1.1: + resolution: {integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==} + engines: {node: '>=4'} + + decompress-unzip@4.0.1: + resolution: {integrity: sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==} + engines: {node: '>=4'} + + decompress@4.2.1: + resolution: {integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==} + engines: {node: '>=4'} + deep-eql@5.0.2: resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} @@ -5529,6 +5777,10 @@ packages: delegates@1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} + depd@2.0.0: + resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} + engines: {node: '>= 0.8'} + deprecation@2.3.1: resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==} @@ -5568,12 +5820,21 @@ packages: devlop@1.1.0: resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==} - dexie@4.0.8: - resolution: {integrity: sha512-1G6cJevS17KMDK847V3OHvK2zei899GwpDiqfEXHP1ASvme6eWJmAp9AU4s1son2TeGkWmC0g3y8ezOBPnalgQ==} + dexie-export-import@4.1.2: + resolution: {integrity: sha512-dWIkkajX+CsEJ19xMnvyqUDlldIl7jW/G49hy3pXZeIgCei9fPeGSjteoh7BeTujexIM3XZ+uAGCEwgCx2HAsQ==} + peerDependencies: + dexie: ^2.0.4 || ^3.0.0 || ^4.0.1-alpha.5 + + dexie@4.0.9: + resolution: {integrity: sha512-VQG1huEVSAdDZssb9Bb9mFy+d3jAE0PT4d1nIRYlT46ip1fzbs1tXi0SlUayRDgV3tTbJG8ZRqAo2um49gtynA==} didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} + diff@4.0.2: + resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} + engines: {node: '>=0.3.1'} + diffie-hellman@5.0.3: resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==} @@ -5740,6 +6001,11 @@ packages: ecdsa-sig-formatter@1.0.11: resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==} + edge-runtime@2.5.9: + resolution: {integrity: sha512-pk+k0oK0PVXdlT4oRp4lwh+unuKB7Ng4iZ2HB+EZ7QCEQizX360Rp/F4aRpgpRgdP2ufB35N+1KppHmYjqIGSg==} + engines: {node: '>=16'} + hasBin: true + ejs@3.1.10: resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==} engines: {node: '>=0.10.0'} @@ -5809,8 +6075,8 @@ packages: resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==} engines: {node: '>=8.0.0'} - electron@33.0.0: - resolution: {integrity: sha512-OdLLR/zAVuNfKahSSYokZmSi7uK2wEYTbCoiIdqWLsOWmCqO9j0JC2XkYQmXQcAk2BJY0ri4lxwAfc5pzPDYsA==} + electron@33.0.2: + resolution: {integrity: sha512-C2WksfP0COsMHbYXSJG68j6S3TjuGDrw/YT42B526yXalIlNQZ2GeAYKryg6AEMkIp3p8TUfDRD0+HyiyCt/nw==} engines: {node: '>= 12.20.55'} hasBin: true @@ -5864,9 +6130,137 @@ packages: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} + es-module-lexer@1.4.1: + resolution: {integrity: sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==} + es6-error@4.1.1: resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==} + esbuild-android-64@0.14.47: + resolution: {integrity: sha512-R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + + esbuild-android-arm64@0.14.47: + resolution: {integrity: sha512-OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + + esbuild-darwin-64@0.14.47: + resolution: {integrity: sha512-R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + + esbuild-darwin-arm64@0.14.47: + resolution: {integrity: sha512-seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + + esbuild-freebsd-64@0.14.47: + resolution: {integrity: sha512-ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + + esbuild-freebsd-arm64@0.14.47: + resolution: {integrity: sha512-ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + + esbuild-linux-32@0.14.47: + resolution: {integrity: sha512-FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + + esbuild-linux-64@0.14.47: + resolution: {integrity: sha512-nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + + esbuild-linux-arm64@0.14.47: + resolution: {integrity: sha512-ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + + esbuild-linux-arm@0.14.47: + resolution: {integrity: sha512-ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + + esbuild-linux-mips64le@0.14.47: + resolution: {integrity: sha512-mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + + esbuild-linux-ppc64le@0.14.47: + resolution: {integrity: sha512-WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + + esbuild-linux-riscv64@0.14.47: + resolution: {integrity: sha512-1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + + esbuild-linux-s390x@0.14.47: + resolution: {integrity: sha512-eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + + esbuild-netbsd-64@0.14.47: + resolution: {integrity: sha512-Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + + esbuild-openbsd-64@0.14.47: + resolution: {integrity: sha512-QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + + esbuild-sunos-64@0.14.47: + resolution: {integrity: sha512-uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + + esbuild-windows-32@0.14.47: + resolution: {integrity: sha512-H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + + esbuild-windows-64@0.14.47: + resolution: {integrity: sha512-/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + + esbuild-windows-arm64@0.14.47: + resolution: {integrity: sha512-HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + + esbuild@0.14.47: + resolution: {integrity: sha512-wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA==} + engines: {node: '>=12'} + hasBin: true + esbuild@0.21.5: resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} engines: {node: '>=12'} @@ -5877,6 +6271,11 @@ packages: engines: {node: '>=18'} hasBin: true + esbuild@0.24.0: + resolution: {integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==} + engines: {node: '>=18'} + hasBin: true + escalade@3.1.2: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} @@ -6071,24 +6470,20 @@ packages: '@typescript-eslint/eslint-plugin': optional: true - eslint-scope@8.1.0: - resolution: {integrity: sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==} + eslint-scope@8.2.0: + resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - eslint-visitor-keys@4.1.0: - resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint-visitor-keys@4.2.0: resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.13.0: - resolution: {integrity: sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==} + eslint@9.14.0: + resolution: {integrity: sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -6097,10 +6492,6 @@ packages: jiti: optional: true - espree@10.2.0: - resolution: {integrity: sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - espree@10.3.0: resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -6124,6 +6515,9 @@ packages: estree-util-is-identifier-name@3.0.0: resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==} + estree-walker@2.0.2: + resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} @@ -6131,6 +6525,10 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} + etag@1.8.1: + resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} + engines: {node: '>= 0.6'} + eventemitter3@5.0.1: resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==} @@ -6141,10 +6539,6 @@ packages: resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==} engines: {node: '>=6'} - execa@5.1.1: - resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} - engines: {node: '>=10'} - execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} @@ -6186,6 +6580,10 @@ packages: fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + fast-folder-size@2.3.0: + resolution: {integrity: sha512-W3HuQYdZ1GaOAdIqKR/guqxvlHW0f8ZFknYfnsTBuL+9QokVARUBNt/kFE8hkyZd/yQ/mYnKmrtWmFyTLRfX3A==} + hasBin: true + fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} @@ -6215,8 +6613,8 @@ packages: fastify-plugin@5.0.1: resolution: {integrity: sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==} - fastify@5.0.0: - resolution: {integrity: sha512-Qe4dU+zGOzg7vXjw4EvcuyIbNnMwTmcuOhlOrOJsgwzvjEZmsM/IeHulgJk+r46STjdJS/ZJbxO8N70ODXDMEQ==} + fastify@5.1.0: + resolution: {integrity: sha512-0SdUC5AoiSgMSc2Vxwv3WyKzyGMDJRAW/PgNsK1kZrnkO6MeqUIW9ovVg9F2UGIqtIcclYMyeJa4rK6OZc7Jxg==} fastparse@1.1.2: resolution: {integrity: sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==} @@ -6231,8 +6629,8 @@ packages: fd-slicer@1.1.0: resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} - fdir@6.3.0: - resolution: {integrity: sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==} + fdir@6.4.2: + resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==} peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -6246,6 +6644,21 @@ packages: resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} engines: {node: '>=16.0.0'} + file-type@3.9.0: + resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==} + engines: {node: '>=0.10.0'} + + file-type@5.2.0: + resolution: {integrity: sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==} + engines: {node: '>=4'} + + file-type@6.2.0: + resolution: {integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==} + engines: {node: '>=4'} + + file-uri-to-path@1.0.0: + resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} + filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} @@ -6326,16 +6739,16 @@ packages: resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} engines: {node: '>= 0.6'} - foxact@0.2.39: - resolution: {integrity: sha512-iIe0eakDQuGL5ArCVzijffkSAm6jNGC3apTkUWBarvnIZuX6tmx/nhXYFNirKG4Vxo+fM3sL6GP36BE/3w4xng==} + foxact@0.2.41: + resolution: {integrity: sha512-NgKsYRU6Dx4dHjZSlgO8AKrwsGuvrcCOqiPPLy+x6Nd9vBmRPq+JZjKWC5OcAVnISR1Bjn+Yg69UEdHEooJXDQ==} peerDependencies: react: '*' peerDependenciesMeta: react: optional: true - framer-motion@11.11.9: - resolution: {integrity: sha512-XpdZseuCrZehdHGuW22zZt3SF5g6AHJHJi7JwQIigOznW4Jg1n0oGPMJQheMaKLC+0rp5gxUKMRYI6ytd3q4RQ==} + framer-motion@11.11.11: + resolution: {integrity: sha512-tuDH23ptJAKUHGydJQII9PhABNJBpB+z0P1bmgKK9QFIssHGlfPd6kxMq00LSKwE27WFsb2z0ovY0bpUyMvfRw==} peerDependencies: '@emotion/is-prop-valid': '*' react: ^18.0.0 @@ -6411,6 +6824,11 @@ packages: resolution: {integrity: sha512-R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ==} engines: {node: '>= 12'} + gauge@3.0.2: + resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} + engines: {node: '>=10'} + deprecated: This package is no longer supported. + gauge@4.0.4: resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -6452,6 +6870,10 @@ packages: resolution: {integrity: sha512-SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw==} engines: {node: '>= 4.0'} + get-stream@2.3.1: + resolution: {integrity: sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==} + engines: {node: '>=0.10.0'} + get-stream@4.1.0: resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==} engines: {node: '>=6'} @@ -6460,10 +6882,6 @@ packages: resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} engines: {node: '>=8'} - get-stream@6.0.1: - resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} - engines: {node: '>=10'} - get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} @@ -6571,8 +6989,8 @@ packages: engines: {node: '>=0.4.7'} hasBin: true - happy-dom@15.7.4: - resolution: {integrity: sha512-r1vadDYGMtsHAAsqhDuk4IpPvr6N8MGKy5ntBo7tSdim+pWDxus2PNqOcOt8LuDZ4t3KJHE+gCuzupcx/GKnyQ==} + happy-dom@15.8.0: + resolution: {integrity: sha512-LwBvPvR4MQ1xfrf4gbWRJzeL2xQqWiEiHvZF5uA1AwlCCgjH9ht0fGVXciRGQCghdHAIXw1zGX1mJ6a3O0fpeA==} engines: {node: '>=18.0.0'} has-flag@3.0.0: @@ -6695,8 +7113,8 @@ packages: resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==} engines: {node: '>=0.10.0'} - hono@4.6.5: - resolution: {integrity: sha512-qsmN3V5fgtwdKARGLgwwHvcdLKursMd+YOt69eGpl1dUCJb8mCd7hZfyZnBYjxCegBG7qkJRQRUy2oO25yHcyQ==} + hono@4.6.8: + resolution: {integrity: sha512-f+2Ec9JAzabT61pglDiLJcF/DjiSefZkjCn9bzm1cYLGkD5ExJ3Jnv93ax9h0bn7UPLHF81KktoyjdQfWI2n1Q==} engines: {node: '>=16.9.0'} hosted-git-info@2.8.9: @@ -6728,6 +7146,10 @@ packages: http-cache-semantics@4.1.1: resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} + http-errors@2.0.0: + resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} + engines: {node: '>= 0.8'} + http-parser-js@0.5.8: resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==} @@ -6755,10 +7177,6 @@ packages: resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==} engines: {node: '>= 14'} - human-signals@2.1.0: - resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} - engines: {node: '>=10.17.0'} - human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} @@ -6772,8 +7190,8 @@ packages: i18next-browser-languagedetector@8.0.0: resolution: {integrity: sha512-zhXdJXTTCoG39QsrOCiOabnWj2jecouOqbchu3EfhtSHxIB5Uugnm9JaizenOy39h7ne3+fLikIjeW88+rgszw==} - i18next@23.16.0: - resolution: {integrity: sha512-Ni3CG6c14teOogY19YNRl+kYaE/Rb59khy0VyHVn4uOZ97E2E/Yziyi6r3C3s9+wacjdLZiq/LLYyx+Cgd+FCw==} + i18next@23.16.4: + resolution: {integrity: sha512-9NIYBVy9cs4wIqzurf7nLXPyf3R78xYbxExVqHLK9od3038rjpyOEzW+XB130kZ1N4PZ9inTtJ471CRJ4Ituyg==} iconv-corefoundation@1.1.7: resolution: {integrity: sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==} @@ -6935,6 +7353,9 @@ packages: is-my-json-valid@2.20.6: resolution: {integrity: sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==} + is-natural-number@4.0.1: + resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==} + is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} @@ -6966,10 +7387,6 @@ packages: resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==} engines: {node: '>=0.10.0'} - is-stream@2.0.1: - resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} - engines: {node: '>=8'} - is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -7077,6 +7494,9 @@ packages: json-schema-ref-resolver@1.0.1: resolution: {integrity: sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw==} + json-schema-to-ts@1.6.4: + resolution: {integrity: sha512-pR4yQ9DHz6itqswtHCm26mw45FSNfQ9rEQjosaZErhn5J3J2sIViQiz8rDaezjKAhFGpmsoczYVBgGHzFw/stA==} + json-schema-traverse@0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} @@ -7406,6 +7826,10 @@ packages: resolution: {integrity: sha512-zIUs3+qpml+w3wiRuADutd7XIO8UABqksot10Utl/tji4UxZzLG4fWDC+yJZoO8/Ehg5RqsvSRE/6TS5AEOeWw==} os: [darwin] + magic-string-ast@0.6.2: + resolution: {integrity: sha512-oN3Bcd7ZVt+0VGEs7402qR/tjgjbM7kPlH/z7ufJnzTLVBzXJITRHOJiwMmmYMgZfdoWQsfQcY+iKlxiBppnMA==} + engines: {node: '>=16.14.0'} + magic-string@0.30.11: resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} @@ -7416,6 +7840,17 @@ packages: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} + make-dir@1.3.0: + resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==} + engines: {node: '>=4'} + + make-dir@3.1.0: + resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} + engines: {node: '>=8'} + + make-error@1.3.6: + resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} + make-fetch-happen@10.2.1: resolution: {integrity: sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -7452,6 +7887,9 @@ packages: mdast-util-from-markdown@2.0.1: resolution: {integrity: sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==} + mdast-util-from-markdown@2.0.2: + resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==} + mdast-util-gfm-autolink-literal@2.0.1: resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==} @@ -7485,8 +7923,8 @@ packages: mdast-util-to-hast@13.2.0: resolution: {integrity: sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==} - mdast-util-to-markdown@2.1.0: - resolution: {integrity: sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==} + mdast-util-to-markdown@2.1.1: + resolution: {integrity: sha512-OrkcCoqAkEg9b1ykXBrA0ehRc8H4fGU/03cACmW2xXzau1+dIdS+qJugh1Cqex3hMumSBgSE/5pc7uqP12nLAw==} mdast-util-to-string@4.0.0: resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==} @@ -7730,6 +8168,10 @@ packages: module-details-from-path@1.0.3: resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==} + mri@1.2.0: + resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} + engines: {node: '>=4'} + ms@2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} @@ -7756,8 +8198,8 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@5.0.7: - resolution: {integrity: sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==} + nanoid@5.0.8: + resolution: {integrity: sha512-TcJPw+9RV9dibz1hHUzlLVy8N4X9TnwirAjrU08Juo6BNKggzVfP2ZJ/3ZUSq15Xl5i85i+Z89XBO90pB2PghQ==} engines: {node: ^18 || >=20} hasBin: true @@ -7795,6 +8237,15 @@ packages: node-fetch-native@1.6.4: resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} + node-fetch@2.6.9: + resolution: {integrity: sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + node-fetch@2.7.0: resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} engines: {node: 4.x || >=6.0.0} @@ -7816,6 +8267,11 @@ packages: node-releases@2.0.18: resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} + nopt@5.0.0: + resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} + engines: {node: '>=6'} + hasBin: true + nopt@6.0.0: resolution: {integrity: sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -7843,14 +8299,14 @@ packages: resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==} engines: {node: '>=4'} - npm-run-path@4.0.1: - resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} - engines: {node: '>=8'} - npm-run-path@5.3.0: resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + npmlog@5.0.1: + resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==} + deprecated: This package is no longer supported. + npmlog@6.0.2: resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} @@ -8025,6 +8481,10 @@ packages: resolution: {integrity: sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==} engines: {node: '>=18'} + parse-ms@2.1.0: + resolution: {integrity: sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==} + engines: {node: '>=6'} + parse-passwd@1.0.0: resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==} engines: {node: '>=0.10.0'} @@ -8038,6 +8498,9 @@ packages: parse5@7.1.2: resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==} + path-browserify@1.0.1: + resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} + path-exists@3.0.0: resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} engines: {node: '>=4'} @@ -8077,6 +8540,9 @@ packages: resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==} engines: {node: 20 || >=22} + path-to-regexp@6.2.1: + resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==} + path-to-regexp@8.2.0: resolution: {integrity: sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==} engines: {node: '>=16'} @@ -8133,9 +8599,15 @@ packages: resolution: {integrity: sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==} engines: {node: '>=10'} + picocolors@1.0.0: + resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + picocolors@1.1.0: resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} @@ -8153,6 +8625,18 @@ packages: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} + pify@3.0.0: + resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==} + engines: {node: '>=4'} + + pinkie-promise@2.0.1: + resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==} + engines: {node: '>=0.10.0'} + + pinkie@2.0.4: + resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==} + engines: {node: '>=0.10.0'} + pino-abstract-transport@2.0.0: resolution: {integrity: sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==} @@ -8478,6 +8962,10 @@ packages: pretty-format@3.8.0: resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==} + pretty-ms@7.0.1: + resolution: {integrity: sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==} + engines: {node: '>=10'} + process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} @@ -8561,6 +9049,10 @@ packages: randomfill@1.0.4: resolution: {integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==} + raw-body@3.0.0: + resolution: {integrity: sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==} + engines: {node: '>= 0.8'} + rc-modal-sheet@0.3.2: resolution: {integrity: sha512-V6q4+xpeIj9VRL/44zCaXCkRLjVZ1iSYUuyiqveD24gQFy41s9GwjTrMoZ0T6Xg54I2wzuXRUITRH1hrHIjF+A==} peerDependencies: @@ -8601,20 +9093,20 @@ packages: react: '>= 16.8.0 || ^18.0.0' react-dom: '>= 16.8.0 || ^18.0.0' - react-hook-form@7.53.0: - resolution: {integrity: sha512-M1n3HhqCww6S2hxLxciEXy2oISPnAzxY7gvwVPrtlczTM/1dDadXgUxDpHMrMTblDOcm/AXtXxHwZ3jpg1mqKQ==} + react-hook-form@7.53.1: + resolution: {integrity: sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==} engines: {node: '>=18.0.0'} peerDependencies: react: ^16.8.0 || ^17 || ^18 || ^19 - react-hotkeys-hook@4.5.1: - resolution: {integrity: sha512-scAEJOh3Irm0g95NIn6+tQVf/OICCjsQsC9NBHfQws/Vxw4sfq1tDQut5fhTEvPraXhu/sHxRd9lOtxzyYuNAg==} + react-hotkeys-hook@4.6.1: + resolution: {integrity: sha512-XlZpbKUj9tkfgPgT9gA+1p7Ey6vFIZHttUjPqpTdyT5nqQ8mHL7elxvSbaC+dpSiHUSmr21Ya1mDxBZG3aje4Q==} peerDependencies: react: '>=16.8.1' react-dom: '>=16.8.1' - react-i18next@15.0.3: - resolution: {integrity: sha512-BlO1P+oLKjjIxDBQ0GkAIMacgjfMbnvops+3Y5nZXF7UJ99v4KCWr0Na1azJXC8AMiNWp4kgUcFCJM7U9ZsUDg==} + react-i18next@15.1.0: + resolution: {integrity: sha512-zj3nJynMnZsy2gPZiOTC7XctCY5eQGqT3tcKMmfJWC9FMvgd+960w/adq61j8iPzpwmsXejqID9qC3Mqu1Xu2Q==} peerDependencies: i18next: '>= 23.2.3' react: '>= 16.8.0' @@ -8661,16 +9153,6 @@ packages: '@types/react': optional: true - react-remove-scroll@2.5.5: - resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==} - engines: {node: '>=10'} - peerDependencies: - '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - react-remove-scroll@2.6.0: resolution: {integrity: sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==} engines: {node: '>=10'} @@ -8774,6 +9256,10 @@ packages: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} + readdirp@4.0.2: + resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==} + engines: {node: '>= 14.16.0'} + real-require@0.2.0: resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} engines: {node: '>= 12.13.0'} @@ -8794,6 +9280,10 @@ packages: resolution: {integrity: sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==} engines: {node: '>=4'} + regenerate-unicode-properties@10.2.0: + resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==} + engines: {node: '>=4'} + regenerate@1.4.2: resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} @@ -8818,10 +9308,21 @@ packages: resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==} engines: {node: '>=4'} + regexpu-core@6.1.1: + resolution: {integrity: sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==} + engines: {node: '>=4'} + + regjsgen@0.8.0: + resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==} + regjsparser@0.10.0: resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==} hasBin: true + regjsparser@0.11.2: + resolution: {integrity: sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==} + hasBin: true + regjsparser@0.9.1: resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==} hasBin: true @@ -9013,6 +9514,10 @@ packages: secure-json-parse@2.7.0: resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==} + seek-bzip@1.0.6: + resolution: {integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==} + hasBin: true + selecto@1.26.3: resolution: {integrity: sha512-gZHgqMy5uyB6/2YDjv3Qqaf7bd2hTDOpPdxXlrez4R3/L0GiEWDCFaUfrflomgqdb3SxHF2IXY0Jw0EamZi7cw==} @@ -9048,6 +9553,9 @@ packages: setimmediate@1.0.5: resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} + setprototypeof@1.2.0: + resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} + sha.js@2.4.11: resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==} hasBin: true @@ -9073,8 +9581,8 @@ packages: engines: {node: '>=4'} hasBin: true - shiki@1.22.0: - resolution: {integrity: sha512-/t5LlhNs+UOKQCYBtl5ZsH/Vclz73GIqT2yQsCBygr8L/ppTdmpL4w3kPLoZJbMKVWtoG77Ue1feOjZfDxvMkw==} + shiki@1.22.2: + resolution: {integrity: sha512-3IZau0NdGKXhH2bBlUk4w1IHNxPh6A5B2sUpyY+8utLu2j/h1QpFkAaUA1bAMxOWWGtTWcAh531vnS4NJKS/lA==} shimmer@1.2.1: resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==} @@ -9094,6 +9602,10 @@ packages: signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + signal-exit@4.0.2: + resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==} + engines: {node: '>=14'} + signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} @@ -9212,6 +9724,10 @@ packages: resolution: {integrity: sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==} engines: {node: '>= 6'} + statuses@2.0.1: + resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} + engines: {node: '>= 0.8'} + std-env@3.7.0: resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} @@ -9269,14 +9785,13 @@ packages: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} + strip-dirs@2.1.0: + resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==} + strip-eof@1.0.0: resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==} engines: {node: '>=0.10.0'} - strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} @@ -9367,6 +9882,10 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + tar-stream@1.6.2: + resolution: {integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==} + engines: {node: '>= 0.8.0'} + tar-stream@2.2.0: resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} engines: {node: '>=6'} @@ -9400,6 +9919,13 @@ packages: thread-stream@3.1.0: resolution: {integrity: sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==} + through@2.3.8: + resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} + + time-span@4.0.0: + resolution: {integrity: sha512-MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g==} + engines: {node: '>=10'} + tiny-inflate@1.0.3: resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==} @@ -9412,8 +9938,8 @@ packages: tinyexec@0.3.1: resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==} - tinyglobby@0.2.6: - resolution: {integrity: sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g==} + tinyglobby@0.2.10: + resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==} engines: {node: '>=12.0.0'} tinypool@1.0.1: @@ -9428,11 +9954,11 @@ packages: resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} engines: {node: '>=14.0.0'} - tldts-core@6.1.52: - resolution: {integrity: sha512-j4OxQI5rc1Ve/4m/9o2WhWSC4jGc4uVbCINdOEJRAraCi0YqTqgMcxUx7DbmuP0G3PCixoof/RZB0Q5Kh9tagw==} + tldts-core@6.1.58: + resolution: {integrity: sha512-dR936xmhBm7AeqHIhCWwK765gZ7dFyL+IqLSFAjJbFlUXGMLCb8i2PzlzaOuWBuplBTaBYseSb565nk/ZEM0Bg==} - tldts@6.1.51: - resolution: {integrity: sha512-33lfQoL0JsDogIbZ8fgRyvv77GnRtwkNE/MOKocwUgPO1WrSfsq7+vQRKxRQZai5zd+zg97Iv9fpFQSzHyWdLA==} + tldts@6.1.58: + resolution: {integrity: sha512-MQJrJhjHOYGYb8DobR6Y4AdDbd4TYkyQ+KBDVc5ODzs1cbrvPpfN1IemYi9jfipJ/vR1YWvrDli0hg1y19VRoA==} hasBin: true tmp-promise@3.0.3: @@ -9446,6 +9972,9 @@ packages: resolution: {integrity: sha512-DbplOfQFkqG5IHcDyyrs/lkvSr3mPUVsFf/RbDppOshs22yTPnSJWEe6FkYd1txAwU/zcnR905ar2fi4kwF29w==} engines: {node: '>=0.12'} + to-buffer@1.1.1: + resolution: {integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==} + to-data-view@1.1.0: resolution: {integrity: sha512-1eAdufMg6mwgmlojAx3QeMnzB/BTVp7Tbndi3U7ftcT2zCZadjxkkmLmd97zmaxWi+sgGcgWrokmpEoy0Dn0vQ==} @@ -9461,6 +9990,10 @@ packages: resolution: {integrity: sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==} engines: {node: '>=12'} + toidentifier@1.0.1: + resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} + engines: {node: '>=0.6'} + tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} @@ -9507,9 +10040,29 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + ts-morph@12.0.0: + resolution: {integrity: sha512-VHC8XgU2fFW7yO1f/b3mxKDje1vmyzFXHWzOYmKEkCEwcLjDtbdLgBQviqj4ZwP4MJkQtRo6Ha2I29lq/B+VxA==} + + ts-node@10.9.1: + resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + ts-pattern@5.5.0: resolution: {integrity: sha512-jqbIpTsa/KKTJYWgPNsFNbLVpwCgzXfFJ1ukNn4I8hMwyQzHMJnk/BqWzggB0xpkILuKzaO/aMYhS0SkaJyKXg==} + ts-toolbelt@6.15.5: + resolution: {integrity: sha512-FZIXf1ksVyLcfr7M317jbB67XFJhOO1YqdTcuGaq9q5jLUoTikukZ+98TPjKiP2jC5CgmYdWWYs0s2nLSU0/1A==} + tsconfck@3.1.1: resolution: {integrity: sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==} engines: {node: ^18 || >=20} @@ -9523,8 +10076,8 @@ packages: tslib@2.7.0: resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} - tsup@8.3.0: - resolution: {integrity: sha512-ALscEeyS03IomcuNdFdc0YWGVIkwH1Ws7nfTbAPuoILvEV2hpGQAY72LIOjglGo4ShWpZfpBqP/jpQVCzqYQag==} + tsup@8.3.5: + resolution: {integrity: sha512-Tunf6r6m6tnZsG9GYWndg0z8dEV7fD733VBFzFJ5Vcm1FtlXB8xBD/rtrBi2a3YKEV7hHtxiZtW5EAVADoe1pA==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -9542,8 +10095,8 @@ packages: typescript: optional: true - tsx@4.19.1: - resolution: {integrity: sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==} + tsx@4.19.2: + resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==} engines: {node: '>=18.0.0'} hasBin: true @@ -9614,6 +10167,11 @@ packages: typescript: optional: true + typescript@4.9.5: + resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} + engines: {node: '>=4.2.0'} + hasBin: true + typescript@5.6.3: resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} engines: {node: '>=14.17'} @@ -9630,12 +10188,19 @@ packages: uhyphen@0.2.0: resolution: {integrity: sha512-qz3o9CHXmJJPGBdqzab7qAYuW8kQGKNEuoHFYrBwV6hWIMcpAmxDLXojcHfFr9US1Pe6zUswEIJIbLI610fuqA==} + unbzip2-stream@1.4.3: + resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==} + unconfig@0.5.5: resolution: {integrity: sha512-VQZ5PT9HDX+qag0XdgQi8tJepPhXiR/yVOkn707gJDKo31lGjRilPREiQJ9Z6zd/Ugpv6ZvO5VxVIcatldYcNQ==} undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + undici@5.28.4: + resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==} + engines: {node: '>=14.0'} + undici@6.19.7: resolution: {integrity: sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==} engines: {node: '>=18.17'} @@ -9717,9 +10282,26 @@ packages: resolution: {integrity: sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==} engines: {node: '>= 0.4.0'} + unpipe@1.0.0: + resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} + engines: {node: '>= 0.8'} + + unplugin-ast@0.11.0: + resolution: {integrity: sha512-faP/JmvaH0huDgfAS9QNShIyo2C9lICSNc6qQ13r7U84PUl7aVyw5RK0/E63FnazxxjFSt6QfKeonMpwu1d75A==} + engines: {node: '>=18.12.0'} + unplugin@1.0.1: resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} + unplugin@1.15.0: + resolution: {integrity: sha512-jTPIs63W+DUEDW207ztbaoO7cQ4p5aVaB823LSlxpsFEU3Mykwxf3ZGC/wzxFJeZlASZYgVrWeo7LgOrqJZ8RA==} + engines: {node: '>=14.0.0'} + peerDependencies: + webpack-sources: ^3 + peerDependenciesMeta: + webpack-sources: + optional: true + unused-filename@4.0.1: resolution: {integrity: sha512-ZX6U1J04K1FoSUeoX1OicAhw4d0aro2qo+L8RhJkiGTNtBNkd/Fi1Wxoc9HzcVu6HfOzm0si/N15JjxFmD1z6A==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -9802,6 +10384,9 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + v8-compile-cache-lib@3.0.1: + resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} + validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} @@ -9847,8 +10432,8 @@ packages: vite: optional: true - vite@5.4.9: - resolution: {integrity: sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==} + vite@5.4.10: + resolution: {integrity: sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -9930,6 +10515,9 @@ packages: webpack-virtual-modules@0.5.0: resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==} + webpack-virtual-modules@0.6.2: + resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==} + websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} engines: {node: '>=0.8.0'} @@ -10059,6 +10647,10 @@ packages: yauzl@2.10.0: resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} + yn@3.1.1: + resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} + engines: {node: '>=6'} + yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} @@ -10079,8 +10671,8 @@ packages: zod@3.23.8: resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} - zustand@5.0.0: - resolution: {integrity: sha512-LE+VcmbartOPM+auOjCCLQOsQ05zUTp8RkgwRzefUk+2jISdMMFnxvyTjA4YNWr5ZGXYbVsEMZosttuxUBkojQ==} + zustand@5.0.1: + resolution: {integrity: sha512-pRET7Lao2z+n5R/HduXMio35TncTlSW68WsYBq2Lg1ASspsNGjpwLAsij3RpouyV6+kHMwwwzP0bZPD70/Jx/w==} engines: {node: '>=12.20.0'} peerDependencies: '@types/react': '>=18.0.0' @@ -10120,7 +10712,7 @@ snapshots: '@antfu/utils@0.7.10': {} - '@auth/core@0.37.0': + '@auth/core@0.37.2': dependencies: '@panva/hkdf': 1.2.1 '@types/cookie': 0.6.0 @@ -10140,19 +10732,27 @@ snapshots: '@babel/highlight': 7.25.7 picocolors: 1.1.0 + '@babel/code-frame@7.26.2': + dependencies: + '@babel/helper-validator-identifier': 7.25.9 + js-tokens: 4.0.0 + picocolors: 1.1.0 + '@babel/compat-data@7.25.4': {} '@babel/compat-data@7.25.8': {} + '@babel/compat-data@7.26.2': {} + '@babel/core@7.25.2': dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.7 + '@babel/generator': 7.26.2 '@babel/helper-compilation-targets': 7.25.2 '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) '@babel/helpers': 7.25.0 - '@babel/parser': 7.25.6 + '@babel/parser': 7.25.8 '@babel/template': 7.25.0 '@babel/traverse': 7.25.6 '@babel/types': 7.25.8 @@ -10168,7 +10768,7 @@ snapshots: dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.25.7 - '@babel/generator': 7.25.7 + '@babel/generator': 7.26.2 '@babel/helper-compilation-targets': 7.25.7 '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.8) '@babel/helpers': 7.25.7 @@ -10184,9 +10784,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.25.7': + '@babel/generator@7.26.2': dependencies: - '@babel/types': 7.25.8 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 3.0.2 @@ -10195,10 +10796,14 @@ snapshots: dependencies: '@babel/types': 7.25.8 - '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7': + '@babel/helper-annotate-as-pure@7.25.9': dependencies: - '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.26.0 + + '@babel/helper-builder-binary-assignment-operator-visitor@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 transitivePeerDependencies: - supports-color @@ -10206,7 +10811,7 @@ snapshots: dependencies: '@babel/compat-data': 7.25.4 '@babel/helper-validator-option': 7.24.8 - browserslist: 4.23.3 + browserslist: 4.24.0 lru-cache: 5.1.1 semver: 6.3.1 @@ -10218,18 +10823,13 @@ snapshots: lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.25.4(@babel/core@7.25.2)': + '@babel/helper-compilation-targets@7.25.9': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-member-expression-to-functions': 7.24.8 - '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 - '@babel/traverse': 7.25.7 + '@babel/compat-data': 7.26.2 + '@babel/helper-validator-option': 7.25.9 + browserslist: 4.24.0 + lru-cache: 5.1.1 semver: 6.3.1 - transitivePeerDependencies: - - supports-color '@babel/helper-create-class-features-plugin@7.25.4(@babel/core@7.25.8)': dependencies: @@ -10244,18 +10844,38 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-create-regexp-features-plugin@7.25.2(@babel/core@7.25.2)': + '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 + '@babel/core': 7.25.8 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-member-expression-to-functions': 7.25.9 + '@babel/helper-optimise-call-expression': 7.25.9 + '@babel/helper-replace-supers': 7.25.9(@babel/core@7.25.8) + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + '@babel/traverse': 7.25.9 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + '@babel/helper-create-regexp-features-plugin@7.25.2(@babel/core@7.25.8)': + dependencies: + '@babel/core': 7.25.8 '@babel/helper-annotate-as-pure': 7.24.7 regexpu-core: 5.3.2 semver: 6.3.1 - '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.25.2)': + '@babel/helper-create-regexp-features-plugin@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-annotate-as-pure': 7.25.9 + regexpu-core: 6.1.1 + semver: 6.3.1 + + '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.25.8)': + dependencies: + '@babel/core': 7.25.8 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 debug: 4.3.7 lodash.debounce: 4.0.8 resolve: 1.22.8 @@ -10264,14 +10884,21 @@ snapshots: '@babel/helper-member-expression-to-functions@7.24.8': dependencies: - '@babel/traverse': 7.25.6 + '@babel/traverse': 7.25.7 '@babel/types': 7.25.8 transitivePeerDependencies: - supports-color + '@babel/helper-member-expression-to-functions@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + '@babel/helper-module-imports@7.24.7': dependencies: - '@babel/traverse': 7.25.6 + '@babel/traverse': 7.25.7 '@babel/types': 7.25.8 transitivePeerDependencies: - supports-color @@ -10283,6 +10910,13 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helper-module-imports@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -10303,29 +10937,35 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helper-module-transforms@7.26.0(@babel/core@7.25.8)': + dependencies: + '@babel/core': 7.25.8 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + '@babel/traverse': 7.25.9 + transitivePeerDependencies: + - supports-color + '@babel/helper-optimise-call-expression@7.24.7': dependencies: '@babel/types': 7.25.8 + '@babel/helper-optimise-call-expression@7.25.9': + dependencies: + '@babel/types': 7.26.0 + '@babel/helper-plugin-utils@7.24.8': {} '@babel/helper-plugin-utils@7.25.7': {} - '@babel/helper-remap-async-to-generator@7.25.0(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-wrap-function': 7.25.0 - '@babel/traverse': 7.25.7 - transitivePeerDependencies: - - supports-color + '@babel/helper-plugin-utils@7.25.9': {} - '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)': + '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-member-expression-to-functions': 7.24.8 - '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.8 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-wrap-function': 7.25.9 + '@babel/traverse': 7.25.9 transitivePeerDependencies: - supports-color @@ -10334,13 +10974,22 @@ snapshots: '@babel/core': 7.25.8 '@babel/helper-member-expression-to-functions': 7.24.8 '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/traverse': 7.25.6 + '@babel/traverse': 7.25.7 + transitivePeerDependencies: + - supports-color + + '@babel/helper-replace-supers@7.25.9(@babel/core@7.25.8)': + dependencies: + '@babel/core': 7.25.8 + '@babel/helper-member-expression-to-functions': 7.25.9 + '@babel/helper-optimise-call-expression': 7.25.9 + '@babel/traverse': 7.25.9 transitivePeerDependencies: - supports-color '@babel/helper-simple-access@7.24.7': dependencies: - '@babel/traverse': 7.25.6 + '@babel/traverse': 7.25.7 '@babel/types': 7.25.8 transitivePeerDependencies: - supports-color @@ -10352,6 +11001,13 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helper-simple-access@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + '@babel/helper-skip-transparent-expression-wrappers@7.24.7': dependencies: '@babel/traverse': 7.25.7 @@ -10359,19 +11015,32 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helper-skip-transparent-expression-wrappers@7.25.9': + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + '@babel/helper-string-parser@7.25.7': {} + '@babel/helper-string-parser@7.25.9': {} + '@babel/helper-validator-identifier@7.25.7': {} + '@babel/helper-validator-identifier@7.25.9': {} + '@babel/helper-validator-option@7.24.8': {} '@babel/helper-validator-option@7.25.7': {} - '@babel/helper-wrap-function@7.25.0': + '@babel/helper-validator-option@7.25.9': {} + + '@babel/helper-wrap-function@7.25.9': dependencies: - '@babel/template': 7.25.7 - '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 transitivePeerDependencies: - supports-color @@ -10399,46 +11068,46 @@ snapshots: js-tokens: 4.0.0 picocolors: 1.1.0 - '@babel/parser@7.25.6': - dependencies: - '@babel/types': 7.25.8 - '@babel/parser@7.25.8': dependencies: '@babel/types': 7.25.8 - '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3(@babel/core@7.25.2)': + '@babel/parser@7.26.2': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/traverse': 7.25.6 + '@babel/types': 7.26.0 + + '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.25.8)': + dependencies: + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/traverse': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.0(@babel/core@7.25.2)': + '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0(@babel/core@7.25.2)': + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 - '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 + '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.25.8) transitivePeerDependencies: - supports-color - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.0(@babel/core@7.25.2)': + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/traverse': 7.25.9 transitivePeerDependencies: - supports-color @@ -10450,367 +11119,285 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.2)': + '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 + '@babel/core': 7.25.8 - '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.2)': + '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.25.2)': + '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.25.2)': + '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-import-assertions@7.24.7(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-import-attributes@7.24.7(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 '@babel/plugin-transform-arrow-functions@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-transform-async-generator-functions@7.25.4(@babel/core@7.25.2)': + '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-remap-async-to-generator': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2) - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-async-generator-functions@7.25.9(@babel/core@7.25.8)': + dependencies: + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.25.8) + '@babel/traverse': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-async-to-generator@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-remap-async-to-generator': 7.25.0(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.25.8) transitivePeerDependencies: - supports-color - '@babel/plugin-transform-block-scoped-functions@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-block-scoped-functions@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-block-scoping@7.25.0(@babel/core@7.25.2)': + '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-class-properties@7.25.4(@babel/core@7.25.2)': + '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-class-static-block@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-classes@7.25.4(@babel/core@7.25.2)': + '@babel/plugin-transform-classes@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.8 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-replace-supers': 7.25.9(@babel/core@7.25.8) + '@babel/traverse': 7.25.9 globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-computed-properties@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/template': 7.25.0 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/template': 7.25.9 - '@babel/plugin-transform-destructuring@7.24.8(@babel/core@7.25.2)': + '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-dotall-regex@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-duplicate-keys@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.0(@babel/core@7.25.2)': + '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-dynamic-import@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-exponentiation-operator@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-exponentiation-operator@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-builder-binary-assignment-operator-visitor': 7.24.7 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-builder-binary-assignment-operator-visitor': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-export-namespace-from@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-for-of@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-for-of@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-function-name@7.25.1(@babel/core@7.25.2)': + '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.8 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/traverse': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-json-strings@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-literals@7.25.2(@babel/core@7.25.2)': + '@babel/plugin-transform-literals@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-logical-assignment-operators@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-member-expression-literals@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-modules-amd@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-modules-commonjs@7.24.8(@babel/core@7.25.2)': + '@babel/plugin-transform-modules-commonjs@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-simple-access': 7.24.7 + '@babel/core': 7.25.8 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-simple-access': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-modules-systemjs@7.25.0(@babel/core@7.25.2)': + '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-validator-identifier': 7.25.7 - '@babel/traverse': 7.25.6 + '@babel/core': 7.25.8 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + '@babel/traverse': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-modules-umd@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-named-capturing-groups-regex@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-new-target@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-nullish-coalescing-operator@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-nullish-coalescing-operator@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-numeric-separator@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-object-rest-spread@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.25.8) - '@babel/plugin-transform-object-super@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-replace-supers': 7.25.9(@babel/core@7.25.8) transitivePeerDependencies: - supports-color - '@babel/plugin-transform-optional-catch-binding@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-optional-chaining@7.24.8(@babel/core@7.25.2)': + '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-parameters@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-private-methods@7.25.4(@babel/core@7.25.2)': + '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-private-property-in-object@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-annotate-as-pure': 7.25.9 + '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-property-literals@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 '@babel/plugin-transform-react-jsx-self@7.25.7(@babel/core@7.25.8)': dependencies: @@ -10822,161 +11409,153 @@ snapshots: '@babel/core': 7.25.8 '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-transform-regenerator@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 regenerator-transform: 0.15.2 - '@babel/plugin-transform-reserved-words@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-shorthand-properties@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-spread@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + + '@babel/plugin-transform-spread@7.25.9(@babel/core@7.25.8)': + dependencies: + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-skip-transparent-expression-wrappers': 7.25.9 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-sticky-regex@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-template-literals@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-template-literals@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-typeof-symbol@7.24.8(@babel/core@7.25.2)': + '@babel/plugin-transform-typeof-symbol@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-unicode-escapes@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-unicode-property-regex@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-unicode-regex@7.24.7(@babel/core@7.25.2)': + '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-transform-unicode-sets-regex@7.25.4(@babel/core@7.25.2)': + '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.25.8) + '@babel/helper-plugin-utils': 7.25.9 - '@babel/preset-env@7.25.4(@babel/core@7.25.2)': + '@babel/preset-env@7.26.0(@babel/core@7.25.8)': dependencies: - '@babel/compat-data': 7.25.4 - '@babel/core': 7.25.2 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-validator-option': 7.24.8 - '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.3(@babel/core@7.25.2) - '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.2) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.25.2) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-import-assertions': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.25.2) - '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.25.2) - '@babel/plugin-transform-arrow-functions': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-async-generator-functions': 7.25.4(@babel/core@7.25.2) - '@babel/plugin-transform-async-to-generator': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-block-scoped-functions': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-block-scoping': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-transform-class-properties': 7.25.4(@babel/core@7.25.2) - '@babel/plugin-transform-class-static-block': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-classes': 7.25.4(@babel/core@7.25.2) - '@babel/plugin-transform-computed-properties': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-destructuring': 7.24.8(@babel/core@7.25.2) - '@babel/plugin-transform-dotall-regex': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-duplicate-keys': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-transform-dynamic-import': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-exponentiation-operator': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-export-namespace-from': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-for-of': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-function-name': 7.25.1(@babel/core@7.25.2) - '@babel/plugin-transform-json-strings': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-literals': 7.25.2(@babel/core@7.25.2) - '@babel/plugin-transform-logical-assignment-operators': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-member-expression-literals': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-modules-amd': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) - '@babel/plugin-transform-modules-systemjs': 7.25.0(@babel/core@7.25.2) - '@babel/plugin-transform-modules-umd': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-named-capturing-groups-regex': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-new-target': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-numeric-separator': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-object-rest-spread': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-object-super': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-optional-catch-binding': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/core@7.25.2) - '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-private-methods': 7.25.4(@babel/core@7.25.2) - '@babel/plugin-transform-private-property-in-object': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-property-literals': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-regenerator': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-reserved-words': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-shorthand-properties': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-spread': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-sticky-regex': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-template-literals': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-typeof-symbol': 7.24.8(@babel/core@7.25.2) - '@babel/plugin-transform-unicode-escapes': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-unicode-property-regex': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-unicode-regex': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-unicode-sets-regex': 7.25.4(@babel/core@7.25.2) - '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.25.2) - babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.25.2) - babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.25.2) - babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.25.2) + '@babel/compat-data': 7.26.2 + '@babel/core': 7.25.8 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-plugin-utils': 7.25.9 + '@babel/helper-validator-option': 7.25.9 + '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.8) + '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.25.8) + '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.25.8) + '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.25.8) + '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-async-generator-functions': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-block-scoped-functions': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.25.8) + '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-exponentiation-operator': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-for-of': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-nullish-coalescing-operator': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.25.8) + '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-template-literals': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-typeof-symbol': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.25.8) + '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.25.8) + '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.25.8) + babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.25.8) + babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.25.8) + babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.25.8) core-js-compat: 3.38.1 semver: 6.3.1 transitivePeerDependencies: - supports-color - '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.25.2)': + '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.25.8)': dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/core': 7.25.8 + '@babel/helper-plugin-utils': 7.25.9 '@babel/types': 7.25.8 esutils: 2.0.3 @@ -10993,20 +11572,26 @@ snapshots: '@babel/template@7.25.0': dependencies: '@babel/code-frame': 7.24.7 - '@babel/parser': 7.25.6 + '@babel/parser': 7.26.2 '@babel/types': 7.25.8 '@babel/template@7.25.7': dependencies: '@babel/code-frame': 7.25.7 - '@babel/parser': 7.25.8 + '@babel/parser': 7.26.2 '@babel/types': 7.25.8 + '@babel/template@7.25.9': + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + '@babel/traverse@7.25.6': dependencies: '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.7 - '@babel/parser': 7.25.6 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 '@babel/template': 7.25.0 '@babel/types': 7.25.8 debug: 4.3.7 @@ -11017,8 +11602,8 @@ snapshots: '@babel/traverse@7.25.7': dependencies: '@babel/code-frame': 7.25.7 - '@babel/generator': 7.25.7 - '@babel/parser': 7.25.8 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 '@babel/template': 7.25.7 '@babel/types': 7.25.8 debug: 4.3.7 @@ -11026,12 +11611,29 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/traverse@7.25.9': + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/types': 7.26.0 + debug: 4.3.7 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + '@babel/types@7.25.8': dependencies: '@babel/helper-string-parser': 7.25.7 '@babel/helper-validator-identifier': 7.25.7 to-fast-properties: 2.0.0 + '@babel/types@7.26.0': + dependencies: + '@babel/helper-string-parser': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + '@cfcs/core@0.0.6': dependencies: '@egjs/component': 3.0.5 @@ -11055,6 +11657,10 @@ snapshots: conventional-commits-filter: 5.0.0 conventional-commits-parser: 6.0.0 + '@cspotcode/source-map-support@0.8.1': + dependencies: + '@jridgewell/trace-mapping': 0.3.9 + '@daybrush/utils@1.13.0': {} '@develar/schema-utils@2.6.5': @@ -11062,6 +11668,36 @@ snapshots: ajv: 6.12.6 ajv-keywords: 3.5.2(ajv@6.12.6) + '@dnd-kit/accessibility@3.1.0(react@18.3.1)': + dependencies: + react: 18.3.1 + tslib: 2.7.0 + + '@dnd-kit/core@6.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@dnd-kit/accessibility': 3.1.0(react@18.3.1) + '@dnd-kit/utilities': 3.2.2(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + tslib: 2.7.0 + + '@dnd-kit/utilities@3.2.2(react@18.3.1)': + dependencies: + react: 18.3.1 + tslib: 2.7.0 + + '@edge-runtime/format@2.2.1': {} + + '@edge-runtime/node-utils@2.3.0': {} + + '@edge-runtime/ponyfill@2.4.2': {} + + '@edge-runtime/primitives@4.1.0': {} + + '@edge-runtime/vm@3.2.0': + dependencies: + '@edge-runtime/primitives': 4.1.0 + '@egjs/children-differ@1.0.1': dependencies: '@egjs/list-differ': 1.0.1 @@ -11070,16 +11706,16 @@ snapshots: '@egjs/list-differ@1.0.1': {} - '@egoist/tailwindcss-icons@1.8.1(tailwindcss@3.4.14)': + '@egoist/tailwindcss-icons@1.8.1(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)))': dependencies: '@iconify/utils': 2.1.32 - tailwindcss: 3.4.14 + tailwindcss: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) transitivePeerDependencies: - supports-color - '@egoist/tipc@0.3.2(electron@33.0.0)(react@18.3.1)': + '@egoist/tipc@0.3.2(electron@33.0.2)(react@18.3.1)': dependencies: - electron: 33.0.0 + electron: 33.0.2 optionalDependencies: '@tanstack/react-query': 5.59.14(react@18.3.1) transitivePeerDependencies: @@ -11327,17 +11963,17 @@ snapshots: dependencies: chrome-trace-event: 1.0.4 - '@electron-toolkit/preload@3.0.1(electron@33.0.0)': + '@electron-toolkit/preload@3.0.1(electron@33.0.2)': dependencies: - electron: 33.0.0 + electron: 33.0.2 - '@electron-toolkit/tsconfig@1.0.1(@types/node@22.7.5)': + '@electron-toolkit/tsconfig@1.0.1(@types/node@22.8.7)': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 - '@electron-toolkit/utils@3.0.0(electron@33.0.0)': + '@electron-toolkit/utils@3.0.0(electron@33.0.2)': dependencies: - electron: 33.0.0 + electron: 33.0.2 '@electron/asar@3.2.10': dependencies: @@ -11562,7 +12198,7 @@ snapshots: '@emotion/memoize@0.9.0': optional: true - '@eneris/push-receiver@4.2.0': + '@eneris/push-receiver@4.3.0': dependencies: http_ece: 1.2.1 jsonwebtoken: 9.0.2 @@ -11581,155 +12217,229 @@ snapshots: '@esbuild/aix-ppc64@0.23.1': optional: true + '@esbuild/aix-ppc64@0.24.0': + optional: true + '@esbuild/android-arm64@0.21.5': optional: true '@esbuild/android-arm64@0.23.1': optional: true + '@esbuild/android-arm64@0.24.0': + optional: true + '@esbuild/android-arm@0.21.5': optional: true '@esbuild/android-arm@0.23.1': optional: true + '@esbuild/android-arm@0.24.0': + optional: true + '@esbuild/android-x64@0.21.5': optional: true '@esbuild/android-x64@0.23.1': optional: true + '@esbuild/android-x64@0.24.0': + optional: true + '@esbuild/darwin-arm64@0.21.5': optional: true '@esbuild/darwin-arm64@0.23.1': optional: true + '@esbuild/darwin-arm64@0.24.0': + optional: true + '@esbuild/darwin-x64@0.21.5': optional: true '@esbuild/darwin-x64@0.23.1': optional: true + '@esbuild/darwin-x64@0.24.0': + optional: true + '@esbuild/freebsd-arm64@0.21.5': optional: true '@esbuild/freebsd-arm64@0.23.1': optional: true + '@esbuild/freebsd-arm64@0.24.0': + optional: true + '@esbuild/freebsd-x64@0.21.5': optional: true '@esbuild/freebsd-x64@0.23.1': optional: true + '@esbuild/freebsd-x64@0.24.0': + optional: true + '@esbuild/linux-arm64@0.21.5': optional: true '@esbuild/linux-arm64@0.23.1': optional: true + '@esbuild/linux-arm64@0.24.0': + optional: true + '@esbuild/linux-arm@0.21.5': optional: true '@esbuild/linux-arm@0.23.1': optional: true + '@esbuild/linux-arm@0.24.0': + optional: true + '@esbuild/linux-ia32@0.21.5': optional: true '@esbuild/linux-ia32@0.23.1': optional: true + '@esbuild/linux-ia32@0.24.0': + optional: true + '@esbuild/linux-loong64@0.21.5': optional: true '@esbuild/linux-loong64@0.23.1': optional: true + '@esbuild/linux-loong64@0.24.0': + optional: true + '@esbuild/linux-mips64el@0.21.5': optional: true '@esbuild/linux-mips64el@0.23.1': optional: true + '@esbuild/linux-mips64el@0.24.0': + optional: true + '@esbuild/linux-ppc64@0.21.5': optional: true '@esbuild/linux-ppc64@0.23.1': optional: true + '@esbuild/linux-ppc64@0.24.0': + optional: true + '@esbuild/linux-riscv64@0.21.5': optional: true '@esbuild/linux-riscv64@0.23.1': optional: true + '@esbuild/linux-riscv64@0.24.0': + optional: true + '@esbuild/linux-s390x@0.21.5': optional: true '@esbuild/linux-s390x@0.23.1': optional: true + '@esbuild/linux-s390x@0.24.0': + optional: true + '@esbuild/linux-x64@0.21.5': optional: true '@esbuild/linux-x64@0.23.1': optional: true + '@esbuild/linux-x64@0.24.0': + optional: true + '@esbuild/netbsd-x64@0.21.5': optional: true '@esbuild/netbsd-x64@0.23.1': optional: true + '@esbuild/netbsd-x64@0.24.0': + optional: true + '@esbuild/openbsd-arm64@0.23.1': optional: true + '@esbuild/openbsd-arm64@0.24.0': + optional: true + '@esbuild/openbsd-x64@0.21.5': optional: true '@esbuild/openbsd-x64@0.23.1': optional: true + '@esbuild/openbsd-x64@0.24.0': + optional: true + '@esbuild/sunos-x64@0.21.5': optional: true '@esbuild/sunos-x64@0.23.1': optional: true + '@esbuild/sunos-x64@0.24.0': + optional: true + '@esbuild/win32-arm64@0.21.5': optional: true '@esbuild/win32-arm64@0.23.1': optional: true + '@esbuild/win32-arm64@0.24.0': + optional: true + '@esbuild/win32-ia32@0.21.5': optional: true '@esbuild/win32-ia32@0.23.1': optional: true + '@esbuild/win32-ia32@0.24.0': + optional: true + '@esbuild/win32-x64@0.21.5': optional: true '@esbuild/win32-x64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.13.0(jiti@2.3.3))': + '@esbuild/win32-x64@0.24.0': + optional: true + + '@eslint-community/eslint-utils@4.4.0(eslint@9.14.0(jiti@2.3.3))': dependencies: - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.1': {} - '@eslint-react/ast@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@eslint-community/regexpp@4.12.1': {} + + '@eslint-react/ast@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) birecord: 0.1.1 string-ts: 2.2.0 ts-pattern: 5.5.0 @@ -11738,18 +12448,18 @@ snapshots: - supports-color - typescript - '@eslint-react/core@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@eslint-react/core@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/jsx': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/jsx': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/var': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/var': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) birecord: 0.1.1 short-unique-id: 5.2.0 ts-pattern: 5.5.0 @@ -11758,46 +12468,46 @@ snapshots: - supports-color - typescript - '@eslint-react/eslint-plugin@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@eslint-react/eslint-plugin@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) - eslint-plugin-react-debug: 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint-plugin-react-dom: 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint-plugin-react-hooks-extra: 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint-plugin-react-naming-convention: 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint-plugin-react-web-api: 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint-plugin-react-x: 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) + eslint-plugin-react-debug: 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint-plugin-react-dom: 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint-plugin-react-hooks-extra: 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint-plugin-react-naming-convention: 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint-plugin-react-web-api: 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint-plugin-react-x: 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@eslint-react/jsx@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@eslint-react/jsx@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/var': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/var': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) ts-pattern: 5.5.0 transitivePeerDependencies: - eslint - supports-color - typescript - '@eslint-react/shared@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@eslint-react/shared@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: '@eslint-react/tools': 1.15.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) picomatch: 4.0.2 transitivePeerDependencies: - eslint @@ -11806,24 +12516,24 @@ snapshots: '@eslint-react/tools@1.15.2': {} - '@eslint-react/types@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@eslint-react/types@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: '@eslint-react/tools': 1.15.2 '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) transitivePeerDependencies: - eslint - supports-color - typescript - '@eslint-react/var@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@eslint-react/var@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) ts-pattern: 5.5.0 transitivePeerDependencies: - eslint @@ -11846,7 +12556,7 @@ snapshots: dependencies: ajv: 6.12.6 debug: 4.3.7 - espree: 10.2.0 + espree: 10.3.0 globals: 14.0.0 ignore: 5.3.2 import-fresh: 3.3.0 @@ -11858,6 +12568,8 @@ snapshots: '@eslint/js@9.13.0': {} + '@eslint/js@9.14.0': {} + '@eslint/object-schema@2.1.4': {} '@eslint/plugin-kit@0.2.0': @@ -11880,6 +12592,8 @@ snapshots: ajv-formats: 3.0.1(ajv@8.17.1) fast-uri: 3.0.3 + '@fastify/busboy@2.1.1': {} + '@fastify/error@4.0.0': {} '@fastify/fast-json-stringify-compiler@5.0.1': @@ -12238,23 +12952,23 @@ snapshots: '@floating-ui/core': 1.6.8 '@floating-ui/utils': 0.2.8 - '@floating-ui/react-dom-interactions@0.3.1(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@floating-ui/react-dom-interactions@0.3.1(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@floating-ui/react-dom': 0.6.3(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@floating-ui/react-dom': 0.6.3(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) aria-hidden: 1.2.4 point-in-polygon: 1.1.0 - use-isomorphic-layout-effect: 1.1.2(@types/react@18.3.11)(react@18.3.1) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.3.12)(react@18.3.1) transitivePeerDependencies: - '@types/react' - react - react-dom - '@floating-ui/react-dom@0.6.3(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@floating-ui/react-dom@0.6.3(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@floating-ui/dom': 0.4.5 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - use-isomorphic-layout-effect: 1.1.2(@types/react@18.3.11)(react@18.3.1) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.3.12)(react@18.3.1) transitivePeerDependencies: - '@types/react' @@ -12281,7 +12995,7 @@ snapshots: '@grpc/grpc-js@1.9.15': dependencies: '@grpc/proto-loader': 0.7.13 - '@types/node': 22.7.5 + '@types/node': 22.8.7 '@grpc/proto-loader@0.7.13': dependencies: @@ -12290,7 +13004,7 @@ snapshots: protobufjs: 7.4.0 yargs: 17.7.2 - '@headlessui/react@2.1.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@headlessui/react@2.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@floating-ui/react': 0.26.25(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-aria/focus': 3.18.4(react@18.3.1) @@ -12299,31 +13013,33 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@hono/auth-js@1.0.11(@auth/core@0.37.0)(hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy))(react@18.3.1)': + '@hono/auth-js@1.0.13(@auth/core@0.37.2)(hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24))(react@18.3.1)': dependencies: - '@auth/core': 0.37.0 - hono: 4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy) + '@auth/core': 0.37.2 + hono: 4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24) react: 18.3.1 - '@hono/node-server@1.13.2(hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy))': + '@hono/node-server@1.13.4(hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24))': dependencies: - hono: 4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy) + hono: 4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24) - '@hookform/resolvers@3.9.0(react-hook-form@7.53.0(react@18.3.1))': + '@hookform/resolvers@3.9.1(react-hook-form@7.53.1(react@18.3.1))': dependencies: - react-hook-form: 7.53.0(react@18.3.1) + react-hook-form: 7.53.1(react@18.3.1) - '@humanfs/core@0.19.0': {} + '@humanfs/core@0.19.1': {} - '@humanfs/node@0.16.5': + '@humanfs/node@0.16.6': dependencies: - '@humanfs/core': 0.19.0 + '@humanfs/core': 0.19.1 '@humanwhocodes/retry': 0.3.1 '@humanwhocodes/module-importer@1.0.1': {} '@humanwhocodes/retry@0.3.1': {} + '@humanwhocodes/retry@0.4.0': {} + '@hutson/parse-repository-url@5.0.0': {} '@iconify-json/logos@1.2.3': @@ -12334,7 +13050,7 @@ snapshots: dependencies: '@iconify/types': 2.0.0 - '@iconify-json/simple-icons@1.2.8': + '@iconify-json/simple-icons@1.2.10': dependencies: '@iconify/types': 2.0.0 @@ -12417,13 +13133,18 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 - '@lottiefiles/dotlottie-react@0.9.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@jridgewell/trace-mapping@0.3.9': dependencies: - '@lottiefiles/dotlottie-web': 0.35.0 + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.5.0 + + '@lottiefiles/dotlottie-react@0.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@lottiefiles/dotlottie-web': 0.36.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@lottiefiles/dotlottie-web@0.35.0': {} + '@lottiefiles/dotlottie-web@0.36.1': {} '@malept/cross-spawn-promise@1.1.1': dependencies: @@ -12442,11 +13163,26 @@ snapshots: transitivePeerDependencies: - supports-color - '@microflash/remark-callout-directives@4.3.1': + '@mapbox/node-pre-gyp@1.0.11(encoding@0.1.13)': + dependencies: + detect-libc: 2.0.3 + https-proxy-agent: 5.0.1 + make-dir: 3.1.0 + node-fetch: 2.7.0(encoding@0.1.13) + nopt: 5.0.0 + npmlog: 5.0.1 + rimraf: 3.0.2 + semver: 7.6.3 + tar: 6.2.1 + transitivePeerDependencies: + - encoding + - supports-color + + '@microflash/remark-callout-directives@4.3.2': dependencies: defu: 6.1.4 hastscript: 9.0.0 - mdast-util-from-markdown: 2.0.1 + mdast-util-from-markdown: 2.0.2 unist-util-visit: 5.0.0 transitivePeerDependencies: - supports-color @@ -12675,7 +13411,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@opentelemetry/instrumentation-express@0.42.0(@opentelemetry/api@1.9.0)': + '@opentelemetry/instrumentation-express@0.43.0(@opentelemetry/api@1.9.0)': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0) @@ -12684,7 +13420,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@opentelemetry/instrumentation-fastify@0.39.0(@opentelemetry/api@1.9.0)': + '@opentelemetry/instrumentation-fastify@0.40.0(@opentelemetry/api@1.9.0)': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0) @@ -12893,11 +13629,11 @@ snapshots: '@panva/hkdf@1.2.1': {} - '@pengx17/electron-forge-maker-appimage@1.2.1(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8))': + '@pengx17/electron-forge-maker-appimage@1.2.1(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)': dependencies: '@electron-forge/maker-base': 7.4.0 '@electron-forge/shared-types': 7.4.0 - app-builder-lib: 24.13.3(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)) + app-builder-lib: 24.13.3(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) transitivePeerDependencies: - bluebird - dmg-builder @@ -12942,695 +13678,544 @@ snapshots: '@radix-ui/number@1.1.0': {} - '@radix-ui/primitive@1.0.1': - dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/primitive@1.1.0': {} - '@radix-ui/react-arrow@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-arrow@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(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.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-avatar@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-avatar@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-checkbox@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-checkbox@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-collection@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-collection@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-slot': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-compose-refs@1.0.1(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-context-menu@2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-context-menu@2.2.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-menu': 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-menu': 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-context@1.0.1(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-context@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-context@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-context@1.1.1(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-context@1.1.1(@types/react@18.3.12)(react@18.3.1)': dependencies: react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-dialog@1.0.5(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-dialog@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.0.2(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/primitive': 1.1.0 + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-slot': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) aria-hidden: 1.2.4 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.5.5(@types/react@18.3.11)(react@18.3.1) + react-remove-scroll: 2.6.0(@types/react@18.3.12)(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-dialog@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-direction@1.1.0(@types/react@18.3.12)(react@18.3.1)': + dependencies: + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.12 + + '@radix-ui/react-dismissable-layer@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.3.12)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + optionalDependencies: + '@types/react': 18.3.12 + '@types/react-dom': 18.3.1 + + '@radix-ui/react-dropdown-menu@2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/primitive': 1.1.0 + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-menu': 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + optionalDependencies: + '@types/react': 18.3.12 + '@types/react-dom': 18.3.1 + + '@radix-ui/react-focus-guards@1.1.1(@types/react@18.3.12)(react@18.3.1)': + dependencies: + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.12 + + '@radix-ui/react-focus-scope@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + optionalDependencies: + '@types/react': 18.3.12 + '@types/react-dom': 18.3.1 + + '@radix-ui/react-hover-card@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/primitive': 1.1.0 + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + optionalDependencies: + '@types/react': 18.3.12 + '@types/react-dom': 18.3.1 + + '@radix-ui/react-id@1.1.0(@types/react@18.3.12)(react@18.3.1)': + dependencies: + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.12 + + '@radix-ui/react-label@2.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(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.12 + '@types/react-dom': 18.3.1 + + '@radix-ui/react-menu@2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/primitive': 1.1.0 + '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-slot': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) aria-hidden: 1.2.4 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.6.0(@types/react@18.3.11)(react@18.3.1) + react-remove-scroll: 2.6.0(@types/react@18.3.12)(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-direction@1.1.0(@types/react@18.3.11)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-dismissable-layer@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-navigation-menu@1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(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.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-dropdown-menu@2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-popover@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-menu': 2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-focus-guards@1.0.1(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-focus-guards@1.1.1(@types/react@18.3.11)(react@18.3.1)': - dependencies: - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-focus-scope@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-hover-card@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-id@1.0.1(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-id@1.1.0(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-label@2.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(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.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-menu@2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-slot': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) aria-hidden: 1.2.4 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.6.0(@types/react@18.3.11)(react@18.3.1) + react-remove-scroll: 2.6.0(@types/react@18.3.12)(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-navigation-menu@1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(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.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-popover@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - aria-hidden: 1.2.4 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.6.0(@types/react@18.3.11)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-popper@1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-popper@1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@floating-ui/react-dom': 2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-arrow': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-rect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-arrow': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-rect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.12)(react@18.3.1) '@radix-ui/rect': 1.1.0 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-portal@1.0.4(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-portal@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-portal@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-presence@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-presence@1.0.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-primitive@2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-slot': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-presence@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-slot': 1.0.2(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-primitive@2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/react-slot': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 - '@types/react-dom': 18.3.1 - - '@radix-ui/react-radio-group@1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-radio-group@1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-roving-focus@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-roving-focus@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-scroll-area@1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-scroll-area@1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/number': 1.1.0 '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-select@2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-select@2.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/number': 1.1.0 '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-focus-guards': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-slot': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) aria-hidden: 1.2.4 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-remove-scroll: 2.6.0(@types/react@18.3.11)(react@18.3.1) + react-remove-scroll: 2.6.0(@types/react@18.3.12)(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-slider@1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-slider@1.2.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/number': 1.1.0 '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-slot@1.0.2(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-slot@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-slot@1.1.0(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-switch@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-switch@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-tabs@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-tabs@1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-direction': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-toast@1.2.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-toast@1.2.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(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.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-tooltip@1.1.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-tooltip@1.1.3(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-context': 1.1.1(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-slot': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.11)(react@18.3.1) - '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-dismissable-layer': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-portal': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-slot': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(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.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 - '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.11)(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.3.11)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.7 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.11 - - '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-use-previous@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-use-previous@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-use-rect@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-use-rect@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: '@radix-ui/rect': 1.1.0 react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-use-size@1.1.0(@types/react@18.3.11)(react@18.3.1)': + '@radix-ui/react-use-size@1.1.0(@types/react@18.3.12)(react@18.3.1)': dependencies: - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.11)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@radix-ui/react-visually-hidden@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@radix-ui/react-visually-hidden@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(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.11 + '@types/react': 18.3.12 '@types/react-dom': 18.3.1 '@radix-ui/rect@1.1.0': {} @@ -13763,6 +14348,19 @@ snapshots: '@resvg/resvg-js-win32-ia32-msvc': 2.6.2 '@resvg/resvg-js-win32-x64-msvc': 2.6.2 + '@rollup/pluginutils@4.2.1': + dependencies: + estree-walker: 2.0.2 + picomatch: 2.3.1 + + '@rollup/pluginutils@5.1.3(rollup@4.24.0)': + dependencies: + '@types/estree': 1.0.6 + estree-walker: 2.0.2 + picomatch: 4.0.2 + optionalDependencies: + rollup: 4.24.0 + '@rollup/rollup-android-arm-eabi@4.24.0': optional: true @@ -13824,84 +14422,84 @@ snapshots: dependencies: '@daybrush/utils': 1.13.0 - '@sentry-internal/browser-utils@8.33.1': + '@sentry-internal/browser-utils@8.35.0': dependencies: - '@sentry/core': 8.33.1 - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry/core': 8.35.0 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 - '@sentry-internal/browser-utils@8.34.0': + '@sentry-internal/browser-utils@8.36.0': dependencies: - '@sentry/core': 8.34.0 - '@sentry/types': 8.34.0 - '@sentry/utils': 8.34.0 + '@sentry/core': 8.36.0 + '@sentry/types': 8.36.0 + '@sentry/utils': 8.36.0 - '@sentry-internal/feedback@8.33.1': + '@sentry-internal/feedback@8.35.0': dependencies: - '@sentry/core': 8.33.1 - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry/core': 8.35.0 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 - '@sentry-internal/feedback@8.34.0': + '@sentry-internal/feedback@8.36.0': dependencies: - '@sentry/core': 8.34.0 - '@sentry/types': 8.34.0 - '@sentry/utils': 8.34.0 + '@sentry/core': 8.36.0 + '@sentry/types': 8.36.0 + '@sentry/utils': 8.36.0 - '@sentry-internal/replay-canvas@8.33.1': + '@sentry-internal/replay-canvas@8.35.0': dependencies: - '@sentry-internal/replay': 8.33.1 - '@sentry/core': 8.33.1 - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry-internal/replay': 8.35.0 + '@sentry/core': 8.35.0 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 - '@sentry-internal/replay-canvas@8.34.0': + '@sentry-internal/replay-canvas@8.36.0': dependencies: - '@sentry-internal/replay': 8.34.0 - '@sentry/core': 8.34.0 - '@sentry/types': 8.34.0 - '@sentry/utils': 8.34.0 + '@sentry-internal/replay': 8.36.0 + '@sentry/core': 8.36.0 + '@sentry/types': 8.36.0 + '@sentry/utils': 8.36.0 - '@sentry-internal/replay@8.33.1': + '@sentry-internal/replay@8.35.0': dependencies: - '@sentry-internal/browser-utils': 8.33.1 - '@sentry/core': 8.33.1 - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry-internal/browser-utils': 8.35.0 + '@sentry/core': 8.35.0 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 - '@sentry-internal/replay@8.34.0': + '@sentry-internal/replay@8.36.0': dependencies: - '@sentry-internal/browser-utils': 8.34.0 - '@sentry/core': 8.34.0 - '@sentry/types': 8.34.0 - '@sentry/utils': 8.34.0 + '@sentry-internal/browser-utils': 8.36.0 + '@sentry/core': 8.36.0 + '@sentry/types': 8.36.0 + '@sentry/utils': 8.36.0 - '@sentry/babel-plugin-component-annotate@2.22.5': {} + '@sentry/babel-plugin-component-annotate@2.22.6': {} - '@sentry/browser@8.33.1': + '@sentry/browser@8.35.0': dependencies: - '@sentry-internal/browser-utils': 8.33.1 - '@sentry-internal/feedback': 8.33.1 - '@sentry-internal/replay': 8.33.1 - '@sentry-internal/replay-canvas': 8.33.1 - '@sentry/core': 8.33.1 - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry-internal/browser-utils': 8.35.0 + '@sentry-internal/feedback': 8.35.0 + '@sentry-internal/replay': 8.35.0 + '@sentry-internal/replay-canvas': 8.35.0 + '@sentry/core': 8.35.0 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 - '@sentry/browser@8.34.0': + '@sentry/browser@8.36.0': dependencies: - '@sentry-internal/browser-utils': 8.34.0 - '@sentry-internal/feedback': 8.34.0 - '@sentry-internal/replay': 8.34.0 - '@sentry-internal/replay-canvas': 8.34.0 - '@sentry/core': 8.34.0 - '@sentry/types': 8.34.0 - '@sentry/utils': 8.34.0 + '@sentry-internal/browser-utils': 8.36.0 + '@sentry-internal/feedback': 8.36.0 + '@sentry-internal/replay': 8.36.0 + '@sentry-internal/replay-canvas': 8.36.0 + '@sentry/core': 8.36.0 + '@sentry/types': 8.36.0 + '@sentry/utils': 8.36.0 - '@sentry/bundler-plugin-core@2.22.5(encoding@0.1.13)': + '@sentry/bundler-plugin-core@2.22.6(encoding@0.1.13)': dependencies: '@babel/core': 7.25.8 - '@sentry/babel-plugin-component-annotate': 2.22.5 + '@sentry/babel-plugin-component-annotate': 2.22.6 '@sentry/cli': 2.37.0(encoding@0.1.13) dotenv: 16.4.5 find-up: 5.0.0 @@ -13952,28 +14550,28 @@ snapshots: - encoding - supports-color - '@sentry/core@8.33.1': + '@sentry/core@8.35.0': dependencies: - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 - '@sentry/core@8.34.0': + '@sentry/core@8.36.0': dependencies: - '@sentry/types': 8.34.0 - '@sentry/utils': 8.34.0 + '@sentry/types': 8.36.0 + '@sentry/utils': 8.36.0 - '@sentry/electron@5.6.0': + '@sentry/electron@5.7.0': dependencies: - '@sentry/browser': 8.33.1 - '@sentry/core': 8.33.1 - '@sentry/node': 8.33.1 - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry/browser': 8.35.0 + '@sentry/core': 8.35.0 + '@sentry/node': 8.35.0 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 deepmerge: 4.3.1 transitivePeerDependencies: - supports-color - '@sentry/node@8.33.1': + '@sentry/node@8.35.0': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/context-async-hooks': 1.26.0(@opentelemetry/api@1.9.0) @@ -13982,8 +14580,8 @@ snapshots: '@opentelemetry/instrumentation-amqplib': 0.42.0(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation-connect': 0.39.0(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation-dataloader': 0.12.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-express': 0.42.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-fastify': 0.39.0(@opentelemetry/api@1.9.0) + '@opentelemetry/instrumentation-express': 0.43.0(@opentelemetry/api@1.9.0) + '@opentelemetry/instrumentation-fastify': 0.40.0(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation-fs': 0.15.0(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation-generic-pool': 0.39.0(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation-graphql': 0.43.0(@opentelemetry/api@1.9.0) @@ -14005,79 +14603,79 @@ snapshots: '@opentelemetry/sdk-trace-base': 1.26.0(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.27.0 '@prisma/instrumentation': 5.19.1 - '@sentry/core': 8.33.1 - '@sentry/opentelemetry': 8.33.1(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.53.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.27.0) - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry/core': 8.35.0 + '@sentry/opentelemetry': 8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.53.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.27.0) + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 import-in-the-middle: 1.11.2 transitivePeerDependencies: - supports-color - '@sentry/opentelemetry@8.33.1(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.53.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.27.0)': + '@sentry/opentelemetry@8.35.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.53.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.26.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.27.0)': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0) '@opentelemetry/sdk-trace-base': 1.26.0(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.27.0 - '@sentry/core': 8.33.1 - '@sentry/types': 8.33.1 - '@sentry/utils': 8.33.1 + '@sentry/core': 8.35.0 + '@sentry/types': 8.35.0 + '@sentry/utils': 8.35.0 - '@sentry/react@8.34.0(react@18.3.1)': + '@sentry/react@8.36.0(react@18.3.1)': dependencies: - '@sentry/browser': 8.34.0 - '@sentry/core': 8.34.0 - '@sentry/types': 8.34.0 - '@sentry/utils': 8.34.0 + '@sentry/browser': 8.36.0 + '@sentry/core': 8.36.0 + '@sentry/types': 8.36.0 + '@sentry/utils': 8.36.0 hoist-non-react-statics: 3.3.2 react: 18.3.1 - '@sentry/types@8.33.1': {} + '@sentry/types@8.35.0': {} - '@sentry/types@8.34.0': {} + '@sentry/types@8.36.0': {} - '@sentry/utils@8.33.1': + '@sentry/utils@8.35.0': dependencies: - '@sentry/types': 8.33.1 + '@sentry/types': 8.35.0 - '@sentry/utils@8.34.0': + '@sentry/utils@8.36.0': dependencies: - '@sentry/types': 8.34.0 + '@sentry/types': 8.36.0 - '@sentry/vite-plugin@2.22.5(encoding@0.1.13)': + '@sentry/vite-plugin@2.22.6(encoding@0.1.13)': dependencies: - '@sentry/bundler-plugin-core': 2.22.5(encoding@0.1.13) + '@sentry/bundler-plugin-core': 2.22.6(encoding@0.1.13) unplugin: 1.0.1 transitivePeerDependencies: - encoding - supports-color - '@shikijs/core@1.22.0': + '@shikijs/core@1.22.2': dependencies: - '@shikijs/engine-javascript': 1.22.0 - '@shikijs/engine-oniguruma': 1.22.0 - '@shikijs/types': 1.22.0 + '@shikijs/engine-javascript': 1.22.2 + '@shikijs/engine-oniguruma': 1.22.2 + '@shikijs/types': 1.22.2 '@shikijs/vscode-textmate': 9.3.0 '@types/hast': 3.0.4 hast-util-to-html: 9.0.3 - '@shikijs/engine-javascript@1.22.0': + '@shikijs/engine-javascript@1.22.2': dependencies: - '@shikijs/types': 1.22.0 + '@shikijs/types': 1.22.2 '@shikijs/vscode-textmate': 9.3.0 oniguruma-to-js: 0.4.3 - '@shikijs/engine-oniguruma@1.22.0': + '@shikijs/engine-oniguruma@1.22.2': dependencies: - '@shikijs/types': 1.22.0 + '@shikijs/types': 1.22.2 '@shikijs/vscode-textmate': 9.3.0 - '@shikijs/transformers@1.22.0': + '@shikijs/transformers@1.22.2': dependencies: - shiki: 1.22.0 + shiki: 1.22.2 - '@shikijs/types@1.22.0': + '@shikijs/types@1.22.2': dependencies: '@shikijs/vscode-textmate': 9.3.0 '@types/hast': 3.0.4 @@ -14091,10 +14689,10 @@ snapshots: '@sindresorhus/is@4.6.0': {} - '@stylistic/eslint-plugin@2.10.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@stylistic/eslint-plugin@2.10.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) eslint-visitor-keys: 4.2.0 espree: 10.3.0 estraverse: 5.3.0 @@ -14117,47 +14715,56 @@ snapshots: optionalDependencies: typescript: 5.6.3 - '@tailwindcss/container-queries@0.1.1(tailwindcss@3.4.14)': + '@tailwindcss/container-queries@0.1.1(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)))': dependencies: - tailwindcss: 3.4.14 + tailwindcss: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) - '@tailwindcss/typography@0.5.15(tailwindcss@3.4.14)': + '@tailwindcss/typography@0.5.15(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)))': dependencies: lodash.castarray: 4.4.0 lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 postcss-selector-parser: 6.0.10 - tailwindcss: 3.4.14 + tailwindcss: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) - '@tanstack/query-core@5.59.13': {} + '@tanstack/query-core@5.59.13': + optional: true - '@tanstack/query-devtools@5.58.0': {} + '@tanstack/query-core@5.59.17': {} - '@tanstack/query-persist-client-core@5.59.13': + '@tanstack/query-devtools@5.59.19': {} + + '@tanstack/query-persist-client-core@5.59.17': dependencies: - '@tanstack/query-core': 5.59.13 + '@tanstack/query-core': 5.59.17 - '@tanstack/query-sync-storage-persister@5.59.13': + '@tanstack/query-sync-storage-persister@5.59.17': dependencies: - '@tanstack/query-core': 5.59.13 - '@tanstack/query-persist-client-core': 5.59.13 + '@tanstack/query-core': 5.59.17 + '@tanstack/query-persist-client-core': 5.59.17 - '@tanstack/react-query-devtools@5.59.14(@tanstack/react-query@5.59.14(react@18.3.1))(react@18.3.1)': + '@tanstack/react-query-devtools@5.59.19(@tanstack/react-query@5.59.19(react@18.3.1))(react@18.3.1)': dependencies: - '@tanstack/query-devtools': 5.58.0 - '@tanstack/react-query': 5.59.14(react@18.3.1) + '@tanstack/query-devtools': 5.59.19 + '@tanstack/react-query': 5.59.19(react@18.3.1) react: 18.3.1 - '@tanstack/react-query-persist-client@5.59.14(@tanstack/react-query@5.59.14(react@18.3.1))(react@18.3.1)': + '@tanstack/react-query-persist-client@5.59.19(@tanstack/react-query@5.59.19(react@18.3.1))(react@18.3.1)': dependencies: - '@tanstack/query-persist-client-core': 5.59.13 - '@tanstack/react-query': 5.59.14(react@18.3.1) + '@tanstack/query-persist-client-core': 5.59.17 + '@tanstack/react-query': 5.59.19(react@18.3.1) react: 18.3.1 '@tanstack/react-query@5.59.14(react@18.3.1)': dependencies: '@tanstack/query-core': 5.59.13 react: 18.3.1 + optional: true + + '@tanstack/react-query@5.59.19(react@18.3.1)': + dependencies: + '@tanstack/query-core': 5.59.17 + react: 18.3.1 '@tanstack/react-virtual@3.10.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: @@ -14171,9 +14778,24 @@ snapshots: '@trysound/sax@0.2.0': {} + '@ts-morph/common@0.11.1': + dependencies: + fast-glob: 3.3.2 + minimatch: 3.1.2 + mkdirp: 1.0.4 + path-browserify: 1.0.1 + + '@tsconfig/node10@1.0.11': {} + + '@tsconfig/node12@1.0.11': {} + + '@tsconfig/node14@1.0.3': {} + + '@tsconfig/node16@1.0.4': {} + '@types/appdmg@0.5.5': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 optional: true '@types/babel__core@7.20.5': @@ -14190,7 +14812,7 @@ snapshots: '@types/babel__template@7.4.4': dependencies: - '@babel/parser': 7.25.8 + '@babel/parser': 7.26.2 '@babel/types': 7.25.8 '@types/babel__traverse@7.20.6': @@ -14201,12 +14823,12 @@ snapshots: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 22.7.5 + '@types/node': 22.8.7 '@types/responselike': 1.0.3 '@types/connect@3.4.36': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 '@types/cookie@0.6.0': {} @@ -14222,12 +14844,12 @@ snapshots: '@types/fs-extra@9.0.13': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 '@types/glob@7.2.0': dependencies: '@types/minimatch': 5.1.2 - '@types/node': 22.7.5 + '@types/node': 22.8.7 '@types/hast@3.0.4': dependencies: @@ -14241,7 +14863,7 @@ snapshots: '@types/keyv@3.1.4': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 '@types/lodash-es@4.17.12': dependencies: @@ -14259,13 +14881,15 @@ snapshots: '@types/mysql@2.15.26': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 + + '@types/node@16.18.11': {} '@types/node@20.16.11': dependencies: undici-types: 6.19.8 - '@types/node@22.7.5': + '@types/node@22.8.7': dependencies: undici-types: 6.19.8 @@ -14273,24 +14897,23 @@ snapshots: '@types/pg-pool@2.0.6': dependencies: - '@types/pg': 8.6.1 + '@types/pg': 8.11.10 '@types/pg@8.11.10': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 pg-protocol: 1.7.0 pg-types: 4.0.2 - optional: true '@types/pg@8.6.1': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 pg-protocol: 1.7.0 pg-types: 2.2.0 '@types/plist@3.0.5': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 xmlbuilder: 15.1.1 optional: true @@ -14298,16 +14921,16 @@ snapshots: '@types/react-dom@18.3.1': dependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - '@types/react@18.3.11': + '@types/react@18.3.12': dependencies: '@types/prop-types': 15.7.13 csstype: 3.1.3 '@types/responselike@1.0.3': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 '@types/semver@7.5.8': {} @@ -14315,7 +14938,7 @@ snapshots: '@types/tar@6.1.13': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 minipass: 4.2.8 '@types/unist@2.0.11': {} @@ -14327,18 +14950,18 @@ snapshots: '@types/yauzl@2.10.3': dependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 optional: true - '@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/parser': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/visitor-keys': 8.12.2 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -14348,14 +14971,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: '@typescript-eslint/scope-manager': 8.12.2 '@typescript-eslint/types': 8.12.2 '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) '@typescript-eslint/visitor-keys': 8.12.2 debug: 4.3.7 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: @@ -14371,10 +14994,10 @@ snapshots: '@typescript-eslint/types': 8.12.2 '@typescript-eslint/visitor-keys': 8.12.2 - '@typescript-eslint/type-utils@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@typescript-eslint/type-utils@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) debug: 4.3.7 ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: @@ -14417,24 +15040,24 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.10.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@typescript-eslint/utils@8.10.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.3.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0(jiti@2.3.3)) '@typescript-eslint/scope-manager': 8.10.0 '@typescript-eslint/types': 8.10.0 '@typescript-eslint/typescript-estree': 8.10.0(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@typescript-eslint/utils@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.3.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0(jiti@2.3.3)) '@typescript-eslint/scope-manager': 8.12.2 '@typescript-eslint/types': 8.12.2 '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) transitivePeerDependencies: - supports-color - typescript @@ -14460,17 +15083,17 @@ snapshots: '@unocss/core@0.63.6': {} - '@unocss/eslint-config@0.63.6(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@unocss/eslint-config@0.63.6(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@unocss/eslint-plugin': 0.63.6(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@unocss/eslint-plugin': 0.63.6(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) transitivePeerDependencies: - eslint - supports-color - typescript - '@unocss/eslint-plugin@0.63.6(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3)': + '@unocss/eslint-plugin@0.63.6(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3)': dependencies: - '@typescript-eslint/utils': 8.10.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.10.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@unocss/config': 0.63.6 '@unocss/core': 0.63.6 magic-string: 0.30.12 @@ -14487,29 +15110,85 @@ snapshots: '@use-gesture/core': 10.3.1 react: 18.3.1 - '@vitejs/plugin-legacy@5.4.2(terser@5.35.0)(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0))': + '@vercel/build-utils@8.4.12': {} + + '@vercel/error-utils@2.0.2': {} + + '@vercel/nft@0.27.3(encoding@0.1.13)': dependencies: - '@babel/core': 7.25.2 - '@babel/preset-env': 7.25.4(@babel/core@7.25.2) - browserslist: 4.23.3 - browserslist-to-esbuild: 2.1.1(browserslist@4.23.3) + '@mapbox/node-pre-gyp': 1.0.11(encoding@0.1.13) + '@rollup/pluginutils': 4.2.1 + acorn: 8.14.0 + acorn-import-attributes: 1.9.5(acorn@8.14.0) + async-sema: 3.1.1 + bindings: 1.5.0 + estree-walker: 2.0.2 + glob: 7.2.3 + graceful-fs: 4.2.11 + micromatch: 4.0.8 + node-gyp-build: 4.8.2 + resolve-from: 5.0.0 + transitivePeerDependencies: + - encoding + - supports-color + + '@vercel/node@3.2.24(encoding@0.1.13)': + dependencies: + '@edge-runtime/node-utils': 2.3.0 + '@edge-runtime/primitives': 4.1.0 + '@edge-runtime/vm': 3.2.0 + '@types/node': 16.18.11 + '@vercel/build-utils': 8.4.12 + '@vercel/error-utils': 2.0.2 + '@vercel/nft': 0.27.3(encoding@0.1.13) + '@vercel/static-config': 3.0.0 + async-listen: 3.0.0 + cjs-module-lexer: 1.2.3 + edge-runtime: 2.5.9 + es-module-lexer: 1.4.1 + esbuild: 0.14.47 + etag: 1.8.1 + node-fetch: 2.6.9(encoding@0.1.13) + path-to-regexp: 6.2.1 + ts-morph: 12.0.0 + ts-node: 10.9.1(@types/node@16.18.11)(typescript@4.9.5) + typescript: 4.9.5 + undici: 5.28.4 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - encoding + - supports-color + + '@vercel/static-config@3.0.0': + dependencies: + ajv: 8.6.3 + json-schema-to-ts: 1.6.4 + ts-morph: 12.0.0 + + '@vitejs/plugin-legacy@5.4.3(terser@5.35.0)(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0))': + dependencies: + '@babel/core': 7.25.8 + '@babel/preset-env': 7.26.0(@babel/core@7.25.8) + browserslist: 4.24.0 + browserslist-to-esbuild: 2.1.1(browserslist@4.24.0) core-js: 3.38.1 - magic-string: 0.30.11 + magic-string: 0.30.12 regenerator-runtime: 0.14.1 systemjs: 6.15.1 terser: 5.35.0 - vite: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + vite: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) transitivePeerDependencies: - supports-color - '@vitejs/plugin-react@4.3.2(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0))': + '@vitejs/plugin-react@4.3.3(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0))': dependencies: '@babel/core': 7.25.8 '@babel/plugin-transform-react-jsx-self': 7.25.7(@babel/core@7.25.8) '@babel/plugin-transform-react-jsx-source': 7.25.7(@babel/core@7.25.8) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + vite: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) transitivePeerDependencies: - supports-color @@ -14517,14 +15196,14 @@ snapshots: dependencies: '@vitest/spy': 2.0.5 '@vitest/utils': 2.0.5 - chai: 5.1.1 + chai: 5.1.2 tinyrainbow: 1.2.0 '@vitest/pretty-format@2.0.5': dependencies: tinyrainbow: 1.2.0 - '@vitest/pretty-format@2.1.3': + '@vitest/pretty-format@2.1.4': dependencies: tinyrainbow: 1.2.0 @@ -14569,18 +15248,18 @@ snapshots: abstract-logging@2.0.1: {} - acorn-import-attributes@1.9.5(acorn@8.12.1): + acorn-import-attributes@1.9.5(acorn@8.14.0): dependencies: - acorn: 8.12.1 - - acorn-jsx@5.3.2(acorn@8.13.0): - dependencies: - acorn: 8.13.0 + acorn: 8.14.0 acorn-jsx@5.3.2(acorn@8.14.0): dependencies: acorn: 8.14.0 + acorn-walk@8.3.4: + dependencies: + acorn: 8.14.0 + acorn@8.12.1: {} acorn@8.13.0: {} @@ -14632,6 +15311,13 @@ snapshots: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 + ajv@8.6.3: + dependencies: + fast-deep-equal: 3.1.3 + json-schema-traverse: 1.0.0 + require-from-string: 2.0.2 + uri-js: 4.4.1 + ansi-escapes@5.0.0: dependencies: type-fest: 1.4.0 @@ -14665,7 +15351,7 @@ snapshots: app-builder-bin@5.0.0-alpha.10: {} - app-builder-lib@24.13.3(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)): + app-builder-lib@24.13.3(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.2.1 @@ -14699,7 +15385,7 @@ snapshots: transitivePeerDependencies: - supports-color - app-builder-lib@25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)): + app-builder-lib@25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.5.0 @@ -14792,11 +15478,18 @@ snapshots: tar-stream: 2.2.0 zip-stream: 4.1.1 + are-we-there-yet@2.0.0: + dependencies: + delegates: 1.0.0 + readable-stream: 3.6.2 + are-we-there-yet@3.0.1: dependencies: delegates: 1.0.0 readable-stream: 3.6.2 + arg@4.1.3: {} + arg@5.0.2: {} argparse@2.0.1: {} @@ -14820,11 +15513,22 @@ snapshots: assertion-error@2.0.1: {} + ast-kit@1.3.1: + dependencies: + '@babel/parser': 7.26.2 + pathe: 1.1.2 + astral-regex@2.0.0: optional: true async-exit-hook@2.0.1: {} + async-listen@3.0.0: {} + + async-listen@3.0.1: {} + + async-sema@3.1.1: {} + async@1.5.2: optional: true @@ -14851,27 +15555,27 @@ snapshots: transitivePeerDependencies: - debug - babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.25.2): + babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.25.8): dependencies: - '@babel/compat-data': 7.25.4 - '@babel/core': 7.25.2 - '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) + '@babel/compat-data': 7.26.2 + '@babel/core': 7.25.8 + '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.8) semver: 6.3.1 transitivePeerDependencies: - supports-color - babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.25.2): + babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.25.8): dependencies: - '@babel/core': 7.25.2 - '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.8) core-js-compat: 3.38.1 transitivePeerDependencies: - supports-color - babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.25.2): + babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.25.8): dependencies: - '@babel/core': 7.25.2 - '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) + '@babel/core': 7.25.8 + '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.8) transitivePeerDependencies: - supports-color @@ -14894,8 +15598,17 @@ snapshots: binary-extensions@2.3.0: {} + bindings@1.5.0: + dependencies: + file-uri-to-path: 1.0.0 + birecord@0.1.1: {} + bl@1.2.3: + dependencies: + readable-stream: 2.3.8 + safe-buffer: 5.2.1 + bl@4.1.0: dependencies: buffer: 5.7.1 @@ -14981,9 +15694,9 @@ snapshots: readable-stream: 2.3.8 safe-buffer: 5.2.1 - browserslist-to-esbuild@2.1.1(browserslist@4.23.3): + browserslist-to-esbuild@2.1.1(browserslist@4.24.0): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 meow: 13.2.0 browserslist@4.23.3: @@ -15000,12 +15713,21 @@ snapshots: node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.0) + buffer-alloc-unsafe@1.1.0: {} + + buffer-alloc@1.2.0: + dependencies: + buffer-alloc-unsafe: 1.1.0 + buffer-fill: 1.0.0 + buffer-crc32@0.2.13: {} buffer-equal-constant-time@1.0.1: {} buffer-equal@1.0.1: {} + buffer-fill@1.0.0: {} + buffer-from@1.1.2: {} buffer-xor@1.0.3: {} @@ -15088,6 +15810,13 @@ snapshots: esbuild: 0.23.1 load-tsconfig: 0.2.5 + bundle-require@5.0.0(esbuild@0.24.0): + dependencies: + esbuild: 0.24.0 + load-tsconfig: 0.2.5 + + bytes@3.1.2: {} + c12@1.11.2: dependencies: chokidar: 3.6.0 @@ -15157,8 +15886,8 @@ snapshots: caniuse-api@3.0.0: dependencies: - browserslist: 4.23.3 - caniuse-lite: 1.0.30001659 + browserslist: 4.24.0 + caniuse-lite: 1.0.30001668 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 @@ -15168,7 +15897,7 @@ snapshots: ccount@2.0.1: {} - chai@5.1.1: + chai@5.1.2: dependencies: assertion-error: 2.0.1 check-error: 2.1.1 @@ -15234,6 +15963,10 @@ snapshots: optionalDependencies: fsevents: 2.3.3 + chokidar@4.0.1: + dependencies: + readdirp: 4.0.2 + chownr@2.0.0: {} chrome-trace-event@1.0.4: {} @@ -15253,6 +15986,8 @@ snapshots: dependencies: consola: 3.2.3 + cjs-module-lexer@1.2.3: {} + cjs-module-lexer@1.4.1: {} class-variance-authority@0.7.0: @@ -15295,9 +16030,9 @@ snapshots: slice-ansi: 5.0.0 string-width: 7.2.0 - click-to-react-component@1.1.0(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + click-to-react-component@1.1.0(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@floating-ui/react-dom-interactions': 0.3.1(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@floating-ui/react-dom-interactions': 0.3.1(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) htm: 3.1.1 react: 18.3.1 react-merge-refs: 1.1.0 @@ -15323,16 +16058,20 @@ snapshots: clsx@2.1.1: {} - cmdk@1.0.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + cmdk@1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@radix-ui/react-dialog': 1.0.5(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-dialog': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(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) + use-sync-external-store: 1.2.2(react@18.3.1) transitivePeerDependencies: - '@types/react' - '@types/react-dom' + code-block-writer@10.1.1: {} + collapse-white-space@2.1.0: {} color-convert@0.5.3: @@ -15483,13 +16222,15 @@ snapshots: dependencies: meow: 13.2.0 + convert-hrtime@3.0.0: {} + convert-source-map@2.0.0: {} cookie@0.7.1: {} core-js-compat@3.38.1: dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 core-js@3.38.1: {} @@ -15532,6 +16273,8 @@ snapshots: safe-buffer: 5.2.1 sha.js: 2.4.11 + create-require@1.1.1: {} + cross-dirname@0.1.0: {} cross-env@7.0.3: @@ -15680,7 +16423,7 @@ snapshots: culori@3.3.0: {} - daisyui@4.12.13(patch_hash=igsntdatmoaxzwxof4bkkh35fy)(postcss@8.4.47): + daisyui@4.12.14(patch_hash=igsntdatmoaxzwxof4bkkh35fy)(postcss@8.4.47): dependencies: css-selector-tokenizer: 0.8.0 culori: 3.3.0 @@ -15711,6 +16454,44 @@ snapshots: dependencies: mimic-response: 3.1.0 + decompress-tar@4.1.1: + dependencies: + file-type: 5.2.0 + is-stream: 1.1.0 + tar-stream: 1.6.2 + + decompress-tarbz2@4.1.1: + dependencies: + decompress-tar: 4.1.1 + file-type: 6.2.0 + is-stream: 1.1.0 + seek-bzip: 1.0.6 + unbzip2-stream: 1.4.3 + + decompress-targz@4.1.1: + dependencies: + decompress-tar: 4.1.1 + file-type: 5.2.0 + is-stream: 1.1.0 + + decompress-unzip@4.0.1: + dependencies: + file-type: 3.9.0 + get-stream: 2.3.1 + pify: 2.3.0 + yauzl: 2.10.0 + + decompress@4.2.1: + dependencies: + decompress-tar: 4.1.1 + decompress-tarbz2: 4.1.1 + decompress-targz: 4.1.1 + decompress-unzip: 4.0.1 + graceful-fs: 4.2.11 + make-dir: 1.3.0 + pify: 2.3.0 + strip-dirs: 2.1.0 + deep-eql@5.0.2: {} deep-is@0.1.4: {} @@ -15743,6 +16524,8 @@ snapshots: delegates@1.0.0: {} + depd@2.0.0: {} + deprecation@2.3.1: {} dequal@2.0.3: {} @@ -15771,10 +16554,16 @@ snapshots: dependencies: dequal: 2.0.3 - dexie@4.0.8: {} + dexie-export-import@4.1.2(dexie@4.0.9): + dependencies: + dexie: 4.0.9 + + dexie@4.0.9: {} didyoumean@1.2.2: {} + diff@4.0.2: {} + diffie-hellman@5.0.3: dependencies: bn.js: 4.12.0 @@ -15801,7 +16590,7 @@ snapshots: dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8): dependencies: - app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)) + app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) builder-util: 25.1.7 builder-util-runtime: 9.2.10 fs-extra: 10.1.0 @@ -15866,11 +16655,11 @@ snapshots: dotenv@9.0.2: {} - drizzle-orm@0.34.1(@opentelemetry/api@1.9.0)(@types/pg@8.11.10)(@types/react@18.3.11)(react@18.3.1): + drizzle-orm@0.34.1(@opentelemetry/api@1.9.0)(@types/pg@8.11.10)(@types/react@18.3.12)(react@18.3.1): optionalDependencies: '@opentelemetry/api': 1.9.0 '@types/pg': 8.11.10 - '@types/react': 18.3.11 + '@types/react': 18.3.12 react: 18.3.1 ds-store@0.1.6: @@ -15886,13 +16675,25 @@ snapshots: dependencies: safe-buffer: 5.2.1 + edge-runtime@2.5.9: + dependencies: + '@edge-runtime/format': 2.2.1 + '@edge-runtime/ponyfill': 2.4.2 + '@edge-runtime/vm': 3.2.0 + async-listen: 3.0.1 + mri: 1.2.0 + picocolors: 1.0.0 + pretty-ms: 7.0.1 + signal-exit: 4.0.2 + time-span: 4.0.0 + ejs@3.1.10: dependencies: jake: 10.9.2 electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8): dependencies: - app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)) + app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) archiver: 5.3.2 builder-util: 25.1.7 fs-extra: 10.1.0 @@ -15986,7 +16787,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron-vite@2.3.0(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)): + electron-vite@2.3.0(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)): dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-arrow-functions': 7.24.7(@babel/core@7.25.2) @@ -15994,7 +16795,7 @@ snapshots: esbuild: 0.21.5 magic-string: 0.30.11 picocolors: 1.1.0 - vite: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + vite: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) transitivePeerDependencies: - supports-color @@ -16011,7 +16812,7 @@ snapshots: - supports-color optional: true - electron@33.0.0: + electron@33.0.2: dependencies: '@electron/get': 2.0.3 '@types/node': 20.16.11 @@ -16072,9 +16873,94 @@ snapshots: es-errors@1.3.0: optional: true + es-module-lexer@1.4.1: {} + es6-error@4.1.1: optional: true + esbuild-android-64@0.14.47: + optional: true + + esbuild-android-arm64@0.14.47: + optional: true + + esbuild-darwin-64@0.14.47: + optional: true + + esbuild-darwin-arm64@0.14.47: + optional: true + + esbuild-freebsd-64@0.14.47: + optional: true + + esbuild-freebsd-arm64@0.14.47: + optional: true + + esbuild-linux-32@0.14.47: + optional: true + + esbuild-linux-64@0.14.47: + optional: true + + esbuild-linux-arm64@0.14.47: + optional: true + + esbuild-linux-arm@0.14.47: + optional: true + + esbuild-linux-mips64le@0.14.47: + optional: true + + esbuild-linux-ppc64le@0.14.47: + optional: true + + esbuild-linux-riscv64@0.14.47: + optional: true + + esbuild-linux-s390x@0.14.47: + optional: true + + esbuild-netbsd-64@0.14.47: + optional: true + + esbuild-openbsd-64@0.14.47: + optional: true + + esbuild-sunos-64@0.14.47: + optional: true + + esbuild-windows-32@0.14.47: + optional: true + + esbuild-windows-64@0.14.47: + optional: true + + esbuild-windows-arm64@0.14.47: + optional: true + + esbuild@0.14.47: + optionalDependencies: + esbuild-android-64: 0.14.47 + esbuild-android-arm64: 0.14.47 + esbuild-darwin-64: 0.14.47 + esbuild-darwin-arm64: 0.14.47 + esbuild-freebsd-64: 0.14.47 + esbuild-freebsd-arm64: 0.14.47 + esbuild-linux-32: 0.14.47 + esbuild-linux-64: 0.14.47 + esbuild-linux-arm: 0.14.47 + esbuild-linux-arm64: 0.14.47 + esbuild-linux-mips64le: 0.14.47 + esbuild-linux-ppc64le: 0.14.47 + esbuild-linux-riscv64: 0.14.47 + esbuild-linux-s390x: 0.14.47 + esbuild-netbsd-64: 0.14.47 + esbuild-openbsd-64: 0.14.47 + esbuild-sunos-64: 0.14.47 + esbuild-windows-32: 0.14.47 + esbuild-windows-64: 0.14.47 + esbuild-windows-arm64: 0.14.47 + esbuild@0.21.5: optionalDependencies: '@esbuild/aix-ppc64': 0.21.5 @@ -16128,6 +17014,33 @@ snapshots: '@esbuild/win32-ia32': 0.23.1 '@esbuild/win32-x64': 0.23.1 + esbuild@0.24.0: + optionalDependencies: + '@esbuild/aix-ppc64': 0.24.0 + '@esbuild/android-arm': 0.24.0 + '@esbuild/android-arm64': 0.24.0 + '@esbuild/android-x64': 0.24.0 + '@esbuild/darwin-arm64': 0.24.0 + '@esbuild/darwin-x64': 0.24.0 + '@esbuild/freebsd-arm64': 0.24.0 + '@esbuild/freebsd-x64': 0.24.0 + '@esbuild/linux-arm': 0.24.0 + '@esbuild/linux-arm64': 0.24.0 + '@esbuild/linux-ia32': 0.24.0 + '@esbuild/linux-loong64': 0.24.0 + '@esbuild/linux-mips64el': 0.24.0 + '@esbuild/linux-ppc64': 0.24.0 + '@esbuild/linux-riscv64': 0.24.0 + '@esbuild/linux-s390x': 0.24.0 + '@esbuild/linux-x64': 0.24.0 + '@esbuild/netbsd-x64': 0.24.0 + '@esbuild/openbsd-arm64': 0.24.0 + '@esbuild/openbsd-x64': 0.24.0 + '@esbuild/sunos-x64': 0.24.0 + '@esbuild/win32-arm64': 0.24.0 + '@esbuild/win32-ia32': 0.24.0 + '@esbuild/win32-x64': 0.24.0 + escalade@3.1.2: {} escalade@3.2.0: {} @@ -16142,46 +17055,46 @@ snapshots: escape-string-regexp@5.0.0: {} - eslint-compat-utils@0.5.1(eslint@9.13.0(jiti@2.3.3)): + eslint-compat-utils@0.5.1(eslint@9.14.0(jiti@2.3.3)): dependencies: - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) semver: 7.6.3 - eslint-config-flat-gitignore@0.3.0(eslint@9.13.0(jiti@2.3.3)): + eslint-config-flat-gitignore@0.3.0(eslint@9.14.0(jiti@2.3.3)): dependencies: '@eslint/compat': 1.1.1 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) find-up-simple: 1.0.0 - eslint-config-hyoban@3.1.12(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(tailwindcss@3.4.14)(typescript@5.6.3): + eslint-config-hyoban@3.1.12(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)))(typescript@5.6.3): dependencies: - '@eslint-react/eslint-plugin': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/eslint-plugin': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint/js': 9.13.0 - '@stylistic/eslint-plugin': 2.10.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@stylistic/eslint-plugin': 2.10.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 - '@unocss/eslint-config': 0.63.6(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@unocss/eslint-config': 0.63.6(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) defu: 6.1.4 - eslint: 9.13.0(jiti@2.3.3) - eslint-config-flat-gitignore: 0.3.0(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-antfu: 2.7.0(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-command: 0.2.6(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-hyoban: 0.6.1(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-import-x: 4.4.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint-plugin-jsonc: 2.16.0(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-package-json: 0.15.4(eslint@9.13.0(jiti@2.3.3))(jsonc-eslint-parser@2.4.0) - eslint-plugin-react-compiler: 19.0.0-beta-9ee70a1-20241017(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-react-hooks: 5.0.0(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-react-refresh: 0.4.14(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-regexp: 2.6.0(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-simple-import-sort: 12.1.1(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-tailwindcss: 3.17.5(tailwindcss@3.4.14) - eslint-plugin-unicorn: 56.0.0(eslint@9.13.0(jiti@2.3.3)) - eslint-plugin-unused-imports: 4.1.4(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3)) + eslint: 9.14.0(jiti@2.3.3) + eslint-config-flat-gitignore: 0.3.0(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-antfu: 2.7.0(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-command: 0.2.6(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-hyoban: 0.6.1(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-import-x: 4.4.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint-plugin-jsonc: 2.16.0(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-package-json: 0.15.4(eslint@9.14.0(jiti@2.3.3))(jsonc-eslint-parser@2.4.0) + eslint-plugin-react-compiler: 19.0.0-beta-9ee70a1-20241017(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-react-hooks: 5.0.0(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-react-refresh: 0.4.14(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-regexp: 2.6.0(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-simple-import-sort: 12.1.1(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-tailwindcss: 3.17.5(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))) + eslint-plugin-unicorn: 56.0.0(eslint@9.14.0(jiti@2.3.3)) + eslint-plugin-unused-imports: 4.1.4(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3)) globals: 15.11.0 jsonc-eslint-parser: 2.4.0 local-pkg: 0.5.0 read-package-up: 11.0.0 - typescript-eslint: 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + typescript-eslint: 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: @@ -16197,26 +17110,26 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-antfu@2.7.0(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-antfu@2.7.0(eslint@9.14.0(jiti@2.3.3)): dependencies: '@antfu/utils': 0.7.10 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) - eslint-plugin-command@0.2.6(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-command@0.2.6(eslint@9.14.0(jiti@2.3.3)): dependencies: '@es-joy/jsdoccomment': 0.48.0 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) - eslint-plugin-hyoban@0.6.1(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-hyoban@0.6.1(eslint@9.14.0(jiti@2.3.3)): dependencies: - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) - eslint-plugin-import-x@4.4.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + eslint-plugin-import-x@4.4.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@typescript-eslint/utils': 8.10.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.10.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) debug: 4.3.7 doctrine: 3.0.0 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.8.1 is-glob: 4.0.3 @@ -16228,23 +17141,23 @@ snapshots: - supports-color - typescript - eslint-plugin-jsonc@2.16.0(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-jsonc@2.16.0(eslint@9.14.0(jiti@2.3.3)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.3.3)) - eslint: 9.13.0(jiti@2.3.3) - eslint-compat-utils: 0.5.1(eslint@9.13.0(jiti@2.3.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0(jiti@2.3.3)) + eslint: 9.14.0(jiti@2.3.3) + eslint-compat-utils: 0.5.1(eslint@9.14.0(jiti@2.3.3)) espree: 9.6.1 graphemer: 1.4.0 jsonc-eslint-parser: 2.4.0 natural-compare: 1.4.0 synckit: 0.6.2 - eslint-plugin-package-json@0.15.4(eslint@9.13.0(jiti@2.3.3))(jsonc-eslint-parser@2.4.0): + eslint-plugin-package-json@0.15.4(eslint@9.14.0(jiti@2.3.3))(jsonc-eslint-parser@2.4.0): dependencies: '@altano/repository-tools': 0.1.1 detect-indent: 6.1.0 detect-newline: 3.1.0 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) jsonc-eslint-parser: 2.4.0 package-json-validator: 0.7.0 semver: 7.6.3 @@ -16252,32 +17165,32 @@ snapshots: sort-package-json: 1.57.0 validate-npm-package-name: 6.0.0 - eslint-plugin-react-compiler@19.0.0-beta-9ee70a1-20241017(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-react-compiler@19.0.0-beta-9ee70a1-20241017(eslint@9.14.0(jiti@2.3.3)): dependencies: '@babel/core': 7.25.8 '@babel/parser': 7.25.8 '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.25.8) - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) hermes-parser: 0.20.1 zod: 3.23.8 zod-validation-error: 3.4.0(zod@3.23.8) transitivePeerDependencies: - supports-color - eslint-plugin-react-debug@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + eslint-plugin-react-debug@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/core': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/jsx': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/core': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/jsx': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/var': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/var': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) string-ts: 2.2.0 ts-pattern: 5.5.0 optionalDependencies: @@ -16285,142 +17198,142 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-react-dom@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + eslint-plugin-react-dom@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/core': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/jsx': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/core': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/jsx': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/var': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/var': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) ts-pattern: 5.5.0 optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - supports-color - eslint-plugin-react-hooks-extra@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + eslint-plugin-react-hooks-extra@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/core': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/jsx': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/core': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/jsx': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/var': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/var': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) ts-pattern: 5.5.0 optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - supports-color - eslint-plugin-react-hooks@5.0.0(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-react-hooks@5.0.0(eslint@9.14.0(jiti@2.3.3)): dependencies: - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) - eslint-plugin-react-naming-convention@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + eslint-plugin-react-naming-convention@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/core': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/jsx': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/core': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/jsx': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) ts-pattern: 5.5.0 optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - supports-color - eslint-plugin-react-refresh@0.4.14(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-react-refresh@0.4.14(eslint@9.14.0(jiti@2.3.3)): dependencies: - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) - eslint-plugin-react-web-api@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + eslint-plugin-react-web-api@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/core': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/jsx': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/core': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/jsx': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/var': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/var': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) birecord: 0.1.1 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) ts-pattern: 5.5.0 optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - supports-color - eslint-plugin-react-x@1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + eslint-plugin-react-x@1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@eslint-react/ast': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/core': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/jsx': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/shared': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/ast': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/core': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/jsx': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/shared': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@eslint-react/tools': 1.15.2 - '@eslint-react/types': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@eslint-react/var': 1.15.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/types': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@eslint-react/var': 1.15.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) - is-immutable-type: 5.0.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) + is-immutable-type: 5.0.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) ts-pattern: 5.5.0 optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - supports-color - eslint-plugin-regexp@2.6.0(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-regexp@2.6.0(eslint@9.14.0(jiti@2.3.3)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.3.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0(jiti@2.3.3)) '@eslint-community/regexpp': 4.11.1 comment-parser: 1.4.1 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) jsdoc-type-pratt-parser: 4.1.0 refa: 0.12.1 regexp-ast-analysis: 0.7.1 scslre: 0.3.0 - eslint-plugin-simple-import-sort@12.1.1(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-simple-import-sort@12.1.1(eslint@9.14.0(jiti@2.3.3)): dependencies: - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) - eslint-plugin-tailwindcss@3.17.5(tailwindcss@3.4.14): + eslint-plugin-tailwindcss@3.17.5(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))): dependencies: fast-glob: 3.3.2 postcss: 8.4.47 - tailwindcss: 3.4.14 + tailwindcss: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) - eslint-plugin-unicorn@56.0.0(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-unicorn@56.0.0(eslint@9.14.0(jiti@2.3.3)): dependencies: '@babel/helper-validator-identifier': 7.25.7 - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.3.3)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0(jiti@2.3.3)) ci-info: 4.0.0 clean-regexp: 1.0.0 core-js-compat: 3.38.1 - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) esquery: 1.6.0 globals: 15.11.0 indent-string: 4.0.0 @@ -16433,35 +17346,33 @@ snapshots: semver: 7.6.3 strip-indent: 3.0.0 - eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3)): + eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3)): dependencies: - eslint: 9.13.0(jiti@2.3.3) + eslint: 9.14.0(jiti@2.3.3) optionalDependencies: - '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) - eslint-scope@8.1.0: + eslint-scope@8.2.0: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 eslint-visitor-keys@3.4.3: {} - eslint-visitor-keys@4.1.0: {} - eslint-visitor-keys@4.2.0: {} - eslint@9.13.0(jiti@2.3.3): + eslint@9.14.0(jiti@2.3.3): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@2.3.3)) - '@eslint-community/regexpp': 4.11.1 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0(jiti@2.3.3)) + '@eslint-community/regexpp': 4.12.1 '@eslint/config-array': 0.18.0 '@eslint/core': 0.7.0 '@eslint/eslintrc': 3.1.0 - '@eslint/js': 9.13.0 + '@eslint/js': 9.14.0 '@eslint/plugin-kit': 0.2.0 - '@humanfs/node': 0.16.5 + '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 - '@humanwhocodes/retry': 0.3.1 + '@humanwhocodes/retry': 0.4.0 '@types/estree': 1.0.6 '@types/json-schema': 7.0.15 ajv: 6.12.6 @@ -16469,9 +17380,9 @@ snapshots: cross-spawn: 7.0.3 debug: 4.3.7 escape-string-regexp: 4.0.0 - eslint-scope: 8.1.0 - eslint-visitor-keys: 4.1.0 - espree: 10.2.0 + eslint-scope: 8.2.0 + eslint-visitor-keys: 4.2.0 + espree: 10.3.0 esquery: 1.6.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -16492,12 +17403,6 @@ snapshots: transitivePeerDependencies: - supports-color - espree@10.2.0: - dependencies: - acorn: 8.13.0 - acorn-jsx: 5.3.2(acorn@8.13.0) - eslint-visitor-keys: 4.1.0 - espree@10.3.0: dependencies: acorn: 8.14.0 @@ -16506,8 +17411,8 @@ snapshots: espree@9.6.1: dependencies: - acorn: 8.13.0 - acorn-jsx: 5.3.2(acorn@8.13.0) + acorn: 8.14.0 + acorn-jsx: 5.3.2(acorn@8.14.0) eslint-visitor-keys: 3.4.3 esquery@1.6.0: @@ -16522,12 +17427,16 @@ snapshots: estree-util-is-identifier-name@3.0.0: {} + estree-walker@2.0.2: {} + estree-walker@3.0.3: dependencies: '@types/estree': 1.0.6 esutils@2.0.3: {} + etag@1.8.1: {} + eventemitter3@5.0.1: {} evp_bytestokey@1.0.3: @@ -16545,18 +17454,6 @@ snapshots: signal-exit: 3.0.7 strip-eof: 1.0.0 - execa@5.1.1: - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - execa@8.0.1: dependencies: cross-spawn: 7.0.3 @@ -16605,6 +17502,13 @@ snapshots: fast-deep-equal@3.1.3: {} + fast-folder-size@2.3.0: + dependencies: + decompress: 4.2.1 + https-proxy-agent: 7.0.5 + transitivePeerDependencies: + - supports-color + fast-glob@3.3.2: dependencies: '@nodelib/fs.stat': 2.0.5 @@ -16639,7 +17543,7 @@ snapshots: fastify-plugin@5.0.1: {} - fastify@5.0.0: + fastify@5.1.0: dependencies: '@fastify/ajv-compiler': 4.0.1 '@fastify/error': 4.0.0 @@ -16671,7 +17575,7 @@ snapshots: dependencies: pend: 1.2.0 - fdir@6.3.0(picomatch@4.0.2): + fdir@6.4.2(picomatch@4.0.2): optionalDependencies: picomatch: 4.0.2 @@ -16681,6 +17585,14 @@ snapshots: dependencies: flat-cache: 4.0.1 + file-type@3.9.0: {} + + file-type@5.2.0: {} + + file-type@6.2.0: {} + + file-uri-to-path@1.0.0: {} + filelist@1.0.4: dependencies: minimatch: 5.1.6 @@ -16796,14 +17708,14 @@ snapshots: forwarded@0.2.0: {} - foxact@0.2.39(react@18.3.1): + foxact@0.2.41(react@18.3.1): dependencies: client-only: 0.0.1 server-only: 0.0.1 optionalDependencies: react: 18.3.1 - framer-motion@11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + framer-motion@11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: tslib: 2.7.0 optionalDependencies: @@ -16883,6 +17795,18 @@ snapshots: transitivePeerDependencies: - supports-color + gauge@3.0.2: + dependencies: + aproba: 2.0.0 + color-support: 1.1.3 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + object-assign: 4.1.1 + signal-exit: 3.0.7 + string-width: 4.2.3 + strip-ansi: 6.0.1 + wide-align: 1.1.5 + gauge@4.0.4: dependencies: aproba: 2.0.0 @@ -16939,6 +17863,11 @@ snapshots: transitivePeerDependencies: - supports-color + get-stream@2.3.1: + dependencies: + object-assign: 4.1.1 + pinkie-promise: 2.0.1 + get-stream@4.1.0: dependencies: pump: 3.0.2 @@ -16947,8 +17876,6 @@ snapshots: dependencies: pump: 3.0.2 - get-stream@6.0.1: {} - get-stream@8.0.1: {} get-tsconfig@4.8.1: @@ -17007,7 +17934,7 @@ snapshots: jackspeak: 4.0.1 minimatch: 10.0.1 minipass: 7.1.2 - package-json-from-dist: 1.0.0 + package-json-from-dist: 1.0.1 path-scurry: 2.0.0 glob@7.2.3: @@ -17115,7 +18042,7 @@ snapshots: optionalDependencies: uglify-js: 3.19.3 - happy-dom@15.7.4: + happy-dom@15.8.0: dependencies: entities: 4.5.0 webidl-conversions: 7.0.0 @@ -17356,7 +18283,7 @@ snapshots: dependencies: parse-passwd: 1.0.0 - hono@4.6.5(patch_hash=hhch3aogyxhxjttgmn52vtceyy): {} + hono@4.6.8(patch_hash=qptujxncoai6tukc4qaqsrqk24): {} hosted-git-info@2.8.9: {} @@ -17387,6 +18314,14 @@ snapshots: http-cache-semantics@4.1.1: {} + 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-parser-js@0.5.8: {} http-proxy-agent@5.0.0: @@ -17425,8 +18360,6 @@ snapshots: transitivePeerDependencies: - supports-color - human-signals@2.1.0: {} - human-signals@5.0.0: {} humanize-ms@1.2.1: @@ -17439,7 +18372,7 @@ snapshots: dependencies: '@babel/runtime': 7.25.4 - i18next@23.16.0: + i18next@23.16.4: dependencies: '@babel/runtime': 7.25.7 @@ -17475,8 +18408,8 @@ snapshots: import-in-the-middle@1.11.2: dependencies: - acorn: 8.12.1 - acorn-import-attributes: 1.9.5(acorn@8.12.1) + acorn: 8.14.0 + acorn-import-attributes: 1.9.5(acorn@8.14.0) cjs-module-lexer: 1.4.1 module-details-from-path: 1.0.3 @@ -17488,7 +18421,7 @@ snapshots: jiti: 2.0.0-beta.3 jiti-v1: jiti@1.21.6 pathe: 1.1.2 - tsx: 4.19.1 + tsx: 4.19.2 transitivePeerDependencies: - supports-color @@ -17568,10 +18501,10 @@ snapshots: is-hexadecimal@2.0.1: {} - is-immutable-type@5.0.0(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + is-immutable-type@5.0.0(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - eslint: 9.13.0(jiti@2.3.3) + '@typescript-eslint/type-utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + eslint: 9.14.0(jiti@2.3.3) ts-api-utils: 1.3.0(typescript@5.6.3) ts-declaration-location: 1.0.4(typescript@5.6.3) typescript: 5.6.3 @@ -17594,6 +18527,8 @@ snapshots: xtend: 4.0.2 optional: true + is-natural-number@4.0.1: {} + is-number@7.0.0: {} is-obj@2.0.0: {} @@ -17611,8 +18546,6 @@ snapshots: is-stream@1.1.0: {} - is-stream@2.0.1: {} - is-stream@3.0.0: {} is-unicode-supported@0.1.0: {} @@ -17659,9 +18592,9 @@ snapshots: jose@5.9.4: {} - jotai@2.10.1(@types/react@18.3.11)(react@18.3.1): + jotai@2.10.1(@types/react@18.3.12)(react@18.3.1): optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 react: 18.3.1 joycon@3.1.1: {} @@ -17688,6 +18621,11 @@ snapshots: dependencies: fast-deep-equal: 3.1.3 + json-schema-to-ts@1.6.4: + dependencies: + '@types/json-schema': 7.0.15 + ts-toolbelt: 6.15.5 + json-schema-traverse@0.4.1: {} json-schema-traverse@1.0.0: {} @@ -18022,6 +18960,10 @@ snapshots: nan: 2.20.0 optional: true + magic-string-ast@0.6.2: + dependencies: + magic-string: 0.30.12 + magic-string@0.30.11: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 @@ -18034,6 +18976,16 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 + make-dir@1.3.0: + dependencies: + pify: 3.0.0 + + make-dir@3.1.0: + dependencies: + semver: 6.3.1 + + make-error@1.3.6: {} + make-fetch-happen@10.2.1: dependencies: agentkeepalive: 4.5.0 @@ -18096,7 +19048,7 @@ snapshots: '@types/unist': 3.0.3 devlop: 1.1.0 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 parse-entities: 4.0.1 stringify-entities: 4.0.4 unist-util-visit-parents: 6.0.1 @@ -18127,6 +19079,23 @@ snapshots: transitivePeerDependencies: - supports-color + mdast-util-from-markdown@2.0.2: + dependencies: + '@types/mdast': 4.0.4 + '@types/unist': 3.0.3 + decode-named-character-reference: 1.0.2 + devlop: 1.1.0 + mdast-util-to-string: 4.0.0 + micromark: 4.0.0 + micromark-util-decode-numeric-character-reference: 2.0.1 + micromark-util-decode-string: 2.0.0 + micromark-util-normalize-identifier: 2.0.0 + micromark-util-symbol: 2.0.0 + micromark-util-types: 2.0.0 + unist-util-stringify-position: 4.0.0 + transitivePeerDependencies: + - supports-color + mdast-util-gfm-autolink-literal@2.0.1: dependencies: '@types/mdast': 4.0.4 @@ -18140,7 +19109,7 @@ snapshots: '@types/mdast': 4.0.4 devlop: 1.1.0 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 micromark-util-normalize-identifier: 2.0.0 transitivePeerDependencies: - supports-color @@ -18149,7 +19118,7 @@ snapshots: dependencies: '@types/mdast': 4.0.4 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 transitivePeerDependencies: - supports-color @@ -18159,7 +19128,7 @@ snapshots: devlop: 1.1.0 markdown-table: 3.0.3 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 transitivePeerDependencies: - supports-color @@ -18168,7 +19137,7 @@ snapshots: '@types/mdast': 4.0.4 devlop: 1.1.0 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 transitivePeerDependencies: - supports-color @@ -18180,7 +19149,7 @@ snapshots: mdast-util-gfm-strikethrough: 2.0.0 mdast-util-gfm-table: 2.0.0 mdast-util-gfm-task-list-item: 2.0.0 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 transitivePeerDependencies: - supports-color @@ -18191,7 +19160,7 @@ snapshots: '@types/mdast': 4.0.4 devlop: 1.1.0 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 transitivePeerDependencies: - supports-color @@ -18204,7 +19173,7 @@ snapshots: ccount: 2.0.1 devlop: 1.1.0 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 parse-entities: 4.0.1 stringify-entities: 4.0.4 unist-util-stringify-position: 4.0.0 @@ -18219,7 +19188,7 @@ snapshots: '@types/mdast': 4.0.4 devlop: 1.1.0 mdast-util-from-markdown: 2.0.1 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 transitivePeerDependencies: - supports-color @@ -18240,13 +19209,14 @@ snapshots: unist-util-visit: 5.0.0 vfile: 6.0.3 - mdast-util-to-markdown@2.1.0: + mdast-util-to-markdown@2.1.1: dependencies: '@types/mdast': 4.0.4 '@types/unist': 3.0.3 longest-streak: 3.1.0 mdast-util-phrasing: 4.1.0 mdast-util-to-string: 4.0.0 + micromark-util-classify-character: 2.0.0 micromark-util-decode-string: 2.0.0 unist-util-visit: 5.0.0 zwitch: 2.0.4 @@ -18582,13 +19552,15 @@ snapshots: mlly@1.7.2: dependencies: - acorn: 8.12.1 + acorn: 8.14.0 pathe: 1.1.2 pkg-types: 1.2.1 ufo: 1.5.4 module-details-from-path@1.0.3: {} + mri@1.2.0: {} + ms@2.0.0: {} ms@2.1.3: {} @@ -18627,7 +19599,7 @@ snapshots: nanoid@3.3.7: {} - nanoid@5.0.7: {} + nanoid@5.0.8: {} natural-compare@1.4.0: {} @@ -18663,14 +19635,19 @@ snapshots: node-fetch-native@1.6.4: {} + node-fetch@2.6.9(encoding@0.1.13): + dependencies: + whatwg-url: 5.0.0 + optionalDependencies: + encoding: 0.1.13 + node-fetch@2.7.0(encoding@0.1.13): dependencies: whatwg-url: 5.0.0 optionalDependencies: encoding: 0.1.13 - node-gyp-build@4.8.2: - optional: true + node-gyp-build@4.8.2: {} node-gyp@9.4.1: dependencies: @@ -18691,6 +19668,10 @@ snapshots: node-releases@2.0.18: {} + nopt@5.0.0: + dependencies: + abbrev: 1.1.1 + nopt@6.0.0: dependencies: abbrev: 1.1.1 @@ -18718,14 +19699,17 @@ snapshots: dependencies: path-key: 2.0.1 - npm-run-path@4.0.1: - dependencies: - path-key: 3.1.1 - npm-run-path@5.3.0: dependencies: path-key: 4.0.0 + npmlog@5.0.1: + dependencies: + are-we-there-yet: 2.0.0 + console-control-strings: 1.1.0 + gauge: 3.0.2 + set-blocking: 2.0.0 + npmlog@6.0.2: dependencies: are-we-there-yet: 3.0.1 @@ -18755,8 +19739,7 @@ snapshots: object-keys@1.1.1: optional: true - obuf@1.1.2: - optional: true + obuf@1.1.2: {} ofetch@1.4.1: dependencies: @@ -18922,6 +19905,8 @@ snapshots: index-to-position: 0.1.2 type-fest: 4.26.1 + parse-ms@2.1.0: {} + parse-passwd@1.0.0: {} parse5-htmlparser2-tree-adapter@7.0.0: @@ -18937,6 +19922,8 @@ snapshots: dependencies: entities: 4.5.0 + path-browserify@1.0.1: {} + path-exists@3.0.0: {} path-exists@4.0.0: {} @@ -18963,6 +19950,8 @@ snapshots: lru-cache: 11.0.0 minipass: 7.1.2 + path-to-regexp@6.2.1: {} + path-to-regexp@8.2.0: {} path-type@2.0.0: @@ -18993,8 +19982,7 @@ snapshots: pg-int8@1.0.1: {} - pg-numeric@1.0.2: - optional: true + pg-numeric@1.0.2: {} pg-protocol@1.7.0: {} @@ -19015,10 +20003,13 @@ snapshots: postgres-date: 2.1.0 postgres-interval: 3.0.0 postgres-range: 1.1.4 - optional: true + + picocolors@1.0.0: {} picocolors@1.1.0: {} + picocolors@1.1.1: {} + picomatch@2.3.1: {} picomatch@4.0.2: {} @@ -19027,6 +20018,14 @@ snapshots: pify@2.3.0: {} + pify@3.0.0: {} + + pinkie-promise@2.0.1: + dependencies: + pinkie: 2.0.4 + + pinkie@2.0.4: {} + pino-abstract-transport@2.0.0: dependencies: split2: 4.2.0 @@ -19065,9 +20064,9 @@ snapshots: mlly: 1.7.2 pathe: 1.1.2 - plain-shiki@0.0.12(shiki@1.22.0): + plain-shiki@0.0.12(shiki@1.22.2): dependencies: - shiki: 1.22.0 + shiki: 1.22.2 plist@3.1.0: dependencies: @@ -19087,7 +20086,7 @@ snapshots: postcss-colormin@7.0.2(postcss@8.4.47): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 caniuse-api: 3.0.0 colord: 2.9.3 postcss: 8.4.47 @@ -19095,7 +20094,7 @@ snapshots: postcss-convert-values@7.0.4(postcss@8.4.47): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 postcss: 8.4.47 postcss-value-parser: 4.2.0 @@ -19128,20 +20127,21 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.4.47 - postcss-load-config@4.0.2(postcss@8.4.47): + postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)): dependencies: lilconfig: 3.1.2 yaml: 2.6.0 optionalDependencies: postcss: 8.4.47 + ts-node: 10.9.1(@types/node@22.8.7)(typescript@5.6.3) - postcss-load-config@6.0.1(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.1)(yaml@2.6.0): + postcss-load-config@6.0.1(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.2)(yaml@2.6.0): dependencies: lilconfig: 3.1.2 optionalDependencies: jiti: 2.3.3 postcss: 8.4.47 - tsx: 4.19.1 + tsx: 4.19.2 yaml: 2.6.0 postcss-merge-longhand@7.0.4(postcss@8.4.47): @@ -19152,7 +20152,7 @@ snapshots: postcss-merge-rules@7.0.4(postcss@8.4.47): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 caniuse-api: 3.0.0 cssnano-utils: 5.0.0(postcss@8.4.47) postcss: 8.4.47 @@ -19172,7 +20172,7 @@ snapshots: postcss-minify-params@7.0.2(postcss@8.4.47): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 cssnano-utils: 5.0.0(postcss@8.4.47) postcss: 8.4.47 postcss-value-parser: 4.2.0 @@ -19219,7 +20219,7 @@ snapshots: postcss-normalize-unicode@7.0.2(postcss@8.4.47): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 postcss: 8.4.47 postcss-value-parser: 4.2.0 @@ -19241,7 +20241,7 @@ snapshots: postcss-reduce-initial@7.0.2(postcss@8.4.47): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 caniuse-api: 3.0.0 postcss: 8.4.47 @@ -19281,30 +20281,25 @@ snapshots: postgres-array@2.0.0: {} - postgres-array@3.0.2: - optional: true + postgres-array@3.0.2: {} postgres-bytea@1.0.0: {} postgres-bytea@3.0.0: dependencies: obuf: 1.1.2 - optional: true postgres-date@1.0.7: {} - postgres-date@2.1.0: - optional: true + postgres-date@2.1.0: {} postgres-interval@1.2.0: dependencies: xtend: 4.0.2 - postgres-interval@3.0.0: - optional: true + postgres-interval@3.0.0: {} - postgres-range@1.1.4: - optional: true + postgres-range@1.1.4: {} postject@1.0.0-alpha.6: dependencies: @@ -19323,6 +20318,10 @@ snapshots: pretty-format@3.8.0: {} + pretty-ms@7.0.1: + dependencies: + parse-ms: 2.1.0 + process-nextick-args@2.0.1: {} process-warning@4.0.0: {} @@ -19358,7 +20357,7 @@ snapshots: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 22.7.5 + '@types/node': 22.8.7 long: 5.2.3 proxy-addr@2.0.7: @@ -19413,13 +20412,20 @@ snapshots: randombytes: 2.1.0 safe-buffer: 5.2.1 - rc-modal-sheet@0.3.2(@radix-ui/react-dialog@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(clsx@2.1.1)(framer-motion@11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(tailwind-merge@2.5.4)(vaul@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)): + raw-body@3.0.0: dependencies: - '@radix-ui/react-dialog': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.6.3 + unpipe: 1.0.0 + + rc-modal-sheet@0.3.2(@radix-ui/react-dialog@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(clsx@2.1.1)(framer-motion@11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(tailwind-merge@2.5.4)(vaul@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)): + dependencies: + '@radix-ui/react-dialog': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) clsx: 2.1.1 - framer-motion: 11.11.9(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + framer-motion: 11.11.11(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwind-merge: 2.5.4 - vaul: 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + vaul: 1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rc9@2.1.2: dependencies: @@ -19452,20 +20458,20 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-hook-form@7.53.0(react@18.3.1): + react-hook-form@7.53.1(react@18.3.1): dependencies: react: 18.3.1 - react-hotkeys-hook@4.5.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-hotkeys-hook@4.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-i18next@15.0.3(i18next@23.16.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-i18next@15.1.0(i18next@23.16.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.25.7 html-parse-stringify: 3.0.1 - i18next: 23.16.0 + i18next: 23.16.4 react: 18.3.1 optionalDependencies: react-dom: 18.3.1(react@18.3.1) @@ -19487,35 +20493,24 @@ snapshots: react-refresh@0.14.2: {} - react-remove-scroll-bar@2.3.6(@types/react@18.3.11)(react@18.3.1): + react-remove-scroll-bar@2.3.6(@types/react@18.3.12)(react@18.3.1): dependencies: react: 18.3.1 - react-style-singleton: 2.2.1(@types/react@18.3.11)(react@18.3.1) + react-style-singleton: 2.2.1(@types/react@18.3.12)(react@18.3.1) tslib: 2.7.0 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - react-remove-scroll@2.5.5(@types/react@18.3.11)(react@18.3.1): + react-remove-scroll@2.6.0(@types/react@18.3.12)(react@18.3.1): dependencies: react: 18.3.1 - react-remove-scroll-bar: 2.3.6(@types/react@18.3.11)(react@18.3.1) - react-style-singleton: 2.2.1(@types/react@18.3.11)(react@18.3.1) + react-remove-scroll-bar: 2.3.6(@types/react@18.3.12)(react@18.3.1) + react-style-singleton: 2.2.1(@types/react@18.3.12)(react@18.3.1) tslib: 2.7.0 - use-callback-ref: 1.3.2(@types/react@18.3.11)(react@18.3.1) - use-sidecar: 1.1.2(@types/react@18.3.11)(react@18.3.1) + use-callback-ref: 1.3.2(@types/react@18.3.12)(react@18.3.1) + use-sidecar: 1.1.2(@types/react@18.3.12)(react@18.3.1) optionalDependencies: - '@types/react': 18.3.11 - - react-remove-scroll@2.6.0(@types/react@18.3.11)(react@18.3.1): - dependencies: - react: 18.3.1 - react-remove-scroll-bar: 2.3.6(@types/react@18.3.11)(react@18.3.1) - react-style-singleton: 2.2.1(@types/react@18.3.11)(react@18.3.1) - tslib: 2.7.0 - use-callback-ref: 1.3.2(@types/react@18.3.11)(react@18.3.1) - use-sidecar: 1.1.2(@types/react@18.3.11)(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 react-router-dom@6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: @@ -19540,14 +20535,14 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-style-singleton@2.2.1(@types/react@18.3.11)(react@18.3.1): + react-style-singleton@2.2.1(@types/react@18.3.12)(react@18.3.1): dependencies: get-nonce: 1.0.1 invariant: 2.2.4 react: 18.3.1 tslib: 2.7.0 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 react-virtuoso@4.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: @@ -19639,6 +20634,8 @@ snapshots: dependencies: picomatch: 2.3.1 + readdirp@4.0.2: {} + real-require@0.2.0: {} rechoir@0.6.2: @@ -19657,6 +20654,10 @@ snapshots: dependencies: regenerate: 1.4.2 + regenerate-unicode-properties@10.2.0: + dependencies: + regenerate: 1.4.2 + regenerate@1.4.2: {} regenerator-runtime@0.14.1: {} @@ -19683,10 +20684,25 @@ snapshots: unicode-match-property-ecmascript: 2.0.0 unicode-match-property-value-ecmascript: 2.1.0 + regexpu-core@6.1.1: + dependencies: + regenerate: 1.4.2 + regenerate-unicode-properties: 10.2.0 + regjsgen: 0.8.0 + regjsparser: 0.11.2 + unicode-match-property-ecmascript: 2.0.0 + unicode-match-property-value-ecmascript: 2.1.0 + + regjsgen@0.8.0: {} + regjsparser@0.10.0: dependencies: jsesc: 0.5.0 + regjsparser@0.11.2: + dependencies: + jsesc: 3.0.2 + regjsparser@0.9.1: dependencies: jsesc: 0.5.0 @@ -19770,7 +20786,7 @@ snapshots: remark-stringify@11.0.0: dependencies: '@types/mdast': 4.0.4 - mdast-util-to-markdown: 2.1.0 + mdast-util-to-markdown: 2.1.1 unified: 11.0.5 repeat-string@1.6.1: @@ -19949,6 +20965,10 @@ snapshots: secure-json-parse@2.7.0: {} + seek-bzip@1.0.6: + dependencies: + commander: 2.20.3 + selecto@1.26.3: dependencies: '@daybrush/utils': 1.13.0 @@ -19984,6 +21004,8 @@ snapshots: setimmediate@1.0.5: {} + setprototypeof@1.2.0: {} + sha.js@2.4.11: dependencies: inherits: 2.0.4 @@ -20007,12 +21029,12 @@ snapshots: interpret: 1.4.0 rechoir: 0.6.2 - shiki@1.22.0: + shiki@1.22.2: dependencies: - '@shikijs/core': 1.22.0 - '@shikijs/engine-javascript': 1.22.0 - '@shikijs/engine-oniguruma': 1.22.0 - '@shikijs/types': 1.22.0 + '@shikijs/core': 1.22.2 + '@shikijs/engine-javascript': 1.22.2 + '@shikijs/engine-oniguruma': 1.22.2 + '@shikijs/types': 1.22.2 '@shikijs/vscode-textmate': 9.3.0 '@types/hast': 3.0.4 @@ -20029,6 +21051,8 @@ snapshots: signal-exit@3.0.7: {} + signal-exit@4.0.2: {} + signal-exit@4.1.0: {} simple-git-hooks@2.11.1: {} @@ -20142,6 +21166,8 @@ snapshots: stat-mode@1.0.0: {} + statuses@2.0.1: {} + std-env@3.7.0: {} steno@4.0.2: {} @@ -20201,9 +21227,11 @@ snapshots: strip-bom@3.0.0: {} - strip-eof@1.0.0: {} + strip-dirs@2.1.0: + dependencies: + is-natural-number: 4.0.1 - strip-final-newline@2.0.0: {} + strip-eof@1.0.0: {} strip-final-newline@3.0.0: {} @@ -20223,7 +21251,7 @@ snapshots: stylehacks@7.0.4(postcss@8.4.47): dependencies: - browserslist: 4.23.3 + browserslist: 4.24.0 postcss: 8.4.47 postcss-selector-parser: 6.1.2 @@ -20282,15 +21310,15 @@ snapshots: tailwind-merge@2.5.4: {} - tailwindcss-animate@1.0.7(tailwindcss@3.4.14): + tailwindcss-animate@1.0.7(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))): dependencies: - tailwindcss: 3.4.14 + tailwindcss: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) - tailwindcss-motion@0.3.0-beta(tailwindcss@3.4.14): + tailwindcss-motion@0.3.0-beta(tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3))): dependencies: - tailwindcss: 3.4.14 + tailwindcss: 3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) - tailwindcss@3.4.14: + tailwindcss@3.4.14(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -20309,7 +21337,7 @@ snapshots: postcss: 8.4.47 postcss-import: 15.1.0(postcss@8.4.47) postcss-js: 4.0.1(postcss@8.4.47) - postcss-load-config: 4.0.2(postcss@8.4.47) + postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3)) postcss-nested: 6.2.0(postcss@8.4.47) postcss-selector-parser: 6.1.2 resolve: 1.22.8 @@ -20317,6 +21345,16 @@ snapshots: transitivePeerDependencies: - ts-node + tar-stream@1.6.2: + dependencies: + bl: 1.2.3 + buffer-alloc: 1.2.0 + end-of-stream: 1.4.4 + fs-constants: 1.0.0 + readable-stream: 2.3.8 + to-buffer: 1.1.1 + xtend: 4.0.2 + tar-stream@2.2.0: dependencies: bl: 4.1.0 @@ -20366,6 +21404,12 @@ snapshots: dependencies: real-require: 0.2.0 + through@2.3.8: {} + + time-span@4.0.0: + dependencies: + convert-hrtime: 3.0.0 + tiny-inflate@1.0.3: {} tiny-typed-emitter@2.1.0: {} @@ -20374,9 +21418,9 @@ snapshots: tinyexec@0.3.1: {} - tinyglobby@0.2.6: + tinyglobby@0.2.10: dependencies: - fdir: 6.3.0(picomatch@4.0.2) + fdir: 6.4.2(picomatch@4.0.2) picomatch: 4.0.2 tinypool@1.0.1: {} @@ -20385,11 +21429,11 @@ snapshots: tinyspy@3.0.2: {} - tldts-core@6.1.52: {} + tldts-core@6.1.58: {} - tldts@6.1.51: + tldts@6.1.58: dependencies: - tldts-core: 6.1.52 + tldts-core: 6.1.58 tmp-promise@3.0.3: dependencies: @@ -20402,6 +21446,8 @@ snapshots: unorm: 1.6.0 optional: true + to-buffer@1.1.1: {} + to-data-view@1.1.0: optional: true @@ -20413,6 +21459,8 @@ snapshots: toad-cache@3.7.0: {} + toidentifier@1.0.1: {} + tr46@0.0.3: {} tr46@1.0.1: @@ -20453,31 +21501,75 @@ snapshots: ts-interface-checker@0.1.13: {} + ts-morph@12.0.0: + dependencies: + '@ts-morph/common': 0.11.1 + code-block-writer: 10.1.1 + + ts-node@10.9.1(@types/node@16.18.11)(typescript@4.9.5): + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.11 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 16.18.11 + acorn: 8.14.0 + acorn-walk: 8.3.4 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 4.9.5 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + + ts-node@10.9.1(@types/node@22.8.7)(typescript@5.6.3): + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.11 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 22.8.7 + acorn: 8.14.0 + acorn-walk: 8.3.4 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 5.6.3 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + optional: true + ts-pattern@5.5.0: {} + ts-toolbelt@6.15.5: {} + tsconfck@3.1.1(typescript@5.6.3): optionalDependencies: typescript: 5.6.3 tslib@2.7.0: {} - tsup@8.3.0(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.1)(typescript@5.6.3)(yaml@2.6.0): + tsup@8.3.5(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.2)(typescript@5.6.3)(yaml@2.6.0): dependencies: - bundle-require: 5.0.0(esbuild@0.23.1) + bundle-require: 5.0.0(esbuild@0.24.0) cac: 6.7.14 - chokidar: 3.6.0 + chokidar: 4.0.1 consola: 3.2.3 debug: 4.3.7 - esbuild: 0.23.1 - execa: 5.1.1 + esbuild: 0.24.0 joycon: 3.1.1 - picocolors: 1.1.0 - postcss-load-config: 6.0.1(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.1)(yaml@2.6.0) + picocolors: 1.1.1 + postcss-load-config: 6.0.1(jiti@2.3.3)(postcss@8.4.47)(tsx@4.19.2)(yaml@2.6.0) resolve-from: 5.0.0 rollup: 4.24.0 source-map: 0.8.0-beta.0 sucrase: 3.35.0 - tinyglobby: 0.2.6 + tinyexec: 0.3.1 + tinyglobby: 0.2.10 tree-kill: 1.2.2 optionalDependencies: postcss: 8.4.47 @@ -20488,7 +21580,7 @@ snapshots: - tsx - yaml - tsx@4.19.1: + tsx@4.19.2: dependencies: esbuild: 0.23.1 get-tsconfig: 4.8.1 @@ -20537,17 +21629,19 @@ snapshots: type-fest@4.26.1: {} - typescript-eslint@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3): + typescript-eslint@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@typescript-eslint/parser': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3))(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/parser': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.2(eslint@9.14.0(jiti@2.3.3))(typescript@5.6.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - eslint - supports-color + typescript@4.9.5: {} + typescript@5.6.3: {} ufo@1.5.4: {} @@ -20557,6 +21651,11 @@ snapshots: uhyphen@0.2.0: {} + unbzip2-stream@1.4.3: + dependencies: + buffer: 5.7.1 + through: 2.3.8 + unconfig@0.5.5: dependencies: '@antfu/utils': 0.7.10 @@ -20567,6 +21666,10 @@ snapshots: undici-types@6.19.8: {} + undici@5.28.4: + dependencies: + '@fastify/busboy': 2.1.1 + undici@6.19.7: {} undici@6.19.8: {} @@ -20651,13 +21754,34 @@ snapshots: unorm@1.6.0: optional: true + unpipe@1.0.0: {} + + unplugin-ast@0.11.0(rollup@4.24.0)(webpack-sources@3.2.3): + dependencies: + '@antfu/utils': 0.7.10 + '@babel/generator': 7.26.2 + '@rollup/pluginutils': 5.1.3(rollup@4.24.0) + ast-kit: 1.3.1 + magic-string-ast: 0.6.2 + unplugin: 1.15.0(webpack-sources@3.2.3) + transitivePeerDependencies: + - rollup + - webpack-sources + unplugin@1.0.1: dependencies: - acorn: 8.12.1 + acorn: 8.14.0 chokidar: 3.6.0 webpack-sources: 3.2.3 webpack-virtual-modules: 0.5.0 + unplugin@1.15.0(webpack-sources@3.2.3): + dependencies: + acorn: 8.14.0 + webpack-virtual-modules: 0.6.2 + optionalDependencies: + webpack-sources: 3.2.3 + unused-filename@4.0.1: dependencies: escape-string-regexp: 5.0.0 @@ -20685,31 +21809,31 @@ snapshots: dependencies: punycode: 2.3.1 - use-callback-ref@1.3.2(@types/react@18.3.11)(react@18.3.1): + use-callback-ref@1.3.2(@types/react@18.3.12)(react@18.3.1): dependencies: react: 18.3.1 tslib: 2.7.0 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 use-context-selector@2.0.0(react@18.3.1)(scheduler@0.23.2): dependencies: react: 18.3.1 scheduler: 0.23.2 - use-isomorphic-layout-effect@1.1.2(@types/react@18.3.11)(react@18.3.1): + use-isomorphic-layout-effect@1.1.2(@types/react@18.3.12)(react@18.3.1): dependencies: react: 18.3.1 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 - use-sidecar@1.1.2(@types/react@18.3.11)(react@18.3.1): + use-sidecar@1.1.2(@types/react@18.3.12)(react@18.3.1): dependencies: detect-node-es: 1.1.0 react: 18.3.1 tslib: 2.7.0 optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 use-sync-external-store@1.2.2(react@18.3.1): dependencies: @@ -20734,6 +21858,8 @@ snapshots: util-deprecate@1.0.2: {} + v8-compile-cache-lib@3.0.1: {} + validate-npm-package-license@3.0.4: dependencies: spdx-correct: 3.2.0 @@ -20741,9 +21867,9 @@ snapshots: validate-npm-package-name@6.0.0: {} - vaul@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + vaul@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@radix-ui/react-dialog': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-dialog': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(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) transitivePeerDependencies: @@ -20772,13 +21898,13 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 - vite-node@2.0.5(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0): + vite-node@2.0.5(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0): dependencies: cac: 6.7.14 debug: 4.3.7 pathe: 1.1.2 tinyrainbow: 1.2.0 - vite: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + vite: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) transitivePeerDependencies: - '@types/node' - less @@ -20790,48 +21916,48 @@ snapshots: - supports-color - terser - vite-plugin-mkcert@1.17.6(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)): + vite-plugin-mkcert@1.17.6(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)): dependencies: '@octokit/rest': 20.1.1 axios: 1.7.7(debug@4.3.7) debug: 4.3.7 picocolors: 1.1.0 - vite: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + vite: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) transitivePeerDependencies: - supports-color - vite-tsconfig-paths@5.0.1(typescript@5.6.3)(vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0)): + vite-tsconfig-paths@5.0.1(typescript@5.6.3)(vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.1.1(typescript@5.6.3) optionalDependencies: - vite: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + vite: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) transitivePeerDependencies: - supports-color - typescript - vite@5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0): + vite@5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0): dependencies: esbuild: 0.21.5 postcss: 8.4.47 rollup: 4.24.0 optionalDependencies: - '@types/node': 22.7.5 + '@types/node': 22.8.7 fsevents: 2.3.3 lightningcss: 1.27.0 terser: 5.35.0 - vitest@2.0.5(@types/node@22.7.5)(happy-dom@15.7.4)(lightningcss@1.27.0)(terser@5.35.0): + vitest@2.0.5(@edge-runtime/vm@3.2.0)(@types/node@22.8.7)(happy-dom@15.8.0)(lightningcss@1.27.0)(terser@5.35.0): dependencies: '@ampproject/remapping': 2.3.0 '@vitest/expect': 2.0.5 - '@vitest/pretty-format': 2.1.3 + '@vitest/pretty-format': 2.1.4 '@vitest/runner': 2.0.5 '@vitest/snapshot': 2.0.5 '@vitest/spy': 2.0.5 '@vitest/utils': 2.0.5 - chai: 5.1.1 + chai: 5.1.2 debug: 4.3.7 execa: 8.0.1 magic-string: 0.30.12 @@ -20840,12 +21966,13 @@ snapshots: tinybench: 2.9.0 tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.4.9(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) - vite-node: 2.0.5(@types/node@22.7.5)(lightningcss@1.27.0)(terser@5.35.0) + vite: 5.4.10(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) + vite-node: 2.0.5(@types/node@22.8.7)(lightningcss@1.27.0)(terser@5.35.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.7.5 - happy-dom: 15.7.4 + '@edge-runtime/vm': 3.2.0 + '@types/node': 22.8.7 + happy-dom: 15.8.0 transitivePeerDependencies: - less - lightningcss @@ -20874,6 +22001,8 @@ snapshots: webpack-virtual-modules@0.5.0: {} + webpack-virtual-modules@0.6.2: {} + websocket-driver@0.7.4: dependencies: http-parser-js: 0.5.8 @@ -20990,6 +22119,8 @@ snapshots: buffer-crc32: 0.2.13 fd-slicer: 1.1.0 + yn@3.1.1: {} + yocto-queue@0.1.0: {} yoga-wasm-web@0.3.3: {} @@ -21006,9 +22137,9 @@ snapshots: zod@3.23.8: {} - zustand@5.0.0(@types/react@18.3.11)(immer@10.1.1(patch_hash=og7mbnoo5vh43tjlw5rbmrdbvu))(react@18.3.1)(use-sync-external-store@1.2.2(react@18.3.1)): + zustand@5.0.1(@types/react@18.3.12)(immer@10.1.1(patch_hash=og7mbnoo5vh43tjlw5rbmrdbvu))(react@18.3.1)(use-sync-external-store@1.2.2(react@18.3.1)): optionalDependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 immer: 10.1.1(patch_hash=og7mbnoo5vh43tjlw5rbmrdbvu) react: 18.3.1 use-sync-external-store: 1.2.2(react@18.3.1) diff --git a/resources/tray-icon.png b/resources/tray-icon.png new file mode 100644 index 000000000..edb10a250 Binary files /dev/null and b/resources/tray-icon.png differ diff --git a/scripts/merge-yml.ts b/scripts/merge-yml.ts new file mode 100644 index 000000000..223e74a97 --- /dev/null +++ b/scripts/merge-yml.ts @@ -0,0 +1,56 @@ +import fs from "node:fs" +import path from "node:path" + +import yaml from "js-yaml" + +const outDir = "./out/make" + +function findYmlFiles(dir: string): string[] { + let results: string[] = [] + const items = fs.readdirSync(dir) + + items.forEach((item) => { + const fullPath = path.join(dir, item) + if (fs.statSync(fullPath).isDirectory()) { + results = results.concat(findYmlFiles(fullPath)) + } else if (item.endsWith(".yml")) { + results.push(fullPath) + } + }) + + return results +} + +const ymlFiles = findYmlFiles(outDir) + +let mergedContent = { + version: "", + files: [], + releaseDate: "", +} + +ymlFiles.forEach((file) => { + const fileContent = fs.readFileSync(file, "utf8") + const ymlData = yaml.load(fileContent) + + if (!mergedContent.version) { + mergedContent.version = ymlData.version + } + + mergedContent = { + version: ymlData.version, + files: mergedContent.files.concat(ymlData.files), + releaseDate: ymlData.releaseDate, + } +}) + +const mergedYml = yaml.dump(mergedContent, { + lineWidth: -1, +}) +fs.mkdirSync(path.join(outDir, "merged"), { recursive: true }) +const mergedFilePath = path.join(outDir, "merged", path.basename(ymlFiles[0])) +fs.writeFileSync(mergedFilePath, mergedYml) + +ymlFiles.forEach((file) => { + fs.unlinkSync(file) +}) diff --git a/resources/dmg-background.png b/static/dmg-background.png similarity index 100% rename from resources/dmg-background.png rename to static/dmg-background.png diff --git a/resources/dmg-background@2x.png b/static/dmg-background@2x.png similarity index 100% rename from resources/dmg-background@2x.png rename to static/dmg-background@2x.png diff --git a/resources/dmg-icon.icns b/static/dmg-icon.icns similarity index 100% rename from resources/dmg-icon.icns rename to static/dmg-icon.icns diff --git a/resources/icon-dev.png b/static/icon-dev.png similarity index 100% rename from resources/icon-dev.png rename to static/icon-dev.png diff --git a/tailwind.config.ts b/tailwind.config.ts index 3076a591f..94cd3569a 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -1,8 +1,8 @@ +import plugin from "tailwindcss/plugin" import resolveConfig from "tailwindcss/resolveConfig" import { baseConfig } from "./configs/tailwind.base.config" -/** @type {import('tailwindcss').Config} */ export default resolveConfig({ ...baseConfig, content: [ @@ -13,4 +13,71 @@ export default resolveConfig({ "./apps/web/index.html", "./packages/**/*.{ts,tsx}", ], + theme: { + ...baseConfig.theme, + extend: { + ...baseConfig.theme?.extend, + spacing: { + "safe-inset-top": "var(--fo-window-padding-top, 0)", + "margin-macos-traffic-light-x": "var(--fo-macos-traffic-light-width, 0)", + "margin-macos-traffic-light-y": "var(--fo-macos-traffic-light-height, 0)", + }, + }, + }, + plugins: [ + ...baseConfig.plugins, + plugin(({ addVariant }) => { + addVariant("f-motion-reduce", '[data-motion-reduce="true"] &') + addVariant("group-motion-reduce", ':merge(.group)[data-motion-reduce="true"] &') + addVariant("peer-motion-reduce", ':merge(.peer)[data-motion-reduce="true"] ~ &') + + addVariant("zen-mode-macos", ":where(html[data-zen-mode='true'][data-os='macOS']) &") + addVariant("zen-mode-windows", ":where(html[data-zen-mode='true'][data-os='Windows']) &") + + addVariant("zen-mode", ":where(html[data-zen-mode='true']) &") + addVariant("macos", ":where(html[data-os='macOS']) &") + addVariant("windows", ":where(html[data-os='Windows']) &") + }), + + plugin(({ addUtilities, matchUtilities, theme }) => { + addUtilities({ + ".safe-inset-top": { + top: "var(--fo-window-padding-top, 0)", + }, + }) + + const safeInsetTopVariants = {} + for (let i = 1; i <= 16; i++) { + safeInsetTopVariants[`.safe-inset-top-${i}`] = { + top: `calc(var(--fo-window-padding-top, 0px) + ${theme(`spacing.${i}`)})`, + } + } + addUtilities(safeInsetTopVariants) + + // left macos traffic light + const leftMacosTrafficLightVariants = {} + addUtilities({ + ".left-macos-traffic-light": { + left: "var(--fo-macos-traffic-light-width, 0)", + }, + }) + + for (let i = 1; i <= 16; i++) { + leftMacosTrafficLightVariants[`.left-macos-traffic-light-${i}`] = { + left: `calc(var(--fo-macos-traffic-light-width, 0px) + ${theme(`spacing.${i}`)})`, + } + } + addUtilities(leftMacosTrafficLightVariants) + + // Add arbitrary value support + matchUtilities( + { + "safe-inset-top": (value) => ({ + top: `calc(var(--fo-window-padding-top, 0px) + ${value})`, + }), + }, + { values: theme("spacing") }, + ) + }), + ], }) diff --git a/vite.config.ts b/vite.config.ts index af6f5e2fd..f0470a23f 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -11,6 +11,7 @@ import { viteRenderBaseConfig } from "./configs/vite.render.config" import type { env as EnvType } from "./packages/shared/src/env" import { createDependencyChunksPlugin } from "./plugins/vite/deps" import { htmlInjectPlugin } from "./plugins/vite/html-inject" +import manifestPlugin from "./plugins/vite/manifest" import { createPlatformSpecificImportPlugin } from "./plugins/vite/specific-import" const __dirname = fileURLToPath(new URL(".", import.meta.url)) @@ -69,7 +70,12 @@ export default ({ mode }) => { targets: "defaults", renderLegacyChunks: false, modernTargets: ">0.3%, last 2 versions, Firefox ESR, not dead", - modernPolyfills: ["es.array.find-last-index", "es.array.find-last"], + modernPolyfills: [ + // https://unpkg.com/browse/core-js@3.39.0/modules/ + "es.array.find-last-index", + "es.array.find-last", + "es.promise.with-resolvers", + ], }), htmlInjectPlugin(typedEnv), mkcert(), @@ -142,6 +148,7 @@ export default ({ mode }) => { ]), createPlatformSpecificImportPlugin(false), + manifestPlugin(), ], define: {