From 3631d6d61dd7891b568ae291e81e870a621d839e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Sep 2020 14:35:04 -0500 Subject: [PATCH 1/7] Don't hijack scrollbar when status is unmounted, fixes #404 --- app/soapbox/components/status.js | Bin 18334 -> 18430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index f8d46b043371cbb0aa9c6c414466ddb5ca783ca7..8acb4e7f5770654e19021caa66595bb9a0b654b0 100644 GIT binary patch delta 150 zcmbQ&&-kyOaf7>vm%hG&n`eZttCd1fX`Vt!MrN@>a(+sxLVjLOr9yc|YMw%(LUBoA zNolbHP%0@kGcR2sB{e6tBsE2kO92S<^`X>cHxV-?ef`PRA{HQOlZYFL`YxglqGUzA XWPnzIK&_@VR0oIyWp1t#RWSkpj_@ez delta 58 zcmey@&p5B2af7?a Date: Wed, 9 Sep 2020 14:52:27 -0500 Subject: [PATCH 2/7] Highlight home tab for public timelines, fixes #406 --- .../features/ui/components/tabs_bar.js | Bin 6041 -> 6216 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js index e85efa40a2539bdd0cdfafd5a46071f87b42fc64..1440e2ae6885e5a9d74c94e1e0935b194b735112 100644 GIT binary patch delta 186 zcmbQKf5Kpc16zG&u}6Mxs$+6VW?8C&t%62wVo7p_jzUg;a$-qlex9a+t(`(OmjVzZ z=jRodC{!yHB$j04CFZ6o)B@GR)LDa-6s4Aw7UdyS*xK4EsOzgM)YQPm^omOoi%N>a xGfOfw)b&faGILXNGV@aP)ipPpvoSHrDr6Qz9AjHul95@ghwQ%E&6XSq`~a>FJ{SN1 delta 21 dcmX?MFjIen1KZ|HY(E(%?`P-Q{D~us9{^?(2(bVF From fd971f053feaaa5aee4f04587140a4520ff0a9b4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Sep 2020 15:03:26 -0500 Subject: [PATCH 3/7] Scroll detailed status into view, fixes #257 --- app/soapbox/features/status/index.js | Bin 16616 -> 16596 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js index d82f8c7a115962cca48353a23b91e3533e9800d3..4f1fe608478ed542063ff3157ddcb8368a51fe53 100644 GIT binary patch delta 35 qcmaFS$atlZal{l+=>M%$(E|-QtqOlG0*z&COEA=Xe4B_6=SD delta 24 gcmcc8$oQg>al Date: Wed, 9 Sep 2020 18:02:26 -0500 Subject: [PATCH 4/7] UserLists: use OrderedSets instead of Lists, fixes #230 --- app/soapbox/features/blocks/index.js | Bin 2153 -> 2159 bytes app/soapbox/features/favourites/index.js | Bin 1943 -> 1949 bytes app/soapbox/features/follow_requests/index.js | Bin 2321 -> 2327 bytes app/soapbox/features/followers/index.js | Bin 4137 -> 4143 bytes app/soapbox/features/following/index.js | Bin 4142 -> 4148 bytes app/soapbox/features/groups/members/index.js | Bin 2192 -> 2198 bytes .../features/groups/removed_accounts/index.js | Bin 2836 -> 2842 bytes app/soapbox/features/mutes/index.js | Bin 2145 -> 2151 bytes app/soapbox/features/reblogs/index.js | Bin 2531 -> 2537 bytes app/soapbox/reducers/user_lists.js | Bin 4419 -> 4467 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/blocks/index.js b/app/soapbox/features/blocks/index.js index ef406e3befbda79341810059cc7e44ccc073ad49..5b34287ddc93511a1b7c3f8f36770f25f2fdc66b 100644 GIT binary patch delta 22 dcmaDU@Lpg;7Yk>8QA%o2YD#eG=3bUN%m8b;2><{9 delta 16 XcmaDa@KRty7YlPvX7T39EO(dzJaPuB diff --git a/app/soapbox/features/favourites/index.js b/app/soapbox/features/favourites/index.js index 6715d312151dafdcde23f5acbb36d07f60c44a97..851a4059acea598bbac1745e6b1526c19a2ba227 100644 GIT binary patch delta 22 ecmbQvKbL>QR%XupqLkF4)Rf@V%{!RyGXnr&m delta 16 XcmbOxI6-hj7z=YwX7T2D7IPK=Ez1P& diff --git a/app/soapbox/features/groups/removed_accounts/index.js b/app/soapbox/features/groups/removed_accounts/index.js index e32637e7ca46336da59770f00c4fb868f7cd5e50..02f87630dd9f86a459ee072c423b1804d7dfe19c 100644 GIT binary patch delta 22 dcmbOtHcMdp2k8I+ delta 16 XcmbOwHbrbh5-W2~X7T21*7d9aFo6Y> diff --git a/app/soapbox/features/mutes/index.js b/app/soapbox/features/mutes/index.js index 8b7368845ee67fd7dba0d080f1823c0feda68e20..abcfe2ea70154d4d3cecbf6789dd70f1f0baaf2f 100644 GIT binary patch delta 22 ecmaDT@LXWSJQmLUqLkF4)Rf@V%?nu$FarQ<)(HFn delta 16 YcmaDZ@K9jGJQn7h%;L?QA%o2YD#cwi9%wrf@f}SX-Q&IPAXh@a|F|VCT=*lL}RibpWJ3E z)^cV}xZvcAoEnqwa3o@ga7|X{=AB&6>5q`ve38?b3Bd(wHQa2$qriwJ)Wf@-834ix BIobdK delta 111 zcmeyYbXaMF3zLXXW^su^VzGi}Zf^9CcDBE!IaZcgQmR#={K?0i%c>=)$dw91q0{}`OB(nej From 8c9206be3ee610dc77fd6e2e67ddecaba0b0ddc2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Sep 2020 22:00:11 -0500 Subject: [PATCH 5/7] Use a better poll icon --- .../compose/components/poll_button.js | Bin 1338 -> 1342 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/components/poll_button.js b/app/soapbox/features/compose/components/poll_button.js index 02495e9ca15d23da0b1c9e7cae421437ecdcd884..d774118cc97851b05fd6c05004dfe94ae7aaf107 100644 GIT binary patch delta 22 dcmdnRwU2AVJ!a0N#3J3~jKrdn&5xPG83ASn2#f## delta 18 ZcmdnTwTo-RJ!aOD#NzDY&Ci*`839O&2R;A* From 98a71b3e09fab9057fbcddb351bfc6d3ca50786e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 10 Sep 2020 18:27:09 -0500 Subject: [PATCH 6/7] Upgrade redux and react-redux to the latest versions --- package.json | 4 ++-- yarn.lock | 39 +++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index e79c4356c4..952300a2b9 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "react-motion": "^0.5.2", "react-notification": "^6.8.4", "react-overlays": "^0.8.3", - "react-redux": "^6.0.1", + "react-redux": "^7.2.1", "react-redux-loading-bar": "^4.5.0", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", @@ -124,7 +124,7 @@ "react-textarea-autosize": "^7.1.0", "react-toggle": "^4.0.1", "redis": "^2.7.1", - "redux": "^4.0.1", + "redux": "^4.0.5", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", "rellax": "^1.7.1", diff --git a/yarn.lock b/yarn.lock index 561257434e..86d6c1cd42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -978,7 +978,7 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== @@ -992,6 +992,13 @@ dependencies: regenerator-runtime "^0.13.2" +"@babel/runtime@^7.5.5": + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" + integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.7.2": version "7.7.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a" @@ -9563,12 +9570,12 @@ react-intl@^4.6.6: intl-messageformat-parser "^5.1.1" shallow-equal "^1.2.1" -react-is@^16.12.0, react-is@^16.8.6: +react-is@^16.12.0, react-is@^16.8.6, react-is@^16.9.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^16.3.2, react-is@^16.6.1, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.2: +react-is@^16.3.2, react-is@^16.6.1, react-is@^16.7.0, react-is@^16.8.1: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== @@ -9623,17 +9630,16 @@ react-redux-loading-bar@^4.5.0: prop-types "^15.6.2" react-lifecycles-compat "^3.0.2" -react-redux@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.1.tgz#0d423e2c1cb10ada87293d47e7de7c329623ba4d" - integrity sha512-T52I52Kxhbqy/6TEfBv85rQSDz6+Y28V/pf52vDWs1YRXG19mcFOGfHnY2HsNFHyhP+ST34Aih98fvt6tqwVcQ== +react-redux@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.1.tgz#8dedf784901014db2feca1ab633864dee68ad985" + integrity sha512-T+VfD/bvgGTUA74iW9d2i5THrDQWbweXP0AVNI8tNd1Rk5ch1rnMiJkDD67ejw7YBKM4+REvcvqRuWJb7BLuEg== dependencies: - "@babel/runtime" "^7.3.1" + "@babel/runtime" "^7.5.5" hoist-non-react-statics "^3.3.0" - invariant "^2.2.4" loose-envify "^1.4.0" prop-types "^15.7.2" - react-is "^16.8.2" + react-is "^16.9.0" react-router-dom@^4.1.1: version "4.3.1" @@ -9931,10 +9937,10 @@ redux-thunk@^2.2.0: resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw== -redux@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5" - integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg== +redux@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" + integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== dependencies: loose-envify "^1.4.0" symbol-observable "^1.2.0" @@ -9966,6 +9972,11 @@ regenerator-runtime@^0.13.2: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447" integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA== +regenerator-runtime@^0.13.4: + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + regenerator-transform@^0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb" From 3cff9538e22cc599ec7704ff8341dd33031b1dcd Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 10 Sep 2020 18:43:57 -0500 Subject: [PATCH 7/7] Upgrade uglifyjs-webpack-plugin to latest version --- package.json | 2 +- webpack/production.js | Bin 3366 -> 3329 bytes yarn.lock | 44 ++++++++++++++---------------------------- 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 952300a2b9..af64d30375 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "substring-trie": "^1.0.2", "throng": "^4.0.0", "tiny-queue": "^0.2.1", - "uglifyjs-webpack-plugin": "^2.1.2", + "uglifyjs-webpack-plugin": "^2.2.0", "uuid": "^3.1.0", "webpack": "^4.41.2", "webpack-assets-manifest": "^3.1.1", diff --git a/webpack/production.js b/webpack/production.js index a788e78843db87c963e8082eea379179f4f3683b..9ed66b40071ec6e949bf8c76a2f62c64e579a9eb 100644 GIT binary patch delta 28 jcmZ1`)hM;0ot3{lu_!MyFTL1GAuTbdICb-G)@*hFmh%c) delta 35 rcmZpaS|+ujos};+KewPLwYb