⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
Merge branch 'dev' into main
Go Compiledf1da9f1f8a3
diff --cc lib/api/archiveHandler.tsindex a7785dba,c43b6dbe..89eb4a0f--- a/lib/api/archiveHandler.ts+++ b/lib/api/archiveHandler.ts@@@ -20,19 -20,11 +20,23 @@@ type LinksAndCollectionAndOwner = Linkconst BROWSER_TIMEOUT = Number(process.env.BROWSER_TIMEOUT) || 5;export default async function archiveHandler(link: LinksAndCollectionAndOwner) {- const browser = await chromium.launch();+ // allow user to configure a proxy+ let browserOptions: LaunchOptions = {};+ if (process.env.ARCHIVER_PROXY) {+ browserOptions.proxy = {+ server: process.env.ARCHIVER_PROXY,+ bypass: process.env.ARCHIVER_PROXY_BYPASS,+ username: process.env.ARCHIVER_PROXY_USERNAME,+ password: process.env.ARCHIVER_PROXY_PASSWORD,+ }+ }++ const browser = await chromium.launch(browserOptions);- const context = await browser.newContext(devices["Desktop Chrome"]);+ const context = await browser.newContext({+ ...devices["Desktop Chrome"],+ ignoreHTTPSErrors: process.env.IGNORE_HTTPS_ERRORS === "true",+ });++const page = await context.newPage();const timeoutPromise = new Promise((_, reject) => {diff --cc package.jsonindex 76edd7e1,7199f79e..9338ac74--- a/package.json+++ b/package.json@@@ -59,8 -59,8 +60,9 @@@"react-hot-toast": "^2.4.1","react-image-file-resizer": "^0.4.8","react-select": "^5.7.4",+ "socks-proxy-agent": "^8.0.2","stripe": "^12.13.0",+ "vaul": "^0.8.8","zustand": "^4.3.8"},"devDependencies": {diff --cc yarn.lockindex feb0d5e8,7f3b8b8f..ce0383ca--- a/yarn.lock+++ b/yarn.lock@@@ -614,9 -614,23 +614,23 @@@chalk "^2.0.0"js-tokens "^4.0.0"- "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":+ "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":+ version "7.21.5"+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"+ integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==+ dependencies:+ regenerator-runtime "^0.13.11"++ "@babel/runtime@^7.13.10":+ version "7.23.8"+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"+ integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==+ dependencies:+ regenerator-runtime "^0.14.0"++ "@babel/runtime@^7.21.0":version "7.23.6"- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d"+ resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.6.tgz"integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==dependencies:regenerator-runtime "^0.14.0"@@@ -1213,12 -1272,154 +1227,154 @@@"@prisma/[email protected]":version "5.1.0"- resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.1.0.tgz#4ccf7f344eaeee08ca1e4a1bb2dc14e36ff1d5ec"+ resolved "https://registry.npmjs.org/@prisma/engines/-/engines-5.1.0.tgz"integrity sha512-HqaFsnPmZOdMWkPq6tT2eTVTQyaAXEDdKszcZ4yc7DGMBIYRP6j/zAJTtZUG9SsMV8FaucdL5vRyxY/p5Ni28g==+ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.0.1.tgz#e46f9958b35d10e9f6dc71c497305c22e3e55dbd"+ integrity sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==+ dependencies:+ "@babel/runtime" "^7.13.10"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz#7ed868b66946aa6030e580b1ffca386dd4d21989"+ integrity sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==+ dependencies:+ "@babel/runtime" "^7.13.10"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.1.tgz#fe46e67c96b240de59187dcb7a1a50ce3e2ec00c"+ integrity sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==+ dependencies:+ "@babel/runtime" "^7.13.10"++ "@radix-ui/react-dialog@^1.0.4":+ version "1.0.5"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz#71657b1b116de6c7a0b03242d7d43e01062c7300"+ integrity sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/primitive" "1.0.1"+ "@radix-ui/react-compose-refs" "1.0.1"+ "@radix-ui/react-context" "1.0.1"+ "@radix-ui/react-dismissable-layer" "1.0.5"+ "@radix-ui/react-focus-guards" "1.0.1"+ "@radix-ui/react-focus-scope" "1.0.4"+ "@radix-ui/react-id" "1.0.1"+ "@radix-ui/react-portal" "1.0.4"+ "@radix-ui/react-presence" "1.0.1"+ "@radix-ui/react-primitive" "1.0.3"+ "@radix-ui/react-slot" "1.0.2"+ "@radix-ui/react-use-controllable-state" "1.0.1"+ aria-hidden "^1.1.1"+ react-remove-scroll "2.5.5"++ "@radix-ui/[email protected]":+ version "1.0.5"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz#3f98425b82b9068dfbab5db5fff3df6ebf48b9d4"+ integrity sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/primitive" "1.0.1"+ "@radix-ui/react-compose-refs" "1.0.1"+ "@radix-ui/react-primitive" "1.0.3"+ "@radix-ui/react-use-callback-ref" "1.0.1"+ "@radix-ui/react-use-escape-keydown" "1.0.3"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz#1ea7e32092216b946397866199d892f71f7f98ad"+ integrity sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==+ dependencies:+ "@babel/runtime" "^7.13.10"++ "@radix-ui/[email protected]":+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz#2ac45fce8c5bb33eb18419cdc1905ef4f1906525"+ integrity sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-compose-refs" "1.0.1"+ "@radix-ui/react-primitive" "1.0.3"+ "@radix-ui/react-use-callback-ref" "1.0.1"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.0.1.tgz#73cdc181f650e4df24f0b6a5b7aa426b912c88c0"+ integrity sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-use-layout-effect" "1.0.1"++ "@radix-ui/[email protected]":+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.4.tgz#df4bfd353db3b1e84e639e9c63a5f2565fb00e15"+ integrity sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-primitive" "1.0.3"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.0.1.tgz#491990ba913b8e2a5db1b06b203cb24b5cdef9ba"+ integrity sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-compose-refs" "1.0.1"+ "@radix-ui/react-use-layout-effect" "1.0.1"++ "@radix-ui/[email protected]":+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz#d49ea0f3f0b2fe3ab1cb5667eb03e8b843b914d0"+ integrity sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-slot" "1.0.2"++ "@radix-ui/[email protected]":+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab"+ integrity sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-compose-refs" "1.0.1"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz#f4bb1f27f2023c984e6534317ebc411fc181107a"+ integrity sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==+ dependencies:+ "@babel/runtime" "^7.13.10"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz#ecd2ced34e6330caf89a82854aa2f77e07440286"+ integrity sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-use-callback-ref" "1.0.1"++ "@radix-ui/[email protected]":+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz#217b840c250541609c66f67ed7bab2b733620755"+ integrity sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==+ dependencies:+ "@babel/runtime" "^7.13.10"+ "@radix-ui/react-use-callback-ref" "1.0.1"++ "@radix-ui/[email protected]":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz#be8c7bc809b0c8934acf6657b577daf948a75399"+ integrity sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==+ dependencies:+ "@babel/runtime" "^7.13.10"+"@rushstack/eslint-patch@^1.1.3":version "1.2.0"- resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"+ resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="@smithy/abort-controller@^2.0.1":@@@ -1981,12 -2190,19 +2137,19 @@@ arg@^5.0.2argparse@^2.0.1:version "2.0.1"- resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"+ resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==+ aria-hidden@^1.1.1:+ version "1.2.3"+ resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.3.tgz#14aeb7fb692bbb72d69bebfa47279c1fd725e954"+ integrity sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==+ dependencies:+ tslib "^2.0.0"+aria-query@^5.1.3:version "5.1.3"- resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"+ resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz"integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==dependencies:deep-equal "^2.0.5"@@@ -2582,12 -2798,17 +2745,17 @@@ depd@~1.1.2detect-libc@^2.0.0:version "2.0.1"- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"+ resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==+ detect-node-es@^1.1.0:+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"+ integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==+dezalgo@^1.0.4:version "1.0.4"- resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"+ resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz"integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==dependencies:asap "^2.0.0"@@@ -3241,9 -3457,14 +3409,14 @@@ get-intrinsic@^1.0.2, get-intrinsic@^1.has "^1.0.3"has-symbols "^1.0.3"+ get-nonce@^1.0.0:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3"+ integrity sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==+get-pixels@^3.3.2:version "3.3.3"- resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.3.tgz#71e2dfd4befb810b5478a61c6354800976ce01c7"+ resolved "https://registry.npmjs.org/get-pixels/-/get-pixels-3.3.3.tgz"integrity sha512-5kyGBn90i9tSMUVHTqkgCHsoWoR+/lGbl4yC83Gefyr0HLIhgSWEx/2F/3YgsZ7UpYNuM6pDhDK7zebrUJ5nXg==dependencies:data-uri-to-buffer "0.0.3"@@@ -3479,12 -3710,17 +3652,17 @@@ has@^1.0.3hexoid@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"+ resolved "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz"integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==+ himalaya@^1.1.0:+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/himalaya/-/himalaya-1.1.0.tgz#31724ae9d35714cd7c6f4be94888953f3604606a"+ integrity sha512-LLase1dHCRMel68/HZTFft0N0wti0epHr3nNY7ynpLbyZpmrKMQ8YIpiOV77TM97cNpC8Wb2n6f66IRggwdWPw==+hoist-non-react-statics@^3.3.1:version "3.3.2"- resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"+ resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==dependencies:react-is "^16.7.0"@@@ -3604,22 -3840,21 +3782,29 @@@ internal-slot@^1.0.3, internal-slot@^1.has "^1.0.3"side-channel "^1.0.4"+ invariant@^2.2.4:+ version "2.2.4"+ resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"+ integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==+ dependencies:+ loose-envify "^1.0.0"+iota-array@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"+ resolved "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz"integrity sha512-pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==+ip-address@^9.0.5:+ version "9.0.5"+ resolved "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz"+ integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==+ dependencies:+ jsbn "1.1.0"+ sprintf-js "^1.1.3"+is-arguments@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"+ resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==dependencies:call-bind "^1.0.2"@@@ -4028,12 -4258,12 +4213,12 @@@ lodash.merge@^4.6.2lodash@^4.17.21:version "4.17.21"- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"+ resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==- loose-envify@^1.1.0, loose-envify@^1.4.0:+ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:version "1.4.0"- resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"+ resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==dependencies:js-tokens "^3.0.0 || ^4.0.0"@@@ -4824,12 -5052,31 +5009,31 @@@ react-image-file-resizer@^0.4.8react-is@^16.13.1, react-is@^16.7.0:version "16.13.1"- resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"+ resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==+ react-remove-scroll-bar@^2.3.3:+ version "2.3.4"+ resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"+ integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==+ dependencies:+ react-style-singleton "^2.2.1"+ tslib "^2.0.0"++ version "2.5.5"+ resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"+ integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==+ dependencies:+ react-remove-scroll-bar "^2.3.3"+ react-style-singleton "^2.2.1"+ tslib "^2.1.0"+ use-callback-ref "^1.3.0"+ use-sidecar "^1.1.2"+react-select@^5.7.4:version "5.7.4"- resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.7.4.tgz#d8cad96e7bc9d6c8e2709bdda8f4363c5dd7ea7d"+ resolved "https://registry.npmjs.org/react-select/-/react-select-5.7.4.tgz"integrity sha512-NhuE56X+p9QDFh4BgeygHFIvJJszO1i1KSkg/JPcIJrbovyRtI+GuOEa4XzFCEpZRAEoEI8u/cAHK+jG/PgUzQ==dependencies:"@babel/runtime" "^7.12.0"@@@ -4842,9 -5089,18 +5046,18 @@@react-transition-group "^4.3.0"use-isomorphic-layout-effect "^1.1.2"+ react-style-singleton@^2.2.1:+ version "2.2.1"+ resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"+ integrity sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==+ dependencies:+ get-nonce "^1.0.0"+ invariant "^2.2.4"+ tslib "^2.0.0"+react-transition-group@^4.3.0:version "4.4.5"- resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"+ resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz"integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==dependencies:"@babel/runtime" "^7.5.5"@@@ -5648,14 -5865,29 +5861,29 @@@ url-parse@^1.5.3querystringify "^2.1.1"requires-port "^1.0.0"+ use-callback-ref@^1.3.0:+ version "1.3.1"+ resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.1.tgz#9be64c3902cbd72b07fe55e56408ae3a26036fd0"+ integrity sha512-Lg4Vx1XZQauB42Hw3kK7JM6yjVjgFmFC5/Ab797s79aARomD2nEErc4mCgM8EZrARLmmbWpi5DGCadmK50DcAQ==+ dependencies:+ tslib "^2.0.0"+use-isomorphic-layout-effect@^1.1.2:version "1.1.2"- resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"+ resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz"integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==+ use-sidecar@^1.1.2:+ version "1.1.2"+ resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz#2f43126ba2d7d7e117aa5855e5d8f0276dfe73c2"+ integrity sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==+ dependencies:+ detect-node-es "^1.1.0"+ tslib "^2.0.0"+version "1.2.0"- resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"+ resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==utif2@^4.0.1:@@@ -5682,12 -5914,19 +5910,19 @@@ uuid@^8.3.2v8-compile-cache-lib@^3.0.1:version "3.0.1"- resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"+ resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==+ vaul@^0.8.8:+ version "0.8.8"+ resolved "https://registry.yarnpkg.com/vaul/-/vaul-0.8.8.tgz#c5edc041825fdeaddf0a89e326abcc7ac7449a2d"+ integrity sha512-Z9K2b90M/LtY/sRyM1yfA8Y4mHC/5WIqhO2u7Byr49r5LQXkLGdVXiehsnjtws9CL+DyknwTuRMJXlCOHTqg/g==+ dependencies:+ "@radix-ui/react-dialog" "^1.0.4"+version "1.10.0"- resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"+ resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==dependencies:assert-plus "^1.0.0"