From 150d21789968e9a3dbfd0e71d1419a796f8c29fb Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 24 Aug 2021 13:51:02 +0300 Subject: [PATCH 01/12] Update array-includes 3.1.1 -> 3.1.3 --- package.json | 2 +- yarn.lock | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index f85d37df0b..a9cb19ac0e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@mapbox/polyline": "^1.1.1", "@sentry/browser": "5.20.1", "@sentry/node": "5.20.1", - "array-includes": "^3.1.1", + "array-includes": "^3.1.3", "array.prototype.find": "^2.1.1", "autosize": "^4.0.0", "basic-auth": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 5f4ae5a742..17654b5d9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3286,6 +3286,17 @@ array-includes@^3.1.1: es-abstract "^1.17.0" is-string "^1.0.5" +array-includes@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" + integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + get-intrinsic "^1.1.1" + is-string "^1.0.5" + array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -4036,6 +4047,14 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" @@ -5765,6 +5784,29 @@ es-abstract@^1.18.0-next.0: string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" +es-abstract@^1.18.0-next.2: + version "1.18.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" + integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + is-callable "^1.2.3" + is-negative-zero "^2.0.1" + is-regex "^1.1.3" + is-string "^1.0.6" + object-inspect "^1.11.0" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + es-to-primitive@^1.2.0, es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -6690,6 +6732,15 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" @@ -6906,6 +6957,11 @@ harmony-reflect@^1.4.6: resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9" integrity sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA== +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6921,6 +6977,18 @@ has-symbols@^1.0.0, has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -7426,6 +7494,15 @@ internal-slot@^1.0.2: has "^1.0.3" side-channel "^1.0.2" +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + intl-format-cache@^4.1.15: version "4.1.15" resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-4.1.15.tgz#325e6e45656ac12aa7ba528a800a57b0ee9c799a" @@ -7522,6 +7599,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" @@ -7541,6 +7625,14 @@ is-boolean-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -7566,6 +7658,11 @@ is-callable@^1.2.2: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== +is-callable@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -7710,6 +7807,11 @@ is-negative-zero@^2.0.0: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + is-npm@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" @@ -7804,6 +7906,14 @@ is-regex@^1.1.1: dependencies: has-symbols "^1.0.1" +is-regex@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" @@ -7834,6 +7944,13 @@ is-string@^1.0.5: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== +is-string@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" @@ -7860,6 +7977,13 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.1" +is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + is-touch-device@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-touch-device/-/is-touch-device-1.0.1.tgz#9a2fd59f689e9a9bf6ae9a86924c4ba805a42eab" @@ -9589,6 +9713,11 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + object-inspect@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" @@ -9644,6 +9773,16 @@ object.assign@^4.1.1: has-symbols "^1.0.1" object-keys "^1.1.1" +object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + object.entries@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" @@ -12469,6 +12608,15 @@ side-channel@^1.0.2: es-abstract "^1.18.0-next.0" object-inspect "^1.8.0" +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -12883,6 +13031,14 @@ string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + string.prototype.trimleft@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" @@ -12909,6 +13065,14 @@ string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -13534,6 +13698,16 @@ uid2@0.0.x: resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + undefsafe@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" @@ -14034,6 +14208,17 @@ whatwg-url@^8.0.0: tr46 "^2.0.2" webidl-conversions "^6.1.0" +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" From d760765a3cdcec8065d8a01437ca95688fa8e208 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 24 Aug 2021 13:53:15 +0300 Subject: [PATCH 02/12] Update chalk v4.1.0 -> v4.1.2 --- package.json | 2 +- yarn.lock | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a9cb19ac0e..28ec27f543 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ }, "devDependencies": { "bfj": "^7.0.2", - "chalk": "^v4.1.0", + "chalk": "^v4.1.2", "concurrently": "^5.3.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.2", diff --git a/yarn.lock b/yarn.lock index 17654b5d9d..608c3ad308 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4170,7 +4170,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^v4.1.0: +chalk@^4.0.0, chalk@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== @@ -4178,6 +4178,14 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^v4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^v4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" From 017e7631f6d126a10d460903ae53f6aa61fae08a Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 13:38:33 +0300 Subject: [PATCH 03/12] Update Final Form --- package.json | 6 +++--- yarn.lock | 37 ++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 28ec27f543..42ebffd12f 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "express": "^4.16.4", "express-enforces-ssl": "^1.1.0", "express-sitemap": "^1.8.0", - "final-form": "^4.20.1", + "final-form": "^4.20.2", "final-form-arrays": "^3.0.2", "full-icu": "^1.3.1", "helmet": "^4.0.0", @@ -48,8 +48,8 @@ "react": "^16.13.1", "react-dates": "^21.3.1", "react-dom": "^16.13.1", - "react-final-form": "^6.5.1", - "react-final-form-arrays": "^3.1.2", + "react-final-form": "^6.5.3", + "react-final-form-arrays": "^3.1.3", "react-helmet-async": "^1.0.6", "react-intl": "^3.1.13", "react-moment-proptypes": "^1.6.0", diff --git a/yarn.lock b/yarn.lock index 608c3ad308..b61dbd889b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1757,7 +1757,14 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5": +"@babel/runtime@^7.12.1": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" + integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/runtime@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132" integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ== @@ -6446,10 +6453,10 @@ final-form-arrays@^3.0.2: resolved "https://registry.yarnpkg.com/final-form-arrays/-/final-form-arrays-3.0.2.tgz#9f3bef778dec61432357744eb6f3abef7e7f3847" integrity sha512-TfO8aZNz3RrsZCDx8GHMQcyztDNpGxSSi9w4wpSNKlmv2PfFWVVM8P7Yj5tj4n0OWax+x5YwTLhT5BnqSlCi+w== -final-form@^4.20.1: - version "4.20.1" - resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.1.tgz#525a7f7f27f55c28d8994b157b24d6104fc560e9" - integrity sha512-IIsOK3JRxJrN72OBj7vFWZxtGt3xc1bYwJVPchjVWmDol9DlzMSAOPB+vwe75TUYsw1JaH0fTQnIgwSQZQ9Acg== +final-form@^4.20.2: + version "4.20.2" + resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.2.tgz#c820b37d7ebb73d71169480256a36c7e6e6c9155" + integrity sha512-5i0IxqwjjPG1nUNCjWhqPCvQJJ2R+QwTwaAnjPmFnLbyjIHWuBPU8u+Ps4G3TcX2Sjno+O5xCZJzYcMJEzzfCQ== dependencies: "@babel/runtime" "^7.10.0" @@ -11480,19 +11487,19 @@ react-fast-compare@^3.0.1: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.1.1.tgz#0becf31e3812fa70dc231e259f40d892d4767900" integrity sha512-SCsAORWK59BvauR2L1BTdjQbJcSGJJz03U0awektk2hshLKrITDDFTlgGCqIZpTDlPC/NFlZee6xTMzXPVLiHw== -react-final-form-arrays@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/react-final-form-arrays/-/react-final-form-arrays-3.1.2.tgz#391ceee29d866f2128c807b510c6a17ff4dc72cc" - integrity sha512-ds1FUS8s3AnfbvfmBTPnjijS7veKBr6DrWOGQzDI7grE4OosVWOREwd2ZUkz3HPB3wXQcNWsqyDuQDBSMGUr2g== +react-final-form-arrays@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/react-final-form-arrays/-/react-final-form-arrays-3.1.3.tgz#d3594c500495a4cf5e437070ada989da9624bba2" + integrity sha512-dzBiLfbr9l1YRExARBpJ8uA/djBenCvFrbrsXjd362joDl3vT+WhmMKKr6HDQMJffjA8T4gZ3n5+G9M59yZfuQ== dependencies: - "@babel/runtime" "^7.4.5" + "@babel/runtime" "^7.12.1" -react-final-form@^6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.1.tgz#baf798129d459c669cfda5ce60a77801ef52badc" - integrity sha512-+Hzd9PqYY1Cv3MnWzw64QOl5BjC5BtSDakx+N7Re49r0FASdFhgpXLFFCJ31fvegq2euP6hz6Ow9K6XM9BSqCA== +react-final-form@^6.5.3: + version "6.5.3" + resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.3.tgz#b60955837fe9d777456ae9d9c48e3e2f21547d29" + integrity sha512-FCs6GC0AMWJl2p6YX7kM+a0AvuSLAZUgbVNtRBskOs4g984t/It0qGtx51O+9vgqnqk6JyoxmIzxKMq+7ch/vg== dependencies: - "@babel/runtime" "^7.10.0" + "@babel/runtime" "^7.12.1" react-helmet-async@^1.0.6: version "1.0.6" From 9d44c199f619df83764985fd4664916fb592dcde Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 13:44:23 +0300 Subject: [PATCH 04/12] Update full-icu v1.3.4 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 42ebffd12f..fe292cc955 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "express-sitemap": "^1.8.0", "final-form": "^4.20.2", "final-form-arrays": "^3.0.2", - "full-icu": "^1.3.1", + "full-icu": "^1.3.4", "helmet": "^4.0.0", "intl-pluralrules": "^1.0.3", "jose": "3.11.4", diff --git a/yarn.lock b/yarn.lock index b61dbd889b..8f565be975 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6679,10 +6679,10 @@ fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.1.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== -full-icu@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/full-icu/-/full-icu-1.3.1.tgz#e67fdf58523f1d1e0d9143b1542fe2024c1c8997" - integrity sha512-VMtK//85QJomhk3cXOCksNwOYaw1KWnYTS37GYGgyf7A3ajdBoPGhaJuJWAH2S2kq8GZeXkdKn+3Mfmgy11cVw== +full-icu@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/full-icu/-/full-icu-1.3.4.tgz#4e09b2f6a30e9f3d2eebc1c08f90b21b037e22a9" + integrity sha512-BERy9j2ybYSfP8QmXyg496NjVrGXfM73TZckQ5s5hgDV2lpKshjGfPEYYWU3hhE2kU8atZXUZNLSeNz4OQ8hNA== function-bind@^1.1.1: version "1.1.1" From c0c3adbafceb1aa154fb9f4d26227e7f296af547 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 13:48:56 +0300 Subject: [PATCH 05/12] Update object.entries v1.1.4 --- package.json | 2 +- yarn.lock | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fe292cc955..7de613f462 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "lodash": "^4.17.21", "mapbox-gl-multitouch": "^1.0.3", "moment": "^2.22.2", - "object.entries": "^1.1.2", + "object.entries": "^1.1.4", "object.values": "^1.1.1", "passport": "^0.4.1", "passport-facebook": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 8f565be975..727570cc25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5799,7 +5799,7 @@ es-abstract@^1.18.0-next.0: string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" -es-abstract@^1.18.0-next.2: +es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: version "1.18.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== @@ -9817,6 +9817,15 @@ object.entries@^1.1.1, object.entries@^1.1.2: es-abstract "^1.17.5" has "^1.0.3" +object.entries@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" + integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.2" + object.fromentries@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" From 481286e940c5eb8d700ce6e57c3f3e5b501f7d85 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 13:50:22 +0300 Subject: [PATCH 06/12] Update object.values v1.1.4 --- package.json | 2 +- yarn.lock | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 7de613f462..5b0e5c2b42 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "mapbox-gl-multitouch": "^1.0.3", "moment": "^2.22.2", "object.entries": "^1.1.4", - "object.values": "^1.1.1", + "object.values": "^1.1.4", "passport": "^0.4.1", "passport-facebook": "^3.0.0", "passport-google-oauth": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 727570cc25..58319a542c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9879,6 +9879,15 @@ object.values@^1.1.1: function-bind "^1.1.1" has "^1.0.3" +object.values@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" + integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.2" + obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" From 2497f0d96f5c7514e30c4119a3c6da85d1cdb88a Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 13:54:24 +0300 Subject: [PATCH 07/12] Update nodemon v2.0.12 --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 5b0e5c2b42..4a062e5b45 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "enzyme-adapter-react-16": "^1.15.2", "enzyme-to-json": "^3.5.0", "inquirer": "^7.3.3", - "nodemon": "^2.0.4", + "nodemon": "^2.0.12", "prettier": "^1.18.2" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index 58319a542c..1ec008372f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9567,10 +9567,10 @@ node-releases@^1.1.70: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== -nodemon@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz#55b09319eb488d6394aa9818148c0c2d1c04c416" - integrity sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ== +nodemon@^2.0.12: + version "2.0.12" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.12.tgz#5dae4e162b617b91f1873b3bfea215dd71e144d5" + integrity sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA== dependencies: chokidar "^3.2.2" debug "^3.2.6" @@ -9580,8 +9580,8 @@ nodemon@^2.0.4: semver "^5.7.1" supports-color "^5.5.0" touch "^3.1.0" - undefsafe "^2.0.2" - update-notifier "^4.0.0" + undefsafe "^2.0.3" + update-notifier "^4.1.0" nopt@^4.0.1: version "4.0.1" @@ -13741,10 +13741,10 @@ unbox-primitive@^1.0.1: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" -undefsafe@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" - integrity sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY= +undefsafe@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae" + integrity sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A== dependencies: debug "^2.2.0" @@ -13852,10 +13852,10 @@ upath@^1.1.1, upath@^1.1.2, upath@^1.2.0: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-notifier@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3" - integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew== +update-notifier@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" + integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A== dependencies: boxen "^4.2.0" chalk "^3.0.0" From bfbaf33381c320c1ba99332b0f21d231b5c39fe9 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 14:43:57 +0300 Subject: [PATCH 08/12] Remove serialize-javascript from resolutions (old CRA update has removed the need) --- package.json | 3 +-- yarn.lock | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 4a062e5b45..2b23558cbb 100644 --- a/package.json +++ b/package.json @@ -78,8 +78,7 @@ }, "resolutions": { "react-dates/lodash": "^4.17.21", - "react-test-renderer": "^16.13.1", - "serialize-javascript": "^2.1.1" + "react-test-renderer": "^16.13.1" }, "nodemonConfig": { "execMap": { diff --git a/yarn.lock b/yarn.lock index 1ec008372f..0e43f1e3ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11382,7 +11382,7 @@ randexp@0.4.6: discontinuous-range "1.0.0" ret "~0.1.10" -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== @@ -12434,10 +12434,19 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^2.1.1, serialize-javascript@^4.0.0, serialize-javascript@^5.0.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" - integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== +serialize-javascript@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" + integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== + dependencies: + randombytes "^2.1.0" + +serialize-javascript@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" + integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== + dependencies: + randombytes "^2.1.0" serve-index@^1.9.1: version "1.9.1" From 5e79b9d1393afca9d088314956e443cb53a5b968 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 14:49:20 +0300 Subject: [PATCH 09/12] Update classnames v2.3.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2b23558cbb..70fad8147b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "autosize": "^4.0.0", "basic-auth": "^2.0.1", "body-parser": "^1.18.3", - "classnames": "^2.2.6", + "classnames": "^2.3.1", "compression": "^1.7.4", "cookie-parser": "^1.4.5", "core-js": "^3.6.5", diff --git a/yarn.lock b/yarn.lock index 0e43f1e3ea..853c12c14d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4314,10 +4314,10 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@^2.2.6: - version "2.2.6" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" - integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== +classnames@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" + integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== clean-css@^4.2.3: version "4.2.3" From 63d2c197bcee54096075b140c030ce603f4b88b9 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 30 Aug 2021 15:15:46 +0300 Subject: [PATCH 10/12] Update intl-pluralrules v1.3.0 --- package.json | 2 +- yarn.lock | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 70fad8147b..1cb76e63ed 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "final-form-arrays": "^3.0.2", "full-icu": "^1.3.4", "helmet": "^4.0.0", - "intl-pluralrules": "^1.0.3", + "intl-pluralrules": "^1.3.0", "jose": "3.11.4", "lodash": "^4.17.21", "mapbox-gl-multitouch": "^1.0.3", diff --git a/yarn.lock b/yarn.lock index 853c12c14d..bf7d57ff00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7541,12 +7541,10 @@ intl-messageformat@^7.1.0: intl-format-cache "^4.1.15" intl-messageformat-parser "^3.0.7" -intl-pluralrules@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/intl-pluralrules/-/intl-pluralrules-1.0.3.tgz#25438469f76fd13a4ac54a68a0ae4c0d30248a47" - integrity sha512-N+q+NmxJD5Pi+h7DoemDcNZN86e1dPSFUsWUtYtnSc/fKRen4vxCTcsmGveWOUgI9O9uSLTaiwJpC9f5xa2X4w== - dependencies: - make-plural "^4.3.0" +intl-pluralrules@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/intl-pluralrules/-/intl-pluralrules-1.3.0.tgz#ed1a9b1a9fa25ac49453ed2e215e01e33be1458f" + integrity sha512-hFzGTkxCjyrwHvn4pWVoB3/cFk1RIOOKNFlcNvm37YjXsmdhIt2dU/Nwh9c9i95Xa248wDF1+bI71Q+yDlGPeA== invariant@^2.1.1, invariant@^2.2.4: version "2.2.4" @@ -8995,13 +8993,6 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" -make-plural@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735" - integrity sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA== - optionalDependencies: - minimist "^1.2.0" - makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" From 6b73b411983d4547f060224bcd457b2c62dbc94a Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 31 Aug 2021 12:47:11 +0300 Subject: [PATCH 11/12] Update react-intl v5.20.10 (from v3.1.13) --- package.json | 2 +- .../__snapshots__/ListingCard.test.js.snap | 5 +- .../ManageListingCard.test.js.snap | 15 +- .../TransactionPanel.test.js.snap | 42 ----- .../AuthenticationPage.test.js.snap | 57 ++---- .../__snapshots__/CheckoutPage.test.js.snap | 2 +- .../ContactDetailsPage.test.js.snap | 3 +- .../__snapshots__/InboxPage.test.js.snap | 22 +-- .../__snapshots__/ListingPage.test.js.snap | 2 +- .../__snapshots__/NotFoundPage.test.js.snap | 6 +- .../PasswordChangePage.test.js.snap | 3 +- .../PasswordRecoveryPage.test.js.snap | 6 +- .../__snapshots__/ProfilePage.test.js.snap | 8 +- .../ProfileSettingsPage.test.js.snap | 3 +- .../StripePayoutPage.test.js.snap | 9 +- .../BookingDatesForm.test.js.snap | 1 - .../EditListingAvailabilityForm.test.js.snap | 1 - .../EditListingLocationForm.test.js.snap | 1 - .../EditListingPhotosForm.test.js.snap | 1 - .../EditListingPoliciesForm.test.js.snap | 1 - src/util/reactIntl.js | 18 +- src/util/test-data.js | 1 - yarn.lock | 177 +++++++++++------- 23 files changed, 165 insertions(+), 221 deletions(-) diff --git a/package.json b/package.json index 1cb76e63ed..b1de394d5a 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "react-final-form": "^6.5.3", "react-final-form-arrays": "^3.1.3", "react-helmet-async": "^1.0.6", - "react-intl": "^3.1.13", + "react-intl": "^5.20.10", "react-moment-proptypes": "^1.6.0", "react-redux": "^7.2.1", "react-router-dom": "^5.2.0", diff --git a/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap b/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap index fa232d8d4c..a325f4f6d2 100644 --- a/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap +++ b/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap @@ -48,9 +48,8 @@ exports[`ListingCard matches snapshot 1`] = `
-
@@ -67,7 +66,7 @@ exports[`ListingCard matches snapshot 1`] = `
- -
@@ -96,9 +95,8 @@ exports[`ManageListingCard matches snapshot 1`] = ` onClick={[Function]} rootClassName="menuItem" > - @@ -122,9 +120,8 @@ exports[`ManageListingCard matches snapshot 1`] = `
-
@@ -168,9 +165,8 @@ exports[`ManageListingCard matches snapshot 1`] = ` } } > - - diff --git a/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap b/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap index 4e22d46350..dc77631d93 100644 --- a/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap +++ b/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap @@ -43,7 +43,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -85,7 +84,6 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -740,7 +738,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -818,7 +815,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -860,7 +856,6 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -1513,7 +1508,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -1591,7 +1585,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -1633,7 +1626,6 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -2288,7 +2280,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -2366,7 +2357,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -2408,7 +2398,6 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -3061,7 +3050,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -3139,7 +3127,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -3181,7 +3168,6 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -3851,7 +3837,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -3929,7 +3914,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -3971,7 +3955,6 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -4623,7 +4606,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -4701,7 +4683,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -4743,7 +4724,6 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -5396,7 +5376,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -5474,7 +5453,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -5516,7 +5494,6 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -6171,7 +6148,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -6249,7 +6225,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -6291,7 +6266,6 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -6944,7 +6918,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -7022,7 +6995,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -7064,7 +7036,6 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -7719,7 +7690,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -7797,7 +7767,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -7839,7 +7808,6 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -8492,7 +8460,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -8570,7 +8537,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -8612,7 +8578,6 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -9267,7 +9232,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -9345,7 +9309,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -9387,7 +9350,6 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -10039,7 +10001,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -10117,7 +10078,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -10159,7 +10119,6 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -10812,7 +10771,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], diff --git a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap index f3e4df5cde..4bc9fa7214 100644 --- a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap +++ b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap @@ -55,9 +55,8 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = ` "text":

-

, }, @@ -74,9 +73,8 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = ` "text":

