-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
62702d5
commit 169bd68
Showing
1 changed file
with
33 additions
and
76 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 |
---|---|---|
|
@@ -996,17 +996,10 @@ | |
mv "~2" | ||
safe-json-stringify "~1" | ||
|
||
<<<<<<< HEAD | ||
"@expo/[email protected]": | ||
version "0.18.14" | ||
resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.18.14.tgz#bc53230855c97af54f9a9f49c6478c392c4dcee4" | ||
integrity sha512-ke2IVs3MfIMe2NjXY11Ky9+r0+eav6NUa+cy61wpZNPe5QkwIJ56SdJ4wIMMKFPFhgLsy1vfaqhOcZo96U4wCg== | ||
======= | ||
"@expo/[email protected]": | ||
version "0.18.13" | ||
resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.18.13.tgz#b3a6aa1d4cfa78720ba86f73ded7c2c93f4805a9" | ||
integrity sha512-ZO1fpDK8z6mLeQGuFP6e3cZyCHV55ohZY7/tEyhpft3bwysS680eyFg5SFe+tWNFesnziFrbtI8JaUyhyjqovA== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
dependencies: | ||
"@babel/runtime" "^7.20.0" | ||
"@expo/code-signing-certificates" "0.0.5" | ||
|
@@ -1119,7 +1112,6 @@ | |
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-51.0.0.tgz#f5df238cd1237d7e4d9cc8217cdef3383c2a00cf" | ||
integrity sha512-acn03/u8mQvBhdTQtA7CNhevMltUhbSrpI01FYBJwpVntufkU++ncQujWKlgY/OwIajcfygk1AY4xcNZ5ImkRA== | ||
|
||
<<<<<<< HEAD | ||
"@expo/[email protected]": | ||
version "9.0.1" | ||
resolved "https://registry.yarnpkg.com/@expo/config/-/config-9.0.1.tgz#e7b79de5af29d5ab2a98a62c3cda31f03bd75827" | ||
|
@@ -1138,9 +1130,6 @@ | |
sucrase "3.34.0" | ||
|
||
"@expo/config@~9.0.0", "@expo/config@~9.0.0-beta.0": | ||
======= | ||
"@expo/[email protected]", "@expo/config@~9.0.0", "@expo/config@~9.0.0-beta.0": | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
version "9.0.2" | ||
resolved "https://registry.yarnpkg.com/@expo/config/-/config-9.0.2.tgz#112b93436dbca8aa3da73a46329e5b58fdd435d2" | ||
integrity sha512-BKQ4/qBf3OLT8hHp5kjObk2vxwoRQ1yYQBbG/OM9Jdz32yYtrU8opTbKRAxfZEWH5i3ZHdLrPdC1rO0I6WxtTw== | ||
|
@@ -1157,11 +1146,7 @@ | |
slugify "^1.3.4" | ||
sucrase "3.34.0" | ||
|
||
<<<<<<< HEAD | ||
"@expo/devcert@^1.0.0": | ||
======= | ||
"@expo/devcert@^1.1.2": | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
version "1.1.2" | ||
resolved "https://registry.yarnpkg.com/@expo/devcert/-/devcert-1.1.2.tgz#a4923b8ea5b34fde31d6e006a40d0f594096a0ed" | ||
integrity sha512-FyWghLu7rUaZEZSTLt/XNRukm0c9GFfwP0iFaswoDWpV6alvVg+zRAfCLdIVQEz1SVcQ3zo1hMZFDrnKGvkCuQ== | ||
|
@@ -1216,7 +1201,6 @@ | |
json5 "^2.2.2" | ||
write-file-atomic "^2.3.0" | ||
|
||
<<<<<<< HEAD | ||
"@expo/[email protected]": | ||
version "0.18.3" | ||
resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.18.3.tgz#fa198b9bf806df44fd7684f1df9af2535c107aa8" | ||
|
@@ -1242,9 +1226,6 @@ | |
resolve-from "^5.0.0" | ||
|
||
"@expo/metro-config@~0.18.0": | ||
======= | ||
"@expo/[email protected]", "@expo/metro-config@~0.18.0": | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
version "0.18.4" | ||
resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.18.4.tgz#bc298e21637a3007f3c31c238525d3bef17e823b" | ||
integrity sha512-vh9WDf/SzE+NYCn6gqbzLKiXtENFlFZdAqyj9nI38RvQ4jw6TJIQ8+ExcdLDT3MOG36Ytg44XX9Zb3OWF6LVxw== | ||
|
@@ -1796,15 +1777,9 @@ | |
"@jridgewell/sourcemap-codec" "^1.4.14" | ||
|
||
"@mantine/core@^7.7.1": | ||
<<<<<<< HEAD | ||
version "7.10.1" | ||
resolved "https://registry.yarnpkg.com/@mantine/core/-/core-7.10.1.tgz#c90a2aed1e47ece38f745db11c1cff56fd5719b9" | ||
integrity sha512-l9ypojKN3PjwO1CSLIsqxi7mA25+7w+xc71Q+JuCCREI0tuGwkZsKbIOpuTATIJOjPh8ycLiW7QxX1LYsRTq6w== | ||
======= | ||
version "7.10.0" | ||
resolved "https://registry.yarnpkg.com/@mantine/core/-/core-7.10.0.tgz#bfaafc92cf2346e5a6cbb49289f577ce3f7c05f7" | ||
integrity sha512-hNqhdn/+4x8+FDWzR5fu1eMgnG1Mw4fZHw4WjIYjKrSv0NeKHY263RiesZz8RwcUQ8r7LlD95/2tUOMnKVTV5Q== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
dependencies: | ||
"@floating-ui/react" "^0.26.9" | ||
clsx "^2.1.1" | ||
|
@@ -1814,15 +1789,9 @@ | |
type-fest "^4.12.0" | ||
|
||
"@mantine/hooks@^7.7.1": | ||
<<<<<<< HEAD | ||
version "7.10.1" | ||
resolved "https://registry.yarnpkg.com/@mantine/hooks/-/hooks-7.10.1.tgz#68d12570f0dad127555904973ec78ae40065ae31" | ||
integrity sha512-0EH9WBWUdtQLGU3Ak+csQ77EtUxI6pPNfwZdRJQWcaA3f8SFOLo9h9CGxiikFExerhvuCeUlaTf3s+TB9Op/rw== | ||
======= | ||
version "7.10.0" | ||
resolved "https://registry.yarnpkg.com/@mantine/hooks/-/hooks-7.10.0.tgz#10a259e204a8af29df6aeeb24090c1e2c6debca0" | ||
integrity sha512-fnalwYS2WQEFS4wmhmAetDZ/VdJPLNeUXPX9t+S21o3p/dRTX1xhU2mS7yWaQUKM0hPD1TcujqXGlP2M2g/A9A== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
|
||
"@mantine/utils@^6.0.21": | ||
version "6.0.21" | ||
|
@@ -2831,15 +2800,9 @@ | |
"@types/node" "*" | ||
|
||
"@types/node@*": | ||
<<<<<<< HEAD | ||
version "20.12.13" | ||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.13.tgz#90ed3b8a4e52dd3c5dc5a42dde5b85b74ad8ed88" | ||
integrity sha512-gBGeanV41c1L171rR7wjbMiEpEI/l5XFQdLLfhr/REwpgDy/4U8y89+i8kRiLzDyZdOkXh+cRaTetUnCYutoXA== | ||
======= | ||
version "20.12.12" | ||
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050" | ||
integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
dependencies: | ||
undici-types "~5.26.4" | ||
|
||
|
@@ -3733,15 +3696,9 @@ camelcase@^6.2.0: | |
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== | ||
|
||
caniuse-lite@^1.0.30001587: | ||
<<<<<<< HEAD | ||
version "1.0.30001625" | ||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz#ead1b155ea691d6a87938754d3cb119c24465b03" | ||
integrity sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w== | ||
======= | ||
version "1.0.30001624" | ||
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001624.tgz#0ec4c8fa7a46e5b785477c70b38a56d0b10058eb" | ||
integrity sha512-0dWnQG87UevOCPYaOR49CBcLBwoZLpws+k6W37nLjWUhumP1Isusj0p2u+3KhjNloRWK9OKMgjBBzPujQHw4nA== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
|
||
ccount@^2.0.0: | ||
version "2.0.1" | ||
|
@@ -4541,15 +4498,9 @@ [email protected]: | |
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== | ||
|
||
electron-to-chromium@^1.4.668: | ||
<<<<<<< HEAD | ||
version "1.4.787" | ||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.787.tgz#3eedd0a3b8be2b9e96e21675d399786ad90b99ed" | ||
integrity sha512-d0EFmtLPjctczO3LogReyM2pbBiiZbnsKnGF+cdZhsYzHm/A0GV7W94kqzLD8SN4O3f3iHlgLUChqghgyznvCQ== | ||
======= | ||
version "1.4.783" | ||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz#933887165b8b6025a81663d2d97cf4b85cde27b2" | ||
integrity sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
|
||
emittery@^0.13.1: | ||
version "0.13.1" | ||
|
@@ -5135,17 +5086,10 @@ [email protected]: | |
find-up "^5.0.0" | ||
fs-extra "^9.1.0" | ||
|
||
<<<<<<< HEAD | ||
[email protected]: | ||
version "1.12.12" | ||
resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-1.12.12.tgz#c4c7d70b7a80dcbb60998ca98624f65743d018ac" | ||
integrity sha512-ls2Ido4Aduo4f9/LPQx66Hp3X2qddVOY5S7kP3/lp/G4ieqfPcUMueGYSeaz76fg/TYXRh2XLv/HGvu8zV6bbQ== | ||
======= | ||
[email protected]: | ||
version "1.12.11" | ||
resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-1.12.11.tgz#71d7efb2f6a2a4d3b96defad52fc799b9804f829" | ||
integrity sha512-CF5G6hZo/6uIUz6tj4dNRlvE5L4lakYukXPqz5ZHQ+6fLk1NQVZbRdpHjMkxO/QSBQcKUzG/ngeytpoJus7poQ== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
dependencies: | ||
invariant "^2.2.4" | ||
|
||
|
@@ -5200,29 +5144,23 @@ expo-web-browser@~13.0.3: | |
integrity sha512-HXb7y82ApVJtqk8tManyudtTrCtx8xcUnVzmJECeHCB0SsWSQ+penVLZxJkcyATWoJOsFMnfVSVdrTcpKKGszQ== | ||
|
||
expo@~51.0.2: | ||
<<<<<<< HEAD | ||
version "51.0.9" | ||
resolved "https://registry.yarnpkg.com/expo/-/expo-51.0.9.tgz#a47de1b3d3afe1bf51f37bf69e487d0317686722" | ||
integrity sha512-USckGusi4389X/mFy8X8tEA59vgsc5joOILQrTsDPdDJawkUidDAVqY4NIjJxOY7zEq1SfPv/LglJ4cOdtvfsg== | ||
======= | ||
version "51.0.8" | ||
resolved "https://registry.yarnpkg.com/expo/-/expo-51.0.8.tgz#a7981e86ee20eac4b847c7c8cc5799d9c6b1508d" | ||
integrity sha512-bdTOiMb1f3PChtuqEZ9czUm2gMTmS0r1+H+Pkm2O3PsuLnOgxfIBzL6S37+J4cUocLBaENrmx9SOGKpzhBqXpg== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
dependencies: | ||
"@babel/runtime" "^7.20.0" | ||
"@expo/cli" "0.18.14" | ||
"@expo/config" "9.0.1" | ||
"@expo/cli" "0.18.13" | ||
"@expo/config" "9.0.2" | ||
"@expo/config-plugins" "8.0.4" | ||
"@expo/metro-config" "0.18.3" | ||
"@expo/metro-config" "0.18.4" | ||
"@expo/vector-icons" "^14.0.0" | ||
babel-preset-expo "~11.0.6" | ||
expo-asset "~10.0.6" | ||
expo-file-system "~17.0.1" | ||
expo-font "~12.0.6" | ||
expo-font "~12.0.5" | ||
expo-keep-awake "~13.0.2" | ||
expo-modules-autolinking "1.11.1" | ||
expo-modules-core "1.12.12" | ||
expo-modules-core "1.12.11" | ||
fbemitter "^3.0.0" | ||
whatwg-url-without-unicode "8.0.0-3" | ||
|
||
|
@@ -10350,7 +10288,16 @@ string-natural-compare@^3.0.1: | |
resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" | ||
integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== | ||
|
||
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: | ||
"string-width-cjs@npm:string-width@^4.2.0": | ||
version "4.2.3" | ||
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" | ||
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== | ||
dependencies: | ||
emoji-regex "^8.0.0" | ||
is-fullwidth-code-point "^3.0.0" | ||
strip-ansi "^6.0.1" | ||
|
||
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: | ||
version "4.2.3" | ||
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" | ||
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== | ||
|
@@ -10436,7 +10383,7 @@ stringify-entities@^4.0.0: | |
character-entities-html4 "^2.0.0" | ||
character-entities-legacy "^3.0.0" | ||
|
||
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: | ||
"strip-ansi-cjs@npm:strip-ansi@^6.0.1": | ||
version "6.0.1" | ||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" | ||
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== | ||
|
@@ -10450,6 +10397,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.2.0: | |
dependencies: | ||
ansi-regex "^4.1.0" | ||
|
||
strip-ansi@^6.0.0, strip-ansi@^6.0.1: | ||
version "6.0.1" | ||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" | ||
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== | ||
dependencies: | ||
ansi-regex "^5.0.1" | ||
|
||
strip-ansi@^7.0.1: | ||
version "7.1.0" | ||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" | ||
|
@@ -10951,15 +10905,9 @@ undici-types@~5.26.4: | |
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== | ||
|
||
undici@^6.10.1: | ||
<<<<<<< HEAD | ||
version "6.18.2" | ||
resolved "https://registry.yarnpkg.com/undici/-/undici-6.18.2.tgz#f662a5dc33cf654fc412a9912e5a07b138d75c97" | ||
integrity sha512-o/MQLTwRm9IVhOqhZ0NQ9oXax1ygPjw6Vs+Vq/4QRjbOAC3B1GCHy7TYxxbExKlb7bzDRzt9vBWU6BDz0RFfYg== | ||
======= | ||
version "6.18.1" | ||
resolved "https://registry.yarnpkg.com/undici/-/undici-6.18.1.tgz#8390af4c4bed00fc32cb5f77f1c5e03e3271b8f2" | ||
integrity sha512-/0BWqR8rJNRysS5lqVmfc7eeOErcOP4tZpATVjJOojjHZ71gSYVAtFhEmadcIjwMIUehh5NFyKGsXCnXIajtbA== | ||
>>>>>>> 9ff3dae73bb4f6f9dbf26bc7970dd1b36955da59 | ||
|
||
unicode-canonical-property-names-ecmascript@^2.0.0: | ||
version "2.0.0" | ||
|
@@ -11480,7 +11428,7 @@ word-wrap@^1.2.5: | |
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" | ||
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== | ||
|
||
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: | ||
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": | ||
version "7.0.0" | ||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" | ||
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== | ||
|
@@ -11498,6 +11446,15 @@ wrap-ansi@^6.2.0: | |
string-width "^4.1.0" | ||
strip-ansi "^6.0.0" | ||
|
||
wrap-ansi@^7.0.0: | ||
version "7.0.0" | ||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" | ||
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== | ||
dependencies: | ||
ansi-styles "^4.0.0" | ||
string-width "^4.1.0" | ||
strip-ansi "^6.0.0" | ||
|
||
wrap-ansi@^8.1.0: | ||
version "8.1.0" | ||
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" | ||
|