Merge branch 'master' of https://git.fascinated.cc/Fascinated/scoresaber-reloaded-v2
This commit is contained in:
commit
ccab42390f
6
package-lock.json
generated
6
package-lock.json
generated
@ -480,9 +480,9 @@
|
||||
"devOptional": true
|
||||
},
|
||||
"node_modules/@types/react": {
|
||||
"version": "18.2.29",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.29.tgz",
|
||||
"integrity": "sha512-Z+ZrIRocWtdD70j45izShRwDuiB4JZqDegqMFW/I8aG5DxxLKOzVNoq62UIO82v9bdgi+DO1jvsb9sTEZUSm+Q==",
|
||||
"version": "18.2.30",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.30.tgz",
|
||||
"integrity": "sha512-OfqdJnDsSo4UNw0bqAjFCuBpLYQM7wvZidz0hVxHRjrEkzRlvZL1pJVyOSY55HMiKvRNEo9DUBRuEl7FNlJ/Vg==",
|
||||
"devOptional": true,
|
||||
"dependencies": {
|
||||
"@types/prop-types": "*",
|
||||
|
21
yarn.lock
21
yarn.lock
@ -206,9 +206,9 @@
|
||||
undici-types "~5.25.1"
|
||||
|
||||
"@types/prop-types@*":
|
||||
version "15.7.8"
|
||||
resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz"
|
||||
integrity sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==
|
||||
version "15.7.9"
|
||||
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.9.tgz#b6f785caa7ea1fe4414d9df42ee0ab67f23d8a6d"
|
||||
integrity sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==
|
||||
|
||||
"@types/react-dom@^18":
|
||||
version "18.2.14"
|
||||
@ -217,19 +217,26 @@
|
||||
dependencies:
|
||||
"@types/react" "*"
|
||||
|
||||
<<<<<<< HEAD
|
||||
"@types/react@*", "@types/react@^18", "@types/react@>=16.8":
|
||||
version "18.2.29"
|
||||
resolved "https://registry.npmjs.org/@types/react/-/react-18.2.29.tgz"
|
||||
integrity sha512-Z+ZrIRocWtdD70j45izShRwDuiB4JZqDegqMFW/I8aG5DxxLKOzVNoq62UIO82v9bdgi+DO1jvsb9sTEZUSm+Q==
|
||||
=======
|
||||
"@types/react@*", "@types/react@^18.2.30":
|
||||
version "18.2.30"
|
||||
resolved "https://registry.npmjs.org/@types/react/-/react-18.2.30.tgz"
|
||||
integrity sha512-OfqdJnDsSo4UNw0bqAjFCuBpLYQM7wvZidz0hVxHRjrEkzRlvZL1pJVyOSY55HMiKvRNEo9DUBRuEl7FNlJ/Vg==
|
||||
>>>>>>> f0ce68ed151b95a4707a2bbcab429f86ff1f6166
|
||||
dependencies:
|
||||
"@types/prop-types" "*"
|
||||
"@types/scheduler" "*"
|
||||
csstype "^3.0.2"
|
||||
|
||||
"@types/scheduler@*":
|
||||
version "0.16.4"
|
||||
resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz"
|
||||
integrity sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==
|
||||
version "0.16.5"
|
||||
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.5.tgz#4751153abbf8d6199babb345a52e1eb4167d64af"
|
||||
integrity sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==
|
||||
|
||||
"@typescript-eslint/parser@^5.4.2 || ^6.0.0":
|
||||
version "6.8.0"
|
||||
@ -701,7 +708,7 @@ cssesc@^3.0.0:
|
||||
|
||||
csstype@^3.0.2:
|
||||
version "3.1.2"
|
||||
resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz"
|
||||
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
|
||||
integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
|
||||
|
||||
damerau-levenshtein@^1.0.8:
|
||||
|
Loading…
x
Reference in New Issue
Block a user