From 133d6a12221a6ee6c0bf50fef08f40d73be03748 Mon Sep 17 00:00:00 2001 From: awadhana Date: Thu, 16 Dec 2021 11:19:28 -0500 Subject: [PATCH] test: jestify runtime-plugin-import test and fix flaky test Migrated test from Tap to Jest. File Path: packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts This is a PARTIAL resolution to issue #238 Signed-off-by: awadhana Signed-off-by: Youngone Lee Fixes #1667 --- .taprc | 1 - Review the current policies format.pdf | Bin 0 -> 66729 bytes jest.config.js | 1 - package.json | 1 + .../runtime-plugin-imports.test.ts | 100 +- yarn.lock | 1240 +++++++++-------- 6 files changed, 691 insertions(+), 652 deletions(-) create mode 100644 Review the current policies format.pdf diff --git a/.taprc b/.taprc index ef9190345a9..6e37147afef 100644 --- a/.taprc +++ b/.taprc @@ -42,7 +42,6 @@ files: - ./packages/cactus-test-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts - ./packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install.test.ts - ./packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install-version-selection.test.ts - - ./packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts - ./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/openapi/openapi-validation.test.ts - ./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/deploy-cordapp-jars-to-nodes-v4.7.test.ts - ./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/jvm-kotlin-spring-server-v4.7.test.ts diff --git a/Review the current policies format.pdf b/Review the current policies format.pdf new file mode 100644 index 0000000000000000000000000000000000000000..cd1f2cf2bdcecb0e61b5afe73845f83d697b7a6f GIT binary patch literal 66729 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�_G|I)$kI!lX}=v``IZdI8R^ygM5ppQu*e!8}O_0iI=?e0Zjcgwr0R8KA-i z`3ouT0G*5b5PJiQrq8ympvDm#o%m(0t$cp1&0*$Hmo9o_GP(JttAfYQ69z9_L%@Tx z{wVUIq_@4;VV(`9HddRrYA5m4x_GbZT~j7XA`e*8EdUgs-%zSYTgFn^xJucU=+0rp zTy4S9I$Sk;Nne?rppY7FJ(hWsx-eu+{Hx0(lw2xa_A9ALr_aXrSTC$USb^+EL^+J3Xr=a}2^X=sJJKhk;9Thr5KGMlN#CW0&kSW3pIZG@-; z#SU-}1H>e7G+q=Vq}YvGHoAZ=-N760pc6>h7cu5cg+GJqNL?_C*LPFf$}@-vNtohc z)C=~8)368|suer)rzQ})n@EC2fq2s`g`z&9JL-eZv zg1K1_=NK{|tljP?ibM}<{eG3lpkwohalQF!u{GvyQmvPfr$CNgHnZ_0a(vihAOX(m zG3sTqVJGM@v+ZbD3|48MsilV5@9t~IQDU2i)=M>P#sjOc_wiv2%Q5kJHNIIDel;R_ z5N!Iz2XekuSV)1WaO-k=yj-0mO*b6_Va6?$eN5uIKsZGt|Mg|@LC{h9kpwphVjX$mXNA}rh&TIrdd;57lbJYzN*s;quLaJe+bRx=8Jp* zyf-Y;bM%fNd{*F(9p%oR&dNI1Y%f|jSF2hCvhCSng-o_5-3j_)@GE@;s~ViCBcO88 zH*hRlsdlp`pR4+KqkN-W2bNALO}jGW_JiX+4~>ylS3cjAbatm zvUkE!4nmb{{cXT!TA~%o!z$hh7k&nbx;fD@Wu z$=Zd?vdA#EvIOCYz@S}~o-?mLrQxMMA54nvWLs(ySJcQXQ(m>@QZLk&O;+TuXF?AZi$PCOZoMkZ;jT=YcEuRj|w zKAmgn+Uqtr>;^95$m*v(iZcbw=iJR0+;7Lc@MJE${4lpuV_)+m=l5J@lUZM>@|w4s zpDZV5%YKfoKQ+CDjBOuF0zF4u$Hi5V9U;l_JhzfHPvcEM{2)8Dl{5?ES#4cict(^4 zlX-@Tb^Y4vq?#G2PAsUVO-MPQ)NB7Cb`fC~VvfS2{BoL5gNR;dc8AJ9+|$*MZE;+V z*i~PhNDn5{>HE;~G1T_QAuq=vasEC3t}y(8zRdxvd}Dp9nWg&vrTI@hpZF5_0wjQB z!#ZW`>K9ewY}SG~;~>g)$s|r$O9>a9w0EWto8XtK0tnbfoq3}GJ{8E1(Nc2`u=1hN zxWd^TdCqZr*6Hfv97IxwG2G?I^F)K{l#><~D?-vr0P(df?18d?osIIm02VDlh>R@^~`1=bf?tk=70U00ItdQi_kv?FDC1)q9ew;ADH8 zLor-3{XX6}s=k?Dqj8;Md&8DeA|ihGU^}IL)4LsenMoU#Q>J>mHaQjvV_#7-^1rR* zsK75k)(~EOlKsf#olG5bn#JBJ`Dh(^^PF<%{6Q-nnR*t)n11RuBj0J@h+S@sw9=;4 zCY|mF36tVMN=|6sk`&tE)QE!Rx`RCQN%mGx}2Q{=AtAhl6+ zf$)psKtPz0#_n@r-fh2Io?E;^pPzJQFu&3vltV~(Z`V?lr0m-_=mW>;5HhkfZqAeA zJQ`OiS~;k5Fk|8knJklZZy0#qca|B_ZsWM{sO#d=ZcY)06f@}JA?;)9qiZz|_Fh7e z(B&$)2nFA6@UgGz4=i=NLel`B0&K(f8?+iwY|2gsW7L+5Zyz9gi9|ZU(6m2{ez?F| zaw2UH(Rs91^O>DD8ojUai54;Q31&U0mnR|cmwv>#?3vZDZlPCSRFwKDW68zcaecQo84U~%8w9_%4aZZ zGS6Igc$3!BHgvo{?hK6-o`!phyNZ7l*DX#d5BTv@uTA|BM#T!pma2RmKB32Uu1Ci2 zRJQ(M0XW2f2w`TapkN~AXd2;P(&mgDRfboOUAte$0gn?Y|th-@Y z?BaZ5M+H>bYWQ;4FJ!7-M~XZFFzwww!XLtzj*k_A#R|f+fI%t?ko{JE^WH=d?f(Hd zK*zrW0%`PXJyB^BJG#lq-3GS)U72=63m{c)CFt%MqTuYQ27b6Gb&vA3y~@<2?gd;uIbV#W zeG1|NvR}p~Q!);Mq>xPek_D9K8VV?;Bnxa2H5AyCoGBp9m@6=eP_)1(jclm^>I~BJ z)=NY|HA{yS5cTx*Fg@KD3X^1uPVQ%-r84)yKxZ^6c(P^gqyA1$hAIV*8=U1(rw0pl zWp22?Q^=LM_n{jt$PpKUn~;k*5%nKWHDigXr9$JlCR&?=>|G@pJk_{Bk@YKnC~{oeZ8O*J^?bHkesn|o-Lnlw(9c(m zylE66Zp25G;$?!8M|qrQ^Wpo%2bD*~M;(X7BaRwgf&T$WdTw!V@O+!y?)d?GUtk}5 zoE0pr&45E!vI|&ao|o)#8Kkmt0Lus+W6JD|!;y!K=^%^B`1F81yI(?5nVmea!}^F7 zTgz--&$|TjjW~oFrF~D^QP|#Q$M%2@fEHRKJ|z0WKJ24#^G#1&znqH2Y)22RPk+?Y z4QWs}iSpg&I?kPK8~WfJ(BBX!fEOuTB5v7a;SzylP12Jv$wED2aYMuVjrGXvwbnDt z1te6}VGm?GK+KV#Bn2^c1>8Dw2nTBvaeRf*VECC0I;oHIs^h21U(txJ1N zhFFAbk~!ie_7jVbGyFOno^H{i_w1;3$gV(* zaaE=8%HeI5-<>X3{=Tz&uWMlMr^n9!0?j^trN=325b0wO=}A?=16ukDYO@73a!u%V z>0aqSCF442ovTlJ!1Iz-)*xx_ue zc!ke9WW?ZbOPonffz=oweDKFuVQ$8k+dieLtNKEm5mV)YMWm5vQh()5$nBb$nNG z@F?n|=?F11wKe!^$I!WsGs9r+j-ggsLzg}PRRdjx${X;e*5Ou?Q z@c_RRbGfX^lof<*AP~wT5%kMICqkht1Ec=VY%R5U7KdE)aY&)Y4poiaR%POgUOVcz zc9pnh!5*X4RF!O=6zIm%xB^>c>Wj!AP7Wiq57n+o6-|kR&F1*hoXV?Gdi>d&S89_c zr`LY=zNTd(-ave|W^jusccC%;6(b&gCze}NNiPq^(v`^zQ{G5^(&oy(gjdp+v)#8U z=|tuCt7f@HQqNEUE99FX^=JcC@#%aSDf+m?^-Y37Fz?T^4`h#JU&y}3{x^1EG^zfWnsKuOWv6N9#xAHO<3d>$KY67^BnT%03*{Hfu!g5lL zW$V&r-eNFf01+70ThGLjOj=6gG{I0Jl}cidmrrHW`gO*MloWGDj|xI5S>WENaS!VW``6X_`Be~By5kN0iH*Xemtk$nn7}g@|7C_0`JdQT`9F+m8i_ULG?R)i9|zW6WduGS6*GbAWf`KxcvuU{VC|!#T@R) zG@UFOlPHgTG(grjQ7n&~*BxY7r0ZFvYg=@}3v?%$cA}_-^igVqXnEuvof;uZUltVhx5D2hb2XjgQ1^kj4} zYKoR|L=Q;QmP|V_jg3r0)21Y%rCG%#MO@r9b?F~`*_qP09&!{(>h7Tcqlc14^D6kS z3a>FONNXktQlx=4kTsK90Vsz%Lv?vp4p7X*36^wgCww~dBy7g@yv#Fg@JHa2g^UUQ z(M;(gNZe#++T{Kh6si9+u14R2_TY5@sH~>pD=4P`qUtnl_!;fGq(AeN5pL)QmF1U!Z`CC)1MC$T25%tWLu1a;D79LpQAefV zQ}uMouP(J;-^7PytVVrd*`Y@LVHv40AuQX~n8ObA!TbD};LgtzocRspt^TOc#rN`q zJUhZ8ji1FY;n~If3H~I{@&@uUo?@6UkNooxc`pnqdWZ(RrI9YRR~=MYO`WAKQP~sf zNfi^bUIVtI4k+gEZ%Pvu`x8pEosRi+v*AqJ>{)e?6vlia)h2@2X zr^}xBob!_L`R~y&tYQZE`v|OJgn5&$q6`@$iZBtRN9W-i@Or#G@?hkN$kB)eMa$?r zdck&m(;U1=!LW*~8ug5m?GvNsuq>&uNI1f1j1GzMpM!P@2Vnzer~3-X1cKEUFy<~i)1TR+4daW#s)7q(?KK`!F~^5Umk!&+#!iHluDQlmbr8N zosbcd)nms(X=Ak@jlAp^k{Ne$6znvJHW}_y*L-%iFgM|*;%P-Vt#>dHCpMrDZkNoKYA$t3*YO$chLJjtJMbr-=s~|*d||-HqFO+w3IKYu_m8U z^Lp7VlYvJQm=euLSADN)Z~NZX zY}HIY5|#sMG#8fBl=XNuR?Y3zu$%%7?(;>-uipCn4D$PYq^>kc%eyq6SIhe#7lY64 z4fy?DEbu(TXj&@GYhMOm_2+ZZNJQPO?pKLl45}t|m)?jP5hk~=N@7H`ldQafIt*B! z@Ze0M#K@o(VqFCwKxuG{4oO+`!bTqSK05GSWJmC}?rsRUWCKsmOD;XqNCa2aWrGe4VS+eB+#k;nr67o$!hn{0ar8D?ajMqTVg0yA`q z05E?3HaXc2Xe8*HFmXa?g7NC}9BUiH*Js-dSDgRJ1++aqrOpYTin(&+P2&c7`dMav zLlM_-zhf`=g!u`{upVvX`p_Mm;d0)ZW>|OHB=}m%xBfB1N-Q~QsIx|PdWfJR&{m3s z^bii&Tgfj4U{MGQSePChEvS$be5TZ${ivFYkDd5yL^3(q7f3pjHjBNUk&&++xi}bk zj4+bS)_UZ}&^UN^J>xY%bLkRiZw11T4=|v`hYocztjSGlWG3Olu|5clkYKB%9oIw( z2X=a_&taD!*mFPRD z6X|xppt?7lgQd8qrIgRD^{tWD1izl{ z%H12}Hu{dlkEP#`-w3`QH~CXiE}d*nG^Zw{wcNtgS5sZN-dxQK3rUZi}_YAeG?UwP}yX zjd_lDFaar`1@u5yz!;dG8?CJ{Ii%I{QGA(nbF$XO2AB-DdOsxo&LCwEOde{cV84azLorW?C16D^!ShKu`le+t%$P% z5)#S8G-f_pjaSESLAT(W!#79PMK>h2qrS)k^-rOv5=WBH)Q`m7rpQ)wSA1*gq4*y3 z7=Aqdbp3Pnr?kJ;kJMWoj0XjvH7(mTEnM=)2L*+a`iUh;7{iJQeO;n%dbi@==eQV$n?} z-4u)NU8SW*k)QcOb}x01{3}a;y(3@6VSW^cqw-^DNCF^s^yIUUt+o0C(oi4S=pu); z9L)j1HQm|D($kX-nvWp0zCnqF6ZNrt0W~PlpYSttXLItWu2oNkJjfmG7%G|pkQ|ju(AmU*Wx%2&< z!A4qX49YZ14C1s!lqi(NDwG>(g^^~4B-v0^L}B~?gEdFC)KKGvb26N9W#zs~sSvR$ zQZRXSi2|HTY4n#bu`|9%(ok8JeKY!$#Ez9vHj8J9W=V9LV#M;f}WaXCI z=Uedi(B9j&JmLg>-8=H8!3dFMJbsYk-0!%z4v9!42hK%9n#mZm?Wi3K_Lef5s-J8c z-xOeF!(!iJ|Kh-6*<`dDZA|Tn7Q>pFHP$t@bz+y&74FJ+Y1{bQYx=Bxwyk1ccCTS? zL2_6N)}pl(Dujxm64_d)H$;?3IFqR_OhS`zn?dtyiWb(?iN%SfE3H@7&aRnjohQxB z%*}?vD2(MoxFk2t_RaRs4lHO~R9IA8R9e)uaGZ^;smVBNt4(lQ~Vwe&c8oZI3L za1Z1k)b{32q<>obLiR+|5ICOZ~LSE5CP!erwO#dIlef6k6i+fl^+ zwEeW5wU=?JpiI=T&A2odU}EE2-}E0XQZ)x4?5~VQa6mN$5`VU=S(MS z>VyK55ecC?q2V-mXs)*um>Nr6HYEYQi?&Q{!T}V|=S{?WvXshcgT^*Uz>7LS;t9)Z zR#u&9s3ro zydyj5-DmHd@z-Z26vO`>@Q1iWA~1iTbMtq{wWKPK-E;Ne|LWX0-WyQOASbeYyZ>#= zwUY`nHm|tpd)Gd6S}?XLdGzbMzq@4X!p0SK%D=CG<|M)%s<93qI7S1Ek6-DC1zA|@ipfilElASW2bU`owH)G!d-bQujJ7-3k8O@BO z(R=hBSx+X#!1B;^lDJ>ucw;x5zI>?zR|y?)zwF*wf8e-DuIH+E-A{ai{mZ(MkBTcWe$ zy$g$|*d*Cpd#^&P@e>GM{55wcegaiy%OyYQDGRDJr`+&cz$~ECbjVT&nnWip@)S5Q zebrh`oj-H?lAK@vP~i+(-EvEX)SW#_0OYhP-JgxFdf>ff?Wi_$x)m#8Cnk zr6F&=CDa@(a#hjNNKp(^&Xt|Pf+b`U9mbsvI(be+B415AY49D?AawHscr9h<1@%@- zD8ySVLI}&&NQ9?Y6r@}MchHr|HwQCL37;h$Nd?o@VkKCuUmQIV6a}?@ai8uk@SG}% zVp9;$4hBM@h(!>H`5Fx2flxlo^G)CxDddYR$H6C|LJ{v4UCwkSgF!4si-N%OoMq)# z*~g0bnH|^5MI$kSBs!$Bg;Jq7QJgF?n~S@PBgIj&bFMg7>mj5+i-9b7h_W*ohdV>1dGL>6gzd^85t?X|(w_mrzW@o3fbeiCbk^hi`O1 zXlwuP?49LXPPTRN_zzpyL&O1Nyr^LU#j#`tx$Dkku*n>OjatB)sNxiB238*eced`f zga{*4X+0wS?Ye60?U@;hpL&aIj@UwUfF^pVkaFr5w>7_wr zh~apdyR*C|;?@>ElflN>Ok&}ttmIz161}UGE3HWUbwVuhf+>fIQvjGvv7H?m2>s}C$`PY-rj)-zr)WRVE;{agRgehN z^7~6dLB7p_tbR+X6WvPvbdN4MfrVMCx>?Jjhm?KZuXMW4uiGJlVDC~xY~hNPhwV~P9Y z-qp444S}9C>vZQ(BKOhQW3k6_rUutGnF8HqaPxrLB{AGS$3WRr9%+gEEl~YN}Q$5K#>H{VZ$dZ>XV~Mj;G6 zRa8J%p%FBSj-hFE4$UC})#<HP2q z!a776832iJpRK`$|6eS(d~3(AA#iPB-FO_|87Nf1FErM(^Hd%+H|19|7z2UcyfL;% z+m|2d227+OjEM+m+OJFBSfN`K%#?B23jV0KbeB|(D`GW=-|_X{YO3Ic@#$0EYE#Br zHDPKy?ybV&w5LSkP^H07hj};4JF88qvswX1n7x`d8gPQ)Ml~AEXjbFq8GH3Z3lkcS zSWP2WL4jP5a#YM=3S>Gu84@7Xg}s0O;xr|xH26-^u7S8^m#U(Q^PiS{eE(EqV;`P6Q6GKoY>(&h6x`p{JipYKe2)D|Y0 zG|PdVyU^#+!6Vn=Jth}Q_AUGn727i&kL+ej~^XZ0ehz#4;mi#1^K^6mk}T zrJtyk^}^N4)&7BksnvIf@3z!!>HB<#(yZU?XKAY7;XE0&FiJEE$z2)QnHebD%-+o1oVmGWv@n4t*t@yAGZQTng(EHBK;NK`7S4o! z9zIu4?_m#e2Qv)f=pZs6Vl<@&qf{mrqzteaQNqDUBBl6z82q|1>u@{|tksmx;Ju8J z^5rvJfzNR1lwyv`h@zs=2!KnUw|?<2B&6nD^cF)$w-apGr1KV<082b}nqbTCsA;$h zPHS0B7t(rqAU&F%NKdA@be;aOm(J>k`)qX0HXqpBaK+?W)Q)ciBJYK8*CIHf2qnD4KTwqQgt!i zAIgbNr)4G=W+E|SpHq?lhEfSZ8=0-3$gslua10^!e^GO(ICB>LA`sZKrEB5YP-;u- z{4}7}h5Og!``szJHe|GYAv_@BlGhM-&usPsGF|rSrHeK$=24y)e9TY z*RRfnTKyDFU3PJnImA3ot)Nyh_btocR%;~wTGQbDXrKpQ-24?N&DGPkYDk(SF6ccW^-hveF*h^e`?P?B^DKB=UK!?1PWkEHs= zpXm{pBuSQo5|0^!~dB!gYtNX2%G8Y*EQ{o z{IeMd$_Dj)V(8vB+PSqIIn`)&qV|O4l)yMO=bhA@ZJ(j;6YndtVW+oKu1(ZTme5A? zMs}^bwrOLhUON=#1skVQO_!k!!e!!R3Ix3B}&5L)l!u*VpSsE@XoS~ksS^2ZbV{K((IQ^QkMcDg=Vq3S=p`Z zQ<%JRK%tdSVWxsBE_CT#G`{RnC_c@W@qMc^>vV@n%uQ!eb|gu)StY4d!Z-eX`~=v+ zw&!7ycPa_rXsc4mXmTPsnKbFixggaks63kbNoNlYC z+yFPhF*1kdI0QvFJ*#^@Zny`=#>cfy*v8l7c?~?g*n(?7Px;+p%##=9&kxJ9W3}0F zNWFDbVUDKd4Ng1GNC@+pQCQQcsp%`P48_f^j!JulW-YwH(`>9sZKBz-SXC)U*cGCj zE_>7(LQV0N=4yzl@Ff+MOQJI*hmfraZ#vno5Jh}_;4&c215ImbfdpI3$C#hd*f<4x zwB{rlNTbFvZ%-BRmF7U{$)q`Dt9Gb1&}YEcDqt@W>p@kl`tUmh)E*G40)CVo8E6IE z3b?i4*0L1kS$qwFnmef|rifIkb8ns8D@lcjjC)gi@$+o1^VX@o1<}-1=Pk$gn#6`9 zVkspEk^~k@3_-COUOCp|TVB`U^Lj|u803+83?Cn;Ijj)dR?vNan`mFP`;JKSKfbeL zYb}|g^QmP1*pb^WUm0==KD#V=x<;=ncA_t|ZtmS)*?9L&4*%bLtf$y}>-NN<>zbNc zJ98^a+3l0f(KXsV3qQPTrJJ*MRUYnr5DjvpJQdAfJ~VRA``o z_&I-?f_>ci_tP*WNvWifQG-RtH1uW~-#23v?F9AP2k3*fjJ8kWDMcloLPohjgFD1v&(l04S&68${q`2gdxihJq(N6dkMczNx)5X9<#=Hp?Qtf)2Y>bcyNDh>E0>Z4QU`k~f(}EAM&qZ~yu0 z_kDZdvF&zM3ANaeE8BKcb=OzEvZq|m(CRK#}^~#jX zO%LMEk4}N!3KtoyNU)O7hHGbL2{Fw;Rnap}l5>1>OSVMC;R*Y!JIr**wav8Eyp`R? z?F{Y=ao3yons*OWRbtLJ|ITlf@%o@uKnc1GEo@eR5 zGu*_G|2{lEHa|9eevFWwrqyO=$B2SB?`*K4ur+*b_~tP4U>L#r6qtW1l?tkmVn{Sj zjT0Zj6eTO*^_n~7s+wgP0wmK|B4hbG{ft~~gms68V0|FF-4ergsFy6(V&Rx@oev$~ z%ZMLdsDj0`NS8}gTchGFooX!9LL?&=mP~*0wY$Fj7D7`8|3|TPWyB%IAwk|CM?#vE8uk(q=oM8EbPk|CmE=jPWHuiClTHX&Rp1CU^c z5?s2)Mi08&R1!bt)>ej~AdrQ5{6-Db^E$>n(}a{EF|zR_wm9)olqxa|92y!8BRxD4 zro&MYpGNc&spvI<2*kh84XtXj+wqo$Pr!_BCUeNev4bp|&k;E}qZ#57(lIp67MrO%wU2^V4}w&rjrOD(`LaXoKcK zew+3%$F1j(n(q+$gzdr?P2Xxcn&+nTa~iFxlp1>u^M;5u^V%+TvwF39ov>HET|Gh_ zQJ>Yen`-nW|vSa88+awTX__m$b6T+e|6bRi)|cVG8VWpk+_t6 zN$>_znu$**Q+%^ZX(qhMa7h)lm|In9skD)761*RNak-Vc6&`ZhiJ6(W7#d;M#DAxC`dhv>E5(dyuXrYISfe7-nMBrtSz2V@gb zlo(7pIH(DrA$&XqM{`7G<9VE^e(_au1n&IkG;ocnD2hbf0Qx7j+PEDaCghKSKz?TW z5)24?Ca9xW$T5rAjO0fc-)Ph_B!JXqPUVhq48@Ibuuz4G`<&_PrsF0CzKX+_1{|9L zvUj_q5qzD{#aD~j1FjY~*gnKVHd{3ELGYl>oCW+ad}eqUTYaRi9J2>;|2uap!~PL! z#QiE`_NyTbF+)|a9;!x30bEaiiI0Nfi4s!Gl*sVbmRu>w`Yk(MS9^E+u2gmfIK)_3 z&caJ(&t>c(`hNDHbgz6*_#5=Mm6NWY(Z8_&Qoca{7vpk{a3lOEzPdw}?{Tl#=QylC zIqTgtV*!3*F+cUUTh`Himd(*^^ft>i^f-OUb;$pS>zkHu3U&UZ<(Tj?{agB+bU|?Q zXE{W1XE}NdTDW%*&FXO%7c27X!?j%na_{01gJR|cukFSJ3 z#-HO^{wbTsL>&UUVp?@)!3I^W3}usTs*RbmAshS>3%-}Oo=8svGhy>()BG3!rZHHr zWft2gq-=d0NJ<;W3IyzgeI9HlXt0Fjg<-7F$O3g#r2_f>Jv*mZ3eoh~5HW0sZ)==* z3OM|2V!SHp*{T)4VQI+Y8E_Lo1G40J(AWzapEdRbV^1*lEM!l&S*jk{U-hews#PT^ zWJvpfg)s!Og5yMohpKb`c5<)BBRYblUd+LXCbEKqcu6lVniMY9*QgOQG^7(WWHOdA zLYu!td-fc>@}6we^P?|5_Vyo6J^Ir8LG*-K_Fvn+^)7nlk3aE=Yj1TQ`ZYqocpGv5 z_*Cc4L`DBJc(pcD6mz@zeoCXemq~?WmgvK*4r(n+d9N~{xzAAs!aV%?*SuEdn zx9ryF5O14`@Skf!QxUGt@Om^JITHD9gpN28NgvV%u)$wwX?8kTo)cuu7WZjx+Mozm!{+!*85g*L%?_vF5vQ^XBmRapGm`>Y5+#s?B3-KHtdIawgMmZz}0Y zCB2ytm3AjW=tDU#m_VQLCFG@8okp?8># z^N&w7wI&jo-fQS9*LNNIhg*8Hl}I^ulgm}S{?#?>u}WCAu#Wj(*s@qjT}BNt^Tx_^ zPVc}MQjfGVR94_EveC6hfRmgclqvC4wvs;eb?H< z8$Pr7A>TvFBb)1{XU$W-DdmTyA8wf5b#~XeU30sF0oBtcm)-5rUFL7`{q40NHOi`Eo{X*W42K*C#+W!Lm&lHQ9aud~sKN48Ze+9atwbj1qAD9Bx zuMxbhQk$599+eAdU*T}!NP#IRpw9~uuu`F1%`p?(&^EX>E9P?C`O%c@CY@gqztuJ) zF&H!8wq!JeGK6-0fzsg&+MF59OlQt!Oc@)@%q;qqap&K4CkUF%E$XhqE`8Tge9z6h z;LwmLm3G+CMG8QBNB3|+vy>B{tpV*@hCDe-l(vO@`%Xpk8rYhWU6h)=E=9jlB`0v0fU# zFbfMSz)13qBpw-G^ny2>;KUie=wG{i!;a3iiE=3HQ;<28Tv2Q*mWmA9o!XqrC0kP4 zliNZlv@#N+Hk3E1)EZP%sa57$h#JUl3Q=3MZ7S+j)`ieudPfLt-x2N%;_1Pa)W%}J ziZ=9@+jY7}h0GLFR|s96zam6!ZN5UK*7|xv#HpYy=JGT)AN)V7TC`7-7aAW1oqJbL?!}~v33fM+HuI>)qdbqIJhJo1$?&Y+-rq_E z{XKQ=jgx!*{(iQL^jPkSRyzcg41Gv$Pe7j8ef45oo5-HUY#y?v7x*;Tc)Vdk8gVA_ zx3t6*xaRO5ISMVU$paxL5|&!FS{^EIyK?5}T_Z1QHik7bcI~e#XCCYAYmLSVq0yhL z8s7J@FTeM_dp3xUGPk>=RgtHEPj6{p<27sB7XFkkbnba!>f3FlM}LhjZ+>v-vuAWO zYw-mHGrN9t;*>j8bvsnf#F#DC(Jf=wes0H#c1209v0NK1M&no02lwCp)g5cbZ$EP7 zn)g55wli5stUj>5 z=PBSJCHAdi16EK{pv$8$kcySc=`4zwB#9o3k#oed3Y;Sgfgu>hop*@~FuTafxbu!~ zCy;@hFN?4Z+AUxp;Kc7FerNDIO_dz{(m66IQ4Cxi5@=9~WQD^MBqbb`QN%uDi%@Mgj z9&3)I>Wod##mnhjcPUctMQXa8B3Fr#pTi*wekEa<6womN*@aQzi11UvB!DPPW~o>r z7tIc2N3x??(?oVMOCQT3DD$4qp3R!FBOQ+)APdMCC60irmzO%u*18|;FIsH$$5&1loUzv;ewH0ZJk1$|+)M_(Z@(cVJwWBs1$ zx`obFakpZR20VEia+)8QzvlL}+pp4}TKM}NsuD^h(kc0J)cf$&`O@Zv(ABwUBH&z zXyZxJ>N$U)gxSf}-(+o$I588Y{oQIL)+_lX*Cf7_Dn&I(oXaUpT9Bm*xZrqC85-SQ zD>Hv3Nmjo#q3BvwA#uO<&eEiU1{5@+j4G4LQDsgsE63x(F8IVNBc2Xl|MA5Hl`f_PL_)lrKzy&?lV+5uaNm;@5PSLB$3K2rz7o)-NuQLvZIE zatQAHD>)?YaBes#j+j_i3`==OC1}Ug%M0p^*dAYpyqrGo#x`1f}!$fem)(mbu z#?Az%2vyFG55aOKjWuVTT4V8UB6#Ic#AXjCL-uG0MQlO9XK2x4!>R|HY{4n7S8itO zeDRb{p=M4F*15Ukdu2QEBw)g7_z^xtT+2d|#!^DdXe^_3b!nKCCSEzZYiBVQ2s%Cz zQ*z!*ly;bW+@f_YsPA9*_W3pO_zEkxBe~=6==;B*#R#<_%0W>k2}{xr=FiJ$O$!kC z;U`;_xEviutrFSd5ug??Y%w-@i_jBvbj<)M?de<;HQ))U2amA?u;d8-$a#SfbBj17 zw}?}6Ae-R?IVcw=1&uiwIijYN;0q)(TD-yrM-hn`6bDSdosT{ zWs$6e6`0>VBd}y4XsrQa=C$eR=}Q6522OYh%V9|0EEXEsR3PP^wO6B6+R4fY|9jB# zkT5AuN?)=+>iClL(dd!t2|=j(tAX9}ZpZHEUU{EmU-V0~OV(0U8i>xNqRK8k46`AwMgJ_GqO*O^k9cYLBP5FeHO1A4M(GE={0s%bl6?ifE2bzY*BVAGicgs9+I~?wz*ipJsgfi zx6+GQgZXxa&_9wHAzjAz=#vtX?!bH`u>Q0p;jeC>E8=R6R z@|1{WR6>oqRYa>%j7FhOD@wqk$X$N8WH9|O;mBQGB>B*`SWj&;R!FWY z4V|(q4eB6#c82310cw1F48n8cjf7unj54ZZWz05iY?Vbb*uKQ?u#O2YV-N$}%17qQ0L7FPm9i~s$=ijGUj4@A)B-}Os;EQKD}a#Q!)Z(q|?NcdMT^rV8B zh2Q#fn-+5G;vUg%Qv;qB2a?SXyg&A{UZ*6v!?dc>xs|_I_?J6kd7F?(Adkz}hOS>Y zJ5*6nBH<8yu`8H0NBV+}ILN3~8131yjPjuGEXR6240Q*91$^c-JA@)ee0AP~j^M1f&sgYP8NTbt}zG>f_ zkMR*FqO zP{JxTPGh7_l~FtvjwpOckVIvnI24ss3$q)i#;Pz#NS_KU_j)D{x$u3!A6F2Yom zZhZbere27Ed;R$pYuAGqQ2VwG>M$oih&B)I8$2+`3~p!pib}Fo z3F-WSyxZG5v>M9|cyM)RZlTTx$-EKko}k^wlM9X5Qq(aQB-dpI7Osu0Tg)20 z17_36vcRD)TfYJSFnYnoI~{h$=2*70r&|v3!$|rSrBtF@gQMDETtoxbO`+E)ZKwIBPZimtol$hX$d)7WqFw7R3%a7|dEBI(CSzluK~y$#lwZul1oGlVrMjn2yb*mb;A-CNylQ12Ih!7KEnVJD%DM-kRGB> z_Eg+BQ8i9f)@4~9O)e#*Dh{<^;SbAYD;pU>AvP}-(&um;5wji9GB;jeHrJGc#2Z5V z4Lzh!ZlK4yzK~+cYRnS;!V+G?1_=x&NQQze9tsBQH4r67M#(^wycs25lpu9FOvb=0 z2p?e>_1fQRc0^KgU){{r**fML-Sxrx=K5&;VBJ<^ph@~;=+)u6{c!zEojP2Ho6*3j zIvr($Moh3wkcJUUt?Xirm}g}&YQ&P339=`XTi6}zSsVe$N|k)$R5B?D9zGOIIS#V$ zFt+56vg7PaEW=_GWZ0-iQ@OY?Xl%y0|Hh1i#$kg7hGEY-oJu*mL^qw%Nt!BwPhmk~t|9WT znjvv=-8q97M2#w3^^ad(wM`3poIQ(X=KIVl&nz6c<94S9PhJ1g9wFYDxl`X?wZ8wJ znY%W`6=HxC*1$V<@A%wIbR-x>b931ixc1x2RWdUvv@o2dpF%TJ08y$qXKqH2AZh_^ zi9l)Tqaud(yHp0xHvA^;m_9tnki(de&N@XMSSzpvm9(rY7vMG=ejgvF;*-Oe3RT8W zXw>f#i3}+c0g@r|2JSLU%;mCRGi1rb3nBFG(t$N4m=zM7#_6eqZ#?3PtvC{AR$Q@h=vj>G z2MpTc=TG6K_R^t$0V-Vq4Di#Hx5T%?b6%oVX!t^An+A+}bx)eoBWYf@rzOF!fhbfp z801h-cA%cmEov}Kqg}um(tu(^ySBdH`6IY?M4gCE;iW^Sw2Rthznj0?bGP@-;4XPr zgdG`f7rWsiqSOokPC&80qb-14X->ueUy@+Qc337_C z@QWbir^M$Gt1e%Jn|umX&VTeICe#X#X_kN=d47H$x;sMGKEicb zDqK~#MY^T%8TKyeuEOWpZ#&*%|HQew=MPnfYujp!IUkl;I%{}+NW4?_cKMKymq~(5 zVofFn7E|7QmS##~1L8ZO9Qd9T*;DC>^9OlqGe5>3;%WYO8bwT*VNDyv@aeGx#IR!v zYHUkv?!(}7qHf{TxozAzX0X^^9h$XQ(;l2*z28cOU9LOatX@mI(%pL9QPE)8jdoS8 zp}`(!N&8qTY~l&VZ1)&+*c$|QZg+S}6OP|Jxy|DYDON&E#nTS>w?OE$UJcBaEhBWB z=?GEP;2f8a&0@hg$f_-DQBX}UJFw;pSMRug^q*HYvXxMC)r_X}W_$rL8IyHb<2;|b za?66tuQrFe%PG3K^Od`<-S+vHrykxD5Q;NzT~m$eIt)5{w$RrNcgvnVGyl9j**A3A zjZgjW9hb>o%g0KcM6{oUznqJi%n{1B$3s$v2r(Hs4%>?2T)isZk$>VH$t8|yj35`{ zMD2?cQ72CHDRLkbX*sB1^P>#Xi2OZkGTSqIGIS>EkX2U>wsf(MI+rGZ}4RI+j@scxO)XYa(Q1T#m6Rx}a;A zrhx^!?;XFDO) z&Z!Zp9Y+Y}xLtN4IRFvk(V(o5C12*Vt_jw6>{dE!3I0|_PZ(%)(B>T(J~ZobyvQ20 z`ZIU+F0ZAM8v@=yvD@cfv|uK`v`gV_?xY&e@Gw9hdhx|e3z^0ezj4jXiq#pku&07V zI=}vrOCpv%e9QT>)Xxx2^)R>0p{Y!j&{WmL>ox_6PZ1KIA{4?Zn{nasOhUk382p}q zS!e~nFZ4LrjF4cwc^kaT2DjOuO)o7`#3PW4flo&FZL1sa_{&O^%G9)v=6P z)Qn)bHzp$_5uAScwD_{cLuVRR@-N7luge$7RTV0 z*ljT?rhAaBv)+bWC{K3&{hH~7)JCiMv2jW(>aQ38;%MG1zMPZ4O7Xe zN-54lwlJQ7n@JEZjU#fY%+pW<6{sCq)tNvzM-UOTr!ivod;*RPH_J%kIC>tUE-CMP zj+E2FBKX-k$%Bx*!XueK<#zhrZf7Tz(6E(DXk_O_*@RHH9iv;)ICl-?t+H~FtP$5l z$?k|tNOiXxYy{vkIlz&%McSp4tl}CtKK?_;`{Mi3hgoK17%BBQVbGANjKgtioE~?6 z-F+}{P(2tv7MxW!x7kJO~y3yyj(J^R~C9-`y6!GFeXvHQDhfOy{ zl~grY>TxK1&NktAW1uRDUKf36=7q1^va&cY zYm}B<|E=8*#dsAid*Dl#H=an$r8&KD)F zXQzvp09*kdwE0NaN0vxm2f5_y_@jOJ2@>ms&&d{qpr64YV*u@FjhsGnx;!=6UL9ZU zL>OM+YD&mL43d3dPCtx2fViV}ItsRp5`+7w6FP-34BYI8EBugroQVh+eYP_UZA6%~ z5p~{1)>oU)GGN%rosyN+*YS4we9_1pb)G~Tw5HFDjGPiri<2WA!~i0O@KeBzZeXFS zxe0Efs8;kL=^^F0z;nR~k2}{*EX)Z3PgIkRr#p>J(^ApS8SN=&iF*!qwA4O>fi6xlbw< zViEB~7$V*VnF+_+$G1Vdz>;WMp-sC4;b&#l4)E)C`WbMI%0A%pqe%ukn2e|LC+k-hHv>Za?dt%=~x%hNX?`lFCmJxxCdbZTf0 z{RK0`-o>`vJ5DXzwt2T@GA-8DUCvsl2Tdghs$ODW_jU-=+tG4R=Ny6WcvBsv#v|)? zr{$Nhf59|A)8yKg1)Xsl*$k5;0HZiAL{b*|bJzRI^)l@3a?tu<#+?4q69y2$g!h zne<%CHrk2AHimbn2!sKVD-i~fOiE&7>M(H4qt){B)~SW zqNcpwLEk|iHHLPFeY92m)FMzsp6T!JxmZ@jg}0}1o~2I77?P40-}$Vxh(Q+Nh#*A- zH3CE_EJh=M7?nspQ=-)zP01l*MAl_H@AO0`Sl3ac*H{3HswGR#3FhjMD-s_a^+cP9 zCF}#GuNM-*c*ZmHPVx48mJIADM0%IQg~P4b!?+CyUg{imSZk5r> zRK8&K>5+LZ%yL{;0-fjd6N9GTXP0tBHSpRgGJ-gUMmie4&guMx{}x=i{OW0uL=2jo z_ey?9zDl7Ll2Ezcg;&FC19iXRSCd>9pO7?fO4bxj?cRTCF6J)-;t!P3XD@;F`muwtKX{v)v~h=;Hd= z8efx};pgqA5~v+^m&o^2JEWhlqVos@HX*K{4+e3Jq}Reg$uhYXjMdhrUwB%}G}saHo)JHvykJA$GyBF6(Kaqi}md@YNES zRV!jXk84?AzM@XcZ{UP1@;P-1w>#yj*>o)86z13a+G$v3vyOd21|%!3*p7~5LZ(O_ zVhH$?ycTq~5R-fJBx<>o6T|3!jieCYge6`jy_n!0BSZ-zdzpkYu-0Bqa}3Cm zi{Dj%1+Ytpx^q_+W}Vj63x#4LQ7X3OIFfv9q=iAAh9QD=7aW919wM408Y-vOlB_2+SC5BH&(}i?1y)N`< z=u!F6H0#uRQ@xorU^N_YtYDX=mSzUB1IGQ1F>y@#d;R|G{l-}7>*9m>VEq~KDgCMJ zbEOyb7qY+5e~~>?iUS+tum_kBr#muS)^5~8mx`B4gSIOi>*Xtq{muj8{qlZgfAW6) z{`6QWw2#{x+Lxx?+%UXDyhCEp>_I=NuJh1==8qVXVxpEz#5718)I3VBtTR zLe@k#n@VM!+DF0-JkkP>96tqaFp@Y%Ct!xlg9>~^fzK*0DX$^^_~ld?F@o?(P0*o; ze)M*1ivA1~K^g=QFL0TBc~csi>9I7GM#9-~Zg-~4K8+Xxi$pnI16eqheGgY#Lec~} zHT#Hz82<(hIEL#jiH2sF#$n@>amH{Mn~Sp&+Z6V~D(ckqS)``zXmbHHq@n@zwtQAa zVjSK&#Y9yLp@hY|PP!PYKV@l#IBy~07Z|g|b{GdccjRx*TZpq3TB)4ih~>n|BgTTc zN*b4pz^W7ukMd!T62%oGW*a|l-a8s<>bMDzS4RRDvYA;t2F*A+OL?SN!UhUtEsqPp zu4kPjzNC5~U72q-5gAEbXz`g2=V`x&N!nsOZa9V(_{ksE(19$y~wvuD2N&op6T zgE8}>@%qfa=`+8K&g(}Eh>1nwh3VhJ@9gUjd2q(DkeKubrvCsxY-qk1rR(mSKl&ZD zV)`Uat*E*&M+yT#{|0fSd5k$nYIUV~xt3;%09~$(ty@K(NX^60L{N-L7Go-xtt^Gp zZC+tzD%|H?!ovgZ1D*rYzVyD@E6!I!zs&ry$_b@3uRBw&o%}B68x=>SuOw`2Fr}8Q zCAOq_=~lK`>+W0OTqCZLmc~}3S7%q%%)a%?dVR2Omt&7}kGMzL6WkN}2gkTLEvRsnpl(Fu-!ToqZ8=z*E*9f2Y4oqq!Uk1~au@k|2a+(U=%rG#TKt1yWU7PciSMq%y3OX$6^A2L*ZuXn z?h0ly-Bp*rT6LjcU*=q)YDQO_^U7(Nr(HEiJ%X8Pf#Vjf6CyAYN54tAgntkuBuElo z`AbC&zsnS1u^5X*c^49TpWGgV!IC}!J;yW!D)%Q^~)c{rC zfHxhjmokW-90OHYeTMoTXo5a!;8^1Hek;M~IgCCX$?upt*C_-%lJ6|+IPZZ-MBtG; z7TSnf=KX|hhfwx5cbDb2#j_*$sh=f}-rF20kDw8eycF+w8}%Hl*zf7z=MnpNPfp@y zlAUy*hDD=mJNIO95^{?1NU%g-jk>`vI4%^dnbgZt_fJUz&Q*Zm=y@k3eE}TMsK*u2)4+i zHM~h^Ov2~kdLLLIIqJ0<$r4Y(?xu(yfP}V?>1~Rl(3H?tFax+q2<9t6tMTH+G=S|r z@0q?pv%vQw`|R4~&6&ZX;xqStWpS}M^RrYqz46p{S6+SzVsnv@ zToJprZoOU&L=lsdyLLW0GjUfBol5yVq0q?W8laK8K{}e2xZpW?&|YG#g?U$1xKpB+|vn`A$%zOW|&XbSo1br6)g?e;fU4l~0d! z7+{<4#JD_&`X%b_3alWx6WEh?a581>c}M0a|x%h+#ZL;RcnWy1>y4_ z0OkC9Kt;<8FSbEjPjEQ;(UboNgYwl%!7YvdWV_E!ah%P|Dy+)o{c4&^c~fdSKMyv% z_3$$9R&FbQvvQ+)eRyl(PWCSTF69pOw(y;W{rrCAYv60#SJnTLe+HbXy>3q;i71~h zD$ZKThz}b-sQp zo@fAfV76k-f;<;Rzg?xHF&sx4Lo_qNYDc$4t+)qF|Lqz)pR7C(?ZG}L3IZ$Xz0gWm z?1E1Oip9ihrzHp5m4`V!D|5=s7aNBzpTD}dJJHPYv1O@+Gbe?FB8IAn>@(5Kl9>wp zvyt_3PB&675fK~O4-i9bX0AC@o>t!#?$jmr1 z?jH9%&P*_l@ep)}cDZ{RgJ4J)4A5aFyJcX2oVZ&c~dL zM-Wmp3Q*ybPNypnpjX6^q7!wPAbGKqy@>!!kP@-<)y|K8PHmof`PzP8n915{F#UCS+0Cm$q7y1Jze&+K zC0SWHqkr^rvY_1r;Q4pp4;hK_02)-RibNEhF?j$~8@!2Gwj9azuU{s<56S}=cXNb- z6OO4P+bAGgNf{FL1S5U;DwBjiT!FDgm(n-USK4j`K~MzagzmBsco;dPhvV5UR&r*| zt`i~2be;eqG_A^rF$g3JB~DzBGlg*9BWOYTf#8XI#yqqKk8w=jAwTphXzhWw9ZRg; zXz_u8scBrncY37F0$Kw|sX+hd5MRfW%!NRgGwYPlca&R`m5NlANGX88Y%q3pPTZ3I z$-{8z&}yD@y9-|9l9j!eZo7}V>IM`2RL(-sxMX17qFeUbZZ%3<<|o}A;gUl4lH1m8 z`A$0BclCmZ$0N?q_blJJ?&j~DKi_#mkOq?gF#ippXMt0`Qvgyq+5ku+L9=(}iSz%9 zdcw99-LX~k$0O52^j7Ll>M{BQ%1%#E*Bqmull~VvgP!`k_%}NW-(a4m`p_?lezJ2@ zRxw4)(!$3mCyl>3fuSLtf_mbk;bHnw+txo{XZt3aP71n@OKe{PCj32F8#@LD7(Qy) zgV?t32KM>2BH%SXE`$UeiiZsh#7j)zqNPsqR~aaZTzW7^&>n-SwO$Z zLYzGBfYGh@WSRcfaQ1A_Xls<4P@EaOB7h&+lIUz@^1_S9dd^M{?C0 zd@B8*eY$UZ3khiX*iG>D5uYGU|MzX0EJaeOfzMNGSDie4dviF`RZ3o74hUD&mmkNR zC4{K7g{U+QYVfC+PA6dHK8seL4CQ1Qc(993vO`R;o|?Uw3jmGP9BC?(?oe!cmSWRt zr0t3OgGI3_p;%Q#t2afCph(y;MJSe%+*a7BeI4rjE1_6-hhp7s^ngBrV%wo+b4V6H zbWFB2XL+zeJ<@=q4cNuHkH^@(U1=kxWxA;2F~{DdYQ*B1q~tE-Lo_9;>1-}k%uT?I zSuMUO2LKqvOJgk~iHICo2cJ!+lyUWtN~tQkV53TLk%JCxX=Lu*N# zn(}s{Lql_^P%c%x{+>#ArCg!yzI4f7jev@`7@4KRksUiR7Cx7&1!SP{f#QVYohP>i z02I;6^$sG$nrOEtV)RA1eP#*q0wrSaM(-SoTRi z87|vgdgO>>?eUE_UibIeK=aa>=Axuu*7VYCeO)14bkWPF4{f_NjY!UXfErr;qvv+6 zT>0VBjlD6LNu8_7C0Gf7_wUO-e=2Hz$e_>ymgzfpR;JW+n3 z{8rh1w`W)A3!eKzjI2a505U>?&AH?gIWy%1C%mT1+0%;j4HltLj2Fj>bdfA>k05sP z1Ex<1!~DwjO_I-mJ_Ler{)H99?D3O` zvH;l!{ehsv#zNN8!_lJ}LGdg14AW@CUXgaDsk9v%(%UNPmh`T<$+6UVqi1uqjX; zxey)x6tL5mO$}q&4m(7w8cB1-p7ll3EEdg{t%)1FpRBXxoCJ_Q zh7^v8BQ{vZ3mld_kZcGaoAJVTp#I(VIkxbBe2y*r=W*M$7tVp;ubuPyh0g&qPs61b z&SC$Cb6D`lr`b8@h=0R5B6#;{(K<&2H-e4KRm^3;0R+S+;vj=~MK5T9Wnc~105*Y} zz;6snyF}>|&DvEczGGQvHQgs?bjlMQYuC zQIsQ>t-O8b&g*Vmy6E1!8*do4&D&_vA{Y zbk~ib{HxQ=^64`qp1E8ui)XO=95IKocp7)-Zsa&vwp#H;>-diy{1?ZgC*V(Z)oayC zrrrA5ZK&OL-go?e#=Zo~ZR1Q61@Ht<@Fqck2LRqANP;(;M|ZPN^&z!ew_399V{A*7 zWjpe%_>djNQ4(itCr)A~Z=NSJaXhgjAF(HgC%v|JSFLOkKWlc^adv0&GMP-;*_qw! zyq$>9R)OqROG@U2lt31WXjJ{@_y1L>x~6>X=e6}(*VSd=n!mqtKjOV?p^*I?I{d4Y zlX5)zCYST@^$jVPlkhoo?E26N{K3`Vc3;dE@_8QQ3WXea2UW^D(D7fHz`i%D$P&IM0v`nNs=d0#acQ~|AuQkGv(_0kaiRpD3Hp6V|Fe`Pnv-oqsK z&FuW^M!u5`dl+Xr7i>5TdZVP6lce*VlV_cDF)W$%@zjRYr_l-vwf=KlYhF3z8HXid6 z4xGlp?Kn{H=0KKfbL%;RlWLYq+LV-fy?ZSH>fw)Mlep`tiZn<&&MWX@r` zDA+Krh#!d$raiRSZ;FgnyWg$0{A!-p1sf%Ncdo|jc|`poXoPNq z)J|bHwnH9>xU>;9p;ATu&Zx~&fTDaEt=1d#WfA!Ey51lpEJS?N))Sb@s=`%CNKolz zMM!ej!y28AJ8;;`|-SfYu!;t=rvNe{3vN{n#6)&X$V!rEq-ro*jI0 zvR(G2X6oGLNdr}BwxnQbeqUzj+;X!(@?&6c^B~vJVRn8 ztn!*suO+oAH1BodoJnf{B$SYsO?m+P^)0muI?vW3?AaokEF%7g?$V;IYF)}h1}HPT zI4V>GS`fnj@#UAl()|EGHYrbnSBc+Tdiu1y3w&ia@u^>Q@55j#3i1hJ9r3rY6`spK zmOly4Y`OeP;wAMVT!W%x$cJJ1Pl#8cG#Ig=wtoyijX#CIhO6+WRbPW-1_XSYjikXq zs@{Yw0GN^Z=p_P&7^NjC6kk$cnh5E= z8!>by1?A@JO8cEkc?MpwLAk>9J5&zB`fn@sZl!(?tUsxqLJ&YHU)6tD4nwWKTdDWG zue1r4zoyjtmHPgQR;azPfjK{E|&=T zJoj79Ld93p9)2N_s2$8Dcks2sK%-Wp6WNAmhbG5|3TXJj7S5BCvzvrY2irS4OWFi@ zi&po1UX& zXEIuX>NB2XgSRnGgVDpeg>Y(oA@{Y3?&rs*d5s_#qU#3ngWb;$OvWvOV2rJ6;Rh$g zn{V1Tm2pMOK^4=;1^&q$j)vWt*+bPww}%SJs8bJmywTjNejIYaw*wkZ>!YAokMnTnBSg>}_OCsdfB08rG z3nG>+tzno(;a7%0ltTQhTm`1~~--}%kc8|=|$V&|6SE6m>V>8cL;0ElK0uTMigv|%yq zIQCpSH#4)tKJSgk=bO#W)QFAe=LxJm1qp#B1x~ zd1*Pn%4x`DlzI@6-Bw0R`aFgKJ}O?}5Y)6Lp>XaB+o7-OG5D&&@6lWJs4nR9@+Jqv z1YG$ttv+fLY@RsB2}!!g8q#9-(=(eka+-Lt>i!f6jgs#!HEBdvfu{{f`RTLJoka(fE>!J0TPTFO5u~uj@ z!@gX|9d;Xaw3L*8rSs(y$-YvZK0R>!s|VVL#-mUr8J71kP03ft@T3nkJk?s!NxXRJ z!0q3-t!iU9n=R-z;YP0~NmUPT#b4O6KX2;3keI55S5#->q3_*O=gWhBF0J=wghULf zUFY=@#1R@~7v)j)uOVG;$3B5Q+g`83rg-Y~$xMdQ>pc%q4;%uAb{;$10F6>4yvCtqT&GDfSg=KG;;vdo+xv+Pu<#gtbJF2;Rg?M~e$YC_8^`LOyr$>lI zUQ~2NT(&CK5z&8fQTjbL(Yne7^z4$NC=#khitNO^4Gupx1%_qyw+(fJaB__?X8L zi+Rjul8gyLg!VHrhSwIfxE6lNsS$?jl*Ev~M z5At8)fi^taCYVbvXCyC-TL{u=qY~`>_q#(@2W`>v;3jYr@<1+l_#|-=BGN%@4!iM{ zN2h^r&iN*h$I4ik$hY~)GJI?12j_SV464Fd_EJ$m@tx%p-^&%Hmt$dmZjzBZ$n<^OJsFdYjU9Oe5 z5fxq4c0i*KHA~=2yFPJaJ!HstM(x&Ixsvh+6A6;8jPDvcZmBWaXtt2@)5%gXWA;QH z?sc)+eA!1;|70tjv+!PVD1k?Fos@%P#DRgby*`z3t5k&96Df{m#IYQsw%Cno+zulM zgC{wd&5enEi;5sFeMO@YYU7-9YF!z}k*%M&{Bso!<*$)TZp1PQd$y}9z-ulI7))? zU~dN!7!@M7y@WQGh0+7K46)*f9jppXU4WwFHmk4L3zr*;kzz-P-|||EE8wID$0qr8 z_ioE`)yeg<;o3bl59fEAIh|h|Ubt&|-?ty%ICtjF!_)i29@a*xRTO1Warl$=L@MQ? zldQFM$JY+;dVK#-#1fO7(OAmsu+~OKYy9NHZyde#2WRI(7SgE2RhFP1X{irt>2@ev z3|7GQwCOWxP)mbq>ai4Fi-JcCU`z)_2{3{KHKI$vng}L7op>&xN+et*hAQwbmJ=w} zLKZ~9&thwZ42a7gDo>FvEMLh$tb`3nj@E|tK%s)FCq%Fsw?Fy8r$?=cu~Oq>C+}{_ zJ5!Z_(aMz~phogZ(e0mK*tt#|zWuqKmRL+6iHoxjetjXb=g|HHRBaV+4oVUHWV#YG zaF=c&v}(cWFb%M0oS!MH?o+R`I0*Kv3YrpSM81hIW@?tNlc0-YX z=o+y+Dp9?H;)fI&(5|Hkktca|c6d7cqra)O85Ke{y3kPdHNu&W&*kUG27G+ItIxvz zYJF0YxcJM?L|7x=MW-r^{3KtEyX4o{ByBV$*LN=S0kP`CZ$M``*n4DAhGFm1*tT}m zY^JQ%G!_K#C5XwO!0Oz*V8+atRxh}%ZY!%5l583!YnUL*_L4Qry{=yA@cESUy4+rO|z+iN1IWI#0mM$O<5fs`I#7{l{) z+XFnFK?9O%8`5@~Wih|sra{`SsQN2zo4_Mwho-V6^|W2Qpd_gjWxt>VTZ*#xWt&^8 z>af#PZz8gpa5@zbex1sze4Mkn`NZV@Cw8WV*4){Z~^~%aqm=S{*gbQpL=lsgy=F-b{$ZSG;l~gV`w1v|FY#9 z&Yat`|E;HXIGlQe2DdmpdSnYdP}`9wsbeSFb&bo#GkS-G#~3En$VXE}zRvO~Ot7#4 zR%B<{v+T31rq%!QLsreQLNTw`u-XEYh1YnuBg(o2gvNTg1BA&CVQyVU^6=q`3M_W} zpHL!-J)U2m+Y33bmkehwei_!VjS~1D#b%H+h8uY~NEcJI%xHtHs_ZSd0$MHGs(^ne zwS#)x`B8KziEBuq@Za3Zqxi)gpMiSfy2Z zrXuprL^FmD2M0ukL;ft-{Z6czaH4zrFaI3B5#C$G5^bY15XCfnI*O%P5#IY1pD%pD zirh_JRPKJEd%^l48b#>c&!N#EJ9-uNTmwFfA^gTd)u&P!4EE~K1m~{iIfH|-Qy!Z| zN6~txhs5=vRuTM!ILGFOc=@@|&|rhkj%7VYUy`*zr$gF&7S8M!n_*ml)KY8*q?YO~ z*y0Y1g~vJ_tOoRYP}6Jm*-Fh((HknY8pLK=ixy}N6y?<$^gQi#&|W=lu^0^TQIU`5 zLlv5j(-mF|hQ&Oa>%h*oNw3Xd3Gply?u!%zY(1gMD@$pt5h>SDEK`_sK-FiPudn$K~JXG+;Cv8M zKT~tbz6h%}I?VE$>cDVQ4kN}YEdDUrjN1Wa2r^EG&!;9Xa=4kTY-*m6|Ex0|H4r?{ zn002Wivru_|H2KVJUs6g>j8Y29mujAX9zVU`8NO~gPdS7+w=t2mq+58kiucC*rx21 z&F15SPG4Bf`+^wS`Fi<;Rj)!^)mL2K=ma%5455GQ zX^l?_{N_s+R{QgJ#5rfOBX*x~ha7rsY}1VV5zmTs1|JSJL|SQG81nz$VC(YOU$zfz zqroEp+zCC0k0!Vb1uRs6!YPkMrRTl4$CE7NBFPX3BW^2)bN)ZWz;W#37`_(+9c&&$ zPfBW_Gr}<@izTf|JQ=ZBIF|AOnx{y{@6UO>UR938d%hM5g);Gsl3I)JgW3V)T!AV!O+RZ?}PQ8>rfVEy7}Yg>dgJ zDvNCLezNmSb-`Jh|@S*Kf`rKX!0d`~g7;og>rJM@9sSP&;Cs1LH%xM^aur=pK6Y z(V5v#e)rf--#N41ncHyZSGPMh9zMFgUf+K7(7Ypj%NU?VK+Fd7!+|)WU5Y!z%!hO5fXyMXe>BAtcxrc1a1w;?k@HMxqcXTeg$lUe$b}u z8VtEsc3uy)SK~GCZTI}112+^JJC7Gzd$M|NWT4v(H$|EZcWPjhE)YpNk`odWZA^xR zF$ZyxuyCzCW8()0S&KpboiGr0qUQvdRt=xb494x8oK%rIO{hMXYi-OswOYhqh&NTN zVlzgt&$Jzn)xcv_kc7&>r<0C!Ite5mF;Q&fa_Nt!!5wLEV;T&mK|0@PIPxZ~#KVBt zAr*yK5+pSMm_~*KAM01#Mmoouj20F%_1uQ_*Glw3AtSJGg*KwHd^h4Zg`k|R+6(cO zXW2qPqv@0C8o$tUsgRbco)ZBsSE;mSY>)8Ee`>ZWv*&@Rx{br^#E&5AV@GipK@^7n62FCx6R40o^#gUYgQ&|Eu zv!k9FE$|+*O8$XA$vQMV_#F(x%w|hcDtl8?<$zX+Z>J%Gcn|8%6!tf-QAXD~h;LnJ z{TWNuS_l^KLZLYm6QWTgIyc|^2KF5czYqHqhVR0TVt57v7A$}QUrPHB1?H$d)NzU^ zP#tK*#o<#ius#MtF@VLaF+3Klif5`|p$h8Nbyd7dYlY#dsqtZ`T(5}&9f<^Kgq9I` zSMc(JGLv0g=zXp!EkI3#(0NHID?_MD%FI5%MItN1Nhl%B5-WpDN>~V^30A!#y)d#~ z!9B|I6ZmI%GLqnSB*OVH#SQMLirYpK+|(U&k->`Suz4wiisLN#T3r&<{74}fsLmDg zyJxc8$iYsmnT=3xk0FA;nA|QU<4!K)jkasG5Z#{LRZs1?p=`BT4HilZriK>=LT17q zsmH?u^;&>wu3Kp27se81%ItAMeuz-3pNFy@z;?Ck0rtxbxSu)8;7w+R!2^uQ;EW3c zpTWT~`~e)#;e$AC#e+DGTXekDWk#_y1Kc{Hr{>+o4|>4!eE0l^h;B=HYya~~FnN_v zQ^-^%o;GtDHd7CO&Je7La$2ghy3b03F^b?##Km8ghj?SRBDB(8p7*9(0{*Tm*^2)P zwq6G<@jbBhRcv>=crpdHqzpzrQK^<-h*0&Fbr^Z@No6A5LLbWW!VRUXdCf`**8Ly7T%-?&iN)BpRKL zrx^#WBWWfSVi?*-Q99D&)A`7($LH|C|L8#b3{1%5&;XKR?S1UBl7nnPdY~K;v_A@n zMGw{}X-DNGM6k*k1->dIiYO0z+3m>aMEcZ0&(kX&_?b+`Y>@vmY1XNd5nv6A5zZ<9 zPeJ~IQ{a&U=78Pjh`PJ4;*>uY@EE)vj$`W^OI-&sDphC|!t=h%Ki5DYgEg@qwjcbM z2_zChyPf5Y6ona6seCs0eEHQfK2-+QGN_lc$v*yG9NI;N9(LpoFLvx<;%0G$7zmxw( zkiYMV2vIL2Heqzx930#IE_iECdo-x#IGl7j4S{gj-2LC6tM!M%W*0;0agI|{iRt#G zE`D?O2_jJ+4rvi5{Lo8=At$DRuKiRjmTfi*ZZ~EgHFvV(dA5)p53+?YDFxU9J7O|- z%tmu3Oztn-UU;}b%tP9nK>?o4vIPgr7Q9}Tg;1Rw%Vo#2hESLcKb8e|XA$deC&2*{ zWXUkek7pg@<5_6B!yp{)%uY{_k9XSbYzK5Y?Ls3Q$;R1OlN_I7eIziuS}?X{XhN31z*UR+cTR8Q8awe^-O)fS6|g4k8b!Ye!kt1NSuudocMfY#oR z>iYS2XhWQXrJjtFa4nHle)$4yR?*6i|_F~>zxD&=nO80j`C+BUwqr{cRLIgn?VIQ&LM3Xc~O3M zY$l?|QSKhCa1;FKEn_eowpwhY3QddFN9WeP50czSIgI#=MnrT93OdyuwA+o4J37*+ z>tmpNJ_!L&k~I4Kq~DnJ`C&lmcRGEXpBIuzzg-BkJOn#Fmkt>1tm9fvATU@}Ozl$s zD&yj@URY4h==!E+En$&vluB#TGFoD7CZ^a^ir2_+*z2^s`x4`~ctbYO@Wc|?;ICE8 zU_@MYjrxzX8?Kw*aUz9V1OqL4w5uLVmVPPOzMC@k}v@7J4hJ+ zo<{~knS-@PswmjgB?(Ox0-=5s+?z1O*@+)@w}Ve?++U-Ok;tV3_+QFz%xsf9M&3_c zytFS=o5{!@5zpAf4NYJ~Gjo*ukoplkV){6S0@nZb$~5L^>j5SNbj~&izfSxHgU%>f zM9)~@U&R~hCowmSWTdty<^)m8MGGE4K<_W6*(3ug zuL|w|)Ydp9)aP#*U3c4jHEfP-d*UWrdupZ~OAO9V)J%mt_YVh4BNOA06DRQ(!B3Qy z=i5*&+@wW^;ioKay9;PZOb2wZ%`XAiZ9TcTiG zFnJ?B`Q<>|qu05iGjyn*?4D*q79tQ(Q$Zg%mnj(Zet35q{vtjJ@1DfAw{2RrM#G&l zo4x6TUhnaGy^vm=b8JF`wwvy>ZAbK=s-Mtr)e{CNF_;!;QQKIhZ79-(9w3k00Gc%> zN-JaWsF^ES_7w<^uhmr4cpm;?z6XSjKnIO)yqXq?y=!)tlsfE(&f(Pn@3a#Pn4lNxM9B<*tT}e z-|(GMhfY-*>Pki3Agrxq(qe5iK*Nt&Ef{>083~Jk$Qxh_MuN^uPS~SmC?HGyaVAPy zg1}iqHnun6xIbiPU(=oFN_VtZu(L9u^~&^4?hOQg-F(Iq$^@MHn2sr|9}vbW+`&?f zR!65#%;bimR^H)BB~m^*%e#`DjR}>gb_?Z*KS`Tybihp6Dw5!g)r6TDN4=iaWw(tc zj1G^%?V{|IQ^@&qLoo{KgAwv|3ihAG%-C4lYQm6;lPUt7G8?rjEn=s|tT$jHXaO8O z_lzcqZg~kqJzr4fSN7&rz~j=QWL4HNQ>G?5p}{HwEeF;5r$>+8FTV)xO{!#otDlr( zJIZb{eu1yK2?F6Uju_>7pEzCo#ZlBl)rz!htd(7lQ3ALW;4NgjL&a3^ScdrHTP{ z_>?=4Q$y<*#caTa3<$>d4G0Q$m(YM)KHrmd*ir~{kQLpN_3 z_Anz-YC}VajqWPf_l?K>)lJ9GZj#RuYD>5pcO*HtF;GqlRrT$7YTcox+3W3nbzGEP z*Dfi7gi_Lt(lf)r07E0)2+|=jgmiaFC`gGkf~0^5N_Tg+NF&|dc?Nx+_x17d`_A{i z=XcKe=N;~w*?aA4t-aQ@*W9!B{=t0%@&JU+Vf4+UVWs;LN7m$F?OA!~lx41!l41#F z+eQy%n8B7$tve&mZkb~B`1o8lf!+u!M7kmEU1<@8cz@c_ieF*OlRXf9d+Tk@!x30D z%XL@p^|_3pPk6=L`bfBA%?WYi1OHIK$JBUA%_;GTwsM6WKVe4OPL!OsmoH79V>MmW zhi}1@H~iU4>Lf~aMTDYa=*6Nt&C$%y4v;+`RzQ_1>9D4%2_h{Im6tZRH+FiC!M)S8HxUMcO3$*QG&j5A!u+GNdjk`O*o;LAwN3q3DtX#Em)rroA@j|=B$zgV=9W$of`1`n^i#31XTLVyz-70s7tG zL0P1iYzC4@C?ZHwcRwRB#gxRBRQc4DwQP+SI19H-ca2xkoWXC#fs3>@eZJ*>zFo83 zW*Et6BL5CdACSBoMo!C1&r9cC<-8V;Sx?h4{iU~2eY9gZ?bExm9HqB@pKPD&8xai+ zi1mGWJUWKhL}nVLTVD~1rjWw5n;;UXPLAv`TDq&EMOh?n-DC1Vcv4s|{gcgE z_H`*HpXU1N+Vf36LmvgLYoGUm;=&%-DCDY%wGN^e(j_Hd`c%MQG@S3Z=oC9j?L3=& z@zAkQ^X=N!gx04b;-7{T#F#b67W!JVtn9yd7XE0YHE$nLTt*@ zhg}fy5M6njh zJQp&R_Ix&d*yM9{U$F{{A>hs7j_S}n9o#b!5lY-rMfYb7+-p3yITRA&AhD_nlszfy z{SH`;YHQK!IQ?~5-hEF$r3T!xBANyokaERo19i-uQZ}zj&wCh`UQw%yYRZ>Ejgw%? z#>!u=YBpJ_=x$>pe@1HK?`b$qkeTT1&|xc|+925|n2-q`buT+4IK#p$rznT6z;Ik~ zT>C1hRW~yFb-robBTd(F1FRLT3Zk$bSCG9S2UinYJfM>2s(pxl|LPuH_dtDzs%ZfH z@J6DzAn1=B$H?2UzFq2hdDdDc!d(2z(I|*Kd8PTej^HY9R{f@x0}&9X*6H4H-h8}x zykLKljv%|xw*XiGEPh&4+jri_*;PQwUeuG(PEv`#u&?upN@grOkHrR(0(Y|@f&`gs zneqz!;C{=eo(Wpx1H#q9St$Aly6>&;kKbN?IUc;$%t?$+{KOmC;{5tPJ1h7!-n~eq zP`ZdsMubipA(kG8e!Gx(Y_pKOsHV`b$PfXuog%^z9zy>g$F;MMNGi&JS62N@ov+}F zuZW(SL1A7}gNP$5D{8oMrso~(NrT~#Xclm>jROOu_=S;1?3}3D&_Fuom)R9%8>oB? z7Q-U+o6*=;|5SU~%RBihhWpA!@zS7@a*-G_e0~`~p==hAHLsoh(H)5w21dlvF^-Iu ztn=-K6q!}GB;FYq>dL@P=*O5Djj4wlYoIbH6YmVY5qFYN)If{s+30s+M_jrTRIF;F!AGqutK3&|*AO>TdzAa?ynX|i7<81Nu;o$zX5K~TWd z9TmuMWF1yi9y4-uXz{q*(~4YFrY6b-(CRpPbdPX_j+(VfX@6sxC=?gQoOg6&%0lhO zIw#g&JleRL{bb93ry_eJtkX|%3^^M1`Qs=0x>`a2ZJrZt2^%vbQA^_UbTsjA%7qLD zJ0vo%m5pXo)9{t|6lI9A8HI=i?g&+(=({|pfQVrrq}vE5)-#|_W!LeS%UM3*cm*sR^BZzw+Np=Lz*yq127D!{Oq1|mAM z92GHA;xWZbvGvzQqN5K%zZZ%4?6u!P&q?fD4!v=|U=*^r=7Y}(_`9tP`96UttBj-S zqoI-hEFXqV$q`(>;l~g1h5DJ$q-$g#o43P8}i zWr5@wk0>Ovwunf$(!@P8rux9NP={}1h}q%}DrD40j&A+*%mUN4?XD*%*a{RW>%X%nc@0()h@cj5 zl|(c67?F_{qwZt6OufB`#6qyUjio2AvRVQp?kR@s#iA@Q zZ>nDkIEnR!gPFhUkaQj7UMu`Vy#@N_>AR!%u-zu_T?K_$|7@NT5&n# zqES(Mh$-zwMi>c56P&r=Hh@3nT^f^5hM05X0R!)$B?vU6OU+ z*S#2aNz`^Y-Iz#5-i>{0+z;lM!Y5zfC0p=eD#&l=cukYSk+;mcKc+W(Co}*>(%F;? zJ$_wmL7M<+tzv=9Y<&Kyso0xH(ENv(-L~4y`X`^pg0ZVN-@|C{X~Hsk_PWcUSLpmv zp7f?~NzTv5LdR&Tax7=;it#t`=vfa`yGDv9o+WU~F~1&vAse;5_);eDJ=>SyyK!Z= zaTpOx-V?+`K*>939;kgl3I&wdqknq@7@U{pkjWq+9^S8XWx3o}9nt-U&RU|DumqYi z3KB7DoAe$CUmHQ#x&_OCHEZI&><2H58O2)oP!DVJs(43+2XzBPNV3(cQ;apV5g0m^ zT2HU8626}2sKq}x&sHmZKx(!ewUi#kpmw)b`r#qGjrqh^f`DW*dLis_z|tptDTMP9 zwF7TXq~Ucf`~W|N#HFHs5KJQ_wiPL)5}SS!Y|TmpOp37?R97bAyhln1 zfO~niC|GPRVaSL0QS&qmL?4OdATwqy?M(kh6F1KDa*+hMEVOjea!Oa8Eyl z{@$=Y4=zmjxgHsj*jvK14$jvRQ8?qE(7>L|U~#gM$d>0M_xr**MmoT&w2458D0-N~?2ESf zM)XLCQux#Wfy1mt9P(0RkYfyhS^WT^gZfgkze|Eyl#hrwjAM~{-BvPD*wRojPl~xw zSznUW^ogmTjba#TxMb*N`AU35K(1I`#b%_EHy&XsWugc6qnK9`oQ_O-xEip?=C{9LMqvulUJ5G6d>q2u(fyba zl&{XHib?p24`evcU|T7o{jy~_2o(3~6 zqGF^HRU2hvpkjbjsqlgb;xN|k^|Tq#i4@2(ZiO+n7|6a&WFrh}rjeB{HlQhZoE@%!20l+5-+Y_XW3F2z84Uy`gp#Nj z-JGg4D($J|R#FB5xP{m|%^J7KpVBU%=(6ZNB9G_Pre=t0XD>Jj!KC6{^4(QIidWIb z^jDPh8HrPm6wO9rYQBw6Qy?2qfaF=t`4$Kh)=gGH;^>R$Qb|@1u14r0z&Av#zr|!~ z`86bGAx@E+FuPe+mQHC25eEqJmGxg_q)Sn|tw^Qsi`#|AY)8*TKozSS!je~-h2elu z#xNX!+3t(3_gau+Zh>(j4JkD^sDT^FFy1C4!B;epz*x#(Lo<>9={;_|q9)aI;j9>4 zwl{=^`M6w-pEOr|8sACD_#+m-7x}2d=riSmmq1kijYM}AAQXq;PpK$@t?s*w^n~KJ;cKD~=(dH;gVjrfsLC>`vT2WAAUv-Z(1>(E zj~E;JN))IWsLd3ejzA^X(>#bOO_i(t9^J77PrFFvLp2ouP|#hZ7)jfK_lgclp@L@U z&X;NgV-g<5NgsD5b%xZZ5#7foyT`^eJh-&C4Boyl?u|iCN-=BpYk3R=zphB^vp4ND z22XwEMubWP86)L zMu3qxzP;Sn6!Jxp&eUeOSATN1BLKCco)(FQS~8=aJwL(#Yzd->f7V+?9VBWXq$qOo zt;$6`RWuqkv7|9nDv&fvcZxOIhnwEzktPPs7!tNAt}s@-dcHPYhtDSiqljvxlnC}a za_U0R8U%S=dJDRA6w?({e6?WVqg(hXpQM;Q)l>``kz<-Os98h(8M-5vuY$sCNbnhq zgor>iRFQsBAx0g9cb=>vmQ*#FX=mc@?P|| z%FnJT(*Z&B68q_Mc&9}5vxV~~jOrdJtzj|^XQFKZV32$r3fqgernw4r2MZBd4zyyi zwtyD8K#4XngVd+m+I;G9X$`U{qNlq=Mv{@iOFL8r>eyT?7%F3_1E7Hm{0D^hdcyrU zXc3ekG4)G(=}owXU$t4NUnkz}n@2eM=3}AlppA0h=3BGf+)1(zvuP8zRLb++w67r0 zO9I||l6_)(0WA+RY|?4dPt;XBWVz8e0_}W^Hu{OM8!#9M2%EyfU$ZbeEbil*IZLTbkVA2yz$eY$Hu)xAj)OOxG``Xy=l;>+>BzF_$ZIZ(3HalsN2en3wjD~R zqpnS+qwuE9Ygn!Sam4p%S$8MS#O3AN*} z9zYG*$%t6QDaGm1AG%r$0YBg3SSw-Cz@2?`)!&X8q!Ox>$*078lm$-A53M|;NQxicM7 zFLaRe63vA>z*p_g^CV^G>TX7%(fS&`4;M9{C*i6}OA8nY(1C1~7)Gm)=D=*eV5awA zQx$TI^g@*{K_nB~n?tdtM!(EY@hRgSSM+`GOLupzjO@8x*PL&qqRTVo*Vj77S)gikWfb>zdelr!4o=G&K zmBSEXah{roq?&0s)pdbJQdrrRK5uE&Ep3o>+-M$+zKv-&jGwpE7n_*`YNT{WwzEI6 zBkscF@(p!ca?>tgP-DX@AhY59YG7(L=5U&KXoc8Cu#I`XxIIUUkwUBwO#vaDv(SZPNak@vo$4Pbdq6bFXku+r7@<{~W^p;Z13(&*dsiMH$1C zDW= z|6VOj?cL0M4})YWir$Z2J?NK}D>c(4IrMJ|?zTwJ2R6|rcb8}!xnDWG|8R-dRCznO z@ap+_$~)(%iad-x3kJ$(t|>jOAHkflUvodB##UKVo_jdkj%3*yhh{w>AOA+$ZuPlB zfT>N4I3oHpS21XRDm{Rg^cEERt%9EObn0H%+OpoAi(U#A^>bsJ-i5_Gxgmmy7nNMh zz=e*3R=Ean=sARJgVfBxT-@w<-!$rxzB*U%R4K_l#F>G5UV)FBctPt6y&ZA(th4<#>q5&8g= zIWS=H(y~|vXKTFt!MbW*pLf;H%fqDC+>}mbu;w|>7}5FHEI8H74w9t%@^aWgsxLEl z5;z1DWXr{ZTIzF+3SPnjw1gbU?G3Fdw}tBJ^J~4lYNu?fX*1TkKR4t_vut_GlU5D| z4Q}VtS_u1I~@{iNs!ztg^E&yMc%$SV(J ziB(iOWDq6|5sEblrY;U&J@WA}ilmEo$&v~aEqt@rJ$Icuk1x(hNnQPfpU|M?-Jt3> zaYbW$rbA}GKxNHtJ!nX4RE6D;lMA*StshMpo*e%5&~~t! zTCFXnnKJo&>+4Bc?Gu2)M_qHsPD|29SesRCwns^U-Q&%N$M;CFAs!G{Sz_;H= zBc_>F@e+}THq95DSx|xevhEPz%Iwt(*GPMPpzixbGszFetii#5hk5(&mx{-OU9;ABhGRI<5#B`0>3fP=k%a93p;m1yu z2ykVBJbbSn?S?3KHxIZ6uFvdlR6d^?F*bifso@|SmN|V`w0soq-2TqB(9P)G%$IdN zC@7z;&CR$!L^;Wwzv8;ZS>7(s^Vva_+*Wdlq0{?=GvHxae!5CqrPUUN?XsBYfxtTE zl~UEz5gOjm8v;uB1B9N|jw;8pCUM%7n0IuH%e~qf$PHNL(jXgiHWD#uihAv)P@BNV zYPNiT$ZBkR645$#WagqmPDOtzu3fWelM_dc|D0#y(Q=kBXI%x3`m9B4YsFAQqcDX{ zb&Z15(aG1AG2+HF;*yh94e}A<9qiBTSd+4&KH3wkIhc0?@beCir}&0-!S&Bufp$O? zEe4krjP%dD5St7}OxvRKAw~M1c(! zm^J(ujuOaHWm-5kusJ;_-65Jq{7}W7LPb2VW-f2cJXl8Di)Z=yVkhdd^~#8@s$yK^ zUIYKRt_C5IBZp8#u5;+<)yW>T;flXZA`em%5B64_vKg%MfH{v>97@CcCwb>+^z8JXr3=c34jMfz-Rg zg%yr>#U3vr4(*#Ik|+Y9m9n4ri5z&I^0`-6MX!nphsSI9mG`aFEUQNO^A)kMV(Qww zF&Uz6sGazDicKuAq=S_As`cz$FmFWZs%4+#bWGxLe(}8nhdS;gSEdwi8%YLpDGBi9 zrPQ4x2kA{2tvDTz-ZPKO+W0qzft3p{K7Hw_^-f(1+^^Qdz%J;7KLi%0s#Cv2iKc(f zm9m>q8>nnjaKTX=D#Ykd?9 zVP}F#uO*Rk-3pNZps;d3i%QvTGDSBdv&&PE1!sVho7=L27jc`rt`?8`O3?Br3I6-jwV4j3wGqHq75eK~>)~uQ z`x|Iq2trMr*G1Ph5SguI1t@q2S|DMLogiD6<3-A3Xkr+NDQGdkJRCcTtJ`!mq}!=4r#3N#gCv@%VUIzERiD@Toi+XL!VvpUvsk391}5o5izs~xq!CfI*6 zUFjyE;2(cU8r@DK_~^wnlZaY*No zWxCUQV(zywN{@Uk8`y$LP}1V*_@ONk@|V4g92H%dEphkzs(a(zJ=o$a%O&5MWsbhL zIf;mKImR+94RaSBBL51%b!8)FV(E^(b9tFF!q-&i{loo(t#Gik=`a^T=KYwck0a_y_ zxrJKli`<`5?s-~!9qu&)Fg?}z-Okew<{*4al}{>03rWv#5}^BD{oF0UhkYZ+bC_6d zXkI&fuAeuPuKcE29lTUI7aN)oAvO1lSGS975V`ob`c>CcrbF)_m7>1;JX%Jb+c>VLKsgQ#FL_WZ`IzynO|5oOxP9;5EhhsD(6WKaZvZ) zq<;7D%Fqt)I*V6nR&ch)cv=6;^%waAv|_E~k~;f>)ax4LlZ65Eq7R><1ZpF{?6@9I zDI|uwsOem|0aW7Ew3tX9YO1!6QBq#72X(o$Hp6n3$SX6jdMX^AZoa8~qq{M_VG3jVt01bMC&9VLVH#pFWp3!p4~q6>8=JWy!?>Z}$7TKfm-VyJg})zS9^v8ql!TUb+eFx{C5WUC>A3 zgV9o0o!Rx54_pA#UlmMLu3BT)Kn&%Qa22++OXCbZmUbuF2j93uvG%sO80MbTwcBkE zU^59X6&F9gY8?U_yx-<6XF2>>uf3!>^v%$-^};t26E? zGp*LubAFb>i5=6e4ho#=MrRgp`zOWj=#G@e!1R@cWgYkMz%1-yO`(w>=inzMAI|G( z%B~MiE~kcv-7c)0F7k!ith1NA`_Z+xugYs%%gn8MSDz#(Y**OWW~O`WQ+CN$!!Erv zmybFD?;`Cd<`a)8JGm1)=QsWCi&f!#QeUuJp3l$XxiGrS_v~t%;IvqltU~uw z@b~|`tasUQwyr>lrg`488Z|6&$Tz&ve#TF0E?$d4G+h@vm0QtLlV!`eUKOudcgVy> zpr@;mWPiMqZanuC@85*fxoLhfwYCgv0IxFsA$}W-+;{ zWH$YB*(%n!Hb>*xiOgx_)GO#mL;tXGRUP)398%RyJB5RV%S3)!e@3?VkNA+^ps6i> z8ccc$oqqP>sq4i2K3lwKFEfwB(!w6N??t$qZLWK5L#WCK*+Wm^%Rm&g)2-Mt1}=)v z2Ql5Z-2h=MZYTO;!)wQ*1hgnTdyO}bXea%MK6#q4bdp&(ga2@I#)9;bBZJvz^6g%n zNsg4Om$q}0)P~VhhueL-E_|!+!%cY0%G_&CbjW5XHSpB7D=p_cnd>YxDKs4q9Ne8Y zdiKJ%_6f^+>if1;T#qZL$v>m6!J)BOj}Rx zkbJeEC(oj_UWPz|ZTrS8k8%oQk z$LE<_Z|RA-8>7KC+cp&Y8l`=)2?$viI*w>FXRW<96%Ji4ZRN9*-!v+z%hoWsWGTg7 zF}n}Oxtz~_JFe&+c<5C9)Iz}1RSUXS2Ea>I#9eBm)+K1O(9{*BN63i&GPOo+UyHB3VJOP>o1#aaHl z-tI6f>a3aG6|biCU6Sh!*AZImbul6(`AyAq>lK$XTb&Y@kNV%h)1&U^e7Ng}@2AQu zg=Rh+xh{};$+fg4P`7FKT35qPTdcpy32vWu_v$5iCSk^$^(IcOG`(}qc;Wf^5Y71= ztZa#oi)Zbr3Ges$=2fC{SOb_Ywn-ty*j>hWCg&&C0v@uJ8@(xB4d}E zny~4tPSsB?o*unHIzZb0yo?&5da8d!OzL&J9fLc^sT--WT zRA4PCc1|F?00L=Ifx+OL^QOl6UH)AHZ>M7C;-=yR0{^=cuEox+^&J66-DXF0&nGj`*0)q(K82^78L~E#?8(1U3$~<1IG!+-B^Iv zZV+%yPI!Mj92|e*;1UR20`K#?7eBw>ME0luH?jN~&&@lWh<~)fF>ou~@aVsD0r%lg zM`R!_xVt};KwLaO`u^UcL-iB!kbe??L*`$9zIOz7??!sldQ<-&QvO2+ z?*5+^Z$kdz=5MI}qvgi_4gP16;R6dN6)yWHz27lEk^8;=XFtIIQgN1`xzT}>{+DdI(fuAOA0I%))dmKTgE{CM={x8HlpPHmZUpLbvH)3_m5GBX6&MKN z5D>t^`18ZgC+K3MZ)gs4pfZ4&m|5}DY**FMP?;I=)2MOE0p)BS!A#90-Rxk>Zt^OI zZsvwOMl^x~d@fKIOB+jgH&iZ`7FPC97k(OjBWnW~6kfg&18AteLmbTcX~1kCRxTij zMgW7)&d3=0SXBHEC3uaW#?-;V1_}T;J3F&EgW0U@OaLGr9v%RY9l*}c3P-ToyIMKu zyRcf>)Bb5e6lQN|XJ+GIW^F}vV^QD0+R=fZhKA}7yEZ@BwX$dX?iib)wIu-F006Op z0XK%=WvHT^wUMJC%uYbg%+Su--rCrqF`r7!+RliI9SGv#yTShx!w0zO>!-f|i03EC zZ@n=x{6~;Bj&>H`Lo_l3z${>vFe?XpxI>`t4jCCj4dK^c2WvZl?>s5PY=0Ci%mf~p z!mL=RG+gbyze%nAalu(Lzid7vCXRv;%72;>9&g8Z&2XKiF=?D{{^ z{0aH*ju_klIl2Fy2}{dA$&izSidq{w-i)P`r~v!{$wp8vPBCr~b}nI7QJ|iANK6>QDGnCl0f~JN^RK!$fx;zHR`w41R)(;D$J$T2zX_h||G^96|3M#A z|LNpkV);LG{fDl9iGhC!{GaUl4_*Hf1OF2EKiT!K(e>kNA3n#1PY(YvNf-F%Bp<%a z=cjRoPvL*R;^+BkDIscRZ)2hF3ZLDmm^oO$s2uDZVK*xWxQXwpjqeN7zpOjdAH$3R z%4Tjb`0@pyrbPv!;-F&Jp#nU%wswG5fK-nGQdY*+RG^!sBfKoC#m6Nq!Y;PUCnT?EO4V)Yp=}OEh(xd&nzMWW@f#UjK)~_RI>N;fErMk7FGMDWP zj$k+@-)cmcsV|alf3fk&y1o3FU<&=CXfgh-Ivs6M@Pwi|&RIkg0{e+0p%q)tRWuqw zwg}c*zt4l>6fE)`YM;B6cZD(0Gqzq%%L*<$vgHX{SDA#&)!yAsA47|(BD(k6A#t&T z8Dn9<7la`A?>}B3_^t>iCzzA!rsbcq?=D*-LZZhas8Ta315RSjwU3w@NeP(|0WLbZ{mP&2>s0$@NeRPXXxK?zlj6fI~i39wb zI5>V22gh&X;P_1(@K44s{&BMZJ+C++kY95M0_5g~@4EaYhaez!$giIx2#E7HIBxb| z^BKay!}V+4LpXt;pX@o<>6=-=?65H4n>;@*v7rC!*VP|aPJKIv9~U7ACzuP2g+Wg* wrXY@m@#lpJh=uY0!#9AU9n1+nd~lZlH{UzT4wmp5oU&h?hL14Z#qUo4F9!*hivR!s literal 0 HcmV?d00001 diff --git a/jest.config.js b/jest.config.js index 3d805f4ed4d..c0af3cc4333 100644 --- a/jest.config.js +++ b/jest.config.js @@ -47,7 +47,6 @@ module.exports = { `./packages/cactus-test-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts`, `./packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install.test.ts`, `./packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install-version-selection.test.ts`, - `./packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts`, `./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/openapi/openapi-validation.test.ts`, `./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/deploy-cordapp-jars-to-nodes-v4.7.test.ts`, `./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/jvm-kotlin-spring-server-v4.7.test.ts`, diff --git a/package.json b/package.json index 0787723dc41..4f0614f197f 100644 --- a/package.json +++ b/package.json @@ -120,6 +120,7 @@ "lerna": "4.0.0", "lint-staged": "11.1.2", "make-dir-cli": "3.0.0", + "node-cleanup": "2.1.2", "node-polyfill-webpack-plugin": "1.1.4", "npm-run-all": "4.1.5", "npm-watch": "0.11.0", diff --git a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts index 6b0c18b6d05..2667136d201 100644 --- a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts +++ b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts @@ -1,9 +1,7 @@ import path from "path"; -import test, { Test } from "tape-promise/tape"; import { v4 as uuidv4 } from "uuid"; - +import "jest-extended"; import { LogLevelDesc } from "@hyperledger/cactus-common"; - import { ApiServer, AuthorizationProtocol, @@ -14,48 +12,68 @@ import { PluginImportType, } from "@hyperledger/cactus-core-api"; +//const nodeCleanup = require("node-cleanup"); const logLevel: LogLevelDesc = "TRACE"; +const testCase = "can import plugins at runtime (CLI)"; +describe(testCase, () => { + let apiServer: ApiServer; -test("can import plugins at runtime (CLI)", async (t: Test) => { - const pluginsPath = path.join( - __dirname, // start at the current file's path - "../../../../../../", // walk back up to the project root - ".tmp/test/cmd-api-server/runtime-plugin-imports_test", // the dir path from the root - uuidv4(), // then a random directory to ensure proper isolation - ); - const pluginManagerOptionsJson = JSON.stringify({ pluginsPath }); + afterEach(() => { + jest.useRealTimers(); + }); - const configService = new ConfigService(); - const apiServerOptions = await configService.newExampleConfig(); - apiServerOptions.authorizationProtocol = AuthorizationProtocol.NONE; - apiServerOptions.pluginManagerOptionsJson = pluginManagerOptionsJson; - apiServerOptions.configFile = ""; - apiServerOptions.apiCorsDomainCsv = "*"; - apiServerOptions.apiPort = 0; - apiServerOptions.cockpitPort = 0; - apiServerOptions.grpcPort = 0; - apiServerOptions.apiTlsEnabled = false; - apiServerOptions.plugins = [ - { - packageName: "@hyperledger/cactus-plugin-keychain-memory", - type: PluginImportType.Local, - action: PluginImportAction.Install, - options: { - instanceId: uuidv4(), - keychainId: uuidv4(), - logLevel, + test(testCase, async () => { + const pluginsPath = path.join( + __dirname, // start at the current file's path + "../../../../../../", // walk back up to the project root + ".tmp/test/cmd-api-server/runtime-plugin-imports_test", // the dir path from the root + uuidv4(), // then a random directory to ensure proper isolation + ); + const pluginManagerOptionsJson = JSON.stringify({ pluginsPath }); + const configService = new ConfigService(); + const apiServerOptions = await configService.newExampleConfig(); + apiServerOptions.authorizationProtocol = AuthorizationProtocol.NONE; + apiServerOptions.pluginManagerOptionsJson = pluginManagerOptionsJson; + apiServerOptions.configFile = ""; + apiServerOptions.apiCorsDomainCsv = "*"; + apiServerOptions.apiPort = 0; + apiServerOptions.cockpitPort = 0; + apiServerOptions.grpcPort = 0; + apiServerOptions.apiTlsEnabled = false; + apiServerOptions.plugins = [ + { + packageName: "@hyperledger/cactus-plugin-keychain-memory", + type: PluginImportType.Local, + action: PluginImportAction.Install, + options: { + instanceId: uuidv4(), + keychainId: uuidv4(), + logLevel, + }, }, - }, - ]; - const config = await configService.newExampleConfigConvict(apiServerOptions); + ]; + const config = await configService.newExampleConfigConvict( + apiServerOptions, + ); - const apiServer = new ApiServer({ - config: config.getProperties(), + apiServer = new ApiServer({ + config: config.getProperties(), + }); + apiServerOptions.plugins = [ + { + packageName: "@hyperledger/cactus-plugin-keychain-memory", + type: PluginImportType.Local, + action: PluginImportAction.Install, + options: { + instanceId: uuidv4(), + keychainId: uuidv4(), + logLevel, + }, + }, + ]; + await expect(apiServer.start()).not.toReject(); + }); + afterAll(async () => { + await apiServer.shutdown(); }); - - await t.doesNotReject( - apiServer.start(), - "failed to start API server with dynamic plugin imports configured for it...", - ); - test.onFinish(() => apiServer.shutdown()); }); diff --git a/yarn.lock b/yarn.lock index c5f97f8a3c6..d3cd445f35b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -462,9 +462,9 @@ xml2js "^0.4.19" "@azure/core-lro@^2.0.0": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.3.tgz#3e245d37ede00f6410c1ea1fb76679dbdec627eb" - integrity sha512-UMdlR9NsqDCLTba3EUbRjfMF4gDmWvld196JmUjbz9WWhJ2XT00OR5MXeWiR+vmGT+ETiO4hHFCi2/eGO5YVtg== + version "2.2.4" + resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.4.tgz#42fbf4ae98093c59005206a4437ddcd057c57ca1" + integrity sha512-e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-tracing" "1.0.0-preview.13" @@ -480,9 +480,9 @@ tslib "^2.2.0" "@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.5.0.tgz#6f3989bd2cad581adb982885f836c00dacd78336" - integrity sha512-Lofjl3mu1TULhjxoPKY4IqXt6mC8Q+r3xMF1dOz0D/aElKfrbqtO2fts36PCClAq+DJzQM/kbnrNTf3X601I5w== + version "1.6.0" + resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.6.0.tgz#f833a0836779a40300a3633fa73ad8a63186ca73" + integrity sha512-9Euoat1TPR97Q1l5aylxhDyKbtp2hv15AoFeOwC5frQAFNJegtDDf6BUBr7OiAggzjGAYidxkyhL0T6Yu05XWQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -585,10 +585,10 @@ dependencies: "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" - integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" + integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== "@babel/core@7.14.8": version "7.14.8" @@ -612,17 +612,17 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.5.5", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.8.6": - version "7.17.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225" - integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA== + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.7.tgz#f7c28228c83cdf2dbd1b9baa06eaf9df07f0c2f9" + integrity sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.17.2" - "@babel/parser" "^7.17.3" + "@babel/generator" "^7.17.7" + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-module-transforms" "^7.17.7" + "@babel/helpers" "^7.17.7" + "@babel/parser" "^7.17.7" "@babel/template" "^7.16.7" "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" @@ -641,10 +641,10 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.14.8", "@babel/generator@^7.17.3", "@babel/generator@^7.7.2": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" - integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg== +"@babel/generator@^7.14.8", "@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" + integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== dependencies: "@babel/types" "^7.17.0" jsesc "^2.5.1" @@ -672,12 +672,12 @@ "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" - integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" + integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== dependencies: - "@babel/compat-data" "^7.16.4" + "@babel/compat-data" "^7.17.7" "@babel/helper-validator-option" "^7.16.7" browserslist "^4.17.5" semver "^6.3.0" @@ -755,11 +755,11 @@ "@babel/types" "^7.16.7" "@babel/helper-member-expression-to-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" - integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q== + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" + integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.17.0" "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.7": version "7.16.7" @@ -768,14 +768,14 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.14.8", "@babel/helper-module-transforms@^7.16.7": - version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz#3c3b03cc6617e33d68ef5a27a67419ac5199ccd0" - integrity sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA== +"@babel/helper-module-transforms@^7.14.8", "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" + integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== dependencies: "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" "@babel/helper-split-export-declaration" "^7.16.7" "@babel/helper-validator-identifier" "^7.16.7" "@babel/template" "^7.16.7" @@ -814,12 +814,12 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" - integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== +"@babel/helper-simple-access@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" + integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.17.0" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" @@ -855,13 +855,13 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.14.8", "@babel/helpers@^7.17.2": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417" - integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ== +"@babel/helpers@^7.14.8", "@babel/helpers@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.7.tgz#6fc0a24280fd00026e85424bbfed4650e76d7127" + integrity sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w== dependencies: "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" + "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": @@ -873,10 +873,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.7", "@babel/parser@^7.14.8", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" - integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.7", "@babel/parser@^7.14.8", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.7.tgz#fc19b645a5456c8d6fdb6cecd3c66c0173902800" + integrity sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.16.7" @@ -1211,9 +1211,9 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.5.0": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz#c445f75819641788a27a0a3a759d9df911df6abc" - integrity sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg== + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" + integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -1280,13 +1280,13 @@ babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.14.5": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe" - integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA== + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19" + integrity sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA== dependencies: - "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-module-transforms" "^7.17.7" "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-simple-access" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.14.5": @@ -1530,9 +1530,9 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.8.4": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" - integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.7.tgz#a5f3328dc41ff39d803f311cfe17703418cf9825" + integrity sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA== dependencies: regenerator-runtime "^0.13.4" @@ -1554,7 +1554,7 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.8", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.7.2": +"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.8", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.7.2": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== @@ -1728,10 +1728,10 @@ dependencies: chalk "^4.0.0" -"@cspell/cspell-bundled-dicts@^5.18.5": - version "5.18.5" - resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.18.5.tgz#76beb90ad6e0ae5c42a2d2177c300f5a6d98f1b5" - integrity sha512-jFvwF8bb8HUYqMUPQiGZUHAf8zfriZRagzoCW8w4NLLJB1IZNGlQvQCQskQG9cYtOmKAYHCbOwm8SjA9FKwQow== +"@cspell/cspell-bundled-dicts@^5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.2.tgz#c20d05d0ff5f3850bb62a32a95e05abd94673936" + integrity sha512-R+12xDw5iLCJH3O0n8t1D7acZrO/bjuULU3rs3CEt+i84/85b27shywc3E/vOiOt9613bpFNOL52J27Tu52YPQ== dependencies: "@cspell/dict-ada" "^2.0.0" "@cspell/dict-aws" "^2.0.0" @@ -1744,7 +1744,7 @@ "@cspell/dict-dart" "^1.1.0" "@cspell/dict-django" "^2.0.0" "@cspell/dict-dotnet" "^2.0.0" - "@cspell/dict-elixir" "^2.0.0" + "@cspell/dict-elixir" "^2.0.1" "@cspell/dict-en-gb" "^1.1.33" "@cspell/dict-en_us" "^2.1.7" "@cspell/dict-filetypes" "^2.0.1" @@ -1752,36 +1752,36 @@ "@cspell/dict-fullstack" "^2.0.4" "@cspell/dict-golang" "^2.0.0" "@cspell/dict-haskell" "^2.0.0" - "@cspell/dict-html" "^3.0.0" + "@cspell/dict-html" "^3.0.1" "@cspell/dict-html-symbol-entities" "^2.0.0" "@cspell/dict-java" "^2.0.0" "@cspell/dict-latex" "^2.0.0" "@cspell/dict-lorem-ipsum" "^2.0.0" "@cspell/dict-lua" "^2.0.0" "@cspell/dict-node" "^2.0.0" - "@cspell/dict-npm" "^2.0.1" + "@cspell/dict-npm" "^2.0.2" "@cspell/dict-php" "^2.0.0" "@cspell/dict-powershell" "^2.0.0" "@cspell/dict-public-licenses" "^1.0.4" "@cspell/dict-python" "^2.0.6" "@cspell/dict-r" "^1.0.2" - "@cspell/dict-ruby" "^2.0.0" + "@cspell/dict-ruby" "^2.0.1" "@cspell/dict-rust" "^2.0.0" "@cspell/dict-scala" "^2.0.0" - "@cspell/dict-software-terms" "^2.1.0" + "@cspell/dict-software-terms" "^2.1.3" "@cspell/dict-swift" "^1.0.2" "@cspell/dict-typescript" "^2.0.0" "@cspell/dict-vue" "^2.0.2" -"@cspell/cspell-pipe@^5.18.5": - version "5.18.5" - resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.18.5.tgz#d8a1cdf0aa4c0e3383ec4ffca7112b10cd8bb43a" - integrity sha512-U/4e4Zm7Mm23SuJu6b49+9Do/2aS+c9sPQa1Z9ZZqHQ4BqswJagk5oZ0V45BjYJ/0acHSRpIxbndpVJ01cjf8A== +"@cspell/cspell-pipe@^5.19.2": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.19.2.tgz#40bf46fae7aa0697f9ab9e36d165fe149b9b5f36" + integrity sha512-mFFSn4ZgNgIOM0iBT0+xKBhRTQd/ecrWVvPfJpHxXIFwTt0neD19hqK54RDedLf8Hjds5cBHvS1EjMNARju/bQ== -"@cspell/cspell-types@^5.18.5", "@cspell/cspell-types@^5.6.5": - version "5.18.5" - resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.18.5.tgz#7d3e6c8cdef15255aacfbdb2e3c8bb949fe2540d" - integrity sha512-yvDFCUa1CbjBuMkFCh+yUAAaG6VW5WXoewzLwhMFsMV1GZmkbftOcvZq0YuZviNsjdBViDH0dhKdlzwC953upg== +"@cspell/cspell-types@^5.19.2", "@cspell/cspell-types@^5.6.5": + version "5.19.2" + resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.19.2.tgz#faae04c918dca53d6a266d86d00c3bd1682ebe16" + integrity sha512-IkMQpa7IzoFm9NXzRz8Gp38f3aoMZf6xjT7J3FvWtIntPvkIFaY53R1/I9U/gujH/zflf2VmZGxoDuFg1VcD0g== "@cspell/dict-ada@^2.0.0": version "2.0.0" @@ -1838,10 +1838,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-2.0.0.tgz#92729d95a71b9f72bf264fbba0c66a7b29f3993a" integrity sha512-WOHfjwMuLbo76khDsDa1lJvP/dXcwXVwonWwfUFRt82BL/GtyMalh1HEtCWwKDuK/9f8PCEt/EZMkHT3D5ZV3w== -"@cspell/dict-elixir@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@cspell/dict-elixir/-/dict-elixir-2.0.0.tgz#2633a290d2eab068ce6035d76529b24abd295b3b" - integrity sha512-NeDObcqiYuqWRrzMAQLZDSrZlChTEZwTA2zHdI2nPtpeDl4FQcTz2BHP8zVt6Lj6G2QHJmNGmQtSmDguX86NYA== +"@cspell/dict-elixir@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz#1a9b422215b5edabb84568cfa5c0c70bc164a2ce" + integrity sha512-eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow== "@cspell/dict-en-gb@^1.1.33": version "1.1.33" @@ -1883,10 +1883,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-2.0.0.tgz#a25d39e62bd2dd7191ca5612714aa0a1b90ca10f" integrity sha512-71S5wGCe7dq6C+zGDwsEAe5msub/irrLi6SExeG11a/EkpA3RKAEheDGPk0hOY4+vOcIFHaApxOjLTtgQfYWfA== -"@cspell/dict-html@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-3.0.0.tgz#0f5411518eb3cb5b069fbcad70b16829f1733208" - integrity sha512-VzZs/UtyRe4spdaH5SWakik+K3vB2fTyW3kdgGQbzjPGHyb5OXI5fmxQcX0yaSv5RkL0igVROHhu2ARUudoTpw== +"@cspell/dict-html@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-3.0.1.tgz#d5d10ef9b62361d8250cf9fe8564606993faa9df" + integrity sha512-sbuFd+nSjgbrGf5eYwSddFhm1eLLePKWyH6Zn8Zb0OODrBK5e4vGn1/scI/MOH5a2IvNs8W9wp84uMBFJcQZtw== "@cspell/dict-java@^2.0.0": version "2.0.0" @@ -1913,10 +1913,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-node/-/dict-node-2.0.0.tgz#f89ca72deac5bfc7ccd46b6b8880fad52ab44843" integrity sha512-tPPl3liJORa/l6AoYqh/7rjoM7bdtaIXnIN6ox7CE0flZcBS5rWOB6mzEY3rpu/XJX0pjbBiIoqrolDkVl1RTQ== -"@cspell/dict-npm@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-2.0.1.tgz#90f9a0ffe0dfcdf998bf1a260b93a3d5ef47ff91" - integrity sha512-LRaJFSQfI0BIbbksPFE6fUjAyRFZRcknfOnYC/5c1wB/vsKH6KsqxTeCWNmHTYrk4KdBLZROhsHJXQIoqVTd4w== +"@cspell/dict-npm@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-2.0.2.tgz#8ad78bc23d10aa1dd295bf2de6078a02d3a91766" + integrity sha512-Q5ua0aeKTxW4WxvtU+UMdct46hCStOTeEiiG8iinTh/mH5brmdtMEj4olO8+mmkAKPpIC4TI3TmaaN6RN+Vpgw== "@cspell/dict-php@^2.0.0": version "2.0.0" @@ -1943,10 +1943,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-r/-/dict-r-1.0.2.tgz#4f21b240427e9bbaab8f82e0e20122d6b3cf7cee" integrity sha512-Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ== -"@cspell/dict-ruby@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@cspell/dict-ruby/-/dict-ruby-2.0.0.tgz#3f2c78ceb38bec272adc7187fda72bb47799cf4e" - integrity sha512-ux73GEIZrApxIG/BDnpdxWE7r9TY3n+3HFAEp+LDJjSjpwpn2VXopd7GsjwsvmlAv5F3Jch8tzgzujFZkvqdoA== +"@cspell/dict-ruby@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@cspell/dict-ruby/-/dict-ruby-2.0.1.tgz#1cbd4d8803428bd421a5562b2d2bb4b3bae80bce" + integrity sha512-qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ== "@cspell/dict-rust@^2.0.0": version "2.0.0" @@ -1958,10 +1958,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-scala/-/dict-scala-2.0.0.tgz#b8098103bb03a13406c1c79f1769052353aafac4" integrity sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g== -"@cspell/dict-software-terms@^2.1.0": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-2.1.1.tgz#1f59b63de03b0b288156112fb40bc1e8401ad294" - integrity sha512-PmmqysKSvNwksjEfXrzD1wEVvctR6qppxDhwNc4IQQjwpjmtN8e+8HiXxIbCsBcll1rO0vOmnhpXUdl+d9apXQ== +"@cspell/dict-software-terms@^2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-2.1.3.tgz#033f93d4cfa03e21b03ad0861ee74560b204a841" + integrity sha512-JmMfRa9Xl0MCD/z5gYUnY05BNxSMnx25Ky6kO/Cs0gBYZZdYzHZNqrbfnqBMsB9PpOzn2uqrYUmAEusoI1WyMQ== "@cspell/dict-swift@^1.0.2": version "1.0.2" @@ -2017,14 +2017,14 @@ integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== "@discoveryjs/json-ext@^0.5.0": - version "0.5.6" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" - integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@electron/get@^1.0.1": - version "1.13.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" - integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== + version "1.14.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" + integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -2147,180 +2147,180 @@ "@ethersproject/strings" "^5.0.4" "@ethersproject/abi@^5.1.2": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.5.0.tgz#fb52820e22e50b854ff15ce1647cc508d6660613" - integrity sha512-loW7I4AohP5KycATvc0MgujU6JyCHPqHdeoo9z3Nr9xEiNioxa65ccdm1+fsoJhkuhdRtfcL8cfyGamz2AxZ5w== - dependencies: - "@ethersproject/address" "^5.5.0" - "@ethersproject/bignumber" "^5.5.0" - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/constants" "^5.5.0" - "@ethersproject/hash" "^5.5.0" - "@ethersproject/keccak256" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/properties" "^5.5.0" - "@ethersproject/strings" "^5.5.0" - -"@ethersproject/abstract-provider@^5.5.0": - version "5.5.1" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.5.1.tgz#2f1f6e8a3ab7d378d8ad0b5718460f85649710c5" - integrity sha512-m+MA/ful6eKbxpr99xUYeRvLkfnlqzrF8SZ46d/xFB1A7ZVknYc/sXJG0RcufF52Qn2jeFj1hhcoQ7IXjNKUqg== - dependencies: - "@ethersproject/bignumber" "^5.5.0" - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/networks" "^5.5.0" - "@ethersproject/properties" "^5.5.0" - "@ethersproject/transactions" "^5.5.0" - "@ethersproject/web" "^5.5.0" - -"@ethersproject/abstract-signer@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz#590ff6693370c60ae376bf1c7ada59eb2a8dd08d" - integrity sha512-lj//7r250MXVLKI7sVarXAbZXbv9P50lgmJQGr2/is82EwEb8r7HrxsmMqAjTsztMYy7ohrIhGMIml+Gx4D3mA== + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.0.tgz#ea07cbc1eec2374d32485679c12408005895e9f3" + integrity sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + +"@ethersproject/abstract-provider@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" + integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/web" "^5.6.0" + +"@ethersproject/abstract-signer@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" + integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ== dependencies: - "@ethersproject/abstract-provider" "^5.5.0" - "@ethersproject/bignumber" "^5.5.0" - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/properties" "^5.5.0" + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" -"@ethersproject/address@^5.0.4", "@ethersproject/address@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.5.0.tgz#bcc6f576a553f21f3dd7ba17248f81b473c9c78f" - integrity sha512-l4Nj0eWlTUh6ro5IbPTgbpT4wRbdH5l8CQf7icF7sb/SI3Nhd9Y9HzhonTSTi6CefI0necIw7LJqQPopPLZyWw== +"@ethersproject/address@^5.0.4", "@ethersproject/address@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" + integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ== dependencies: - "@ethersproject/bignumber" "^5.5.0" - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/keccak256" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/rlp" "^5.5.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" -"@ethersproject/base64@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.5.0.tgz#881e8544e47ed976930836986e5eb8fab259c090" - integrity sha512-tdayUKhU1ljrlHzEWbStXazDpsx4eg1dBXUSI6+mHlYklOXoXF6lZvw8tnD6oVaWfnMxAgRSKROg3cVKtCcppA== +"@ethersproject/base64@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" + integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw== dependencies: - "@ethersproject/bytes" "^5.5.0" + "@ethersproject/bytes" "^5.6.0" -"@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.5.0.tgz#875b143f04a216f4f8b96245bde942d42d279527" - integrity sha512-6Xytlwvy6Rn3U3gKEc1vP7nR92frHkv6wtVr95LFR3jREXiCPzdWxKQ1cx4JGQBXxcguAwjA8murlYN2TSiEbg== +"@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" + integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA== dependencies: - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" bn.js "^4.11.9" -"@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c" - integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog== +"@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.0.tgz#81652f2a0e04533575befadce555213c11d8aa20" + integrity sha512-3hJPlYemb9V4VLfJF5BfN0+55vltPZSHU3QKUyP9M3Y2TcajbiRrz65UG+xVHOzBereB1b9mn7r12o177xgN7w== dependencies: - "@ethersproject/logger" "^5.5.0" + "@ethersproject/logger" "^5.6.0" -"@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.5.0.tgz#d2a2cd7d94bd1d58377d1d66c4f53c9be4d0a45e" - integrity sha512-2MsRRVChkvMWR+GyMGY4N1sAX9Mt3J9KykCsgUFd/1mwS0UH1qw+Bv9k1UJb3X3YJYFco9H20pjSlOIfCG5HYQ== +"@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" + integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA== dependencies: - "@ethersproject/bignumber" "^5.5.0" + "@ethersproject/bignumber" "^5.6.0" -"@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.5.0.tgz#7cee76d08f88d1873574c849e0207dcb32380cc9" - integrity sha512-dnGVpK1WtBjmnp3mUT0PlU2MpapnwWI0PibldQEq1408tQBAbZpPidkWoVVuNMOl/lISO3+4hXZWCL3YV7qzfg== - dependencies: - "@ethersproject/abstract-signer" "^5.5.0" - "@ethersproject/address" "^5.5.0" - "@ethersproject/bignumber" "^5.5.0" - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/keccak256" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/properties" "^5.5.0" - "@ethersproject/strings" "^5.5.0" - -"@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.5.0.tgz#e4b1f9d7701da87c564ffe336f86dcee82983492" - integrity sha512-5VoFCTjo2rYbBe1l2f4mccaRFN/4VQEYFwwn04aJV2h7qf4ZvI2wFxUE1XOX+snbwCLRzIeikOqtAoPwMza9kg== +"@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" + integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + +"@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" + integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w== dependencies: - "@ethersproject/bytes" "^5.5.0" + "@ethersproject/bytes" "^5.6.0" js-sha3 "0.8.0" -"@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d" - integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg== +"@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.6.0.tgz#d7db1bfcc22fd2e4ab574cba0bb6ad779a9a3e7a" + integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg== -"@ethersproject/networks@^5.5.0": - version "5.5.2" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.5.2.tgz#784c8b1283cd2a931114ab428dae1bd00c07630b" - integrity sha512-NEqPxbGBfy6O3x4ZTISb90SjEDkWYDUbEeIFhJly0F7sZjoQMnj5KYzMSkMkLKZ+1fGpx00EDpHQCy6PrDupkQ== +"@ethersproject/networks@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.0.tgz#486d03fff29b4b6b5414d47a232ded09fe10de5e" + integrity sha512-DaVzgyThzHgSDLuURhvkp4oviGoGe9iTZW4jMEORHDRCgSZ9K9THGFKqL+qGXqPAYLEgZTf5z2w56mRrPR1MjQ== dependencies: - "@ethersproject/logger" "^5.5.0" + "@ethersproject/logger" "^5.6.0" -"@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.5.0.tgz#61f00f2bb83376d2071baab02245f92070c59995" - integrity sha512-l3zRQg3JkD8EL3CPjNK5g7kMx4qSwiR60/uk5IVjd3oq1MZR5qUg40CNOoEJoX5wc3DyY5bt9EbMk86C7x0DNA== +"@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.6.0.tgz#38904651713bc6bdd5bdd1b0a4287ecda920fa04" + integrity sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg== dependencies: - "@ethersproject/logger" "^5.5.0" + "@ethersproject/logger" "^5.6.0" -"@ethersproject/rlp@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.5.0.tgz#530f4f608f9ca9d4f89c24ab95db58ab56ab99a0" - integrity sha512-hLv8XaQ8PTI9g2RHoQGf/WSxBfTB/NudRacbzdxmst5VHAqd1sMibWG7SENzT5Dj3yZ3kJYx+WiRYEcQTAkcYA== +"@ethersproject/rlp@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" + integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g== dependencies: - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" -"@ethersproject/signing-key@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.5.0.tgz#2aa37169ce7e01e3e80f2c14325f624c29cedbe0" - integrity sha512-5VmseH7qjtNmDdZBswavhotYbWB0bOwKIlOTSlX14rKn5c11QmJwGt4GHeo7NrL/Ycl7uo9AHvEqs5xZgFBTng== +"@ethersproject/signing-key@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.0.tgz#4f02e3fb09e22b71e2e1d6dc4bcb5dafa69ce042" + integrity sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA== dependencies: - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/properties" "^5.5.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" bn.js "^4.11.9" elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.5.0.tgz#e6784d00ec6c57710755699003bc747e98c5d549" - integrity sha512-9fy3TtF5LrX/wTrBaT8FGE6TDJyVjOvXynXJz5MT5azq+E6D92zuKNx7i29sWW2FjVOaWjAsiZ1ZWznuduTIIQ== +"@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" + integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg== dependencies: - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/constants" "^5.5.0" - "@ethersproject/logger" "^5.5.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" -"@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.5.0.tgz#7e9bf72e97bcdf69db34fe0d59e2f4203c7a2908" - integrity sha512-9RZYSKX26KfzEd/1eqvv8pLauCKzDTub0Ko4LfIgaERvRuwyaNV78mJs7cpIgZaDl6RJui4o49lHwwCM0526zA== - dependencies: - "@ethersproject/address" "^5.5.0" - "@ethersproject/bignumber" "^5.5.0" - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/constants" "^5.5.0" - "@ethersproject/keccak256" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/properties" "^5.5.0" - "@ethersproject/rlp" "^5.5.0" - "@ethersproject/signing-key" "^5.5.0" - -"@ethersproject/web@^5.5.0": - version "5.5.1" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.5.1.tgz#cfcc4a074a6936c657878ac58917a61341681316" - integrity sha512-olvLvc1CB12sREc1ROPSHTdFCdvMh0J5GSJYiQg2D0hdD4QmJDy8QYDb1CvoqD/bF1c++aeKv2sR5uduuG9dQg== +"@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" + integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + +"@ethersproject/web@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" + integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg== dependencies: - "@ethersproject/base64" "^5.5.0" - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - "@ethersproject/properties" "^5.5.0" - "@ethersproject/strings" "^5.5.0" + "@ethersproject/base64" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" "@fidm/asn1@^1.0.4": version "1.0.4" @@ -2355,9 +2355,9 @@ "@types/node" ">=12.12.47" "@grpc/grpc-js@^1.3.4", "@grpc/grpc-js@~1.5.0": - version "1.5.7" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.7.tgz#c83a5dc1d0cf7b8aa82371cfa7125955d1f25a96" - integrity sha512-RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ== + version "1.5.9" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.9.tgz#df44b3d6bc1d5eb4779aab96e00f6084fd07a3c8" + integrity sha512-un+cXqErq5P4p3+WgYVNVh7FB51MSnaoRef7QWDcMXKR6FX2R6Z/bltcJMxNNdTUMC85lkOQcpnAAetFziPSng== dependencies: "@grpc/proto-loader" "^0.6.4" "@types/node" ">=12.12.47" @@ -2499,9 +2499,9 @@ multiformats "^9.5.4" "@ipld/dag-pb@^2.1.3": - version "2.1.15" - resolved "https://registry.yarnpkg.com/@ipld/dag-pb/-/dag-pb-2.1.15.tgz#416d1a720bd3b1c3b876ec73d8a15e7bd121f09b" - integrity sha512-qkoUIiuQDx2ZN+YmYFdSNNHRt15p1XTYbqsseb8DgA0ACcqCUurbiNVd0jt5GuiBm76t2mOV2cZsNu6rykRFBQ== + version "2.1.16" + resolved "https://registry.yarnpkg.com/@ipld/dag-pb/-/dag-pb-2.1.16.tgz#7133fec4f1bbce8fedb859bc2d477a0a2401de93" + integrity sha512-5+A87ZsKZ2yEEjtW6LIzTgDJcm6O24d0lmXlubwtMblI5ZB+aTw7PH6kjc8fM6pbnNtVg4Y+c+WZ3zCxdesIBg== dependencies: multiformats "^9.5.4" @@ -3598,13 +3598,13 @@ "@octokit/types" "^6.0.3" "@octokit/core@^3.5.1": - version "3.5.1" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b" - integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw== + version "3.6.0" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085" + integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q== dependencies: "@octokit/auth-token" "^2.4.4" "@octokit/graphql" "^4.5.8" - "@octokit/request" "^5.6.0" + "@octokit/request" "^5.6.3" "@octokit/request-error" "^2.0.5" "@octokit/types" "^6.0.3" before-after-hook "^2.2.0" @@ -3667,7 +3667,7 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@^5.6.0": +"@octokit/request@^5.6.0", "@octokit/request@^5.6.3": version "5.6.3" resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0" integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A== @@ -3899,9 +3899,9 @@ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sindresorhus/is@^4.0.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.5.0.tgz#7c8293e2268de42d7037249a9e4f905dc890539b" - integrity sha512-ZzlL5VTnHZJl8wMWEaYk/13hwMNKLylTSPZRz8+0HIwfRTQMnFgUahDNRRV+rTmPADxQZYxna/nQcStNSCccKg== + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== "@sinonjs/commons@^1.7.0": version "1.8.3" @@ -3933,9 +3933,9 @@ integrity sha512-H8BSBoKE8EubJa0ONqecA2TviT3TnHeC4NpgnAHSUiuhZoQBfPB4L2P9bs8R6AoTW10Endvh3vc+fomVMIDIYQ== "@stencil/core@^2.4.0": - version "2.14.0" - resolved "https://registry.yarnpkg.com/@stencil/core/-/core-2.14.0.tgz#4878e56b1989bfd77d73de6e951c3721e0e32052" - integrity sha512-tiGFK9VADoHJvAZoTHN/c6YBaTzB5+V3aTn7CzjPxIqryjh3jCUlMP4VDvzkrnVWjhj8Fa82zMWdePgr/xoyOw== + version "2.14.2" + resolved "https://registry.yarnpkg.com/@stencil/core/-/core-2.14.2.tgz#c221d18bbfd9b637d755d43631598695c7526ff2" + integrity sha512-NMC5Xi8sPFJxaO4rz6CbMHuD6PteE/RJWtjrbkusmpjKRtMXkfZJPIgOrleZ4xO+vXcNyL535Ru7vUADqEsTiQ== "@stencil/core@~2.10.0": version "2.10.0" @@ -4333,9 +4333,9 @@ "@types/istanbul-lib-report" "*" "@types/jasmine@*": - version "3.10.3" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.10.3.tgz#a89798b3d5a8bd23ca56e855a9aee3e5a93bdaaa" - integrity sha512-SWyMrjgdAUHNQmutvDcKablrJhkDLy4wunTme8oYLjKp41GnHGxMRXr2MQMvy/qy8H3LdzwQk9gH4hZ6T++H8g== + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-4.0.0.tgz#48bfd99cbe16dcdcde0b7d3bfa62319504d141f9" + integrity sha512-KvhqNz4NaONk7cfp4E9x+uXOUp7x4H2Zeyb4yXnw2vIuxD5YfSi1767x+aF7z54elhZcC0OH9/78/WL6+5jcDg== "@types/jasminewd2@2.0.10": version "2.0.10" @@ -4358,9 +4358,9 @@ integrity sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg== "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + version "7.0.10" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" + integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A== "@types/json-stable-stringify@1.0.33": version "1.0.33" @@ -4514,9 +4514,9 @@ integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg== "@types/node@^12.12.6": - version "12.20.46" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.46.tgz#7e49dee4c54fd19584e6a9e0da5f3dc2e9136bc7" - integrity sha512-cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A== + version "12.20.47" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.47.tgz#ca9237d51f2a2557419688511dab1c8daf475188" + integrity sha512-BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg== "@types/node@^14.6.2": version "14.18.12" @@ -4605,9 +4605,9 @@ integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== "@types/react@^16.9.23": - version "16.14.23" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.23.tgz#37201b9f2324c5ff8fa4600dbf19079dfdffc880" - integrity sha512-WngBZLuSkP4IAgPi0HOsGCHo6dn3CcuLQnCfC17VbA7YBgipZiZoTOhObwl/93DsFW0Y2a/ZXeonpW4DxirEJg== + version "16.14.24" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.24.tgz#f2c5e9fa78f83f769884b83defcf7924b9eb5c82" + integrity sha512-e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -4787,9 +4787,9 @@ "@types/node" "*" "@types/yargs-parser@*": - version "20.2.1" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" - integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^13.0.0": version "13.0.12" @@ -4813,9 +4813,9 @@ "@types/yargs-parser" "*" "@types/yargs@^17.0.2": - version "17.0.8" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" - integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== + version "17.0.9" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.9.tgz#f1f931a4e5ae2c0134dea10f501088636a50b46a" + integrity sha512-Ci8+4/DOtkHRylcisKmVMtmVO5g7weUVCKcsu1sJvF1bn0wExTmbHmhFKj7AnEm0de800iovGhdSKzYnzbaHpg== dependencies: "@types/yargs-parser" "*" @@ -5310,9 +5310,9 @@ ansi-regex@^3.0.0: integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= ansi-regex@^4.0.0, ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" + integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== ansi-regex@^5.0.0, ansi-regex@^5.0.1: version "5.0.1" @@ -6581,12 +6581,12 @@ browserify-zlib@^0.2.0: pako "~1.0.5" browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.6.4, browserslist@^4.9.1: - version "4.19.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.3.tgz#29b7caad327ecf2859485f696f9604214bedd383" - integrity sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg== + version "4.20.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" + integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== dependencies: - caniuse-lite "^1.0.30001312" - electron-to-chromium "^1.4.71" + caniuse-lite "^1.0.30001317" + electron-to-chromium "^1.4.84" escalade "^3.1.1" node-releases "^2.0.2" picocolors "^1.0.0" @@ -6977,10 +6977,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001312: - version "1.0.30001312" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f" - integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001317: + version "1.0.30001317" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b" + integrity sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ== canonical-path@1.0.0: version "1.0.0" @@ -7014,9 +7014,9 @@ cbor@6.0.1: nofilter "^1.0.4" cborg@^1.5.4: - version "1.8.0" - resolved "https://registry.yarnpkg.com/cborg/-/cborg-1.8.0.tgz#d75be6c5cdaa0f9aab3d24c62b8d2c47ed57ca76" - integrity sha512-zT4TJQJJFXLGpd0iMmj1gQCscbcrBxC6X5S0D9bdA8nH34ZbsSdtzJXD0A2ZJzBWP95WI1pKX9CLkwW6UpolwA== + version "1.8.1" + resolved "https://registry.yarnpkg.com/cborg/-/cborg-1.8.1.tgz#c54334f70f411783b9f67feb5ec81ecb600be797" + integrity sha512-x49Vf1DUrS9rc+ar8QwOqfvA48H9YRn6UzcvlXpd1jKIzq2ebSR1R/yegu7MsskJew4+yc+3znWmud0PMJkR1Q== chalk@1.1.3, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" @@ -8251,48 +8251,50 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -cspell-glob@^5.18.5, cspell-glob@^5.6.5: - version "5.18.5" - resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.18.5.tgz#1cc757bb2028cc12bf5acd9336cfc505cd5cd311" - integrity sha512-Tr/wMHpJ5zvD4qV4d5is1WJ6OQZSQSjiWoLCQ8pslpltGJhjYXPh3W9A8n4Ghr4AUUJNLKEQyCX+Z1kcA3hgOQ== +cspell-glob@^5.19.2, cspell-glob@^5.6.5: + version "5.19.2" + resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.19.2.tgz#57a208bbb583d8385403d35fa2f1a1351b50e883" + integrity sha512-23pgM0KzWsnNv6zwC/xnxdE86MfLU7NWbBqDmn1KixhJjezOhg/LiSjnJuRVUuLR+4qApzjrBRpk+Rj1jzYi6A== dependencies: micromatch "^4.0.4" -cspell-io@^5.18.5: - version "5.18.5" - resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.18.5.tgz#320c0c67b7f0f5046b1d7e31d4372fe1a65366a6" - integrity sha512-Ar2shXmKtLP935Linv+162xY6SNqIrwLI3rBRXs0/KnD/YdcLJQB0iBgFqvfvg7TcPg+EZOf9Oc6EvTLg2eprg== +cspell-io@^5.19.2: + version "5.19.2" + resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.19.2.tgz#32ae634cccc73c8a0b8f1c83038301fbe137c85f" + integrity sha512-TLlXMmDdZQold3ZsbHEpwKjUIRtYksp7Qr9Z0Rt9JpII6riliUPdB0SMFgtrqAvV1+bhJEPPmSxts8SdtLkdnA== cspell-lib@^5.6.6: - version "5.18.5" - resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.18.5.tgz#76b169399c5e635cde59381d86260019b6b42909" - integrity sha512-yrUk3MbRXy/YGNIcLfURDnw4fRiXcbHo9K5B6IhwYfHKc3VM6QgvEQ0ce44uzZ+AEZzWuQ++GbhUih+bSJ87DQ== + version "5.19.2" + resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.19.2.tgz#678ade6f3217e0ca3bb12efca55871912d90d2ff" + integrity sha512-x8NhOiXKRj6PHQty9RmaujE8dywzX0ZJr6AlPE/0N8IHmOg0Y8gAs7aN45l3PjFz+vaWfCghPbCIyxE/fdXNaw== dependencies: - "@cspell/cspell-bundled-dicts" "^5.18.5" - "@cspell/cspell-types" "^5.18.5" + "@cspell/cspell-bundled-dicts" "^5.19.2" + "@cspell/cspell-pipe" "^5.19.2" + "@cspell/cspell-types" "^5.19.2" clear-module "^4.1.2" comment-json "^4.2.2" configstore "^5.0.1" cosmiconfig "^7.0.1" - cspell-glob "^5.18.5" - cspell-io "^5.18.5" - cspell-trie-lib "^5.18.5" + cspell-glob "^5.19.2" + cspell-io "^5.19.2" + cspell-trie-lib "^5.19.2" fast-equals "^3.0.0" find-up "^5.0.0" - fs-extra "^10.0.0" + fs-extra "^10.0.1" gensequence "^3.1.1" import-fresh "^3.3.0" resolve-from "^5.0.0" resolve-global "^1.0.0" + vscode-languageserver-textdocument "^1.0.4" vscode-uri "^3.0.3" -cspell-trie-lib@^5.18.5: - version "5.18.5" - resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.18.5.tgz#dff995e8773857564d4bda91e64626838c69674a" - integrity sha512-FifImmkcArPYiE8fLXcbB/yS15QyWwvHw/gpCPEkcuJMJH2gxC+HOE909JnBsyPyjCaX5gHWiIf7ePjdXlWsDg== +cspell-trie-lib@^5.19.2: + version "5.19.2" + resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.19.2.tgz#4573f897de9ad1200390c14b73d43066acdf8746" + integrity sha512-JCPBuA6XtIRuMZtIzRAV/nk/NmTQwxcQA4GEAkdxYZ9aUPTpMDItxQkrKrlEvAuqt8hKZkOpE6ZpChdLW7aKsg== dependencies: - "@cspell/cspell-pipe" "^5.18.5" - fs-extra "^10.0.0" + "@cspell/cspell-pipe" "^5.19.2" + fs-extra "^10.0.1" gensequence "^3.1.1" cspell@5.6.6: @@ -8463,52 +8465,52 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^5.1.12: - version "5.1.12" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.12.tgz#64e2ad8e27a279e1413d2d2383ef89a41c909be9" - integrity sha512-rO/JZYyjW1QNkWBxMGV28DW7d98UDLaF759frhli58QFehZ+D/LSmwQ2z/ylBAe2hUlsIWTq6NYGfQPq65EF9w== +cssnano-preset-default@^*: + version "5.2.4" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.4.tgz#eced79bbc1ab7270337c4038a21891daac2329bc" + integrity sha512-w1Gg8xsebln6/axZ6qDFQHuglrGfbIHOIx0g4y9+etRlRab8CGpSpe6UMsrgJe4zhCaJ0LwLmc+PhdLRTwnhIA== dependencies: css-declaration-sorter "^6.0.3" - cssnano-utils "^3.0.2" - postcss-calc "^8.2.0" - postcss-colormin "^5.2.5" - postcss-convert-values "^5.0.4" - postcss-discard-comments "^5.0.3" - postcss-discard-duplicates "^5.0.3" - postcss-discard-empty "^5.0.3" - postcss-discard-overridden "^5.0.4" - postcss-merge-longhand "^5.0.6" - postcss-merge-rules "^5.0.6" - postcss-minify-font-values "^5.0.4" - postcss-minify-gradients "^5.0.6" - postcss-minify-params "^5.0.5" - postcss-minify-selectors "^5.1.3" - postcss-normalize-charset "^5.0.3" - postcss-normalize-display-values "^5.0.3" - postcss-normalize-positions "^5.0.4" - postcss-normalize-repeat-style "^5.0.4" - postcss-normalize-string "^5.0.4" - postcss-normalize-timing-functions "^5.0.3" - postcss-normalize-unicode "^5.0.4" - postcss-normalize-url "^5.0.5" - postcss-normalize-whitespace "^5.0.4" - postcss-ordered-values "^5.0.5" - postcss-reduce-initial "^5.0.3" - postcss-reduce-transforms "^5.0.4" - postcss-svgo "^5.0.4" - postcss-unique-selectors "^5.0.4" - -cssnano-utils@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.2.tgz#d82b4991a27ba6fec644b39bab35fe027137f516" - integrity sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ== + cssnano-utils "^*" + postcss-calc "^8.2.3" + postcss-colormin "^*" + postcss-convert-values "^*" + postcss-discard-comments "^*" + postcss-discard-duplicates "^*" + postcss-discard-empty "^*" + postcss-discard-overridden "^*" + postcss-merge-longhand "^*" + postcss-merge-rules "^*" + postcss-minify-font-values "^*" + postcss-minify-gradients "^*" + postcss-minify-params "^*" + postcss-minify-selectors "^*" + postcss-normalize-charset "^*" + postcss-normalize-display-values "^*" + postcss-normalize-positions "^*" + postcss-normalize-repeat-style "^*" + postcss-normalize-string "^*" + postcss-normalize-timing-functions "^*" + postcss-normalize-unicode "^*" + postcss-normalize-url "^*" + postcss-normalize-whitespace "^*" + postcss-ordered-values "^*" + postcss-reduce-initial "^*" + postcss-reduce-transforms "^*" + postcss-svgo "^*" + postcss-unique-selectors "^*" + +cssnano-utils@^*, cssnano-utils@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" + integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== cssnano@^5.0.6: - version "5.0.17" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.17.tgz#ff45713c05cfc780a1aeb3e663b6f224d091cabf" - integrity sha512-fmjLP7k8kL18xSspeXTzRhaFtRI7DL9b8IcXR80JgtnWBpvAzHT7sCR/6qdn0tnxIaINUN6OEQu83wF57Gs3Xw== + version "5.1.4" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.4.tgz#c648192e8e2f1aacb7d839e6aa3706b50cc7f8e4" + integrity sha512-hbfhVZreEPyzl+NbvRsjNo54JOX80b+j6nqG2biLVLaZHJEiqGyMh4xDGHtwhUKd5p59mj2GlDqlUBwJUuIu5A== dependencies: - cssnano-preset-default "^5.1.12" + cssnano-preset-default "^*" lilconfig "^2.0.3" yaml "^1.10.2" @@ -8537,9 +8539,9 @@ cssstyle@^2.3.0: cssom "~0.3.6" csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== + version "3.0.11" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" + integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== csv-parse@^4.4.6: version "4.16.3" @@ -8595,10 +8597,10 @@ date-fns@^2.16.1: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2" integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw== -date-format@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.3.tgz#f63de5dc08dc02efd8ef32bf2a6918e486f35873" - integrity sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ== +date-format@^4.0.3, date-format@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.5.tgz#ba385f89782c6cb114cf45dfa4704c6bb29fca51" + integrity sha512-zBhRiN/M0gDxUoM2xRtzTjJzSg0XEi1ofYpF84PfXeS3hN2PsGxmc7jw3DNQtFlimRbMmob5FC3G0cJq6jQQpw== dateformat@^3.0.0: version "3.0.3" @@ -9378,10 +9380,10 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.4.71: - version "1.4.73" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz#422f6f514315bcace9615903e4a9b6b9fa283137" - integrity sha512-RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA== +electron-to-chromium@^1.4.84: + version "1.4.86" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.86.tgz#90fe4a9787f48d6522957213408e08a8126b2ebc" + integrity sha512-EVTZ+igi8x63pK4bPuA95PXIs2b2Cowi3WQwI9f9qManLiZJOD1Lash1J3W4TvvcUCcIR4o/rgi9o8UicXSO+w== electron@13.3.0: version "13.3.0" @@ -9548,9 +9550,9 @@ engine.io@~6.1.0: ws "~8.2.3" enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.0: - version "5.9.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.1.tgz#e898cea44d9199fd92137496cff5691b910fb43e" - integrity sha512-jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw== + version "5.9.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9" + integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -9676,20 +9678,20 @@ es-to-primitive@^1.2.1: is-symbol "^1.0.2" es5-ext@^0.10.35, es5-ext@^0.10.50: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== + version "0.10.58" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.58.tgz#5b97d94236285fb87c8ffc782cf42eb0a25d2ae0" + integrity sha512-LHO+KBBaHGwjy32ibSaMY+ZzjpC4K4I5bPoijICMBL7gXEXfrEUrzssmNP+KigbQEp1dRUnGkry/vUnxOqptLQ== dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" + es6-iterator "^2.0.3" + es6-symbol "^3.1.3" + next-tick "^1.1.0" es6-error@^4.0.1, es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== -es6-iterator@~2.0.3: +es6-iterator@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= @@ -9715,7 +9717,7 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -es6-symbol@^3.1.1, es6-symbol@~3.1.3: +es6-symbol@^3.1.1, es6-symbol@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== @@ -10322,7 +10324,7 @@ events@^3.0.0, events@^3.2.0, events@^3.3.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -eventsource@^1.0.7: +eventsource@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== @@ -10955,7 +10957,7 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -faye-websocket@^0.11.3: +faye-websocket@^0.11.3, faye-websocket@^0.11.4: version "0.11.4" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== @@ -11154,7 +11156,7 @@ flat@^4.1.0: dependencies: is-buffer "~2.0.3" -flatted@^3.1.0, flatted@^3.2.4: +flatted@^3.1.0, flatted@^3.2.4, flatted@^3.2.5: version "3.2.5" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== @@ -11307,7 +11309,7 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^10.0.0: +fs-extra@^10.0.0, fs-extra@^10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== @@ -11743,9 +11745,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.12.1" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.1.tgz#ec206be932e6c77236677127577aa8e50bf1c5cb" - integrity sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw== + version "13.13.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b" + integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A== dependencies: type-fest "^0.20.2" @@ -11857,9 +11859,9 @@ google-auth-library@^7.14.0: lru-cache "^6.0.0" google-gax@^2.17.1: - version "2.30.0" - resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.0.tgz#f30fac36fbbcb7d63a88b9a370b763b534c308b0" - integrity sha512-JcZGDuSOzhPwOJfbK80cyyGLZkrlLBTiwfqrW46sC0I9h3FtFmbN7FwIQ3PHreYiE6iVK4InfEZiTp4laOmPfA== + version "2.30.1" + resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.1.tgz#57a2826d53837bc74b071c3d27355c7bed5a9939" + integrity sha512-AR00wrunctUqwKQFl15Yq5bo9NuFLnT0zguZYCf8eAqoOUMbxn9V1L0ONCtV4+P9z7sLu+cjtgl+5b4eRZvktg== dependencies: "@grpc/grpc-js" "~1.5.0" "@grpc/proto-loader" "^0.6.1" @@ -12167,9 +12169,9 @@ has-symbol-support-x@^1.4.1: integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== has-symbols@^1.0.0, has-symbols@^1.0.1, 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== + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-to-string-tag-x@^1.2.0: version "1.4.1" @@ -12427,9 +12429,9 @@ http-https@^1.0.0: integrity sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs= http-parser-js@>=0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5" - integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA== + version "0.5.6" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.6.tgz#2e02406ab2df8af8a7abfba62e0da01c62b95afd" + integrity sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA== http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1: version "4.0.1" @@ -14583,11 +14585,6 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" - integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== - json5@2.2.0, json5@2.x, json5@^2.1.1, json5@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" @@ -14686,9 +14683,9 @@ jsrsasign@10.5.0: integrity sha512-AC1kfL1LJASKBLGv4bLLl+auFlsBajOxEcggL7fn8cp7nMRPhyln3LK/Q9lEDCrxYFU35NGUeFtUBCbasoF2Uw== jsrsasign@^10.4.0, jsrsasign@^10.4.1: - version "10.5.8" - resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.8.tgz#df269e5694ebb53245c4dadfca68ee2fc8aa41ec" - integrity sha512-ewFUGPZJujIR9j84Q5LEzPTG4D1qQZ4CjJrgHfMEAAiArkC3xfdgNP0ZAXXxXbb+K8Phw15soOIJ8bX3+usEdQ== + version "10.5.12" + resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.12.tgz#ff3cee31f4f018f1b4ad35b9c8c08c5d4f9960e7" + integrity sha512-YE03UOxqAkF7smFH/WKsDO8uPsvK3n+OUaT4qV77YwGJ+IiWwNyBh7XILQ+k1BSIdrsMWsEb2vyoBAw6aP5EBQ== jszip@^3.1.3: version "3.7.1" @@ -15156,9 +15153,9 @@ libnpmpublish@^4.0.0: ssri "^8.0.1" libtap@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/libtap/-/libtap-1.1.4.tgz#b329a49733f71f6193358664b608f301d096bf62" - integrity sha512-jM+QyAeRdVs1bJrNpjlu+l8gRdDkAehqls31AwSnqXghVLUP6nbYeU2Xfs2svYS7ZdksvnHvrxCKRBFEz/BCjA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/libtap/-/libtap-1.3.0.tgz#47c3c885d4f25f8db257965db3170237cdcf80dd" + integrity sha512-yU5uSY987sVwpWiR5h84ZM96bxvmCQFZ/bOEJ1M7+Us8oez25fLmmLNGFRFGWi2PzuLqAzqzESH7HCaZ/b9IZA== dependencies: async-hook-domain "^2.0.4" bind-obj-methods "^3.0.0" @@ -15169,11 +15166,10 @@ libtap@^1.1.1: own-or-env "^1.0.2" signal-exit "^3.0.4" stack-utils "^2.0.4" - tap-parser "^10.0.1" + tap-parser "^11.0.0" tap-yaml "^1.0.0" tcompare "^5.0.6" trivial-deferred "^1.0.1" - yapool "^1.0.0" license-webpack-plugin@2.3.20: version "2.3.20" @@ -15521,7 +15517,7 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" -log4js@6.4.1, log4js@^6.4.1: +log4js@6.4.1: version "6.4.1" resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.1.tgz#9d3a8bf2c31c1e213fe3fc398a6053f7a2bc53e8" integrity sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg== @@ -15532,6 +15528,17 @@ log4js@6.4.1, log4js@^6.4.1: rfdc "^1.3.0" streamroller "^3.0.2" +log4js@^6.4.1: + version "6.4.3" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.3.tgz#8bddd981846873895bcc55c0961560c7214a8ad7" + integrity sha512-H/oQKcCVIhQ8zCtUh5aftdp9eRpGyVB1M5sKzAJ0i10q5jS+YXk133vtLgzT1RIoWMbIn7QD1LUto8a1hqh6gA== + dependencies: + date-format "^4.0.5" + debug "^4.3.3" + flatted "^3.2.5" + rfdc "^1.3.0" + streamroller "^3.0.5" + logform@^2.3.2, logform@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz#131651715a17d50f09c2a2c1a524ff1a4164bcfe" @@ -15625,13 +15632,20 @@ lynx@^0.2.0: mersenne "~0.0.3" statsd-parser "~0.0.4" -magic-string@0.25.7, magic-string@^0.25.0: +magic-string@0.25.7: version "0.25.7" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== dependencies: sourcemap-codec "^1.4.4" +magic-string@^0.25.0: + version "0.25.9" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" + integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== + dependencies: + sourcemap-codec "^1.4.8" + make-dir-cli@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/make-dir-cli/-/make-dir-cli-3.0.0.tgz#cf35a79363f3fbab2b67b99e45e1883a2be14d27" @@ -15943,22 +15957,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.51.0: - version "1.51.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" - integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== - -"mime-db@>= 1.43.0 < 2": +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.34" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" - integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: - mime-db "1.51.0" + mime-db "1.52.0" mime@1.3.4: version "1.3.4" @@ -16124,7 +16133,7 @@ minipass@^2.6.0, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.5: +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.5, minipass@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== @@ -16548,10 +16557,10 @@ nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0: resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61" integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug== -next-tick@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= +next-tick@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" + integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== ngo@2.7.0: version "2.7.0" @@ -16603,6 +16612,11 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +node-cleanup@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" + integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= + node-environment-flags@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088" @@ -17657,9 +17671,9 @@ parse-duration@^1.0.0: integrity sha512-Dg27N6mfok+ow1a2rj/nRjtCfaKrHUZV2SJpEn/s8GaVUSlf4GGRCRP1c13Hj+wfPKVMrFDqLMLITkYKgKxyyg== parse-headers@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.4.tgz#9eaf2d02bed2d1eff494331ce3df36d7924760bf" - integrity sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw== + version "2.0.5" + resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.5.tgz#069793f9356a54008571eb7f9761153e6c770da9" + integrity sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA== parse-json@^4.0.0: version "4.0.0" @@ -17976,7 +17990,7 @@ postcss-attribute-case-insensitive@^4.0.1: postcss "^7.0.2" postcss-selector-parser "^6.0.2" -postcss-calc@^8.2.0: +postcss-calc@^8.2.3: version "8.2.4" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== @@ -18026,20 +18040,20 @@ postcss-color-rebeccapurple@^4.0.1: postcss "^7.0.2" postcss-values-parser "^2.0.0" -postcss-colormin@^5.2.5: - version "5.2.5" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.5.tgz#d1fc269ac2ad03fe641d462b5d1dada35c69968a" - integrity sha512-+X30aDaGYq81mFqwyPpnYInsZQnNpdxMX0ajlY7AExCexEFkPVV+KrO7kXwayqEWL2xwEbNQ4nUO0ZsRWGnevg== +postcss-colormin@^*: + version "5.3.0" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" + integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" colord "^2.9.1" postcss-value-parser "^4.2.0" -postcss-convert-values@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.4.tgz#3e74dd97c581f475ae7b4500bc0a7c4fb3a6b1b6" - integrity sha512-bugzSAyjIexdObovsPZu/sBCTHccImJxLyFgeV0MmNBm/Lw5h5XnjfML6gzEmJ3A6nyfCW7hb1JXzcsA4Zfbdw== +postcss-convert-values@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10" + integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g== dependencies: postcss-value-parser "^4.2.0" @@ -18074,25 +18088,25 @@ postcss-dir-pseudo-class@^5.0.0: postcss "^7.0.2" postcss-selector-parser "^5.0.0-rc.3" -postcss-discard-comments@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz#011acb63418d600fdbe18804e1bbecb543ad2f87" - integrity sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q== +postcss-discard-comments@^*: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369" + integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ== -postcss-discard-duplicates@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz#10f202a4cfe9d407b73dfea7a477054d21ea0c1f" - integrity sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw== +postcss-discard-duplicates@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" + integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== -postcss-discard-empty@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz#ec185af4a3710b88933b0ff751aa157b6041dd6a" - integrity sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA== +postcss-discard-empty@^*: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" + integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== -postcss-discard-overridden@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz#cc999d6caf18ea16eff8b2b58f48ec3ddee35c9c" - integrity sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg== +postcss-discard-overridden@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" + integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== postcss-double-position-gradients@^1.0.0: version "1.0.0" @@ -18194,53 +18208,53 @@ postcss-media-minmax@^4.0.0: dependencies: postcss "^7.0.2" -postcss-merge-longhand@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.6.tgz#090e60d5d3b3caad899f8774f8dccb33217d2166" - integrity sha512-rkmoPwQO6ymJSmWsX6l2hHeEBQa7C4kJb9jyi5fZB1sE8nSCv7sqchoYPixRwX/yvLoZP2y6FA5kcjiByeJqDg== +postcss-merge-longhand@^*: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.2.tgz#fe3002f38ad5827c1d6f7d5bb3f71d2566a2a138" + integrity sha512-18/bp9DZnY1ai9RlahOfLBbmIUKfKFPASxRCiZ1vlpZqWPCn8qWPFlEozqmWL+kBtcEQmG8W9YqGCstDImvp/Q== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^5.0.3" + stylehacks "^*" -postcss-merge-rules@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.6.tgz#26b37411fe1e80202fcef61cab027265b8925f2b" - integrity sha512-nzJWJ9yXWp8AOEpn/HFAW72WKVGD2bsLiAmgw4hDchSij27bt6TF+sIK0cJUBAYT3SGcjtGGsOR89bwkkMuMgQ== +postcss-merge-rules@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz#a2d5117eba09c8686a5471d97bd9afcf30d1b41f" + integrity sha512-NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" - cssnano-utils "^3.0.2" + cssnano-utils "^3.1.0" postcss-selector-parser "^6.0.5" -postcss-minify-font-values@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.4.tgz#627d824406b0712243221891f40a44fffe1467fd" - integrity sha512-RN6q3tyuEesvyCYYFCRGJ41J1XFvgV+dvYGHr0CeHv8F00yILlN8Slf4t8XW4IghlfZYCeyRrANO6HpJ948ieA== +postcss-minify-font-values@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" + integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== dependencies: postcss-value-parser "^4.2.0" -postcss-minify-gradients@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.6.tgz#b07cef51a93f075e94053fd972ff1cba2eaf6503" - integrity sha512-E/dT6oVxB9nLGUTiY/rG5dX9taugv9cbLNTFad3dKxOO+BQg25Q/xo2z2ddG+ZB1CbkZYaVwx5blY8VC7R/43A== +postcss-minify-gradients@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz#de0260a67a13b7b321a8adc3150725f2c6612377" + integrity sha512-J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg== dependencies: colord "^2.9.1" - cssnano-utils "^3.0.2" + cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.5.tgz#86cb624358cd45c21946f8c317893f0449396646" - integrity sha512-YBNuq3Rz5LfLFNHb9wrvm6t859b8qIqfXsWeK7wROm3jSKNpO1Y5e8cOyBv6Acji15TgSrAwb3JkVNCqNyLvBg== +postcss-minify-params@^*: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz#c5f8e7dac565e577dd99904787fbec576cbdbfb2" + integrity sha512-WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg== dependencies: browserslist "^4.16.6" - cssnano-utils "^3.0.2" + cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.3.tgz#6ac12d52aa661fd509469d87ab2cebb0a1e3a1b5" - integrity sha512-9RJfTiQEKA/kZhMaEXND893nBqmYQ8qYa/G+uPdVnXF6D/FzpfI6kwBtWEcHx5FqDbA79O9n6fQJfrIj6M8jvQ== +postcss-minify-selectors@^*: + version "5.2.0" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c" + integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA== dependencies: postcss-selector-parser "^6.0.5" @@ -18279,75 +18293,75 @@ postcss-nesting@^7.0.0: dependencies: postcss "^7.0.2" -postcss-normalize-charset@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz#719fb9f9ca9835fcbd4fed8d6e0d72a79e7b5472" - integrity sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA== +postcss-normalize-charset@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" + integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== -postcss-normalize-display-values@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.3.tgz#94cc82e20c51cc4ffba6b36e9618adc1e50db8c1" - integrity sha512-FIV5FY/qs4Ja32jiDb5mVj5iWBlS3N8tFcw2yg98+8MkRgyhtnBgSC0lxU+16AMHbjX5fbSJgw5AXLMolonuRQ== +postcss-normalize-display-values@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" + integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.4.tgz#4001f38c99675437b83277836fb4291887fcc6cc" - integrity sha512-qynirjBX0Lc73ROomZE3lzzmXXTu48/QiEzKgMeqh28+MfuHLsuqC9po4kj84igZqqFGovz8F8hf44hA3dPYmQ== +postcss-normalize-positions@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458" + integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.4.tgz#d005adf9ee45fae78b673031a376c0c871315145" - integrity sha512-Innt+wctD7YpfeDR7r5Ik6krdyppyAg2HBRpX88fo5AYzC1Ut/l3xaxACG0KsbX49cO2n5EB13clPwuYVt8cMA== +postcss-normalize-repeat-style@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398" + integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-string@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.4.tgz#b5e00a07597e7aa8a871817bfeac2bfaa59c3333" - integrity sha512-Dfk42l0+A1CDnVpgE606ENvdmksttLynEqTQf5FL3XGQOyqxjbo25+pglCUvziicTxjtI2NLUR6KkxyUWEVubQ== +postcss-normalize-string@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" + integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-timing-functions@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.3.tgz#47210227bfcba5e52650d7a18654337090de7072" - integrity sha512-QRfjvFh11moN4PYnJ7hia4uJXeFotyK3t2jjg8lM9mswleGsNw2Lm3I5wO+l4k1FzK96EFwEVn8X8Ojrp2gP4g== +postcss-normalize-timing-functions@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" + integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.4.tgz#02866096937005cdb2c17116c690f29505a1623d" - integrity sha512-W79Regn+a+eXTzB+oV/8XJ33s3pDyFTND2yDuUCo0Xa3QSy1HtNIfRVPXNubHxjhlqmMFADr3FSCHT84ITW3ig== +postcss-normalize-unicode@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" + integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ== dependencies: browserslist "^4.16.6" postcss-value-parser "^4.2.0" -postcss-normalize-url@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.5.tgz#c39efc12ff119f6f45f0b4f516902b12c8080e3a" - integrity sha512-Ws3tX+PcekYlXh+ycAt0wyzqGthkvVtZ9SZLutMVvHARxcpu4o7vvXcNoiNKyjKuWecnjS6HDI3fjBuDr5MQxQ== +postcss-normalize-url@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" + integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== dependencies: normalize-url "^6.0.1" postcss-value-parser "^4.2.0" -postcss-normalize-whitespace@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.4.tgz#1d477e7da23fecef91fc4e37d462272c7b55c5ca" - integrity sha512-wsnuHolYZjMwWZJoTC9jeI2AcjA67v4UuidDrPN9RnX8KIZfE+r2Nd6XZRwHVwUiHmRvKQtxiqo64K+h8/imaw== +postcss-normalize-whitespace@^*: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" + integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== dependencies: postcss-value-parser "^4.2.0" -postcss-ordered-values@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.5.tgz#e878af822a130c3f3709737e24cb815ca7c6d040" - integrity sha512-mfY7lXpq+8bDEHfP+muqibDPhZ5eP9zgBEF9XRvoQgXcQe2Db3G1wcvjbnfjXG6wYsl+0UIjikqq4ym1V2jGMQ== +postcss-ordered-values@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz#04ef429e0991b0292bc918b135cd4c038f7b889f" + integrity sha512-wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA== dependencies: - cssnano-utils "^3.0.2" + cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" postcss-overflow-shorthand@^2.0.0: @@ -18423,18 +18437,18 @@ postcss-pseudo-class-any-link@^6.0.0: postcss "^7.0.2" postcss-selector-parser "^5.0.0-rc.3" -postcss-reduce-initial@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.3.tgz#68891594defd648253703bbd8f1093162f19568d" - integrity sha512-c88TkSnQ/Dnwgb4OZbKPOBbCaauwEjbECP5uAuFPOzQ+XdjNjRH7SG0dteXrpp1LlIFEKK76iUGgmw2V0xeieA== +postcss-reduce-initial@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" + integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" -postcss-reduce-transforms@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.4.tgz#717e72d30befe857f7d2784dba10eb1157863712" - integrity sha512-VIJB9SFSaL8B/B7AXb7KHL6/GNNbbCHslgdzS9UDfBZYIA2nx8NLY7iD/BXFSO/1sRUILzBTfHCoW5inP37C5g== +postcss-reduce-transforms@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" + integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== dependencies: postcss-value-parser "^4.2.0" @@ -18478,18 +18492,18 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.4.tgz#cfa8682f47b88f7cd75108ec499e133b43102abf" - integrity sha512-yDKHvULbnZtIrRqhZoA+rxreWpee28JSRH/gy9727u0UCgtpv1M/9WEWY3xySlFa0zQJcqf6oCBJPR5NwkmYpg== +postcss-svgo@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" + integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== dependencies: postcss-value-parser "^4.2.0" svgo "^2.7.0" -postcss-unique-selectors@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.4.tgz#08e188126b634ddfa615fb1d6c262bafdd64826e" - integrity sha512-5ampwoSDJCxDPoANBIlMgoBcYUHnhaiuLYJR5pj1DLnYQvMRVyFuTA5C3Bvt+aHtiqWpJkD/lXT50Vo1D0ZsAQ== +postcss-unique-selectors@^*: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" + integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== dependencies: postcss-selector-parser "^6.0.5" @@ -18525,9 +18539,9 @@ postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.32, postcss@^7.0. source-map "^0.6.1" postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7: - version "8.4.7" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.7.tgz#f99862069ec4541de386bf57f5660a6c7a0875a8" - integrity sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A== + version "8.4.12" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" + integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg== dependencies: nanoid "^3.3.1" picocolors "^1.0.0" @@ -19021,9 +19035,9 @@ raw-body@2.4.3: unpipe "1.0.0" raw-body@^2.3.0, raw-body@^2.4.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.0.tgz#865890d9435243e9fe6141feb4decf929a6e1525" - integrity sha512-XpyZ6O7PVu3ItMQl0LslfsRoKxMOxi3SzDkrOtxMES5AqLFpYjQCryxI4LGygUN2jL+RgFsPkMPPlG7cg/47+A== + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== dependencies: bytes "3.1.2" http-errors "2.0.0" @@ -19126,9 +19140,9 @@ read-package-json@^3.0.0: npm-normalize-package-bin "^1.0.0" read-package-json@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.1.tgz#153be72fce801578c1c86b8ef2b21188df1b9eea" - integrity sha512-P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw== + version "4.1.2" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703" + integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ== dependencies: glob "^7.1.1" json-parse-even-better-errors "^2.3.0" @@ -19811,9 +19825,9 @@ rxjs@7.4.0: tslib "~2.1.0" rxjs@^7.2.0, rxjs@^7.5.1: - version "7.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.4.tgz#3d6bd407e6b7ce9a123e76b1e770dc5761aa368d" - integrity sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ== + version "7.5.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f" + integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw== dependencies: tslib "^2.1.0" @@ -20585,16 +20599,15 @@ socketio-wildcard@^2.0.0: integrity sha1-JGboMidrGRY1Y77ncjiHR/kSR1s= sockjs-client@^1.5.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3" - integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ== + version "1.6.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.6.0.tgz#e0277b8974558edcb557eafc7d3027ef6128d865" + integrity sha512-qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ== dependencies: - debug "^3.2.6" - eventsource "^1.0.7" - faye-websocket "^0.11.3" + debug "^3.2.7" + eventsource "^1.1.0" + faye-websocket "^0.11.4" inherits "^2.0.4" - json3 "^3.3.3" - url-parse "^1.5.3" + url-parse "^1.5.10" sockjs@^0.3.21: version "0.3.24" @@ -20891,9 +20904,9 @@ sprintf-js@~1.0.2: integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= ssh2@^1.1.0, ssh2@^1.4.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz#61aebc3a6910fe488f9c85cd8355bdf8d4724e05" - integrity sha512-lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q== + version "1.7.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.7.0.tgz#7aa30f2a5266f0ffd93944621b4eb1f403330fd4" + integrity sha512-u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g== dependencies: asn1 "^0.2.4" bcrypt-pbkdf "^1.0.2" @@ -21055,14 +21068,14 @@ stream-to-it@^0.2.2: dependencies: get-iterator "^1.0.2" -streamroller@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.2.tgz#30418d0eee3d6c93ec897f892ed098e3a81e68b7" - integrity sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA== +streamroller@^3.0.2, streamroller@^3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.5.tgz#17e348dc2a662f9f325373549ab91d55316051ab" + integrity sha512-5uzTEUIi4OB5zy/H30kbUN/zpDNJsFUA+Z47ZL8EfrP93lcZvRLEqdbhdunEPa7CouuAzXXsHpCJ9dg90Umw7g== dependencies: - date-format "^4.0.3" - debug "^4.1.1" - fs-extra "^10.0.0" + date-format "^4.0.5" + debug "^4.3.3" + fs-extra "^10.0.1" streamsearch@0.1.2: version "0.1.2" @@ -21302,10 +21315,10 @@ style-loader@3.2.1: resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.2.1.tgz#63cb920ec145c8669e9a50e92961452a1ef5dcde" integrity sha512-1k9ZosJCRFaRbY6hH49JFlRB0fVSbmnyq1iTPjNxUmGVjBNEmwrrHPenhlp+Lgo51BojHSf6pl2FcqYaN3PfVg== -stylehacks@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.3.tgz#2ef3de567bfa2be716d29a93bf3d208c133e8d04" - integrity sha512-ENcUdpf4yO0E1rubu8rkxI+JGQk4CgjchynZ4bDBJDfqdy+uhTRSWb8/F3Jtu+Bw5MW45Po3/aQGeIyyxgQtxg== +stylehacks@^*: + version "5.1.0" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" + integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q== dependencies: browserslist "^4.16.6" postcss-selector-parser "^6.0.4" @@ -21445,20 +21458,20 @@ table@^6.0.9: strip-ansi "^6.0.1" tap-mocha-reporter@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/tap-mocha-reporter/-/tap-mocha-reporter-5.0.1.tgz#74f00be2ddd2a380adad45e085795137bc39497a" - integrity sha512-1knFWOwd4khx/7uSEnUeaP9IPW3w+sqTgJMhrwah6t46nZ8P25atOKAjSvVDsT67lOPu0nfdOqUwoyKn+3E5pA== + version "5.0.3" + resolved "https://registry.yarnpkg.com/tap-mocha-reporter/-/tap-mocha-reporter-5.0.3.tgz#3e261b2a43092ba8bc0cb67a89b33e283decee05" + integrity sha512-6zlGkaV4J+XMRFkN0X+yuw6xHbE9jyCZ3WUKfw4KxMyRGOpYSRuuQTRJyWX88WWuLdVTuFbxzwXhXuS2XE6o0g== dependencies: color-support "^1.1.0" debug "^4.1.1" diff "^4.0.1" escape-string-regexp "^2.0.0" glob "^7.0.5" - tap-parser "^10.0.0" + tap-parser "^11.0.0" tap-yaml "^1.0.0" unicode-length "^2.0.2" -tap-parser@^10.0.0, tap-parser@^10.0.1: +tap-parser@^10.0.1: version "10.1.0" resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-10.1.0.tgz#7b1aac40dbcaa4716c0b58952686eae65d2b74ad" integrity sha512-FujQeciDaOiOvaIVGS1Rpb0v4R6XkOjvWCWowlz5oKuhPkEJ8U6pxgqt38xuzYhPt8dWEnfHn2jqpZdJEkW7pA== @@ -21467,6 +21480,15 @@ tap-parser@^10.0.0, tap-parser@^10.0.1: minipass "^3.0.0" tap-yaml "^1.0.0" +tap-parser@^11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-11.0.1.tgz#513be88daa179cd5b158bbb939b8613e6125312b" + integrity sha512-5ow0oyFOnXVSALYdidMX94u0GEjIlgc/BPFYLx0yRh9hb8+cFGNJqJzDJlUqbLOwx8+NBrIbxCWkIQi7555c0w== + dependencies: + events-to-array "^1.0.1" + minipass "^3.1.6" + tap-yaml "^1.0.0" + tap-yaml@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/tap-yaml/-/tap-yaml-1.0.0.tgz#4e31443a5489e05ca8bbb3e36cef71b5dec69635" @@ -21711,9 +21733,9 @@ terser@5.7.1: source-map-support "~0.5.19" terser@^5.7.0, terser@^5.7.2: - version "5.11.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.11.0.tgz#2da5506c02e12cd8799947f30ce9c5b760be000f" - integrity sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A== + version "5.12.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c" + integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ== dependencies: acorn "^8.5.0" commander "^2.20.0" @@ -22074,9 +22096,9 @@ ts-node@9.1.1, ts-node@^9: yn "3.1.1" ts-node@^10.0.0: - version "10.5.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.5.0.tgz#618bef5854c1fbbedf5e31465cbb224a1d524ef9" - integrity sha512-6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw== + version "10.7.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5" + integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A== dependencies: "@cspotcode/source-map-support" "0.7.0" "@tsconfig/node10" "^1.0.7" @@ -22100,9 +22122,9 @@ ts-protoc-gen@^0.12.0: google-protobuf "^3.6.1" tsconfig-paths@^3.9.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" - integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== + version "3.14.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976" + integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" @@ -22319,9 +22341,9 @@ typescript@4.3.5: integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== typescript@^4.4.3: - version "4.5.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" - integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== + version "4.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" + integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== ua-parser-js@^0.7.30: version "0.7.31" @@ -22329,9 +22351,9 @@ ua-parser-js@^0.7.30: integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ== uglify-js@^3.1.4: - version "3.15.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz#9403dc6fa5695a6172a91bc983ea39f0f7c9086d" - integrity sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ== + version "3.15.3" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471" + integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg== uid-number@0.0.6: version "0.0.6" @@ -22574,7 +22596,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3, url-parse@^1.5.3: +url-parse@^1.4.3, url-parse@^1.5.10: version "1.5.10" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== @@ -22626,9 +22648,9 @@ use@^3.1.0: integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== utf-8-validate@^5.0.2: - version "5.0.8" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.8.tgz#4a735a61661dbb1c59a0868c397d2fe263f14e58" - integrity sha512-k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA== + version "5.0.9" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.9.tgz#ba16a822fbeedff1a58918f2a6a6b36387493ea3" + integrity sha512-Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q== dependencies: node-gyp-build "^4.3.0" @@ -22774,6 +22796,11 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= +vscode-languageserver-textdocument@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz#3cd56dd14cec1d09e86c4bb04b09a246cb3df157" + integrity sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ== + vscode-uri@^3.0.2, vscode-uri@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" @@ -24316,11 +24343,6 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.5.0: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yapool@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/yapool/-/yapool-1.0.0.tgz#f693f29a315b50d9a9da2646a7a6645c96985b6a" - integrity sha1-9pPymjFbUNmp2iZGp6ZkXJaYW2o= - yargs-parser@13.1.2, yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" @@ -24348,9 +24370,9 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3: decamelize "^1.2.0" yargs-parser@^21.0.0: - version "21.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" - integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== + version "21.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" + integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== yargs-unparser@1.6.0: version "1.6.0"