-

, }, @@ -103,9 +101,8 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `

-

- , }, @@ -199,9 +195,8 @@ exports[`AuthenticationPageComponent with Facebook login matches snapshot 1`] = "text":

-

, }, @@ -222,9 +217,8 @@ exports[`AuthenticationPageComponent with Facebook login matches snapshot 1`] = - @@ -249,9 +243,8 @@ exports[`AuthenticationPageComponent with Facebook login matches snapshot 1`] = /> - @@ -271,9 +264,8 @@ exports[`AuthenticationPageComponent with Facebook login matches snapshot 1`] =

-

- , }, @@ -367,9 +358,8 @@ exports[`AuthenticationPageComponent with Google and Facebook login matches snap "text":

-

, }, @@ -390,9 +380,8 @@ exports[`AuthenticationPageComponent with Google and Facebook login matches snap - @@ -417,9 +406,8 @@ exports[`AuthenticationPageComponent with Google and Facebook login matches snap /> - @@ -463,9 +451,8 @@ exports[`AuthenticationPageComponent with Google and Facebook login matches snap - @@ -485,9 +472,8 @@ exports[`AuthenticationPageComponent with Google and Facebook login matches snap

-

- , }, @@ -581,9 +566,8 @@ exports[`AuthenticationPageComponent with Google login matches snapshot 1`] = ` "text":

-

, }, @@ -604,9 +588,8 @@ exports[`AuthenticationPageComponent with Google login matches snapshot 1`] = ` - @@ -650,9 +633,8 @@ exports[`AuthenticationPageComponent with Google login matches snapshot 1`] = ` - @@ -672,9 +654,8 @@ exports[`AuthenticationPageComponent with Google login matches snapshot 1`] = `

-

- - diff --git a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap index b176d04d34..266405b596 100644 --- a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap +++ b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap @@ -29,9 +29,8 @@ exports[`InboxPage matches snapshot 1`] = `

-

- , }, @@ -65,9 +63,8 @@ exports[`InboxPage matches snapshot 1`] = ` }, "selected": false, "text": - , }, @@ -90,7 +87,6 @@ exports[`InboxPage matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -244,7 +240,6 @@ exports[`InboxPage matches snapshot 1`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -516,9 +511,8 @@ exports[`InboxPage matches snapshot 3`] = `

-

- , }, @@ -552,9 +545,8 @@ exports[`InboxPage matches snapshot 3`] = ` }, "selected": true, "text": - , }, @@ -577,7 +569,6 @@ exports[`InboxPage matches snapshot 3`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], @@ -731,7 +722,6 @@ exports[`InboxPage matches snapshot 3`] = ` intl={ Object { "formatDate": [Function], - "formatHTMLMessage": [Function], "formatMessage": [Function], "formatNumber": [Function], "formatPlural": [Function], diff --git a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap index 2ef1e40798..70a6a44da8 100644 --- a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap +++ b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap @@ -338,7 +338,7 @@ exports[`ListingPage matches snapshot 1`] = ` subTitle="ListingPage.bookingSubTitle" timeSlots={null} title={ - -

-

- -

-

- - - - - diff --git a/src/containers/StripePayoutPage/__snapshots__/StripePayoutPage.test.js.snap b/src/containers/StripePayoutPage/__snapshots__/StripePayoutPage.test.js.snap index 2186917507..30c3a678e8 100644 --- a/src/containers/StripePayoutPage/__snapshots__/StripePayoutPage.test.js.snap +++ b/src/containers/StripePayoutPage/__snapshots__/StripePayoutPage.test.js.snap @@ -38,9 +38,8 @@ exports[`StripePayoutPage matches snapshot with Stripe connected 1`] = `

-

- - { // Create fake Internalization object to help with shallow rendering. export const fakeIntl = { formatDate: d => `${d.getUTCFullYear()}-${pad(d.getUTCMonth() + 1)}-${pad(d.getUTCDate())}`, - formatHTMLMessage: d => d, formatMessage: msg => msg.id, formatNumber: d => d, formatPlural: d => d, diff --git a/yarn.lock b/yarn.lock index bf7d57ff00..03846a181a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1923,12 +1923,62 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@formatjs/intl-relativetimeformat@^2.8.2": - version "2.8.2" - resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-2.8.2.tgz#b137c0333716e88c49c0f56e35edeadbcc170a12" - integrity sha512-ZsEpxaDkTv4Zrr6+yrMCcxRFAdE5nfraNVy2HLc51SYGiUO99BM/RPot1+Mb7whUrtjvjnYkzWMYOD0jxQmTMg== +"@formatjs/ecma402-abstract@1.9.8": + version "1.9.8" + resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz#f3dad447fbc7f063f88e2a148b7a353161740e74" + integrity sha512-2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA== + dependencies: + "@formatjs/intl-localematcher" "0.2.20" + tslib "^2.1.0" + +"@formatjs/fast-memoize@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz#1123bfcc5d21d761f15d8b1c32d10e1b6530355d" + integrity sha512-fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w== + dependencies: + tslib "^2.1.0" + +"@formatjs/icu-messageformat-parser@2.0.11": + version "2.0.11" + resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz#e4ba40b9a8aefc8bccfc96be5906d3bca305b4b3" + integrity sha512-5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg== + dependencies: + "@formatjs/ecma402-abstract" "1.9.8" + "@formatjs/icu-skeleton-parser" "1.2.12" + tslib "^2.1.0" + +"@formatjs/icu-skeleton-parser@1.2.12": + version "1.2.12" + resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz#45426eb1448c0c08c931eb9f0672283c0e4d0062" + integrity sha512-DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg== + dependencies: + "@formatjs/ecma402-abstract" "1.9.8" + tslib "^2.1.0" + +"@formatjs/intl-displaynames@5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-5.2.3.tgz#a0cebc81e89c5414177ade71a2f2388d799ee6e8" + integrity sha512-5BmhSurLbfgdeo0OBcNPPkIS8ikMMYaHe2NclxEQZqcMvrnQzNMNnUE2dDF5vZx+mkvKq77aQYzpc8RfqVsRCQ== dependencies: - "@formatjs/intl-utils" "^0.6.1" + "@formatjs/ecma402-abstract" "1.9.8" + "@formatjs/intl-localematcher" "0.2.20" + tslib "^2.1.0" + +"@formatjs/intl-listformat@6.3.3": + version "6.3.3" + resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-6.3.3.tgz#0cb83a012c0ae46876e30589a086695298e0fb5c" + integrity sha512-3nzAKgVS5rePDa5HiH0OwZgAhqxLtzlMc9Pg4QgajRHSP1TqFiMmQnnn52wd3+xVTb7cjZVm3JBnTv51/MhTOg== + dependencies: + "@formatjs/ecma402-abstract" "1.9.8" + "@formatjs/intl-localematcher" "0.2.20" + tslib "^2.1.0" + +"@formatjs/intl-localematcher@0.2.20": + version "0.2.20" + resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz#782aef53d1c1b6112ee67468dc59f9b8d1ba7b17" + integrity sha512-/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA== + dependencies: + tslib "^2.1.0" "@formatjs/intl-relativetimeformat@^4.2.1": version "4.2.1" @@ -1937,18 +1987,24 @@ dependencies: "@formatjs/intl-utils" "^1.4.0" -"@formatjs/intl-utils@^0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-0.6.1.tgz#7661afd5abb2161dc8ac92238be9432aee28ad38" - integrity sha512-CthSQc/GV94y0cdMpTM69cwH98T/qx9twaZZXh9VZ6B0nL+2KptE5fXqcde4ffrHMZx1bPZJTIpwky4X1Is00A== - dependencies: - date-fns "^2.0.0" - "@formatjs/intl-utils@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-1.4.0.tgz#b59fdf78bbae9f99c500a298bf73b1945f5991f1" integrity sha512-z5HyJumGzORM+5SpvkAlp/hu0AHDeZcUNKSmj9NjS7kWxOGZMuAdS3X1K5XiE0j5I8r8s8SIaz0IQOdMA1WFeA== +"@formatjs/intl@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.14.1.tgz#03e12f7e2cf557defdd1a5aeb1c143efb8cfbc7b" + integrity sha512-mtL8oBgFwTu0GHFnxaF93fk/zNzNkPzl+27Fwg5AZ88pWHWb7037dpODzoCBnaIVk4FBO5emUn/6jI9Byj8hOw== + dependencies: + "@formatjs/ecma402-abstract" "1.9.8" + "@formatjs/fast-memoize" "1.2.0" + "@formatjs/icu-messageformat-parser" "2.0.11" + "@formatjs/intl-displaynames" "5.2.3" + "@formatjs/intl-listformat" "6.3.3" + intl-messageformat "9.9.1" + tslib "^2.1.0" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -2585,11 +2641,6 @@ resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA== -"@types/invariant@^2.2.30": - version "2.2.30" - resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.30.tgz#20efa342807606ada5483731a8137cb1561e5fe9" - integrity sha512-98fB+yo7imSD2F7PF7GIpELNgtLNgo5wjivu0W5V4jx+KVVJxo6p/qN4zdzSTBWy4/sN3pPyXwnhRSD28QX+ag== - "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" @@ -2672,6 +2723,15 @@ "@types/prop-types" "*" csstype "^2.2.0" +"@types/react@17": + version "17.0.19" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.19.tgz#8f2a85e8180a43b57966b237d26a29481dacc991" + integrity sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/resolve@0.0.8": version "0.0.8" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" @@ -2679,6 +2739,11 @@ dependencies: "@types/node" "*" +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -5042,6 +5107,11 @@ csstype@^2.2.0: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41" integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg== +csstype@^3.0.2: + version "3.0.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" + integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== + cyclist@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" @@ -5076,11 +5146,6 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-fns@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.1.tgz#c5f30e31d3294918e6b6a82753a4e719120e203d" - integrity sha512-C14oTzTZy8DH1Eq8N78owrCWvf3+cnJw88BTK/N3DYWVxDJuJzPaNdplzYxDYuuXXGvqBcO4Vy5SOrwAooXSWw== - date-fns@^2.0.1: version "2.14.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.14.0.tgz#359a87a265bb34ef2e38f93ecf63ac453f9bc7ba" @@ -7112,7 +7177,7 @@ hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react- dependencies: react-is "^16.7.0" -hoist-non-react-statics@^3.3.1: +hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -7518,35 +7583,21 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" -intl-format-cache@^4.1.15: - version "4.1.15" - resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-4.1.15.tgz#325e6e45656ac12aa7ba528a800a57b0ee9c799a" - integrity sha512-b/wDoQRAV0wzwmYMMmUGt36pXNxTq4I4KVJa0q1CTvex2dsCpivCFwLcf44D+fhFQ09LMxq9a+P9F+4CYXTDIg== - -intl-locales-supported@^1.4.5: - version "1.4.5" - resolved "https://registry.yarnpkg.com/intl-locales-supported/-/intl-locales-supported-1.4.5.tgz#be9774e6d4ea518f000165ecfe78c78d5bee7de5" - integrity sha512-D7oriM5x46rd7kNlSW0f9noIBegFr3ReIM6xlMpwH4lfIPD/zvBelPlCjR10IK16boGJG9lKccOvRAM8wzpbrA== - -intl-messageformat-parser@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-3.0.7.tgz#d28493501a1bc40a094239b7ef26fe9412558e72" - integrity sha512-L16VbbV3NFaiZV65XwOIH9fBe52TS2EkOR0k8Y4ratsgTE7KPEbcUCUrz/iEQwJo7BcWY4ohkZbeYZRgAiPR1Q== - -intl-messageformat@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-7.1.0.tgz#496965b200cbf273096c0a0da8a54c7a206653e6" - integrity sha512-T4uj8B5rABJ27ugLYSsJ30sNBUJe3uHGinIDmFI6W7jUOV6UOOOWKIhaLqgjO3Jav1UMEVvN5ti6O1+fP1/2eg== +intl-messageformat@9.9.1: + version "9.9.1" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.9.1.tgz#255d453b0656b4f7e741f31d2b4a95bf2adfe064" + integrity sha512-cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA== dependencies: - intl-format-cache "^4.1.15" - intl-messageformat-parser "^3.0.7" + "@formatjs/fast-memoize" "1.2.0" + "@formatjs/icu-messageformat-parser" "2.0.11" + tslib "^2.1.0" intl-pluralrules@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/intl-pluralrules/-/intl-pluralrules-1.3.0.tgz#ed1a9b1a9fa25ac49453ed2e215e01e33be1458f" integrity sha512-hFzGTkxCjyrwHvn4pWVoB3/cFk1RIOOKNFlcNvm37YjXsmdhIt2dU/Nwh9c9i95Xa248wDF1+bI71Q+yDlGPeA== -invariant@^2.1.1, invariant@^2.2.4: +invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -11521,21 +11572,21 @@ react-helmet-async@^1.0.6: react-fast-compare "^3.0.1" shallowequal "^1.1.0" -react-intl@^3.1.13: - version "3.1.13" - resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-3.1.13.tgz#21e7ee63033b3a0b5b8bb13a402408ea4738767d" - integrity sha512-dmkf4rm3HbT4xIL1SOhcruEOQZ7h+llmqN1bV9M13wYKLgalCU+WuMjET/ihyXT+2FupPZDRZ0JPX0xeqsXNog== +react-intl@^5.20.10: + version "5.20.10" + resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.20.10.tgz#8b0f18a5b76e9f8f5a3ccc993deb0c4cef9dcde0" + integrity sha512-zy0ZQhpjkGsKcK1BFo2HbGM/q8GBVovzoXZGQ76DowR0yr6UzQuPLkrlIrObL2zxIYiDaxaz+hUJaoa2a1xqOQ== dependencies: - "@formatjs/intl-relativetimeformat" "^2.8.2" + "@formatjs/ecma402-abstract" "1.9.8" + "@formatjs/icu-messageformat-parser" "2.0.11" + "@formatjs/intl" "1.14.1" + "@formatjs/intl-displaynames" "5.2.3" + "@formatjs/intl-listformat" "6.3.3" "@types/hoist-non-react-statics" "^3.3.1" - "@types/invariant" "^2.2.30" - hoist-non-react-statics "^3.3.0" - intl-format-cache "^4.1.15" - intl-locales-supported "^1.4.5" - intl-messageformat "^7.1.0" - intl-messageformat-parser "^3.0.7" - invariant "^2.1.1" - shallow-equal "^1.1.0" + "@types/react" "17" + hoist-non-react-statics "^3.3.2" + intl-messageformat "9.9.1" + tslib "^2.1.0" react-is@^16.12.0: version "16.13.1" @@ -12505,11 +12556,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-equal@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.0.tgz#fd828d2029ff4e19569db7e19e535e94e2d1f5cc" - integrity sha512-Z21pVxR4cXsfwpMKMhCEIO1PCi5sp7KEp+CmOpBQ+E8GpHwKOw2sEzk7sgblM3d/j4z4gakoWEoPcjK0VJQogA== - shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" @@ -13623,6 +13669,11 @@ tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== +tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" From 2c12b03c4abc3f4982711c1579bdce223a5e5e6a Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 31 Aug 2021 14:42:31 +0300 Subject: [PATCH 12/12] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 158f845b52..60ba8d126a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2021-XX-XX +- [change] Updates to some of the libraries. React Intl had a breaking change v3 -> v5. + [#464](https://github.com/sharetribe/ftw-daily/pull/1464) - [fix] Adblockers might block Google analytics (window.ga) and cause an error. [#1462](https://github.com/sharetribe/ftw-daily/pull/1462)