From a9f545e950c21b65b3ed0805fcb5e1bbbf4c08b4 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 6 Feb 2018 14:06:15 -0500 Subject: [PATCH 1/4] Bump line2d --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4015757365e..1b5be44fd4d 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "polybooljs": "^1.2.0", "regl": "^1.3.1", "regl-error2d": "^2.0.3", - "regl-line2d": "^2.1.2", + "regl-line2d": "^2.1.4", "regl-scatter2d": "^2.1.13", "right-now": "^1.0.0", "robust-orientation": "^1.1.3", From 9a31ccdfa85023b3f5094dbd60a3247a738ba10c Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 6 Feb 2018 15:23:46 -0500 Subject: [PATCH 2/4] Add scatter/scattergl lines mock --- test/image/mocks/gl2d_line_aligned.json | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 test/image/mocks/gl2d_line_aligned.json diff --git a/test/image/mocks/gl2d_line_aligned.json b/test/image/mocks/gl2d_line_aligned.json new file mode 100644 index 00000000000..72629b34ebf --- /dev/null +++ b/test/image/mocks/gl2d_line_aligned.json @@ -0,0 +1,56 @@ +{ + "data": [ + { + "x" : [ 20, 20 ], + "y" : [ 40, 30 ], + "type" : "scattergl", + "mode" : "lines+markers", + "name" : "Same X-points scattergl" + }, + + { + "x" : [ 21, 21 ], + "y" : [ 40, 30 ], + "type" : "scatter", + "mode" : "lines+markers", + "name" : "Same X-points scatter" + }, + + { + "x" : [ 25, 30 ], + "y" : [ 25, 30 ], + "type" : "scattergl", + "mode" : "lines+markers", + "name" : "All Different scattergl" + }, + + { + "x" : [ 25, 30 ], + "y" : [ 30, 35 ], + "type" : "scatter", + "mode" : "lines+markers", + "name" : "All Different scatter" + }, + + { + "x" : [ 15, 20 ], + "y" : [ 23, 23 ], + "type" : "scattergl", + "mode" : "lines+markers", + "name" : "Same Y-points scattergl" + }, + + { + "x" : [ 15, 20 ], + "y" : [ 25, 25 ], + "type" : "scatter", + "mode" : "lines+markers", + "name" : "Same Y-points scatter" + } + ], + "layout": { + "showlegend": false, + "width": 800, + "height": 500 + } +} From 7ae503e4c27bc92335c8cb7784d414b6911f5d90 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 6 Feb 2018 15:34:34 -0500 Subject: [PATCH 3/4] Add baseline --- test/image/baselines/gl2d_line_aligned.png | Bin 0 -> 24281 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/image/baselines/gl2d_line_aligned.png diff --git a/test/image/baselines/gl2d_line_aligned.png b/test/image/baselines/gl2d_line_aligned.png new file mode 100644 index 0000000000000000000000000000000000000000..2d3752f23c689e0b54a0c32cf684e21f298c1ade GIT binary patch literal 24281 zcmeHvc|6qX+y9WFB&np5r6gN&S}fU15+zbY$f)dln{CFRO+`i4A{<+?P8nMm6DnJX zFoqbiGmLEp!;Ihkk)m^YzR&aL?|EMR)9V~=_vgB=`&!@Eb=?p3&uDS2+p!J?gK=q} zJZ=DktrCX8Sf)7EfS-I&*Y<$HgkjppkDm8HjI?vUfV;k37`Mq^zn;J%`}b`Ne}WEL zBGQVlCdAcXazlrXlKsQ!sx38D29vj~1oa|iq$=BZ-W;Dad>Ea*@4)9{8#e77)8knk z8ui!3HB1bN_2qW!XP(7nWZ7Zj9M&8&so1Z8Cl2Rz)P3{pQ*xlFz=sJKa~I`}>M$0z zAOGCi$(G6?d_?>P$Il;uUskYj2w&vj5cY+!F8vb}1!LJGZ@=O0&!2$bv2Dy;-U<3M zU0+x*zbyN)6(3+>afbkk*jtsZ|)0Yx$Cg6C1&5m3teK+so_QT4h{*iI{W9$3*9oBnwpGbRngavAg1o@NxS*Dsj>06 zTG&O}Lah?z!t`i+MnQpMM7O3I2d=~XC=y4K%t$0SAb1QntM5K9F(bHLhsk;{blz~i zXpLmXUSC^lwv9Cb2+DLkVJ>5U8VL_=Vha)vTUVs#7mW85+nZO$^Pp!{Sjq>W2>jp#u_?7f*07JPX85F0GLzkl)61PM>Q^y_8Rt1iMC(_ z4DLuvNs$VV0y2vliCcy!&{ z=UX(@aLTP(I2KLzNZyoG8(jbn9~%n@*?}f(L6JYq)@-eN+ow<39BSX>vi}gO@8!!nX6AHM zH1%}K6LA$8mgC=c``TVSftkKjKg=)$YARV}&syq7 zfvWUZxcP}{;;GkiD*KDZjw#Ldgg9Yvw5;Ch2(1*?GqtJ{OWlr3I96 ziHB7RZVomKq8`4!MW@r#UAlVHw&FVav+a0s9h5Lu(;@Rgn}_kr^r^vfp&56-va`JZ z#GI}3v35DQz?{a%GCBzgzRG|$BI?-3N87*Xch)Cp*|=-DwYwUf;<~Ff%sObbeo(f5 z{dg`Ww9ztz?{S7}TA=yD++G=cYc{=CO08Y)`dXu#IQLLEZvHq{Bpo-f@Eq>WJSAs@ zK}6#oWorcrik=sbO+MrPsNr-cA8T=B!!Y^`M4n5S;Y;&1iA;FnG^U;}dxvvzBnu0}o(TCmoqR&O`^LBUALs@?+DHaoNN{tYdE1XVzSy#MZi>%RQuKLvL zJ^K;2ldg?#+E)^Qkh%2S3QyK$1en*_Icp+xVRmtfk14*1d#|XauR zJr+>Pt#FlY?BEb)UWZiiu||cD*QM9(H%mL3GaOhDeG#L+UtK@>Z9a1K5%E^Uj9%({ zskOp8{&G1+C>r>#K9U)Gfb>F6qLo8N?n(oPYkhsWEGxo-OHf(i7@G5q z7SPT0kZzj1Wjxc$av7MCk98>?sh)G0k?B8kpv^kp%|P^`F0B6QTH#2b3lvSvv?;I( zY2s;Xh0jXzdc>|5^%>u$<1NMdz&Z?k@bDql2Yp}>YK8co4AoiPA*NAjuIv{~0%paS zNByP@SP!K9&$2%Z0S4}mg#6KkKgQv^v;RdGQa`iwyhMN6igR=u-GX)Ua}a}pI*_EaO&ltw;c(it2PLB0P{*v;8ToashWy%jS(Z!Vi(>~eT z4>yao9%UD>%*n}-b7>0)hlc{PWysd&wsazTf@ zcDE?5ZGXKxqdb1RaBj4af7EwNZsh9rZ6JZz_PYcEZJ5Snx<}oZUz_Xv!Qani+tqJt z!j3S#Pq`s&FPg0e_5-lErqmJ2P{U=v*&4UyIUKvDoo00W~|Gt@3~ED zXUQEbCMm*Y+}7+8G0UpC(A{OYA&K+66GviPXi-Bo%rjg1by-rNRRChP!zUZ3P|j=S zosA*JM>w?;>z+FuQZ5(C^L_^&s2ClMN;~c3p?8j-DM`^II;3b9Dd6b zGPY@+;zbC5Bt&u?e-g6SIByrf_lDtgcC{~#(aJ1|Pe}vy2~IRJQO>erV_{X+w|MOcrEBo!uA7 zB9rOVST)kt$AV4{{kRUtuH3v1`zF*#$}RUXdqg4PInt20_X9q0&%v_t`AdM#w zQKY#J>(Yc1kF$gr16sKwxoytT-uJxZ^LiQg`f`f^Z28sulL%4%697L(_)p>JFVR^_ z!fvCX$J$v^($cC&eG|=JjoF&|MqJ8qYV=sWm}!!-n*3AFIgLIPv*K*PoR;&Nufq$P z+1oqzt1VQfBB#dgV6(1*LY#DH&rlksR(17o=N)e6+}$`e%dh#@nv?ZnOL?;&@Lv(1 zO)LE#;G|`PXz4kKbRdu^073d{KWGuy=3qXn6C#rcGng#lHfhhc<61yhgc+HPyeXe~ zV{Ckq1>i3cXQfTDE8JQxmz@&rtBrQB`1q)@V^wfRVNh}IWUZ17{>bUrN7S!3>a1e@ zKa`2R)1Nq!1c%^75PbcDx4OJG$-AC}LsL9ZH@Z>I@@t)M(CrMB>_g$)0+Ed5-Z~W< zDTGh^8t)$1aPEklx2@q;Ltg+{aPsZXzFFSgWMp2`arGI3;NGAuMr2{%dC8?{+|SIj zH%!il>6Mn5ncMD8YHvVkuGz5jLQDKsCkv3DYcA#IAOggJ2yr`LE_@K@O?`1B*JIwp z^yXatUfVk|b0@Ycr^?NB-p_F$Si4{K?0vYfLyE4$da_>X{F*rn5G7t1)TornxhzUy zsekXWHoOn)2O$m^oe?T!ezwkd?4(Sd{k#XohY>+l={aZ0w#Rn{lOYb!iJwS;q^tPs zy~s=ePh5wPYFNA{WEsMmha;3{f@%t9zU@`dDc@+l2UWF)**f1*0OC>R#Mb`!YACA0y441+Px+Jo{bzs>J#%ZeQ_PQZ57JAD?G-^TJ@ zm)Ck1%bwFI-<(6^dN5|9;9gF&0jiw%Wf4cg830cpXaio0Q)N&m^2!7A@+ig0Yb$~% z-sSdMPo_jhp$nqAbTJfwhB7oY4^) z-95&;wL{P+RvPu~;hG1k>;j?fBLg=&#pV^H)A#r~@|y3$KZhAqWQ7u5f}N1z-TD); zxMFamMbTV3QrJ0+xpEhi{6wogKt>KW9K+)OqZeSkLKhqVU-pUA7FQ!R9Vu`Wfzk`F z#CG{^N!{7|c00gyGJ6k)&fByz!vL3`04^_yyc7~+UU)T5y4c-ot8(-H3!krkYcsp* z?N**J?91Z4zFdd(!77QCO{^zh-`4!P9~j)60gXzZmjYNo+mRLQ)*PWqnR^|W+tz-Q zVDTk^fIt~9oE6ESy-JveeFK|tY`t`ZWsmyPc$cSuJk@6+BmT7y566n?9^KIlJV7b`ETlmK?gU)ZE)y;rWIw$yb zn1`flzz6ztmhX)>j)1{nTs)q`>6U3zuZHSHP!HiwNT2d2N_0IBDR4u%n_l~p&cGxt zovm^@1u2BcdeH@9s5iK_L!f8^RYRbniR5*R`5_ks?O@uJymA9+;$+~E4}b0fk4IVi zai}@H>^p{=)D=0h)b%uA68Zg|y#(f@%c$4D6 zdIu8P>D_ojIw|fxT`!XjT$rf(NKf(}-<#K2B)i7IK4Ae0q4R}xJ`hP_D@ZcHnA2M< zfS#ghwXq9dud*_@)s#^_S{R-=fc)Ksc6vXOn7r5b<|Z#ufpEZWx2Jx=K7{BzaAib* z$NkU{S2v7#-gT?3iVXsRaIB3DKcykhg_fseF!oANvC-$?5g?g8zAq+sf#!}oM&G&s zzf;|5`V*AwZQvs&0+5m{U7TVX0TXjbY_3gU(8VKhW3Zr#A9o$XI_$O zDSET=9opct(QM|WWt-G>9#o%m*?38O7IU}gez1?t2Ou2vL&uic9cF~la}n1ovFL3~ z;fhLA>D!hjaHPSW_O%S(bq1jg8|+~X?HpqZ+VuBCsP1ZTG^yQ~xE|8kH$XVD=^K~1 z6qZH6m=+wK<7nTa++0L6$xU%?a|~gOJOL6>z_p`?WP20{!8(Hn8@{e#NnCZnGc|m1 zyM$1UN_>C<#HoxGoYJWu{vyPAI!@#scN(Tn?#qq5_H^3JS>v$>^TNKzGZED&G2c*g zT~7BCKm@dP4usBY1wt3s^k`XU(?n1VB|Ww1)qz%er|nzRWAALJ>LAtkZ;l;vNqq;t zxO)E?rMweBTXvHA_yChK6t9cV2JUbNqLe1E!Z2w~(LZb+t-B4`6K931a5zoda4_NK zm*~Lj$c^e%DUtj#1nQtU3pbmNIB;OyZtwLcgru23vJEvLn*`VmS$i6dp2Nv!Efg1Z zyS#NZXVxk=p@SY4W819E*w>G_?EVZq#@|ke=dY|)j>Q*tY%uay9h{uF?Eb}HXY13M&WVK6UVQfL2s~s=Tu?0<}*>%-Ei0hGg2o6gsTD8*t8ZaK8o)be1sRK{Z!Em~GyP(qOfSUeupd+E$yZEEQ-Ot;b z&%ccdneRB!72A^mVRMGS7;#fe_ zK`GmHO+{;Q^Zq8;&^}VoKH$%P2~pCnVa#XeCy7y25vRRgcdbQ^6uQt36ficZG%h4s z0VinS{XujEe>j8}f%p}UJ`Bm2H=i#xRGWX0F*6y;9!1?T9+xTnXgSWyo-RQFfY7j`3GP33@EOtS)(cW*y zj-7>@Wn4CD0SNFc?~DILMIS;c1}(=acuEMJ-W7o3RuG;$oaQ<=VgnMA9oO$=LQ>MT zR=C&bOKCI@a9o>MAN-1}FGLW6*@dz`Ot;%ey*zC<6UYcuRV-{fi|rRYfgxl{0}1E7 zEX%UzSlDd}a9T3L8kLKMKMvsnVD}ECO(D$jH&diLW|&W8F}Uz9*EZ`Yva{AY!S*#= z_OK*^17R!BHUHO)LroKtGf ztoe)_&5ddjjP1CfnyPsmiF0!T5`f`ITPw_yy2UFnOfj_eoSa|q%a2048;fR?zMJ6G zYy^IOFd5tVhWt>QOCQaxSV0fmVTa~cehpXt_a1Vgxi2rS7u5}15>IeYxCG97oPn>n zU0!APMGgjXLU+Xmb1BN(w#@y9k+^`A%RIlFMM5J*r0TtX!7oXwY zORf&g;oNHZSNj_7TBh3~LpFrI9-wZD_~k6U%Atw{hXEa-E9iKFD|V(&ku7fWk>ul8 z60GY~7Tx5+SuH#D$A({qWffOm%bT6|4N`PU^&2c#($P2^p&J>xI?z1^S-=uU*>&Ht z1XBI@lI+)!2n-LqIIp8EIfcq)fgmeESp8%|ea} z^@zFADBP!15I5M1$z;AHI9!4jl>&XaE4i9vksa6g{43yT>@rVzlL#`X`EhcRA!UA0 zk4vnD^13WbNf1X9h>O0dWCYHl@XJ}M^d(sjX=tahE)$Vff%7&qi-w{^w{iw*yFp?6_$z}km93uQypO}<65)53iGhPK2s!%I zuk#Ja%*l6=>q!SV1%VlayXLqB3uJ@)Ir_`}XztX}6txn!3){660)ee~QwaD;GL|UB zbrA{@#Gb0E=E>pk-9Z}Jo25zs8Geu}SSG_xoHsfcknvyz8Fvx*p1Avt<1=%PA3`O# zqA)7-0T5UNe`70lzO-oy$rS-sYhD15xPDS6YG0|o|FH`F21&^0ExGfdbjSb<`UTbt zsC6uc27{Ta*sXmEMOFun-eGqT3oe6bfduO(EpE;F{uLkf8&Xd!?^9I>nSiui9_i+V za&3-v?e5hbZBK7&Jr$ZlW+?u0yB!)52l>F&2rgfZ6z03`>tRip?-TvFXh+80ktyzp z3j$q7F@)6PE5F_+8+!YYRhx~t9ULkLFL|i20)kBO0-y2Nt0+0AvX7~$JD4V(f$eTh za&47BNKIIN5m5u~q)uhs+&XXu5OV$Cg`_5wMqH-7oFFpJj8>W=5h_4pA>H=CaURG`W;rqeKTHA&R1cD84bBk7hi(O!BwhsDVpSML{1;N$C z|8g~``vzlQoC&n;Iy?B64|HmT>Hw1Wtt6$6tsO{*vRkS5xv;H|DU^YRJWe5 ztYnOqtN3cQ_Ka4*m~N=yWa*APQ4Ih7*t(AM#g^ahaIp`_Ub)-!a@u{T+cUS%e?yye z{jv!~f1P)vKo;6B_#>o|;CE1@Zl6YwK`$Euy%(&&HcR-PZ@7cNz@t_&*3kh_f!ojy zQL#c&avDK6l-@RGXV_idHblho$6Ss2a;6$#ABMONf5?r*8M>~tBu`=A7M*68;Z`}{ ziyb~?4__#KaE$6|)egHV%W}L-6rArdiUANn?6mv70tU@bOxtCzo{J<#K(;D1H7!R> z1`9MX7GZgBuD%5NB{hNHK!I@*g5>&fy{Y2m+tQvr^?ojAgkqyqPspQR><{E( zokEW22!l`kY>`_l{JljE{PA~ubKd%tAhKd>2Rbl=Ic&~foI)E&z$yu50(FzO4T3eNLj}%gzv;JQAz(@RB#;c^jZ6wvgsKx#BaL#SuTbBJ6+eROj z?cbX$zQ=aDH662MLRos*CbTxO9mSvf->m{%O!6hs!Y^Qqjev?r2qtV+@ z&i1T%?X&$>B?-gtZq=v{Qkf2*uW%9hg__0U&r6O$J!RiOWC=AhK^FkO0!xWfRRLf8 zwsv!*FV}1bJY2OYHHRJ7;q&;v=^DZ4tP`$|^=e>xHWPJ&=mOUtGzqFzHIT-~ln1DS zNn8#fL4i6^c&$Jrr<24=2?3Fu;Bq8q^p-sc;HOYJEw@lea=LwJY%;bE7(jY;Z`BE>d(XVEWf!;^)YRPEnr@6G#|P}sTDy7gg^2xTM)IRJL8JMn1S z(|e&y&4y=ZzHPO-0}^S`6={$^xG)UD3EtGCd&c%dPo>;6XYygC%4sIyar1PL##D$) zIZ!u-?Jqjx7^hP%h)M?q0w>x>ewP;MysuZ}J3K6M56V7%Dx%ezf2}*+ozlT$|8)=r zPI?ODxTevb{aa98^m#Hr(v5P(J@yTL{^yVsesl8Dlg;8=wNYYX`0E^coHm4hh zwD&$cXytE)8p)Ac(Wn^KAA`z_zEOK5w|ak}N3;}D0OU;Ge!+D^ky_?iLTc1N>wx}? zH(o)Fl0$*=kqnxtZY+AH#9C}2>%3NIOayHAHRF2L3UWeVZoxv-n-3u^Zd0}pCh5xm z^~kLV1O;C_KvhlSXI{UXM86n5Q=A<=3!p_*%bBMs-n2O-#`!na>d&TRR)~ zdfd99dRs$+X`XWui#XOs7ayb}QwI7Z9g<^-LqIG&#a^^H3Jupdwz*uiM+YAHm>z=K zheH&e9-um*&=V1{*}V=C@}>%&Jw3Vjx9_F$LyBDAK^2h({sx;*&n_F8xrQw^+fCya z+V|?kID%4v-G%43t7iLST?$7F(vnEx6Sii;+mnP|0SMY$VleMYWx&Vgf~NbK44ky_ z+phbA9|I%ytK~cOY|4C9Jb86^!ep`}f2e3Mx0sMCs+>hhIS11wK+WN3l73g3A?Sg; z7kG><2z(F0eqQ&Ns~xG%oU0*4?HldLsj@bs8ZS1q_OyKx#JwKGQjqz?arZE&lXha$zK3a7WlADZ z4VAf9szUdQjmHReTwwK4jp=sw0y5*~+}fua9L zRpod6mvAIz`tAnS2Mb95{9xFoH})m8Px=#l=?(XT&F#xTEb;Oo1Xh7C1?tv>+hdIG zl9gs6?Eyb2lsl*Ofj4QbV`-XoR4|+|Hr(Jl* z05OJUT6SDdgqaa3gbElK*7UG5LduyA-MDU0M(O?8}KpGKNs*N;|j}kHQ-Ce zPQTy<$GpW7!V2R3TZbpt3p|#E0wJj?0IvOLeJy$g3Mqa9g&;Ha{E>D5zH1Isqj`Tr zdVn0LDi}sWuwvL!q62~hDIE-j{2S6W0sV(0M<9^m)QU@*Lf}2eo&meNP#Jbf6j#jl zDtbPYE$GaCbQEje_;LSBkaGS{lA9v zb$-W5El}U8|AqmADZ4^ATO$$X+P~4mwn(5SI2f zF-B^;j)~a{xhcXGH{4-&SDz=G&jtXuEiY%jIWWk!9RRfdIDvplHY=pF$q*yvaX9DS z#;g@E-X`@?*m}{7S|I*EYQ&~P)F}2qyX4c8YIfT(iG&FAYyW_IB{M9=?S7=tkX?9; zQgK&mbxR=RIc;%Ty)0-uSl%x}yAAeG6Z(>#Hx5tdTLfB@-U$STbAg=kSM^o?C!9R( zd9A#xztIEWD ztX-mK32IIt$WOO6w1X`2A8;@b;$O2sP|9bTBb;!b{1F&4Q^2gB$e;)y5Fz}}z9w3MrOPO>9F93KNaHh!RJQPKe*O^WF( z5!g5q*$P}bNi}b`4c5Ayrz)L;$^{e-{7n^*xYL6=0j9XF2S!X^_dc*zg%m; z;ZXlGK>Z~lcyh@)N*=?=KxWsLu!SWNjo>K`SgM=cjoWfB2#^7wf*)iwJ;$l){AO*- za}9|dpu(B9ZCPBTC|nfg9}H9BpQHGa2D{?G%2 z`Dn=H=B-Z)F<=^nX21JhuD|Lh}?|=XZ*iXAKZQS5I()$3H61 z;IEouegqIBe;)-gXin)bDmAiQr$p~T2OrtiCZq<{D3MUJnp9xFu*JfybqL{d#U4T@itx)W0XB(74nkT0suKD zqK{F60lW#!`*Kb2y~{@dZU|@tca^{DKjMXLk2>pf&z_P36S)vt{If`S5;p#;VMYkM?()F8W91RWQ=s}?YdBle@qg|G}X5@84y@}KK*=Ih(9cz7 zs_t-!)hDF}WSHVJiQ2C3#Z2rB_(7qTVGlxjAoN)OtVmeHv829F&n-x^weDnEn@e4B zWN8I}^lYSzGPAqN?zcU+iLtxG&b|NmW1|d@a^{>`pu8!*xYFAXeO0FI8U>6;mQQKu z1q!OH78%vxIv;r)m&=sfW{`H;F7p{30!}7e)khBn59;m8}jFs$`axLn2Xc5 z_YY}pBxbWSj@nFi2;h?$Z8X8F-tbeQ-$_$+<=(mTRy>CnEsgYgS0ULjbY#nQp+WXo zU5brV&l=9`lz3w_xg=2bOUkH$Q^pY61<;#;&fiYEueRU#Qtg>Ja$}PoOmCX>?DCHNoA4(JMrHisSazs%9PBa1uF1 zCT`w+U!C52F3-6=iwVD5F6iz!b1C#=U^F|~aazdRhbK1z{ooXmcs*jj*}6BeyInv& z*#qyH4&PcS!?>=%*jHcZer@#XWWbAz!ebo5{0xIb`Cx$E>76f&lXqzo)HB}w@p1JI zCmumP(&UY(`Odq38B^`nO8l;~vds%-cl=+gAo%v3ztuLOnl9>6e7Rdj$fA0ywC#)^ z^($!&?AyVcud} zmOUfh^QXE;o)QCFf;u$Fx6%76nC@pmS<**zh3>uogg{f_bKm&zwxHqM#UO8rq{p60wJ8DAs&1`fKap}Rd9gae0(=?>i@y6o!}qZG=%dA;#OUqv-#7|j zC4Y{S{Re;YXW5VWx+MquharC$@}EPn|BocZkoLASwtA$5|7B|`uLBld=;iT%F(*;T z+xH2WE(7R!0=;=Jznb|k!$kS1fu@=#GgTeA?VnYdVz1tX{hU)>r;K8Rf>ausJoxni zfu<@|7ePj1hB@hG$pa0NjgaCz`ksOkfQ`Vb1hGw6e58|)r=?rS2RPi?rhP)2wE6si zBuJb*prqzs&j;jW)d@wTYL`Ie9t=rxbyDIoJ) zFZn?t)WjFoQ1BPa@j}+cbpJhNrMEsS325|OYq)*OwQh;OLcMZ&L@%f&*BF8LOnx!5 z8vn-|202-J9d{9HH23&cX!ht19DEK|E_@=&jQ{$xKY?Q^eE4f)hiwyj0X=2#-H~`?_PewP=5_5 zo*oq6oxJ=bU-d2El|fKtAle`;+QIOT6Mp7{4D<$%ZPu{oWFHaCh}j>qsm;zbD{KY9 zisdTy4ePI4ClUL==-c9}Iz6;#idS-%Fs7KE3f2E|uXdGw8k*@2%+uI#B=K+*$3!}Q zuAM>#PusjnIu&8!Nh1{}G&&3-zS};sb0+mxR{?|q*rpclf=14+4pA@~L z90-{;>E4WCb5k@L=LGr&o>xNgcLqA6+kI2_c9Qp;Qy~}?Bg^>A27vj+8d|%%xe|Ds z1-noS93jT2Aa&oqp@cgDXyH zDsUYpcik7N_4dB-=E^7-hV7X?MaI^_~S z#&}Is?z`)VOgs_neMuSQU?U{{WEY>gC}<>$$bEazq@XX-!Evm! z#H~sq*^)&bJ(8@(NTGrOKQbmE{LED_Xh=&lXH-2=o;W$&lokPo>CA}SYNYu-`HUP4 zd{6ju25Es|PP=odptylsodi-nrv=8e%gn9=Zxi+27eI5E)S)J#4433=gjfa`r;1vT zqSv^1TTndfP+8{wiQX~RU0`f1nsLP!L28s@9CQXbhTG?(>{fVNoi1rcVboujkI^_; zkm%W)cAyWtF>9mE1ej!7e9P%o!jr1VikDh+r;qWP0a>t8i#zH&8VB!}$~rV#;z#Uu zs)NUlcFqkM;q8^kuQhVz-l9R$o8t~7X3S~JNwtf~Lg}dKQ70`SboSzlJGZ(gs%7%( zy!s9ixt}V30^zBTrTc>hfr=U-AQlEA-m}%_t@E>!Bk9;$d*K=Ievk`zsK?zcI!Q=S z>WHtSx7lG@JRy&P*}MAd6z9uT8x-C_g?RxK`3+GZamz{Qe>9DcLPbOMxzjSU3VqKk zBH4nb%BY}}ZR-PM5gSoW&LJR(PEDijh3tyh21nPS#uOSD9h6%u>@(jjgpJ683e2=m zhw3b4%IxRM^zGa>^&9tpdLH804&KoswkL4z&llzti4s(st<=jhofgr0^5}+v=+{9F zZk5n`K^U)IshTGZtpuI?q+@DS@DA2f#?@z|>MzTCDnmxb%Z2JjFT5;<54x+%$sjCb zkm%tEH)N7}!MV9IA?9Bw?L9c}YDARxkq89+8MCH-n6q83w}waE@?deC^sR8#lSma; z@MIi0t9pMmVpUY6_PRY_@X~&Gu!=b>y*g;>df?%Tb7f{Z_Hegp5zq10WR>-N=3dum zibFT=cY~8xd;fJ>=56a#KIovqMl>WIH6IL|GQjtQF>8{9Ja(v=%$Xz=Bo*cl(zPii zIwfih)1t9bPHcpC;xr$RdL&|d6!3Va3lSmo^Fx=-nG+G%dsFmqTtoGfFH&qP8#<=w z2OX*wCmndsBqzawy)~i{C#G(3dkMFF%eMQHC13e6;^29D0`#kM=$WqjHuzh*6ubPP z)U>PxQ0KSRypcp;7rVdZ;~9mnyPtOBvSo0Ox_p@ZK06$}!9}(CvaFI+?R;7ISiJXKH{V8hsf+|Ge@_|HK2$M7UY&U#-AB2<*MO~1-2j`GXZI!D0%Z3 zvG&0;?q3>YLJjhDxseQT2$`o1vf)T?waDDn_X;v;|K&~tVYzKOS(aolKe zl!Y-eQK;Yx>bQYO=2Uqf%O0Hec+q67!$fd=EQ4&rh4INakJ+M{iD%OHT{!G5bCymS z6!mcjxwcz`v`X>#W0w{iwK*c$>TnqSLb2Cdv+I?jZr>h?wcb~o@7lW_(gPgAd$yOn z|7^iz%M8x&z97;zB*OpYv~!Zs-CDJUdA|r-cswy2*hFb_uEEWNF&^I@l2;v+Lo2Mo zbxg~MG2#!R*BR39?ZkE1Y`x68Sk)MLlLVUpPr$X+$dg{+(s$w5q*ez`SyOd|G`Eqr zDBUcKVh`$x@Ggv1J?jWYqQg~F<8_MO99mE)Gkds>U4A*sglVgzf zZsp>*Jq}>hmMEqU|0co+dU5Oma)S30m<@o>fdx1i^1p`*byL^b184nY4*z`KO< zcw~dt12y_Uf^Mmni6&^M2pj$MvamHu)mN0!c6t(|{Fho@UnUCZAkm&T0s86L_(tER z-TN5cK$inO@LzwPy#Dj#_5Z0Sug4ZxYS0OrG835b;K_QJw&t1Rna3{O F{(t@xmh}Jt literal 0 HcmV?d00001 From 1e4362cffb7bf57a5afea9d2b5311c68874971f7 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 6 Feb 2018 15:56:11 -0500 Subject: [PATCH 4/4] Regenerate package-lock --- package-lock.json | 89 ++--------------------------------------------- 1 file changed, 3 insertions(+), 86 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ff5a15252e..51d0fe33a4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10040,9 +10040,9 @@ } }, "regl-line2d": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-2.1.2.tgz", - "integrity": "sha512-xV1wRhzjq6JcE3ojKdF+LF9mufIzYugMUH97X4QFohi3nYyobpRYU2FBaEDowUCvInnkNeLNzhj837nm50oKew==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-2.1.4.tgz", + "integrity": "sha512-m7c7y1H5QhlWVN++DjHdDvn/2sLdpBMd97GiGsnnXeE1oWboh6LGV7xNIcmodokc5B3AFR7W+izeFkSGThXg8g==", "requires": { "array-bounds": "1.0.1", "array-normalize": "1.1.3", @@ -10055,89 +10055,6 @@ "pick-by-alias": "1.2.0", "to-float32": "1.0.0", "update-diff": "1.1.0" - }, - "dependencies": { - "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.5.7" - } - }, - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" - }, - "glslify": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/glslify/-/glslify-6.1.0.tgz", - "integrity": "sha1-zf/P0qZXFyISjT0TNWwTbebOl0I=", - "requires": { - "bl": "1.2.1", - "concat-stream": "1.6.0", - "duplexify": "3.5.3", - "falafel": "2.1.0", - "from2": "2.3.0", - "glsl-resolve": "0.0.1", - "glsl-token-whitespace-trim": "1.0.0", - "glslify-bundle": "5.0.0", - "glslify-deps": "1.3.0", - "minimist": "1.2.0", - "resolve": "1.4.0", - "stack-trace": "0.0.9", - "static-eval": "1.1.1", - "tape": "4.8.0", - "through2": "2.0.3", - "xtend": "4.0.1" - } - }, - "glslify-bundle": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glslify-bundle/-/glslify-bundle-5.0.0.tgz", - "integrity": "sha1-AlKtoe+d8wtmAAbguyH9EwtIbkI=", - "requires": { - "glsl-inject-defines": "1.0.3", - "glsl-token-defines": "1.0.0", - "glsl-token-depth": "1.1.2", - "glsl-token-descope": "1.0.2", - "glsl-token-scope": "1.1.2", - "glsl-token-string": "1.0.1", - "glsl-token-whitespace-trim": "1.0.0", - "glsl-tokenizer": "2.1.2", - "murmurhash-js": "1.0.0", - "shallow-copy": "0.0.1" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "optional": true - }, - "static-eval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-1.1.1.tgz", - "integrity": "sha1-yoEwIQNUzxPZpyK8fpI3eEV7sZI=", - "requires": { - "escodegen": "1.9.0" - } - } } }, "regl-scatter2d": {