From d448277bbe27a459ab0d894be9ee85c02993951e Mon Sep 17 00:00:00 2001 From: Sean King Date: Sat, 24 Oct 2020 21:44:22 -0600 Subject: [PATCH 01/20] Message when a profile is blocked changed --- .../features/account_timeline/index.js | Bin 6412 -> 6757 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/account_timeline/index.js b/app/soapbox/features/account_timeline/index.js index 21a55181bb7d9dbc1a861eaf9daf73e0972df311..7f0e121140e112423af591c947a25df9ace17c3f 100644 GIT binary patch delta 196 zcmeA%dTO%aAUjJ*QEBSrQ|v~ZnZ-^y`N`R-DVx8sH*;~oxSPv_;usNUqW}N^ From 3d393deee4ba97d6f11ed77c43ff2709fd7acdf9 Mon Sep 17 00:00:00 2001 From: Sean King Date: Mon, 2 Nov 2020 08:25:21 -0700 Subject: [PATCH 02/20] A better way to handle block messages --- .../features/account_timeline/index.js | Bin 6757 -> 6625 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/account_timeline/index.js b/app/soapbox/features/account_timeline/index.js index 7f0e121140e112423af591c947a25df9ace17c3f..94762c918bd459344692c33884f99a1e41f4cce5 100644 GIT binary patch delta 76 zcmaEA^3Zt0L3Yl}VyB$^ Date: Mon, 6 Sep 2021 21:54:48 +0200 Subject: [PATCH 03/20] Add emoji reacts page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/actions/interactions.js | Bin 10479 -> 11460 bytes app/soapbox/components/account.js | Bin 6114 -> 6457 bytes app/soapbox/components/column_back_button.js | Bin 891 -> 1043 bytes app/soapbox/features/reactions/index.js | Bin 0 -> 4080 bytes .../components/status_interaction_bar.js | Bin 2588 -> 2828 bytes app/soapbox/features/ui/components/column.js | Bin 1005 -> 1059 bytes app/soapbox/features/ui/index.js | Bin 23446 -> 23600 bytes .../features/ui/util/async-components.js | Bin 7969 -> 8080 bytes .../reducers/__tests__/user_lists-test.js | Bin 565 -> 598 bytes app/soapbox/reducers/user_lists.js | Bin 4916 -> 5194 bytes app/styles/accounts.scss | 7 +++++++ app/styles/components/emoji-reacts.scss | 4 ++-- app/styles/ui.scss | 14 +++++++++++++- 13 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 app/soapbox/features/reactions/index.js diff --git a/app/soapbox/actions/interactions.js b/app/soapbox/actions/interactions.js index aaa6b61437ece36573c9f85a9fbb414366a4c371..1e2d729f17bb8b1f6aa46977c206af2d74a03bd5 100644 GIT binary patch delta 428 zcmaDKcqDSeHx}g}S4Za%Pk+DQcsJJ&XOH+G*T7KM;1C5{1$CIz7xJy$fohL$Zr0|A|p3>og6z`Vsc4le%@pOS$(mT%;JK?lH?4H zv{WD&lnRxqmep4%$Vn~A&rQ@XE=epYElw@gSEr1< SQpka^K}iE{;pT@*d~5({yo#Ry delta 17 ZcmX>S`95&NHtg_^zDj{6yVeP)`1 z227)-LN(AB5CEI5V5^`3{a2IAIgu$2h)5YfqNMAatOipy<&Ec%}j00ekwWdHyG delta 41 zcmV+^0M`GxGU6|=X#%sI0tE%L!Ux6zvyuu70kf?O+o_7*0yDHjj|Q*aK> diff --git a/app/soapbox/components/column_back_button.js b/app/soapbox/components/column_back_button.js index 1ce0d8f1feb9f15cfd41a495c18af69131cf6f27..bbc2fc701cb373dcc52a0238ef702fe7c5ae7cf7 100644 GIT binary patch delta 118 zcmey(Hko6>OPzwE{DP3mg4ALKTZL*a1t2KNw^9gziRu-X6lLb6>i}hHttZ}#QA^Ix zD=tx}2C7o11!^hD$Sl?anNe)b1=gLJrl3)hKRKIGo4+Jq(;6&RtB{&goVwYP(TNEF DYuhEX delta 15 XcmbQt@tbYJ%gG9iftxQeIx+zOG}8s- diff --git a/app/soapbox/features/reactions/index.js b/app/soapbox/features/reactions/index.js new file mode 100644 index 0000000000000000000000000000000000000000..260c8726b1a9c30c8e67b80408780c4e4ec52315 GIT binary patch literal 4080 zcmbtX+fLj@7{2EzexxY&O1pNiVGTj4QlSEkAXP6Af?++Ionm{oo-u(qeuQ513HpkC zg#L3L8**q9MNvHS{fGJfkUPIEV|0nx9%v|-b;!Q*GdWZpwmX_T^ z4Ev=mDIQ)>2}HngU3Ze)Rx~-GOZ(F{7 z_qe6PI=aR0g;WOt6AVqj`q{A&yr0OPa8k17{c%&W6_LEPX0j~Dzuq5_R|a>@959$a zWkP(5irV0wQ_;hk%GKr#x#wNWBo%XWpkv5*BYdEYV;D_!nzKgI)_w$sthNhDWcN8q zp)X?=dw9d!nn+2@Qz`^`PrXsgVDz$5Shc*WRQjDT;nL_yoPGV61*n$ z;hRHfT4@A7gv%amj*7iV(Hw(?`5hl+f_=o08d{To{{HLF1cocvgUhQ~);0LXG?@PM zNgZp3TPnM@(Fp*W+fJAudGsE{4>Fg*srXJkDIIa{l<2Sn9FA0FYiwBFE0u;0o~dU* zQ553{y6aiy>}QzVsr^t2(q8ADJ(+ujlT34pFwJJxwec&pUXO}B`|p;W8uKW$ILp?R zYGqA2o9SHN-x)9#^g)ltlCDWtNqB|zsK#JAso&Yosv<&|5vo&{KA^5L8iC`P)~iBN zRl`=APBXCz8*)>id!TxQzRCFQ?`Sq-;++1`F`Td_&gq**D1z6WLZZx6FB+PG(pdVJ1Clruzdx zgcxf%R||_`{(F>M=o$A_4TI@|;ibQBOYGfPW%OS0g6-S1T+_XKFpt5pP(%+_6E_zuCT_nAW%`yEU+Y<&)Krl|^E_%zQ7(v{VANy;|`iIpct(v=Quv~=KeE%3{;CGx{p(`=;N=TJ+|JvGS+0d4Mwfvky4D< z(e#JR9lFrpym0avD~Cn+a(p3GxCa$63UgI%&bXvSzb2KSgU_=7^WvDqW>gzyA}*Kt Rm?P)!xNqpLfjwi``4{ddRGI() literal 0 HcmV?d00001 diff --git a/app/soapbox/features/status/components/status_interaction_bar.js b/app/soapbox/features/status/components/status_interaction_bar.js index d921efca085d5292b522ecd18cfcdb5d2f65e191..fbd943a6340b0a8cc0a0444d1183732a709a02c6 100644 GIT binary patch delta 230 zcmbOu(j&GZgN-9SwZt_yKPz+cRA!UOMQoFVxDgEayEzLWPMK7$=w`+ljm{hPd?A#Jz0iR z5Gdw3S&L0TR6#*gvzAK%3T*UKGRy3^Cik(cOg_meB37N8Uz%5fE=3ou_X%`5u=Z00-beQvd(} diff --git a/app/soapbox/features/ui/components/column.js b/app/soapbox/features/ui/components/column.js index 5f31399e3e46496d855dc702cf27153d52d91374..e915e5e709ac321b4b1b1c5177912c9f3ea2a849 100644 GIT binary patch delta 62 zcmaFMzL;afTShhog`~vf?8ym?Vw2x8da~(2xMoZ}oF)0T)gZar$p@LF5WLN|n1mSt DsXG;# delta 24 gcmZ3?@s@qVTgJ(pOrDb?n0h9^W0Kq~$SlMN0ChG96aWAK diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js index 010242b0dba604fcb5adcacf224d987af700fdb6..c6136f69be56b68e03f3808659793c8e9398d80b 100644 GIT binary patch delta 78 zcmbQXopHks#tqI~96_mx$t9Wjd7JIHycH)W=*mt$pus(PjTXPCei2lvSlOeD2MBJWav?AqE6% diff --git a/app/soapbox/reducers/__tests__/user_lists-test.js b/app/soapbox/reducers/__tests__/user_lists-test.js index feaaca3e67e15df4cd2a9ff500fc73e7b9505a62..7d571e20804925e288180a41d118af28e3ca57bd 100644 GIT binary patch delta 25 hcmdnWa*bufK1R->)WqbH%>2CK$%%{-llL)}0|0?o390}9 delta 11 Scmcb{vXy1SKE}!S8Os44jRfrg diff --git a/app/soapbox/reducers/user_lists.js b/app/soapbox/reducers/user_lists.js index 9afaf55b9dcd9bd247b8c01f534ec58995ad86ac..f0d80de778a204ff9bd7c34441206ffeaa6a6431 100644 GIT binary patch delta 206 zcmdm@c1mNzd`2z>g&;DFCIB l1VLs%)LKn`z$>l-VS~+qN`Ul0nLtZ5H5F<%Z{%v`001X8Mm7Kd delta 26 icmX@5u|;jee8$PMnT0o>W$ay{ diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss index ad2190be5a..14f74f59ae 100644 --- a/app/styles/accounts.scss +++ b/app/styles/accounts.scss @@ -216,6 +216,13 @@ .account__avatar-wrapper { float: left; margin-right: 12px; + + .emoji-react__emoji { + position: absolute; + top: 36px; + left: 32px; + z-index: 1; + } } .account__avatar { diff --git a/app/styles/components/emoji-reacts.scss b/app/styles/components/emoji-reacts.scss index 4fca2108c3..bc69b05423 100644 --- a/app/styles/components/emoji-reacts.scss +++ b/app/styles/components/emoji-reacts.scss @@ -1,6 +1,8 @@ .emoji-react { display: inline-block; transition: 0.1s; + color: var(--primary-text-color--faint); + text-decoration: none; &__emoji { img { @@ -20,8 +22,6 @@ } .emoji-react--reblogs { - color: var(--primary-text-color--faint); - text-decoration: none; vertical-align: middle; display: inline-flex; diff --git a/app/styles/ui.scss b/app/styles/ui.scss index bf8dd9f7ef..72c55a6bd7 100644 --- a/app/styles/ui.scss +++ b/app/styles/ui.scss @@ -611,7 +611,8 @@ .notification__filter-bar, .search__filter-bar, -.account__section-headline { +.account__section-headline, +.reaction__filter-bar { border-bottom: 1px solid var(--brand-color--faint); cursor: default; display: flex; @@ -661,6 +662,17 @@ } } +.reaction__filter-bar { + overflow-x: auto; + overflow-y: hidden; + + a { + flex: unset; + padding: 15px 24px; + min-width: max-content; + } +} + ::-webkit-scrollbar-thumb { border-radius: 0; } From 275d898a63479e7ad344357eed374722ccb08623 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 9 Sep 2021 12:00:42 -0500 Subject: [PATCH 04/20] Webpack: simplify module.rules --- webpack/shared.js | Bin 3638 -> 3595 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/webpack/shared.js b/webpack/shared.js index c0bbad931d2610c3e91fc76fa708cc5c001e0538..505554a6cb353c4eb7bd0277231d39fc7623bda6 100644 GIT binary patch delta 12 Tcmdlc(=D^%9s6cU4p}w;AejUf delta 56 zcmeB{*(S5$9lN%bf`3w0YI2EQc4}p@Mp0=_YO$tXZeoE3kgs5CrvMg-26AFGH@{<- GWdi_5J`@=M From 660661451cab1ac269b821a1c23589a15f396a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 9 Sep 2021 20:44:12 +0200 Subject: [PATCH 05/20] Conditionally link to emoji reaction list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../components/status_interaction_bar.js | Bin 2828 -> 3354 bytes app/soapbox/utils/features.js | Bin 1777 -> 1843 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/status/components/status_interaction_bar.js b/app/soapbox/features/status/components/status_interaction_bar.js index fbd943a6340b0a8cc0a0444d1183732a709a02c6..186bec37d517c292e950e6b2147eaa97bf5d77f4 100644 GIT binary patch delta 571 zcmeAXnzaXTtAhlQ_ttdZNLA?OT*WKtJ#i)^uhvrJ#_UpI2O>kO?Fb^O92)Y!!fvl2kpQIU4FPQFTpg zxJrn2py{>>NOoz!lmb-(l@_G}U67{$GJkRyldY)&5EP{*CYNO9=lNt7mslyljL}Q2 zD9A5POv*_Og31@`0Cm+`bJb3s%JfbST_4=%dP({DIh*U5MVR??P|V&unaz{Y3S>1h zfOs=CH$N*AY!T4;8fZ!s6m0B34wmN>o!reKJb4a>@#M1{{*$GEd|gi80HC}+NC7f{ zco$hDGfhDQ*{ho1P(W4z3!cfZ*}JT&5l*VL(f7&B%eDiBH8Q9Lg(xzBgzjWLPT9%X W99&AMMidt$=Aju;ySbmUmJt9hVyUPA delta 109 zcmbOw)gv|`Zex=-<78&0Rm>XIT$2TvZJBB{CpR;{+dP>?fO+x>7QxMj*ew`2G`JMN zU@|{j*yQ_M){I<}O*l0s$8j1?p2+Dt`2nZ! Date: Thu, 9 Sep 2021 23:35:25 +0200 Subject: [PATCH 06/20] Change chunk name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../features/ui/util/async-components.js | Bin 8080 -> 8082 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js index 61f6c2143035daa510796c922f9b7d0dd56f4156..2dda61d1f702c17d3cc94bb77c7be1271c79cd77 100644 GIT binary patch delta 19 bcmbPWKgoW>J#Mzdie*9ijvQMU*m delta 17 ZcmbPaKf!*(J#Lnyoc#37Pq^0!0{}vD2Soq? From fc8bb223590fc5b0ff8167c690a49c24d820561b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 10 Sep 2021 00:23:49 +0200 Subject: [PATCH 07/20] Reactions page improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/components/column_back_button.js | Bin 1043 -> 988 bytes app/soapbox/features/reactions/index.js | Bin 4080 -> 4115 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/column_back_button.js b/app/soapbox/components/column_back_button.js index bbc2fc701cb373dcc52a0238ef702fe7c5ae7cf7..54b700b63b5c4a109233b130bb015815519ca98f 100644 GIT binary patch delta 27 hcmbQtaff}wRL05I7$dk!@)hhAfP|I8W<92-i~xzs2^jzY delta 45 ycmcb^KAB^~R7U2Ke9g)1OsXOUrNtQ Date: Fri, 10 Sep 2021 00:44:21 +0200 Subject: [PATCH 08/20] do not push filter changes to history MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/features/reactions/index.js | Bin 4115 -> 4334 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/reactions/index.js b/app/soapbox/features/reactions/index.js index 4eca0880b0b1795ee240575c540d63935e3b112d..0e843cd33528c179610b9a1eb5ea8171ffcf9b63 100644 GIT binary patch delta 293 zcmbQN@J?}q1M}t_W?>fTiP!A|nl3!G*SCm?ilbD>UF}aghYqB37H)m~vrZv!Jpk*CgUzseDN=r)e^Az&) zoO3dhvu&%vW?{NOLtS07*3K~}$3`EbWAX{!05f7W!`!ZymzbNXIXQt(g$<&0b2ncH FBLGhKW}*N9 delta 149 zcmaE-I9XwX1G8pkZb5!gi9)r4Ut*b0W?r^JtwLH+ey)OgQEFmxiEdGTX-R64Zc2Xc zW?N=4md$h6d6_r&a(`svfvGRax2>M+&8;PxP^*wy0n}sXn3H3p50#$0jV}OQsVTc& WUSe))ZNg+5eie48!p&*?9gF}#%`+na From 1dc78e4e95b4a19e6a7927906e1c2206fff1c9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 10 Sep 2021 00:48:06 +0200 Subject: [PATCH 09/20] fix proptypes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/features/reactions/index.js | Bin 4334 -> 4381 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/reactions/index.js b/app/soapbox/features/reactions/index.js index 0e843cd33528c179610b9a1eb5ea8171ffcf9b63..8e3ab9884165ea9f8dd460020174b6ad6aeae27a 100644 GIT binary patch delta 121 zcmaE-I9F-IYj&2j(!Au!AJ}EQJacnPOA?cEQUi+e3qmRjQj7KSi&9dHQd5FcOLVvt xfFLnBIlnZoq}WOUuj0*C9GBUIvr{W=tBX<-lS?x5^Yro(b5mH|WBCs-0sxfs9SHyc From 196284695b398bb53280c19342840ce53fa30c32 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 10 Sep 2021 11:44:18 -0500 Subject: [PATCH 10/20] SoapboxConfig: allow authenticated profiles to be configured --- app/soapbox/actions/accounts.js | Bin 23594 -> 23514 bytes app/soapbox/actions/soapbox.js | Bin 2829 -> 2861 bytes .../features/favourited_statuses/index.js | Bin 2347 -> 2351 bytes app/soapbox/features/pinned_statuses/index.js | Bin 1852 -> 1856 bytes app/soapbox/features/soapbox_config/index.js | Bin 23024 -> 23734 bytes app/soapbox/features/ui/index.js | Bin 23724 -> 24246 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/accounts.js b/app/soapbox/actions/accounts.js index e215e5256dea75b706713b8ebaf852fef50efe79..9fd4a478e95a90a76ff98dfb662d3b28e5ec2572 100644 GIT binary patch delta 31 lcmZ3rgYnjO#tr|BC&xr^Zq_%s$PQvm);HnaY-96I9su3l44wc0 delta 35 kcmcb$opIF;#tr|BCpXw@Og8Wk*(_voj2+H-WBpDZ02P1^wg3PC diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js index d2abc83a655d9db1f796842aa2581b532f1ae563..64fbe18912ecfa14ce95012675e594ea313f7b8e 100644 GIT binary patch delta 41 wcmeAbTPwDqhgC*FA+fY1BQ>uiGdZy&H6@@ZKP@vS)k>kHs5EtR2Wu-U06I($8~^|S delta 12 TcmZ20)+@H5hjsHB)<#wUAQ=Rb diff --git a/app/soapbox/features/favourited_statuses/index.js b/app/soapbox/features/favourited_statuses/index.js index 233acf6402f003909f4249fd3900d122d4074838..527afd2debc792c7f0e39545b17f76b136e97ac7 100644 GIT binary patch delta 17 YcmZ22v|eZf3p0z3g1Y)<7G`xe04b#dy8r+H delta 12 TcmZ24v|4Bb3-e|UW_30I8UOsYUdiMJb_pr0hR0`sq!)6CIu)lD6)WVH7MCa_ zr7Gm)r>Cc;=w{|Al;kUvWu}$`?Jda3Of6PO%u7+oO-;#6RLIX$Cq@3)*5L*c41YuVszZ W)DN0AlQ(EsOg>{Gt+tYK8RFlHmNrf~5Qk=ls01%=F2HoRaLt5RuK(Ie)WiC@3W7=M|SI zKm`?SG4yB@mn4>?Ztmx2VdPYRsoUHyaEVC~&b3m&bfsQyV!`AZQ_0QQ!VXNFIxwA+ z8~j8k-?wA4N-QnONX;wBOa_{s0`yy2W=<;5dZVB*SErFrl)8^ ZW+sCfQj7h9*#%+YVp|Q1KHsQ#CID8h&~^X- delta 111 zcmV-#0FeK-y#cJb0kAp&vvvVs2(uCj_yw~y5CH+RLlMpblS(%Vvr7~}0uLa4AUz;- zXlZjUaB^>ObF=9dvk{XaC_^L?Y RlhQ&Jvp`h_2eVjQUII}mCLjO+ From 50caa0d1d8a84d138b1a18eda5334080af56b3e1 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 10 Sep 2021 15:58:29 -0500 Subject: [PATCH 11/20] Webpack: replace file-loader with asset/resource asset module --- .../features/crypto_donate/utils/coin_icons.js | Bin 585 -> 146 bytes webpack/rules/file.js | Bin 546 -> 245 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/crypto_donate/utils/coin_icons.js b/app/soapbox/features/crypto_donate/utils/coin_icons.js index 2c0376bfa5357448791ff77067faf9331c23d08b..39fe39ded9089851e78624cffb250995aa21e2e5 100644 GIT binary patch delta 68 zcmX@fGKq2W6GmH+YAywZqSTVoqC6l~SejXss*x~x2BW-^N_9zQa&~HwUP-=BetBw< Wb7FC-hGwl^aanqTrZrcsH5ULjYZo*C literal 585 zcmZ9K!EW0y42JJ|3LXm7E@}xWhM{Ya0z`c@2T!3LEwbcNR2!qsyN|Y$9(poJ zksp8lv@viWF+qwQ0+X{lqyadB>-tCxwfDeV1ZQJN;DWr2VNdZNT2{uuAH*BjGWY4m zn8dZ+#aE=p$2VYcTc2!+%90@$q zQ03%8TfO1mUbsq)BKW9f1@DKYQcVtaO`ScDrH68<4oc0-Pm=K^%hKXlVBB+YZfWQ_+DwGOicKTZjG}Gyk<9s} z94q7HxRPYgOesW#`{`!KL9-4?%aMLZf)<&@&Che5%4eVC^)9;bAdyHut$X`rnU9Y- Qp<4_ne+x(=Wbc>iKN*w9ssI20 diff --git a/webpack/rules/file.js b/webpack/rules/file.js index d23a0a97756343e5d218385a0f45557eb5319424..47516e57679b57ddf72822993bf8ebefa4394fca 100644 GIT binary patch delta 103 zcmZ3)@|AI-(zN)J%7RoY1@*+@;?xrTqSWI2(xT*4bsa7Rh4j?C)S|?a{30ubY9LoZ zAuTf}H7_w2q`V+8IlEXtH#H?QQ9n94Kd&S;uOuU}I3qSXwW1^zti4u;tJaze08WP@ ArT_o{ literal 546 zcmZut!ES>v488LeK2!>k+HjqycH9r_iV%&!wAmnGaiSr0{QDf%Zmrf_>{!pw@4ePp z3UG!uXDlr63?4tC@tBKAhm(-|ti2!zLooJ8_b8B<>JM<-p-VC_=`H6&0&rL}kmA_~Jt4GWeR^AK&Ob_c+8QTuAL(2a|y69VM zQZn*>2{^Y9y#RrV-v8!;>bgEUw7HhG;s7nf$oBknL?*{f) i7Z3Q#r~i!0)jGg>dFJ%jFdy2vf-hTZskhm(&%Oa^cc-2J From 19181f40c348f894af0002d15502d93fe98b607f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 10 Sep 2021 17:15:57 -0500 Subject: [PATCH 12/20] Webpack: bundle Twemoji icons as assets --- app/soapbox/components/autosuggest_emoji.js | Bin 953 -> 864 bytes .../components/emoji_picker_dropdown.js | Bin 11562 -> 11480 bytes app/soapbox/features/emoji/emoji.js | Bin 3532 -> 3466 bytes webpack/shared.js | Bin 3595 -> 3318 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/autosuggest_emoji.js b/app/soapbox/components/autosuggest_emoji.js index 6311061b08813e5bed5cb60cbbca858589ba5fdf..da2df72a35a0783c5c0eab41bef27764610b354a 100644 GIT binary patch delta 44 zcmdnV{(x;l_r?cX8D)x63rjPLQZ*7v%2RXmvoiG)i;GiBiuH@j()BlQWny6j0IF#b AhyVZp delta 131 zcmaFBwv&BAcTi?-L4Hw*LbXCxerBFRtwLH+ey)OgL1IaUx-}PE(#} delta 200 zcmcZ+xhiVIWyYY)+=Bd~5`}7oto+P8g<6HQqWoM1^@7Bb40UTRxTKqFd~m3fi)WCl zbBKRXBwSr_equpVeuaKgX=YAJd~$wXT4ws@3yjlQG(g5_plQ=lP*2Ux&&pH>GKw=& jQ%m9vjWj-6cICe&ZGkPV40Syy6mt;-X{)TZN+3!qUv5RE>m^^3>e?tW5pH;^NejV*TQ> obbXcTw9K5;yu{qpT0I~?LDQOR@E;?A9O~ra8RY65 z;vWeip$ayG&fsv1u_Ew*JCsZ diff --git a/webpack/shared.js b/webpack/shared.js index 505554a6cb353c4eb7bd0277231d39fc7623bda6..372a0423f2af97900ed6540645b3585016e35e4e 100644 GIT binary patch delta 12 TcmeB{`6jvH4%g<7+)_*cC7T5p delta 141 zcmew+*)6l-4wrmheoAV5ZhlH>PHM4!NqK5+epaS_VsUY5NwI!$S^8ujZe>=m;ADPo zLvs|>U}4>q#FE6~{L-T2RQ=4{bf6KLB_*jv`o$TkAR~;8^a}F8rU*fd28+iV8iR%T MxlK1e;1Xj30MxrPWdHyG From 3359bda7f83afe8278dc1cc05e01505519fb46e5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 10 Sep 2021 17:23:37 -0500 Subject: [PATCH 13/20] Webpack: bundle sounds as assets --- app/soapbox/middleware/sounds.js | Bin 1304 -> 1182 bytes webpack/shared.js | Bin 3318 -> 3218 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/middleware/sounds.js b/app/soapbox/middleware/sounds.js index a2fc7572fe190448f216868ae9ab6cbbef2911c4..6950e76188ec8532fa02830e85c7c3f0398f8577 100644 GIT binary patch delta 97 zcmbQiHII{9y|g%0p}3?dGr44Aq8AfiQEFjnW>Kn!x}KiCp5Ej`OupzsYRq})LaUk4 LRc+>H;ba5==cgSI delta 219 zcmbQoIfE-vy|g%0p}3?dGr2_Fnu{wlw;;c$M4?(CD?c+&p;jTSC_h(0y&$n911JlZ zbaRal4s~+z403f2@ehiGt1He=EJ(_)&`&DO%t?t)&d*EBOy9`u#Uu_gO#@Arj)MB+ YWF}vna{HL_aLQRRj<#l!YNobxj>E1u&@9QP{kL>lPybV~Y;0 From 0aa0828e130fd0f6139f8ca24f7ac0d480738099 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 10 Sep 2021 17:43:35 -0500 Subject: [PATCH 14/20] Webpack: really don't serve audio with sw.js --- webpack/production.js | Bin 2428 -> 2460 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/webpack/production.js b/webpack/production.js index 9968a2ca99b445ad0095d74388af599dc00d679d..181d533e6eb0417b83378a35616f5a36cffdd5ce 100644 GIT binary patch delta 42 ycmew(G)H(t9LwYsmI<4=SW}rNe`gWqQP Date: Fri, 10 Sep 2021 19:18:51 -0500 Subject: [PATCH 15/20] Webpack: reorganize module assets rules --- webpack/configuration.js | Bin 923 -> 766 bytes webpack/rules/assets.js | Bin 0 -> 1280 bytes webpack/rules/file.js | Bin 245 -> 0 bytes webpack/rules/index.js | Bin 535 -> 544 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 webpack/rules/assets.js delete mode 100644 webpack/rules/file.js diff --git a/webpack/configuration.js b/webpack/configuration.js index 0089469c4749a0e49e66529e83937a1cb90d0c4d..960e25e60c64e6d268e42af2433b44c93c176d79 100644 GIT binary patch delta 12 TcmbQu{*QG-BID+NjB^8WYF=?>eqOPaLbQUqURFW6x(=95g)j>8 zAaqG)S{hg;GdUkj7neaK(la6Asre;f@%$19zXVE`=R-Au7)I)nAk%XTj3H{%A!g*K NC#oxKj$vHH2mtrJFdP5? diff --git a/webpack/rules/assets.js b/webpack/rules/assets.js new file mode 100644 index 0000000000000000000000000000000000000000..2c6fb3f0daa41da3bb96af9a753584b533a78417 GIT binary patch literal 1280 zcmc&!!H%0S5WVvibErfjg;;7Y6{||!e^{vpiYnI(h7H)RJtP|~`S*?u-B!IMyFK)R zVCMPp-kSj-;64N-7;Q5R7&0NCBXXe>;)LIwREPaz*julKp85uZkP%+2aFJ!onn3Uj z9)lf@2p9Oo_dllI<0f~Kx_o<=McRiB1A_Dj&Rc~{(?D++dqf|wu)aYbabFN722zJ$ zJW0q2140@Z6Qx0xYk+^18S+x%p(I!$rfdMd~()PU@_Hm20$371o3shaYoPK zsJCJl%V&q>N++U&$t%obr#EVt8g5qn0KeRAa_L;YgS;Q5#*l9#^pCEw4Srj*i7*`P zV_!6qSX-h_2kLlAqd_mp`Vyi*fVLkn8fHDou~^+{9KTHxwKH0ZM(2}l+jM#VkDgl=aNRPGypa W>Rj~k=W?s^^>bM$ZgNoHWj_J=XreX% literal 0 HcmV?d00001 diff --git a/webpack/rules/file.js b/webpack/rules/file.js deleted file mode 100644 index 47516e57679b57ddf72822993bf8ebefa4394fca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmXwz!ES>v5Jd0(iakU!NXXoYdh8GM8byiaOo-dCCf-G*qWpUeQm?yj=1oW}N(%{8 zBlkipy-~(%iW!x4t__Lrv7fTnnAp}wV}^8_o^Y7QlvN787$SveM~rX!K>t3E)wMb- z|D{f}#KXl)xyS{xf~C}n`%IB5`)lj9K3p5J(bmn@_A{a*yYp>^q$vm3?bCx%wxrzc mTB3V=g8i`JqYq!w4!A|%p33fG(TA7E`BaSOJ-#+(J(@p$lTvd4 diff --git a/webpack/rules/index.js b/webpack/rules/index.js index 91a4abd19e2a40d9a63d0b8ff54fcc449b10c2de..d3290659e816b9b03cc69aa38fd1122f406faa31 100644 GIT binary patch delta 50 xcmbQvvVdj68L7nL;?$C21zUxp)WXutqEroaJ$;DS#78eV_4M>0oXO`IJpkYn6E6S& delta 41 scmZ3$GM#0@8L_m?oKyu{g`(8L(#)b%4Rt+zkjTVmFIhnJ Date: Fri, 10 Sep 2021 19:30:47 -0500 Subject: [PATCH 16/20] Webpack: use one entrypoint --- app/application.js | Bin 200 -> 258 bytes webpack/shared.js | Bin 3218 -> 3121 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/application.js b/app/application.js index a6d4ed1995b3c637ea238b85d43dcd0d2aa698ae..96cedfeef3fd6c5ac8027319cf28ec64c577bacd 100644 GIT binary patch delta 64 zcmX@X*u*p;#!O#d!6!d4MWMK)GAFe-BQ>>zt0=XwG_xpGLtRfFBC4NQP>_?EoLG{X PpQl%xTwJU^F`@tf-0Bxx delta 9 QcmZo-I>9(0X5zFQ01>nU%>V!Z diff --git a/webpack/shared.js b/webpack/shared.js index d3414d6c063ec19a9b6d163b677dfb3bbdb1ccb5..0c4bd856e8163abc5c70c137f3e3795381eda4dd 100644 GIT binary patch delta 28 icmbOvxlv+62McR8mx6-A Date: Fri, 10 Sep 2021 19:39:39 -0500 Subject: [PATCH 17/20] Webpack: fix some warnings from OfflinePlugin --- webpack/production.js | Bin 2460 -> 2430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/webpack/production.js b/webpack/production.js index 181d533e6eb0417b83378a35616f5a36cffdd5ce..b633ec8ee341d50509db7889bd9d10ad6bff2f8a 100644 GIT binary patch delta 67 zcmbOu{7-1ZT$ahFSok)-V_C>zq@Ylon3funA6lI1Ur>^npO={9oS2-ET5P3IQdF9% T!=(TOwVEJ0R)?!r)0ztaOrI6P delta 60 zcmew-G)H*DTo%c!f^>BqE(JJH*V5A0(#tAHo!rTyG})9xZ1ZZCg)F?anjl57I$X7y G)?5JY9uFS? From a720f3ea32d52fb6872f0235a45c5931d6da9d15 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 10 Sep 2021 20:11:36 -0500 Subject: [PATCH 18/20] Webpack: OfflinePlugin improvements --- webpack/production.js | Bin 2430 -> 2561 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/webpack/production.js b/webpack/production.js index b633ec8ee341d50509db7889bd9d10ad6bff2f8a..cccfc41634c17189d3718e214c2a642ea0afad0e 100644 GIT binary patch delta 459 zcmew-)F`q+gjt?T0S?p)5|guw^;2{6voiG!)65KvbhRemXEBsfP=HEh<|d}67V8@W zCG-mN($#eo6eg>&Dol1^RdR;E|eGRD#tWGpH({BA>+4^o-2BbZqL3QYUA!$RJs0W@I#ZHjAVY%tD}>jVuvn zg##_D#A=Y? Date: Mon, 6 Sep 2021 19:03:23 -0500 Subject: [PATCH 19/20] Jest: fix SVG import breaking tests --- jest.config.js | Bin 829 -> 1090 bytes package.json | 1 + yarn.lock | 5 +++++ 3 files changed, 6 insertions(+) diff --git a/jest.config.js b/jest.config.js index d7b2fb44a414ae447beb3ea030d3db5a73b7b66f..efe1644570b7b4494130f025d325beb5998f51bb 100644 GIT binary patch delta 274 zcmdnXc8Ftx6?46Uf_iR#N@-52Ut(^mZ(>0~YLU8?LN%8H5U9uLY3peu7Z=wQmsIA| zL) HT5|ya{li`U delta 11 ScmX@av6pRw6*F_KH5ULE!~;M8 diff --git a/package.json b/package.json index 018088f2df..4192942990 100644 --- a/package.json +++ b/package.json @@ -92,6 +92,7 @@ "intl-messageformat-parser": "^6.0.0", "intl-pluralrules": "^1.3.0", "is-nan": "^1.2.1", + "jest-transform-stub": "^2.0.0", "jsdoc": "~3.6.7", "lodash": "^4.7.11", "mark-loader": "^0.1.6", diff --git a/yarn.lock b/yarn.lock index 4876a41de5..9e75304e72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7239,6 +7239,11 @@ jest-snapshot@^27.1.0: pretty-format "^27.1.0" semver "^7.3.2" +jest-transform-stub@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d" + integrity sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg== + jest-util@^27.0.0: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297" From d0630c765f9eaba6970de76b14adf0641c5ffad6 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 10 Sep 2021 20:37:13 -0500 Subject: [PATCH 20/20] Jest: update emoji tests --- .../autosuggest_emoji-test.js.snap | 6 +++++- .../__snapshots__/emoji_selector-test.js.snap | 12 ++++++------ .../features/emoji/__tests__/emoji-test.js | Bin 5996 -> 5872 bytes 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/soapbox/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap index 1c37278483..6bbb1eb748 100644 --- a/app/soapbox/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap +++ b/app/soapbox/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap @@ -20,7 +20,11 @@ exports[` renders native emoji 1`] = ` 💙 :foobar: diff --git a/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap index 06d7764ec1..d009a55512 100644 --- a/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap +++ b/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap @@ -15,7 +15,7 @@ exports[` renders correctly 1`] = ` className="emoji-react-selector__emoji" dangerouslySetInnerHTML={ Object { - "__html": "\\"👍\\"", + "__html": "\\"👍\\"", } } onClick={[Function]} @@ -26,7 +26,7 @@ exports[` renders correctly 1`] = ` className="emoji-react-selector__emoji" dangerouslySetInnerHTML={ Object { - "__html": "\\"❤\\"", + "__html": "\\"❤\\"", } } onClick={[Function]} @@ -37,7 +37,7 @@ exports[` renders correctly 1`] = ` className="emoji-react-selector__emoji" dangerouslySetInnerHTML={ Object { - "__html": "\\"😆\\"", + "__html": "\\"😆\\"", } } onClick={[Function]} @@ -48,7 +48,7 @@ exports[` renders correctly 1`] = ` className="emoji-react-selector__emoji" dangerouslySetInnerHTML={ Object { - "__html": "\\"😮\\"", + "__html": "\\"😮\\"", } } onClick={[Function]} @@ -59,7 +59,7 @@ exports[` renders correctly 1`] = ` className="emoji-react-selector__emoji" dangerouslySetInnerHTML={ Object { - "__html": "\\"😢\\"", + "__html": "\\"😢\\"", } } onClick={[Function]} @@ -70,7 +70,7 @@ exports[` renders correctly 1`] = ` className="emoji-react-selector__emoji" dangerouslySetInnerHTML={ Object { - "__html": "\\"😩\\"", + "__html": "\\"😩\\"", } } onClick={[Function]} diff --git a/app/soapbox/features/emoji/__tests__/emoji-test.js b/app/soapbox/features/emoji/__tests__/emoji-test.js index c8425c4c6db63e3a0fd2de969daf8a090179f465..ce8d4e2a8da9d8ecabcb6509b1867a47ef5a39fc 100644 GIT binary patch delta 638 zcmaE(_d$2Vd}jXW{G_bZt6ehoC_rlO%$SXHFjlB#*`~r{RWEl=w3~`Y9OpZF77GRg?XZOWw(lyRz z>>98*b@NHCnT!~wT;MUD{DW5-i+CW0m?19?+xppcCx7FW#qJc4WGJ5khH0_<>XX;- zO~WF7S{O_4Prk?{x;a2#Ikvc$o6IAuIoVI-0)}Cr;Pw&Si_<_OF+oO6EVij@T5~A? LK`odDksu5JzLnT$ delta 807 zcmeyM`$liWd}c%a)ZF~6Ont*N6EjO)BLjmJT{NZ{LexyJxGa6LBCFiwGt9G)by^_Q zAQ@tg5H*MEoXk?MM%YfM@^*fxQX_Lyh!OkvB`05CU5g>!!{#ppQ)>*gH`N$wgvw+- z_5xv;6x0|c1%1286WP3QYT>BBW`j7)7=#TVlN2T!vioAF2L)3RXETO4(4|s1%t=Zt zn!Hd{baOpd4WkHD4KOxLl0kj}yLltG{$yJoX@sP)fdz`>YhF14gicFSXeh`{e#(<7 zijY7UsW2I8CPEg;Oo%L2Lm@H2I@yeGzBH1-hOkICO$EDbGE5y4KO)u)EiFL~+q{qe z05ih5W(J64GDlEivc4$m@kC4oK(}n(CMw9N a33afMxv>c>_|!G6xfFn)7EFUk5C#A{-|z_l