Skip to content

Commit 5df1700

Browse files
authored
Merge branch 'main' into dev
2 parents b173e19 + ec690b0 commit 5df1700

File tree

2 files changed

+100
-20
lines changed

2 files changed

+100
-20
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"devDependencies": {
6868
"@babel/core": "^7.18.2",
6969
"@babel/plugin-transform-react-jsx": "^7.17.12",
70-
"@types/react": "^18.0.9",
70+
"@types/react": "^18.0.12",
7171
"@typescript-eslint/eslint-plugin": "^5.27.0",
7272
"@typescript-eslint/parser": "^5.27.0",
7373
"babel-eslint": "^10.1.0",

yarn.lock

Lines changed: 99 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
semver "^5.4.1"
149149
source-map "^0.5.0"
150150

151-
"@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.17.12":
151+
"@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.18.2":
152152
version "7.18.2"
153153
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876"
154154
integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==
@@ -1258,7 +1258,7 @@
12581258
resolved "https://registry.yarnpkg.com/@francoischalifour/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.0.0-alpha.28.tgz#a5ad7996f42e43e4acbb4e0010d663746d0e9997"
12591259
integrity sha512-bprfNmYt1opFUFEtD2XfY/kEsm13bzHQgU80uMjhuK0DJ914IjolT1GytpkdM6tJ4MBvyiJPP+bTtWO+BZ7c7w==
12601260

1261-
"@headlessui/react@^1.6.1":
1261+
"@headlessui/react@^1.6.4":
12621262
version "1.6.4"
12631263
resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.4.tgz#c73084e23386bef5fb86cd16da3352c3a844bb4c"
12641264
integrity sha512-0yqz1scwbFtwljmbbKjXsSGl5ABEYNICVHZnMCWo0UtOZodo2Tpu94uOVgCRjRZ77l2WcTi2S0uidINDvG7lsA==
@@ -1779,10 +1779,10 @@
17791779
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df"
17801780
integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==
17811781

1782-
"@types/react@^18.0.9":
1783-
version "18.0.10"
1784-
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.10.tgz#5692944d4a45e204fb7a981eb1388afe919cf4d0"
1785-
integrity sha512-dIugadZuIPrRzvIEevIu7A1smqOAjkSMv8qOfwPt9Ve6i6JT/FQcCHyk2qIAxwsQNKZt5/oGR0T4z9h2dXRAkg==
1782+
"@types/react@^18.0.12":
1783+
version "18.0.12"
1784+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.12.tgz#cdaa209d0a542b3fcf69cf31a03976ec4cdd8840"
1785+
integrity sha512-duF1OTASSBQtcigUvhuiTB1Ya3OvSy+xORCiEf20H0P0lzx+/KeVsA99U5UjLXSbyo1DRJDlLKqTeM1ngosqtg==
17861786
dependencies:
17871787
"@types/prop-types" "*"
17881788
"@types/scheduler" "*"
@@ -1798,7 +1798,22 @@
17981798
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
17991799
integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
18001800

1801-
"@typescript-eslint/eslint-plugin@^5.25.0", "@typescript-eslint/eslint-plugin@^5.5.0":
1801+
"@typescript-eslint/eslint-plugin@^5.27.0":
1802+
version "5.27.1"
1803+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz#fdf59c905354139046b41b3ed95d1609913d0758"
1804+
integrity sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw==
1805+
dependencies:
1806+
"@typescript-eslint/scope-manager" "5.27.1"
1807+
"@typescript-eslint/type-utils" "5.27.1"
1808+
"@typescript-eslint/utils" "5.27.1"
1809+
debug "^4.3.4"
1810+
functional-red-black-tree "^1.0.1"
1811+
ignore "^5.2.0"
1812+
regexpp "^3.2.0"
1813+
semver "^7.3.7"
1814+
tsutils "^3.21.0"
1815+
1816+
"@typescript-eslint/eslint-plugin@^5.5.0":
18021817
version "5.27.0"
18031818
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.0.tgz#23d82a4f21aaafd8f69dbab7e716323bb6695cc8"
18041819
integrity sha512-DDrIA7GXtmHXr1VCcx9HivA39eprYBIFxbQEHI6NyraRDxCGpxAFiYQAT/1Y0vh1C+o2vfBiy4IuPoXxtTZCAQ==
@@ -1820,7 +1835,7 @@
18201835
dependencies:
18211836
"@typescript-eslint/utils" "5.27.0"
18221837

1823-
"@typescript-eslint/parser@^5.21.0", "@typescript-eslint/parser@^5.25.0", "@typescript-eslint/parser@^5.5.0":
1838+
"@typescript-eslint/parser@^5.21.0", "@typescript-eslint/parser@^5.5.0":
18241839
version "5.27.0"
18251840
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.27.0.tgz#62bb091ed5cf9c7e126e80021bb563dcf36b6b12"
18261841
integrity sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==
@@ -1830,6 +1845,16 @@
18301845
"@typescript-eslint/typescript-estree" "5.27.0"
18311846
debug "^4.3.4"
18321847

1848+
"@typescript-eslint/parser@^5.27.0":
1849+
version "5.27.1"
1850+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.27.1.tgz#3a4dcaa67e45e0427b6ca7bb7165122c8b569639"
1851+
integrity sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==
1852+
dependencies:
1853+
"@typescript-eslint/scope-manager" "5.27.1"
1854+
"@typescript-eslint/types" "5.27.1"
1855+
"@typescript-eslint/typescript-estree" "5.27.1"
1856+
debug "^4.3.4"
1857+
18331858
"@typescript-eslint/scope-manager@5.27.0":
18341859
version "5.27.0"
18351860
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz#a272178f613050ed62f51f69aae1e19e870a8bbb"
@@ -1838,6 +1863,14 @@
18381863
"@typescript-eslint/types" "5.27.0"
18391864
"@typescript-eslint/visitor-keys" "5.27.0"
18401865

1866+
"@typescript-eslint/scope-manager@5.27.1":
1867+
version "5.27.1"
1868+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz#4d1504392d01fe5f76f4a5825991ec78b7b7894d"
1869+
integrity sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==
1870+
dependencies:
1871+
"@typescript-eslint/types" "5.27.1"
1872+
"@typescript-eslint/visitor-keys" "5.27.1"
1873+
18411874
"@typescript-eslint/type-utils@5.27.0":
18421875
version "5.27.0"
18431876
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.27.0.tgz#36fd95f6747412251d79c795b586ba766cf0974b"
@@ -1847,11 +1880,25 @@
18471880
debug "^4.3.4"
18481881
tsutils "^3.21.0"
18491882

1883+
"@typescript-eslint/type-utils@5.27.1":
1884+
version "5.27.1"
1885+
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz#369f695199f74c1876e395ebea202582eb1d4166"
1886+
integrity sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw==
1887+
dependencies:
1888+
"@typescript-eslint/utils" "5.27.1"
1889+
debug "^4.3.4"
1890+
tsutils "^3.21.0"
1891+
18501892
"@typescript-eslint/types@5.27.0":
18511893
version "5.27.0"
18521894
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.27.0.tgz#c3f44b9dda6177a9554f94a74745ca495ba9c001"
18531895
integrity sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==
18541896

1897+
"@typescript-eslint/types@5.27.1":
1898+
version "5.27.1"
1899+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.27.1.tgz#34e3e629501349d38be6ae97841298c03a6ffbf1"
1900+
integrity sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==
1901+
18551902
"@typescript-eslint/typescript-estree@5.27.0":
18561903
version "5.27.0"
18571904
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz#7965f5b553c634c5354a47dcce0b40b94611e995"
@@ -1865,6 +1912,19 @@
18651912
semver "^7.3.7"
18661913
tsutils "^3.21.0"
18671914

1915+
"@typescript-eslint/typescript-estree@5.27.1":
1916+
version "5.27.1"
1917+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz#7621ee78607331821c16fffc21fc7a452d7bc808"
1918+
integrity sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==
1919+
dependencies:
1920+
"@typescript-eslint/types" "5.27.1"
1921+
"@typescript-eslint/visitor-keys" "5.27.1"
1922+
debug "^4.3.4"
1923+
globby "^11.1.0"
1924+
is-glob "^4.0.3"
1925+
semver "^7.3.7"
1926+
tsutils "^3.21.0"
1927+
18681928
"@typescript-eslint/utils@5.27.0", "@typescript-eslint/utils@^5.13.0":
18691929
version "5.27.0"
18701930
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.27.0.tgz#d0021cbf686467a6a9499bd0589e19665f9f7e71"
@@ -1877,6 +1937,18 @@
18771937
eslint-scope "^5.1.1"
18781938
eslint-utils "^3.0.0"
18791939

1940+
"@typescript-eslint/utils@5.27.1":
1941+
version "5.27.1"
1942+
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.27.1.tgz#b4678b68a94bc3b85bf08f243812a6868ac5128f"
1943+
integrity sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==
1944+
dependencies:
1945+
"@types/json-schema" "^7.0.9"
1946+
"@typescript-eslint/scope-manager" "5.27.1"
1947+
"@typescript-eslint/types" "5.27.1"
1948+
"@typescript-eslint/typescript-estree" "5.27.1"
1949+
eslint-scope "^5.1.1"
1950+
eslint-utils "^3.0.0"
1951+
18801952
"@typescript-eslint/visitor-keys@5.27.0":
18811953
version "5.27.0"
18821954
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz#97aa9a5d2f3df8215e6d3b77f9d214a24db269bd"
@@ -1885,6 +1957,14 @@
18851957
"@typescript-eslint/types" "5.27.0"
18861958
eslint-visitor-keys "^3.3.0"
18871959

1960+
"@typescript-eslint/visitor-keys@5.27.1":
1961+
version "5.27.1"
1962+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz#05a62666f2a89769dac2e6baa48f74e8472983af"
1963+
integrity sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==
1964+
dependencies:
1965+
"@typescript-eslint/types" "5.27.1"
1966+
eslint-visitor-keys "^3.3.0"
1967+
18881968
"@uiuxarghya/progress-bar@^0.1.0":
18891969
version "0.1.0"
18901970
resolved "https://registry.yarnpkg.com/@uiuxarghya/progress-bar/-/progress-bar-0.1.0.tgz#6d3ce446a6d52b93216168325363cb0dbfda59d5"
@@ -3188,10 +3268,10 @@ eslint-visitor-keys@^3.3.0:
31883268
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
31893269
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
31903270

3191-
eslint@^8.15.0:
3192-
version "8.16.0"
3193-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae"
3194-
integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==
3271+
eslint@^8.16.0:
3272+
version "8.17.0"
3273+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.17.0.tgz#1cfc4b6b6912f77d24b874ca1506b0fe09328c21"
3274+
integrity sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==
31953275
dependencies:
31963276
"@eslint/eslintrc" "^1.3.0"
31973277
"@humanwhocodes/config-array" "^0.9.2"
@@ -4760,7 +4840,7 @@ postcss@^7.0.27:
47604840
picocolors "^0.2.1"
47614841
source-map "^0.6.1"
47624842

4763-
postcss@^8.1.6, postcss@^8.3.5, postcss@^8.4.13:
4843+
postcss@^8.1.6, postcss@^8.3.5, postcss@^8.4.14:
47644844
version "8.4.14"
47654845
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
47664846
integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
@@ -5239,7 +5319,7 @@ set-blocking@~2.0.0:
52395319
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
52405320
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
52415321

5242-
sharp@^0.30.4:
5322+
sharp@^0.30.6:
52435323
version "0.30.6"
52445324
resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.6.tgz#02264e9826b5f1577509f70bb627716099778873"
52455325
integrity sha512-lSdVxFxcndzcXggDrak6ozdGJgmIgES9YVZWtAFrwi+a/H5vModaf51TghBtMPw+71sLxUsTy2j+aB7qLIODQg==
@@ -5729,10 +5809,10 @@ type-fest@^0.20.2:
57295809
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
57305810
integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
57315811

5732-
typescript@^4.6.4:
5733-
version "4.7.2"
5734-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4"
5735-
integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==
5812+
typescript@^4.7.2:
5813+
version "4.7.3"
5814+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
5815+
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
57365816

57375817
unbox-primitive@^1.0.2:
57385818
version "1.0.2"
@@ -6062,4 +6142,4 @@ yaml@^1.10.0, yaml@^1.10.2:
60626142
zwitch@^1.0.0:
60636143
version "1.0.5"
60646144
resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
6065-
integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
6145+
integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==

0 commit comments

Comments
 (0)