diff --git a/app/soapbox/components/column_back_button.js b/app/soapbox/components/column_back_button.js index 40840f8ada..75d5269928 100644 Binary files a/app/soapbox/components/column_back_button.js and b/app/soapbox/components/column_back_button.js differ diff --git a/app/soapbox/components/column_header.js b/app/soapbox/components/column_header.js index c13113db78..c5fa73e5d9 100644 Binary files a/app/soapbox/components/column_header.js and b/app/soapbox/components/column_header.js differ diff --git a/app/soapbox/components/dropdown_menu.js b/app/soapbox/components/dropdown_menu.js index 80ec04f3c9..bddb47d1af 100644 Binary files a/app/soapbox/components/dropdown_menu.js and b/app/soapbox/components/dropdown_menu.js differ diff --git a/app/soapbox/components/filter_bar.js b/app/soapbox/components/filter_bar.js index 172bbf4206..49fdb58ca3 100644 Binary files a/app/soapbox/components/filter_bar.js and b/app/soapbox/components/filter_bar.js differ diff --git a/app/soapbox/components/modal_root.js b/app/soapbox/components/modal_root.js index 7b6aa06373..feefbf6d67 100644 Binary files a/app/soapbox/components/modal_root.js and b/app/soapbox/components/modal_root.js differ diff --git a/app/soapbox/components/permalink.js b/app/soapbox/components/permalink.js index fffbd5471a..5bae087ac1 100644 Binary files a/app/soapbox/components/permalink.js and b/app/soapbox/components/permalink.js differ diff --git a/app/soapbox/components/scrollable_list.js b/app/soapbox/components/scrollable_list.js index 7bc4c89e57..1c96b5d57a 100644 Binary files a/app/soapbox/components/scrollable_list.js and b/app/soapbox/components/scrollable_list.js differ diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index 0a3fbcf0ef..261ada64e0 100644 Binary files a/app/soapbox/components/status.js and b/app/soapbox/components/status.js differ diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js index bf9cbfe27d..dbdb7f8d09 100644 Binary files a/app/soapbox/components/status_action_bar.js and b/app/soapbox/components/status_action_bar.js differ diff --git a/app/soapbox/components/status_content.js b/app/soapbox/components/status_content.js index 717071a5c8..be07ed28d9 100644 Binary files a/app/soapbox/components/status_content.js and b/app/soapbox/components/status_content.js differ diff --git a/app/soapbox/components/sub_navigation.js b/app/soapbox/components/sub_navigation.js index 11fc6016c4..0d24dfffbb 100644 Binary files a/app/soapbox/components/sub_navigation.js and b/app/soapbox/components/sub_navigation.js differ diff --git a/app/soapbox/features/account_timeline/components/header.js b/app/soapbox/features/account_timeline/components/header.js index 166d139c6b..add4ff79f6 100644 Binary files a/app/soapbox/features/account_timeline/components/header.js and b/app/soapbox/features/account_timeline/components/header.js differ diff --git a/app/soapbox/features/account_timeline/components/moved_note.js b/app/soapbox/features/account_timeline/components/moved_note.js index 5963dbeeaf..fb2f000e89 100644 Binary files a/app/soapbox/features/account_timeline/components/moved_note.js and b/app/soapbox/features/account_timeline/components/moved_note.js differ diff --git a/app/soapbox/features/auth_login/components/registration_form.js b/app/soapbox/features/auth_login/components/registration_form.js index 8a6f7353f7..87de069c7f 100644 Binary files a/app/soapbox/features/auth_login/components/registration_form.js and b/app/soapbox/features/auth_login/components/registration_form.js differ diff --git a/app/soapbox/features/bookmarks/index.js b/app/soapbox/features/bookmarks/index.js index 0169082f51..0a2a90c31a 100644 Binary files a/app/soapbox/features/bookmarks/index.js and b/app/soapbox/features/bookmarks/index.js differ diff --git a/app/soapbox/features/chats/components/chat_panes.js b/app/soapbox/features/chats/components/chat_panes.js index f70e71dc6c..900873e647 100644 Binary files a/app/soapbox/features/chats/components/chat_panes.js and b/app/soapbox/features/chats/components/chat_panes.js differ diff --git a/app/soapbox/features/chats/index.js b/app/soapbox/features/chats/index.js index a062d68888..d7e1036bcf 100644 Binary files a/app/soapbox/features/chats/index.js and b/app/soapbox/features/chats/index.js differ diff --git a/app/soapbox/features/community_timeline/index.js b/app/soapbox/features/community_timeline/index.js index c3ffc9c99d..a2121b4bbb 100644 Binary files a/app/soapbox/features/community_timeline/index.js and b/app/soapbox/features/community_timeline/index.js differ diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index f5dde2d9dd..03889ddf08 100644 Binary files a/app/soapbox/features/compose/components/compose_form.js and b/app/soapbox/features/compose/components/compose_form.js differ diff --git a/app/soapbox/features/compose/components/reply_indicator.js b/app/soapbox/features/compose/components/reply_indicator.js index 6f928dd53f..b3e8109be3 100644 Binary files a/app/soapbox/features/compose/components/reply_indicator.js and b/app/soapbox/features/compose/components/reply_indicator.js differ diff --git a/app/soapbox/features/compose/components/upload.js b/app/soapbox/features/compose/components/upload.js index 062ea92624..6c3ef5638a 100644 Binary files a/app/soapbox/features/compose/components/upload.js and b/app/soapbox/features/compose/components/upload.js differ diff --git a/app/soapbox/features/conversations/components/conversation.js b/app/soapbox/features/conversations/components/conversation.js index 2c8782e8b2..7179499683 100644 Binary files a/app/soapbox/features/conversations/components/conversation.js and b/app/soapbox/features/conversations/components/conversation.js differ diff --git a/app/soapbox/features/follow_recommendations/index.js b/app/soapbox/features/follow_recommendations/index.js index 5941f1f970..2e9e3bcc3c 100644 Binary files a/app/soapbox/features/follow_recommendations/index.js and b/app/soapbox/features/follow_recommendations/index.js differ diff --git a/app/soapbox/features/groups/create/index.js b/app/soapbox/features/groups/create/index.js index 271ac84021..7da3e4c6a6 100644 Binary files a/app/soapbox/features/groups/create/index.js and b/app/soapbox/features/groups/create/index.js differ diff --git a/app/soapbox/features/groups/edit/index.js b/app/soapbox/features/groups/edit/index.js index 3ba5ea8d6e..13601708b1 100644 Binary files a/app/soapbox/features/groups/edit/index.js and b/app/soapbox/features/groups/edit/index.js differ diff --git a/app/soapbox/features/groups/timeline/components/header.js b/app/soapbox/features/groups/timeline/components/header.js index 29369b04f5..9cb26eae34 100644 Binary files a/app/soapbox/features/groups/timeline/components/header.js and b/app/soapbox/features/groups/timeline/components/header.js differ diff --git a/app/soapbox/features/groups/timeline/index.js b/app/soapbox/features/groups/timeline/index.js index 6d11ebb6bd..529c971ffa 100644 Binary files a/app/soapbox/features/groups/timeline/index.js and b/app/soapbox/features/groups/timeline/index.js differ diff --git a/app/soapbox/features/list_timeline/index.js b/app/soapbox/features/list_timeline/index.js index c81290874d..f3c7a242eb 100644 Binary files a/app/soapbox/features/list_timeline/index.js and b/app/soapbox/features/list_timeline/index.js differ diff --git a/app/soapbox/features/public_timeline/index.js b/app/soapbox/features/public_timeline/index.js index 6647e2392a..3319895ebe 100644 Binary files a/app/soapbox/features/public_timeline/index.js and b/app/soapbox/features/public_timeline/index.js differ diff --git a/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js b/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js index a5858de9e6..f9cc609a2d 100644 Binary files a/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js and b/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js differ diff --git a/app/soapbox/features/remote_timeline/index.js b/app/soapbox/features/remote_timeline/index.js index d6b6ab2ef6..75103c69b9 100644 Binary files a/app/soapbox/features/remote_timeline/index.js and b/app/soapbox/features/remote_timeline/index.js differ diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js index 2579cc3388..0e17739016 100644 Binary files a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js and b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js differ diff --git a/app/soapbox/features/scheduled_statuses/index.js b/app/soapbox/features/scheduled_statuses/index.js index 8b2fe3a561..314663f57d 100644 Binary files a/app/soapbox/features/scheduled_statuses/index.js and b/app/soapbox/features/scheduled_statuses/index.js differ diff --git a/app/soapbox/features/security/mfa_form.js b/app/soapbox/features/security/mfa_form.js index 76439e46ac..b4c37b0d29 100644 Binary files a/app/soapbox/features/security/mfa_form.js and b/app/soapbox/features/security/mfa_form.js differ diff --git a/app/soapbox/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js index 4e6b847c0b..317cdfe6ac 100644 Binary files a/app/soapbox/features/status/components/action_bar.js and b/app/soapbox/features/status/components/action_bar.js differ diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index b42840f341..8d45af06ba 100644 Binary files a/app/soapbox/features/status/components/detailed_status.js and b/app/soapbox/features/status/components/detailed_status.js differ diff --git a/app/soapbox/features/status/components/quoted_status.js b/app/soapbox/features/status/components/quoted_status.js index 56dc470292..c3af169ce7 100644 Binary files a/app/soapbox/features/status/components/quoted_status.js and b/app/soapbox/features/status/components/quoted_status.js differ diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js index 46d0ec46a2..fc0359d69f 100644 Binary files a/app/soapbox/features/status/index.js and b/app/soapbox/features/status/index.js differ diff --git a/app/soapbox/features/ui/components/birthdays_modal.js b/app/soapbox/features/ui/components/birthdays_modal.js index 22cbd2ca51..904d06a209 100644 Binary files a/app/soapbox/features/ui/components/birthdays_modal.js and b/app/soapbox/features/ui/components/birthdays_modal.js differ diff --git a/app/soapbox/features/ui/components/boost_modal.js b/app/soapbox/features/ui/components/boost_modal.js index 468e305a15..49763625fb 100644 Binary files a/app/soapbox/features/ui/components/boost_modal.js and b/app/soapbox/features/ui/components/boost_modal.js differ diff --git a/app/soapbox/features/ui/components/media_modal.js b/app/soapbox/features/ui/components/media_modal.js index 786433ec3a..8e80535496 100644 Binary files a/app/soapbox/features/ui/components/media_modal.js and b/app/soapbox/features/ui/components/media_modal.js differ diff --git a/app/soapbox/features/ui/components/reblogs_modal.js b/app/soapbox/features/ui/components/reblogs_modal.js index 299b9f80f3..37feaf1dcb 100644 Binary files a/app/soapbox/features/ui/components/reblogs_modal.js and b/app/soapbox/features/ui/components/reblogs_modal.js differ diff --git a/app/soapbox/features/ui/components/video_modal.js b/app/soapbox/features/ui/components/video_modal.js index 1291d32b16..a42cc76d2d 100644 Binary files a/app/soapbox/features/ui/components/video_modal.js and b/app/soapbox/features/ui/components/video_modal.js differ diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js index 1b5179e7f2..0d516fe2fc 100644 Binary files a/app/soapbox/features/ui/index.js and b/app/soapbox/features/ui/index.js differ diff --git a/package.json b/package.json index 89b417d351..1167ab31f6 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ "react-overlays": "^0.9.0", "react-popper": "^2.2.3", "react-redux": "^7.2.5", - "react-router-dom": "^4.3.1", + "react-router-dom": "^5.3.0", "react-router-scroll-4": "^1.0.0-beta.1", "react-simple-pull-to-refresh": "^1.3.0", "react-sparklines": "^1.7.0", diff --git a/yarn.lock b/yarn.lock index baddb08b48..a660a31f82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1141,7 +1141,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.17.0": +"@babel/runtime@^7.12.13", "@babel/runtime@^7.17.0": version "7.17.8" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== @@ -5374,7 +5374,7 @@ history@*: dependencies: "@babel/runtime" "^7.7.6" -history@^4.10.1, history@^4.7.2: +history@^4.10.1, history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== @@ -5386,12 +5386,7 @@ history@^4.10.1, history@^4.7.2: tiny-warning "^1.0.0" value-equal "^1.0.1" -hoist-non-react-statics@^2.5.0: - version "2.5.5" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" - integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== - -hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, 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== @@ -7412,6 +7407,14 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== +mini-create-react-context@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== + dependencies: + "@babel/runtime" "^7.12.1" + tiny-warning "^1.0.3" + mini-css-extract-plugin@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" @@ -8596,7 +8599,7 @@ prop-types-extra@^1.0.1: react-is "^16.3.2" warning "^4.0.0" -prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -8840,7 +8843,7 @@ react-intl@^5.0.0: intl-messageformat "9.9.1" tslib "^2.1.0" -react-is@^16.13.1, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6: +react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -8921,17 +8924,18 @@ react-redux@^7.2.5: prop-types "^15.7.2" react-is "^16.13.1" -react-router-dom@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6" - integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA== +react-router-dom@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" + integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== dependencies: - history "^4.7.2" - invariant "^2.2.4" + "@babel/runtime" "^7.12.13" + history "^4.9.0" loose-envify "^1.3.1" - prop-types "^15.6.1" - react-router "^4.3.1" - warning "^4.0.1" + prop-types "^15.6.2" + react-router "5.2.1" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" react-router-scroll-4@^1.0.0-beta.1: version "1.0.0-beta.2" @@ -8941,18 +8945,21 @@ react-router-scroll-4@^1.0.0-beta.1: scroll-behavior "^0.9.1" warning "^3.0.0" -react-router@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" - integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg== +react-router@5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" + integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== dependencies: - history "^4.7.2" - hoist-non-react-statics "^2.5.0" - invariant "^2.2.4" + "@babel/runtime" "^7.12.13" + history "^4.9.0" + hoist-non-react-statics "^3.1.0" loose-envify "^1.3.1" + mini-create-react-context "^0.4.0" path-to-regexp "^1.7.0" - prop-types "^15.6.1" - warning "^4.0.1" + prop-types "^15.6.2" + react-is "^16.6.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" react-side-effect@^2.1.0: version "2.1.1"