diff --git a/package.json b/package.json index 196089b..52358bf 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "react-final-form": "6.5.2", "sitemap": "6.3.2", "swr": "0.3.8-beta.2", - "ua-parser-js": "0.7.22" + "ua-parser-js": "0.7.33" }, "devDependencies": { "@commitlint/cli": "11.0.0", diff --git a/yarn.lock b/yarn.lock index f4f603d..1c22aa0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1484,34 +1484,16 @@ prop-types "^15.7.2" react-is "^16.8.0" -<<<<<<< HEAD -"@next/env@10.0.1-canary.2": - version "10.0.1-canary.2" - resolved "https://registry.yarnpkg.com/@next/env/-/env-10.0.1-canary.2.tgz#a7101a9843343ae67be5c95cc675a4bee7300000" - integrity sha512-KTPXgQkE9RA5SwqmV0Yk9oN8UE+bGeHS7SQctAORF1LxOAmmvaKWuGsPDZ/PZudgT+jWTg9dqnFrbxRs1YzM+Q== -======= "@next/env@10.0.1-canary.4": version "10.0.1-canary.4" resolved "https://registry.yarnpkg.com/@next/env/-/env-10.0.1-canary.4.tgz#1cacf34918db82df0131c3f5b6ad2cc6de2d4be8" integrity sha512-YLvuUW4HnYrnzmdO2TcEjPqANZV2gn1i/PlDYMTUOvE8FhL/nUrOu0TTtYPSyCdhFSPzyVNf10vleZ/wEfjOWw== ->>>>>>> alpha "@next/eslint-plugin-next@10.0.0": version "10.0.0" resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-10.0.0.tgz#bf31db554774eab0770aae26cfd542b452083272" integrity sha512-4YwtYRqD0F6GheYPcuvv2WfRz+WOvwaDsIbp6XYYlM2l3TOGsAMnVP+sPsal3i6d2qaIxqYsJb04U4GtEc6J4w== -<<<<<<< HEAD -"@next/polyfill-module@10.0.1-canary.2": - version "10.0.1-canary.2" - resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-10.0.1-canary.2.tgz#7cacca473f158b38897e091435d26f02c66c8f5c" - integrity sha512-uZeGO6ehoTTcqG9hFcyfbzrrdC5sxA4f5ELROtAHCGO9pNu4+eEPBt6y/wl6Md12UOkTTyKIelR1rt6g6E8lOQ== - -"@next/react-dev-overlay@10.0.1-canary.2": - version "10.0.1-canary.2" - resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-10.0.1-canary.2.tgz#07b0f69aa049f14fe96e28144a50c34306abbe91" - integrity sha512-i34MvzH71E/EortGcyPMdDXT2zFbc7aFW3vFqwRsrs8n8NpyFzX+Lw4UR6pZKUFbmKh4n6B+JhDsrwbaI7RPsw== -======= "@next/polyfill-module@10.0.1-canary.4": version "10.0.1-canary.4" resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-10.0.1-canary.4.tgz#4cb13e0c47befce5a4ac3375642f21efb19d03fa" @@ -1521,7 +1503,6 @@ version "10.0.1-canary.4" resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-10.0.1-canary.4.tgz#f29e007b44db4c5ac1eb62ea5b9389c61a732fe7" integrity sha512-ZRl3cRUfoETEfwtMX7pVmYaP6RXXqcETboDSAmKwhxwSONEfUNpP53x66t16GrHPVqmpCg1grSU59AMQ/FP2kw== ->>>>>>> alpha dependencies: "@babel/code-frame" "7.10.4" ally.js "1.4.1" @@ -1534,17 +1515,10 @@ stacktrace-parser "0.1.10" strip-ansi "6.0.0" -<<<<<<< HEAD -"@next/react-refresh-utils@10.0.1-canary.2": - version "10.0.1-canary.2" - resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-10.0.1-canary.2.tgz#dd15aa6977cfc6b51f1041541c8f052026b1c56b" - integrity sha512-SrUpToRn8vm8+LUCX00uPegOgIGIDRlStjrKSQ4f2CiUXZuYslYE26LRlVdLxuZKHbkEoh3x2f3zy1nuAhMLfQ== -======= "@next/react-refresh-utils@10.0.1-canary.4": version "10.0.1-canary.4" resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-10.0.1-canary.4.tgz#f35b27db0778b2dc152c889dbfd17090755e34da" integrity sha512-5ePGOKot6Y2T9xxiASjJOYCo8qFHCSLC7MZSEIgzA9W5pgvM3P1UP0/a0TWdMaMcz3Dup5j22FUIVuA8C9yDkw== ->>>>>>> alpha "@nodelib/fs.scandir@2.1.3": version "2.1.3" @@ -2000,12 +1974,7 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6" integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= -"@types/node@*", "@types/node@>= 8", "@types/node@^14.11.1": - version "14.14.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f" - integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw== - -"@types/node@14.14.6": +"@types/node@*", "@types/node@14.14.6", "@types/node@>= 8", "@types/node@^14.11.1": version "14.14.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f" integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw== @@ -2049,15 +2018,7 @@ dependencies: "@types/react" "*" -"@types/react@*": - version "16.9.55" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.55.tgz#47078587f5bfe028a23b6b46c7b94ac0d436acff" - integrity sha512-6KLe6lkILeRwyyy7yG9rULKJ0sXplUsl98MGoCfpteXf9sPWFWWMknDcsvubcpaTdBuxtsLF6HDUwdApZL/xIg== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" - -"@types/react@16.9.55": +"@types/react@*", "@types/react@16.9.55": version "16.9.55" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.55.tgz#47078587f5bfe028a23b6b46c7b94ac0d436acff" integrity sha512-6KLe6lkILeRwyyy7yG9rULKJ0sXplUsl98MGoCfpteXf9sPWFWWMknDcsvubcpaTdBuxtsLF6HDUwdApZL/xIg== @@ -3717,11 +3678,7 @@ commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -<<<<<<< HEAD commander@^6.2.0: -======= -commander@^6.0.0: ->>>>>>> alpha version "6.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== @@ -4248,7 +4205,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -5170,29 +5127,7 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -<<<<<<< HEAD -execa@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" - integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A== -======= -execa@^4.0.0, execa@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== ->>>>>>> alpha - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - -execa@^4.1.0: +execa@^4.0.0, execa@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== @@ -6304,7 +6239,7 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -7394,11 +7329,6 @@ lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -7407,33 +7337,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -7479,11 +7387,6 @@ lodash.map@^4.5.1: resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -8122,17 +8025,10 @@ next-tick@~1.0.0: resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= -<<<<<<< HEAD -next@^10.0.1-canary.2: - version "10.0.1-canary.2" - resolved "https://registry.yarnpkg.com/next/-/next-10.0.1-canary.2.tgz#7ea9928afcbd60f4e625e505941c0beea7df98de" - integrity sha512-EgToEl/mLlCAAwnErcVAoF224ivJRi3B/NlyWfN+uXwFvHjExCCzbH4ZUj9LasoBHIouFLvXrknD9vLs7kgqTg== -======= next@^10.0.1-canary.4: version "10.0.1-canary.4" resolved "https://registry.yarnpkg.com/next/-/next-10.0.1-canary.4.tgz#c4e0b33deaf837863e3ea458ede0de67a78dda76" integrity sha512-VVXeOapYIR7hAOP0i5+3gI7thF613Tq/pVmTtiYgNkIuAf/PpUPfY6kCeZ8MZGsp69Rsz9GYoe/+WSVhQD5YfA== ->>>>>>> alpha dependencies: "@ampproject/toolbox-optimizer" "2.7.0-alpha.1" "@babel/code-frame" "7.10.4" @@ -8153,17 +8049,10 @@ next@^10.0.1-canary.4: "@babel/runtime" "7.11.2" "@babel/types" "7.11.5" "@hapi/accept" "5.0.1" -<<<<<<< HEAD - "@next/env" "10.0.1-canary.2" - "@next/polyfill-module" "10.0.1-canary.2" - "@next/react-dev-overlay" "10.0.1-canary.2" - "@next/react-refresh-utils" "10.0.1-canary.2" -======= "@next/env" "10.0.1-canary.4" "@next/polyfill-module" "10.0.1-canary.4" "@next/react-dev-overlay" "10.0.1-canary.4" "@next/react-refresh-utils" "10.0.1-canary.4" ->>>>>>> alpha ast-types "0.13.2" babel-plugin-transform-define "2.0.0" babel-plugin-transform-react-remove-prop-types "0.4.24" @@ -11199,11 +11088,7 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -<<<<<<< HEAD terser-webpack-plugin@^5.0.3: -======= -terser-webpack-plugin@^5.0.0: ->>>>>>> alpha version "5.0.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz#ec60542db2421f45735c719d2e17dabfbb2e3e42" integrity sha512-zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ== @@ -11490,10 +11375,10 @@ typescript@4.0.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== -ua-parser-js@0.7.22: - version "0.7.22" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3" - integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q== +ua-parser-js@0.7.33: + version "0.7.33" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" + integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== uglify-js@^3.1.4: version "3.11.4" @@ -11844,11 +11729,7 @@ webpack-sources@1.4.3, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-s source-list-map "^2.0.0" source-map "~0.6.1" -<<<<<<< HEAD webpack-sources@^2.1.1: -======= -webpack-sources@^2.1.0: ->>>>>>> alpha version "2.2.0" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==