-
-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into develop
- Loading branch information
Showing
1 changed file
with
106 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1802,6 +1802,11 @@ | |
| resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" | ||
| integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== | ||
|
|
||
| "@remix-run/[email protected]": | ||
| version "1.10.0" | ||
| resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.10.0.tgz#e2170dc2049b06e65bbe883adad0e8ddf8291278" | ||
| integrity sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw== | ||
|
|
||
| "@sinclair/typebox@^0.27.8": | ||
| version "0.27.8" | ||
| resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" | ||
|
|
@@ -2367,7 +2372,7 @@ | |
| resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.5.tgz#4751153abbf8d6199babb345a52e1eb4167d64af" | ||
| integrity sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw== | ||
|
|
||
| "@types/semver@^7.3.12": | ||
| "@types/semver@^7.3.12", "@types/semver@^7.3.6": | ||
| version "7.5.4" | ||
| resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.4.tgz#0a41252ad431c473158b22f9bfb9a63df7541cff" | ||
| integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ== | ||
|
|
@@ -3377,6 +3382,14 @@ buffer@^5.1.0, buffer@^5.5.0: | |
| base64-js "^1.3.1" | ||
| ieee754 "^1.1.13" | ||
|
|
||
| [email protected]: | ||
| version "9.1.1" | ||
| resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" | ||
| integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== | ||
| dependencies: | ||
| debug "^4.3.4" | ||
| sax "^1.2.4" | ||
|
|
||
| [email protected]: | ||
| version "9.2.1" | ||
| resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz#3184dcdf7ed6c47afb8df733813224ced4f624fd" | ||
|
|
@@ -4141,7 +4154,7 @@ [email protected]: | |
| dependencies: | ||
| ms "2.0.0" | ||
|
|
||
| debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: | ||
| debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: | ||
| version "4.3.4" | ||
| resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" | ||
| integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== | ||
|
|
@@ -4526,6 +4539,14 @@ electron-builder@^24.2.1: | |
| simple-update-notifier "2.0.0" | ||
| yargs "^17.6.2" | ||
|
|
||
| electron-debug@^3.2.0: | ||
| version "3.2.0" | ||
| resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.2.0.tgz#46a15b555c3b11872218c65ea01d058aa0814920" | ||
| integrity sha512-7xZh+LfUvJ52M9rn6N+tPuDw6oRAjxUj9SoxAZfJ0hVCXhZCsdkrSt7TgXOiWiEOBgEV8qwUIO/ScxllsPS7ow== | ||
| dependencies: | ||
| electron-is-dev "^1.1.0" | ||
| electron-localshortcut "^3.1.0" | ||
|
|
||
| electron-devtools-installer@^3.2.0: | ||
| version "3.2.0" | ||
| resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.2.0.tgz#acc48d24eb7033fe5af284a19667e73b78d406d0" | ||
|
|
@@ -4536,6 +4557,31 @@ electron-devtools-installer@^3.2.0: | |
| tslib "^2.1.0" | ||
| unzip-crx-3 "^0.2.0" | ||
|
|
||
| electron-is-accelerator@^0.1.0: | ||
| version "0.1.2" | ||
| resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b" | ||
| integrity sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA== | ||
|
|
||
| electron-is-dev@^1.1.0: | ||
| version "1.2.0" | ||
| resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.2.0.tgz#2e5cea0a1b3ccf1c86f577cee77363ef55deb05e" | ||
| integrity sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw== | ||
|
|
||
| electron-localshortcut@^3.1.0: | ||
| version "3.2.1" | ||
| resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz#cfc83a3eff5e28faf98ddcc87f80a2ce4f623cd3" | ||
| integrity sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q== | ||
| dependencies: | ||
| debug "^4.0.1" | ||
| electron-is-accelerator "^0.1.0" | ||
| keyboardevent-from-electron-accelerator "^2.0.0" | ||
| keyboardevents-areequal "^0.2.1" | ||
|
|
||
| electron-log@^4.4.8: | ||
| version "4.4.8" | ||
| resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.8.tgz#fcb9f714dbcaefb6ac7984c4683912c74730248a" | ||
| integrity sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA== | ||
|
|
||
| [email protected]: | ||
| version "24.5.0" | ||
| resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.5.0.tgz#492a4d7caa232e88ee3c18f5c3b4dc637e5e1b3a" | ||
|
|
@@ -4562,6 +4608,21 @@ electron-to-chromium@^1.4.535: | |
| resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz#c92e8fbc2bd15df3068d92571733a218a5413add" | ||
| integrity sha512-8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w== | ||
|
|
||
| electron-updater@^5.3.0: | ||
| version "5.3.0" | ||
| resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-5.3.0.tgz#3ba0d20407911a2edc5a68bee45c5aa2023e9ff8" | ||
| integrity sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw== | ||
| dependencies: | ||
| "@types/semver" "^7.3.6" | ||
| builder-util-runtime "9.1.1" | ||
| fs-extra "^10.0.0" | ||
| js-yaml "^4.1.0" | ||
| lazy-val "^1.0.5" | ||
| lodash.escaperegexp "^4.1.2" | ||
| lodash.isequal "^4.5.0" | ||
| semver "^7.3.5" | ||
| typed-emitter "^2.1.0" | ||
|
|
||
| electron@^25.8.1: | ||
| version "25.9.3" | ||
| resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.3.tgz#cdd53a30fb914adadcfbd34124237fb38b1c07d0" | ||
|
|
@@ -6949,6 +7010,16 @@ jszip@^3.1.0: | |
| readable-stream "~2.3.6" | ||
| setimmediate "^1.0.5" | ||
|
|
||
| keyboardevent-from-electron-accelerator@^2.0.0: | ||
| version "2.0.0" | ||
| resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz#ace21b1aa4e47148815d160057f9edb66567c50c" | ||
| integrity sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA== | ||
|
|
||
| keyboardevents-areequal@^0.2.1: | ||
| version "0.2.2" | ||
| resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" | ||
| integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== | ||
|
|
||
| keyv@^4.0.0, keyv@^4.5.3: | ||
| version "4.5.4" | ||
| resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" | ||
|
|
@@ -7081,6 +7152,11 @@ lodash.escape@^4.0.1: | |
| resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" | ||
| integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw== | ||
|
|
||
| lodash.escaperegexp@^4.1.2: | ||
| version "4.1.2" | ||
| resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" | ||
| integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw== | ||
|
|
||
| lodash.flatten@^4.4.0: | ||
| version "4.4.0" | ||
| resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" | ||
|
|
@@ -7091,6 +7167,11 @@ lodash.invokemap@^4.6.0: | |
| resolved "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz#1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62" | ||
| integrity sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w== | ||
|
|
||
| lodash.isequal@^4.5.0: | ||
| version "4.5.0" | ||
| resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" | ||
| integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== | ||
|
|
||
| [email protected], lodash.memoize@^4.1.2: | ||
| version "4.1.2" | ||
| resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" | ||
|
|
@@ -8463,6 +8544,21 @@ react-refresh@^0.14.0: | |
| resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e" | ||
| integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ== | ||
|
|
||
| react-router-dom@^6.11.2: | ||
| version "6.17.0" | ||
| resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.17.0.tgz#ea73f89186546c1cf72b10fcb7356d874321b2ad" | ||
| integrity sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ== | ||
| dependencies: | ||
| "@remix-run/router" "1.10.0" | ||
| react-router "6.17.0" | ||
|
|
||
| [email protected]: | ||
| version "6.17.0" | ||
| resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.17.0.tgz#7b680c4cefbc425b57537eb9c73bedecbdc67c1e" | ||
| integrity sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA== | ||
| dependencies: | ||
| "@remix-run/router" "1.10.0" | ||
|
|
||
| react-shallow-renderer@^16.15.0: | ||
| version "16.15.0" | ||
| resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" | ||
|
|
@@ -8785,7 +8881,7 @@ runtime-required@^1.1.0: | |
| resolved "https://registry.yarnpkg.com/runtime-required/-/runtime-required-1.1.0.tgz#a000a50c2748dba123f4dac5105e66d4599519c4" | ||
| integrity sha512-yX97f5E0WfNpcQnfVjap6vzQcvErkYYCx6eTK4siqGEdC8lglwypUFgZVTX7ShvIlgfkC4XGFl9O1KTYcff0pw== | ||
|
|
||
| rxjs@^7.8.1: | ||
| rxjs@^7.5.2, rxjs@^7.8.1: | ||
| version "7.8.1" | ||
| resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" | ||
| integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== | ||
|
|
@@ -9794,6 +9890,13 @@ typed-array-length@^1.0.4: | |
| for-each "^0.3.3" | ||
| is-typed-array "^1.1.9" | ||
|
|
||
| typed-emitter@^2.1.0: | ||
| version "2.1.0" | ||
| resolved "https://registry.yarnpkg.com/typed-emitter/-/typed-emitter-2.1.0.tgz#ca78e3d8ef1476f228f548d62e04e3d4d3fd77fb" | ||
| integrity sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA== | ||
| optionalDependencies: | ||
| rxjs "^7.5.2" | ||
|
|
||
| typescript@^4.0.2: | ||
| version "4.9.5" | ||
| resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" | ||
|
|
||