diff --git a/package.json b/package.json index f3bc61e..ca9d936 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,10 @@ }, "devDependencies": { "@types/node": "18.11.0", - "@types/react": "18.0.22", + "@types/react": "18.0.25", + "@types/react-dom": "18.0.8", "@types/react-dom": "18.0.7", - "autoprefixer": "^10.4.12", + "autoprefixer": "^10.4.13", "copy-to-clipboard": "^3.3.2", "eslint": "8.26.0", "eslint-config-next": "^13.0.0", diff --git a/yarn.lock b/yarn.lock index be87236..475e8ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -183,6 +183,7 @@ dependencies: "@types/react" "*" +<<<<<<< HEAD "@types/react@*": version "18.0.25" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44" @@ -196,6 +197,12 @@ version "18.0.22" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.22.tgz#97782d995d999617de116cf61f437f1351036fc7" integrity sha512-4yWc5PyCkZN8ke8K9rQHkTXxHIWHxLzzW6RI1kXVoepkD3vULpKzC2sDtAMKn78h92BRYuzf+7b/ms7ajE6hFw== +======= +"@types/react@*", "@types/react@18.0.25": + version "18.0.25" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44" + integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g== +>>>>>>> 669712172cf0235a249ab35aa906b0ce1e5a8a2b dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -373,7 +380,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +<<<<<<< HEAD autoprefixer@^10.4.12: +======= +autoprefixer@^10.4.13: +>>>>>>> 669712172cf0235a249ab35aa906b0ce1e5a8a2b version "10.4.13" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8" integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg== @@ -493,9 +504,15 @@ camelcase-css@^2.0.1: integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426: +<<<<<<< HEAD version "1.0.30001431" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795" integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ== +======= + version "1.0.30001427" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001427.tgz#d3a749f74be7ae0671fbec3a4eea18576e8ad646" + integrity sha512-lfXQ73oB9c8DP5Suxaszm+Ta2sr/4tf8+381GkIm1MLj/YdLf+rEDyDSRCzeltuyTVGm+/s18gdZ0q+Wmp8VsQ== +>>>>>>> 669712172cf0235a249ab35aa906b0ce1e5a8a2b chalk@^4.0.0: version "4.1.2"