From 3d755790b31983c777c6941e773b368e60dcc2e5 Mon Sep 17 00:00:00 2001 From: Richard Owen <1186519+richardowen@users.noreply.github.com> Date: Tue, 23 Jun 2020 11:49:42 +0100 Subject: [PATCH] Remove url-regex from dependency tree --- .github/CONTRIBUTING.md | 2 +- README.md | 2 +- package-lock.json | 29 +++++++---------------------- package.json | 7 +++---- test/snapshots/func.test.js.md | 4 ++-- test/snapshots/func.test.js.snap | Bin 15948 -> 15934 bytes 6 files changed, 14 insertions(+), 30 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 959fd97..5596afc 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -10,6 +10,6 @@ We 💛 contributions! The rules for contributing to this org are few: ## Before Committing -1. Use at least Node.js v6.14.4 or higher. [NVM](https://github.com/creationix/nvm) can be handy for switching between Node versions. +1. Use at least Node.js v10 or higher. [NVM](https://github.com/creationix/nvm) can be handy for switching between Node versions. 1. Lint your changes via `npm run lint`. Fix any errors and warnings before committing. 1. Test your changes via `npm run test`. Only Pull Requests with passing tests will be accepted. diff --git a/README.md b/README.md index 1b10c9b..6bf6eb7 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Please consider [becoming a patron](https://www.patreon.com/shellscape) if you f ## Requirements -`postcss-values-parser` Node version v6.14.0+ and PostCSS v7.0.0+. +`postcss-values-parser` Node version v10+ and PostCSS v7.0.0+. ## Benefits diff --git a/package-lock.json b/package-lock.json index 441603a..677a9f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3382,11 +3382,6 @@ } } }, - "ip-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz", - "integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==" - }, "irregular-plurals": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.2.0.tgz", @@ -3507,7 +3502,8 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, "is-obj": { "version": "1.0.1", @@ -3603,12 +3599,9 @@ "dev": true }, "is-url-superb": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-3.0.0.tgz", - "integrity": "sha512-3faQP+wHCGDQT1qReM5zCPx2mxoal6DzbzquFlCYJLWyy4WPTved33ea2xFbX37z4NoriEwZGIYhFtx8RUB5wQ==", - "requires": { - "url-regex": "^5.0.0" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-url-superb/-/is-url-superb-4.0.0.tgz", + "integrity": "sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==" }, "is-windows": { "version": "1.0.2", @@ -6010,7 +6003,8 @@ "tlds": { "version": "1.203.1", "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.203.1.tgz", - "integrity": "sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==" + "integrity": "sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==", + "dev": true }, "tmp": { "version": "0.0.33", @@ -6138,15 +6132,6 @@ "prepend-http": "^2.0.0" } }, - "url-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-5.0.0.tgz", - "integrity": "sha512-O08GjTiAFNsSlrUWfqF1jH0H1W3m35ZyadHrGv5krdnmPPoxP27oDTqux/579PtaroiSGm5yma6KT1mHFH6Y/g==", - "requires": { - "ip-regex": "^4.1.0", - "tlds": "^1.203.0" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index 23537c3..8da5ae9 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "engines": { - "node": ">=6.14.4" + "node": ">=10" }, "scripts": { "ci:coverage": "nyc npm run test && nyc report --reporter=text-lcov > coverage.lcov", @@ -35,9 +35,8 @@ ], "dependencies": { "color-name": "^1.1.4", - "is-url-superb": "^3.0.0", - "postcss": "^7.0.5", - "url-regex": "^5.0.0" + "is-url-superb": "^4.0.0", + "postcss": "^7.0.5" }, "devDependencies": { "@commitlint/cli": "^8.1.0", diff --git a/test/snapshots/func.test.js.md b/test/snapshots/func.test.js.md index c921298..c162a96 100644 --- a/test/snapshots/func.test.js.md +++ b/test/snapshots/func.test.js.md @@ -3514,7 +3514,7 @@ Generated by [AVA](https://avajs.dev). Word { isColor: false, isHex: false, - isUrl: true, + isUrl: false, isVariable: false, parent: [Circular], raws: { @@ -3638,7 +3638,7 @@ Generated by [AVA](https://avajs.dev). Word { isColor: false, isHex: false, - isUrl: true, + isUrl: false, isVariable: false, parent: [Circular], raws: { diff --git a/test/snapshots/func.test.js.snap b/test/snapshots/func.test.js.snap index eb310c1db32dac89ef46ee5af24ba133782bb987..b3b5b870a2d3bb72e3740b96dbee63785c5fbf3c 100644 GIT binary patch delta 10515 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 Vm&}M^!u_P_{{tU(XvN0e0RZc05!3(x delta 10517 zcmV+wDeBg~e9U|zK~_N^Q*L2!b7*gLAa*he0svfb7oPyP=gZ`9)KK|{C7qEXQGarH z@c+&1B-!n**_qAG?yCR&f8O_Rm{d<{duO_;tE;P9TLhu1P_xvtnP=D&cz_FbtwYbvqV4W>btjibWtCbRLv{&d@7upOs z+hyAKzi!{(_JvK;-btS!%2#s~o>r*UR1i*Wc>Y9k)MF9b>Q~EecJ;GkqI|WN!bFAA zZ3LnE7v<}xzj|qE?n|?pXHDwUOq8$QuP|LGEfnl!#r z{-()q{#%r<#`m+)T_Js_AWVJd_S4V2yXVi7#sNlua9g3xLP1z`f2UXbb?&pK;SX)k ze^WWoj6r^>F0aSbi4A{j6nLW#xqr}b;q>9 zdsZyHc4YO<>`{Y6`RZc|D-~Yff#+c1>UtB$UO6&s>Asr%4o!Jpl&>CCxT!GcYeDFC z;I*%Rl6IHAwW!gzSC`xv|FS4wou#l&A?~6eyz<__XNJB}YV^FRTT2EFc&)K0Uu~rD zu)^Zs@kH;x@$QF5e&4(6`Ddfz=giL$<*V;0{8yn$q)D)Z&%NGer#L_8&(0@u%ct!Y z<*N@UOjS5j+az2%ef)t-(_c>5F}_64N1OJ4yHAv_hSaf9OW|qInsLq>YdNV-iMpd@ujd|DIg<#Nn#VmoA=#r%t;1KZV~FvZk4YIrB2sbojO7{nsD6 z_pK{su5JOpKN0O!G|u~Tok-Mzd`AR<9`(8s}mHKC_Hf#-<1#~TMJX55N!$^ zojW`!+1aIFQ$P*;w~l06Ocwlqx>as&+M^~@!B3Hqk%Gx8n9yCJCeu9yjY1~jzf-^p zuoavH*Fl^KLpW$-Qf_FzcXW2TDInTp={jI&MtWXURFq%}$2|m7BqRc2@jaRXqfJ4X zquS&Q&&iel9T3I*HZXHkuQZk4nX}WfG7A17;^PUX2$N|b6ew(+oii|hV-(ZOG9oQE zEo)T4KLe7I<#vzRwKM0YjU6RlU2AvMGAd_uZh8i*Mc$($3bil~!iSbVqkW%>4t*MI z62HMsPk}!Q`by~{li9Jif=%YK0fKNBXaKqdFyet+=LWFdmo_LbBUkyCz;?udj6pfM z8AZRv4MbZX1{8g2F(Z3_pnP$j-NnGn>=C2$opl@=F4;yJLHy>YN+Z&=cEhL6t5mj7usnb|LLcxHBn@;g&O zXE;cR>7xoC8{6x|{(&KBqgr?ELO-qnnF9-c48KS2zeL8kbSN6VKI z2j%1>4oJ%d&T!0e)H|{ns{3T$FwckbkU!XIs(_ zLq-;U90i^NZ-BkvTM&rHLwdgJ1~?lsaD$!@cnFLGi@;mpOK=|C0f_~Vg89Lm+<~SL z?gp(O&>my}xV6H6GO!IC2A34S+3p4r+znD8P!Dtm*^U||IR9RPiESH;TeSj(E2IzvwYy4hznC05 znRT|zca&*jMbMHBe?)Ubdw+-w0u#UjR-7653cteF0_3ld7;Ic~IUIf)GAbi06VGf; zcHvilRA}ygqM|FMMbg~07b$aR&Bf($U@>?b90V7XiEI_n6!b7VJaC+QD&|38Jb2d3 z^i&D1V>dwLJ#ZEXfsQtl^Yp|dNThet+0Ei3$lfWWYJX~c2SZnd}2yn$hi~wbW$Pu7p5IF+m;qrL!EZ6`J zfU6(`Q=1B)A?RH&%d$nKI9FJF6atgMGIlz~MZnBkAo3wN3xp8I5rCUTib;@21)W2G zoX;SOGXfYHSQrvQzvI~<)H}W;#8aUpPrAv$1p|Nq?|(f5-v1~$gp7yeGj!)ZaFKmT zxLKH4njuDl%AhGb#nTS_7c+Lyotl?UqUWV+>3Qi9Ts{GAvr2P8YI8iMcjZ7+&^y%e z4dWs};$x7Q23}_8j-i^p;p$w**~4XjdxG75uId}R2of*Zy~LV>2aT(lnKiiPfWfIl zM+{C(c1gzQc|cXTviE?VzMcn+c5xn1g6JjrM(fB4!O3Dy2!g`k7RP{cpc<$Hnt=`h z8k2+`5aBqpeAS!h8H+%!CgmWud-~YcOwu-QYY3hNqJV8i4yij>W+x;l?$~d%gbr1TY10f1PtVtceh+ z3fhAHU?Nxsq}cava2A*y9U^Xj=3=P=f$E?Q=mSQA#lhTPFU|e+jSzYt90R|AXxOwm z;9sCW7zdVwIQ;eU+?c)<0-u1>tU;{8J;Z-NM1)PL54tl!%&Odt$3x;V@B(Xvs&S)F zp!{gOXQln3kF3-yf6?mFD<7Pr^rKVX$W+t!?qQiwx*HNhscz^LYP5TQh+)_6OBt`C z&10lCYhBak@AIX6qtXqh$ZiM?Gx|$`9klyWnuO8Xv<#!P8RnWcf1fYqIhAgBk?e-u zMt><5n`5HGiHvv4-BocK4e)>)7&EhygC^o_^sf*u2npd@i_Yd|5NQK?gB(_zi5L{# ze;NemfY;at+|sjo7ew}df-~S2E6y*B+3p_|AqerHZiLnXw7DBZ9t6X|6jq#H9JAg3 zIS9T8wz3W4xceW6$Z7B^2#?fUAhX@SG6e4i?b!xpxcg^7WEgl1Jj05YRk{B<2yOs} z*aj82`(K5~4GxkO`-@#G$V?1L>ET!j;L{Av-oY4CKqT;E_+my zGSP%4?V?FdIz@X@lQEPgD`-ttdsLHylqP@Bnusy3Ya&0DI(12nA#~{zL+a9x&;@Vi zEL@%s*2QSXw7!7I0q_SXQ^L`O=aUOsL!tv1RD!uN7n4*C!hdd~p`aBzwn88Zq<~Ir zFqqG~9R`t+U>aD)iZhd+!f$hfw-Zb*Qwb(z=me7vWP(Z1C|rINJO$nYJHdZ#foH5=kATP+um{31!QX(bWdQ*V(!TTLp1 z!|@9kDSe7USAVgZ+^jyC;L+c;1P_aRXXjCiXzoqWF?N-5%jT<&R0f#-Mn;A(=ApZv z1{>Hfn-5_ehR8SIGO(~Y9~SP}aBI5YILS?*@;EwJ$QNylg`6;~z~$9o2dg+gVK@zu z^B^8JrEZYcgyCUGq=Ct7&VPtzj~MA>mLMKB1D>_UZhyO(gaNO}Xj+jp^UkFFX1>VG z6aC~j^L{h0Y38p$;#X;DTCbU}<*J#lC^u_Bn)x&jn0f9^@RFG)-@sxGy%F{smTMVl z=jWrp7lV!3cK$1f90ykdZ7HGNv-9OCJKvGE^J8f{{}L|03U+GS`7;pt9+ZSpsi$e@ z`$8fe$fqDjq~19P&{GP6_DbFwrh_{C^uv@6gU zcCITJ>}ywGhKsI1Rec?2+m%TA1}BQ^8-&6_Mr-*71tm6`gMVxL1`{FjICuuE)9V}T z@V0Lth{T9ho%Rj-(7wSFxI7EI1h#{t;4+BO_J0keG6}sEqp#r`EKoL}oV2f^pz0e` z!qA_r~tNgGI*s1{Jkm4ISejYt~&Gy7dokMhxgiY_Kf!9zMZ0@;Ufk z+k22Q5hFk)(8R0WLpREMm`HmMYiRG`D_lMfZfScDaj-wqRuXCcKTgwoSOJOEV25wL zha}2+9zP?VK3yA_Ty-ZZYU$1f5{l8x?@koC6M8z%?@svLiNBMz5c>fev#}8m0RaY+ z!4iA{>9al)W&r^)lcf|Ne-C~!Y;Av)FXl;=o>)Zo#D}i+g!UH`%?;2xjH`Qfe4W`* z1N@UZhHmTl2_1f2se`C7(WnWL`bw$9G*(<~q9N5&{0~^lHsB{3TOjfwI82oqR;xf2 z0M9fSRAD_-z5-Pnh;#&xP|k8RH=G$Xk(oo)CVrQ$P5d2Eo7gx_f1*MOO`3+1nzRb_ zq$a~DO`f4OSw?6g)uhJdec%#XR+*np1&0Yj1duBI^$pXSPECWv9I%ExGl!o}?S#l4 z@B=HVHl4DB3qlyUo2{?L*YCL(BAvldR#dHiPeG}-HEaVun&!!=T0A}Q88Pm;e*mYB z_JKZb@6n1id|hpge<`7sjKB7_^3M`PFUdE0j+_X7Ufj&)n`ro_)?qxsn4CobX(HHB zJF__xB01m*uvBkm^V{CeY`#HlqOM3!_3o#qdJ~jWWtW5ZmCWXwAPQ5ws-U?t1#~vm z6Q6{@BJj3$j`Kc<999yUDlv!g@Hx&>ic@zmLOaLVrw;ubf0g5Q7Ld8qTa7-|)dvo} z$|z`rO*3?p)g|=xH6^J{!UTmbh7YL)u5u7)k{S& ztK(jeS(T(>R;}rn)d)IfwG@|EfGx_&$>%|+n=z|nI$~DR;ctI}c#9y^0Byk#Wl3Kv ze`d7`GHbyn;25|H;`PL=>O-h0=m9c8K3D~|>xfyMfz0>7q8+oU2$3XZQ_5J)n3Z(+ z>nq?>y)mm(Dlw~bWXvks_?VT55y5$Eps{__s-;RC=w31oG}7xaHj}-wFRCc}3aRXu zzEU=jTPwC#)C0yMhC3g&;hG#T+Rav zv;$V_AhH3R27hX9TB(!3AS8cDJ76_f*|0KOZ@_A`vSDSncEIYqvSB4uZ@{XWvSFo@ zZv$4*oEu$Kp*NH~H4p)WyxV=ZiWsaLt($j{gC#B%wOuRdBOj>Tzpq!lK zWLHFtE~8@5z7_U;(qBeJ`nbi~xDw5E(qDVuN?CTOb-r(f8E&2LTWNpm^?fTdseLOO z=zS|^=zS~Fo|O`yI%oy@fJtD9_P!O1ly$Wo90Qj@P@o{xD2PNAMTNLfl(is?l>=sj zwculLP6<)PDj_PncY)u%(ggxNz({tJNdosB&xOcB@F_UW>|WubmZBAJc@#)x3!+ru z-bdRc{9h_NEbb?FSWJKL_I{9*S`KM9YgDv-i`4eGYuf4zVcae2JRcF!jBJ87I*{-zRj(LwgRFF99nX+~ViuRUuLXJP7i_wC3f@ zlwvR2*&Flo@{@lMIU6SToxXW_0t738R%`=qUT*EH1lIDwGOz`F1FnJK2th~$ts)8> z0QsowXimWa5EufcMKFJ_w2Fc+LGV?ulWkB&^OZ7kk{rp5$wmyxy6TL&J4N<c`*5wy+!K7z9OB_dt3`I;w>i+C1vbYiHRUjlzSh2-tBJdF~i%r_~`ErSgW z#&AQ>6o||OFMy4#xb{Z3Vw$TxRQU4-9saBmMGmv~<8m)0UrwXE!F-4;1{>`&<&$-tql^3H+Z=O&WY4trh;fP46I1Gp8Jn1rSZ~C*WS3-& z4#60dFJyl}2*%Zfp%}iG{P{xZMfpO@i}HoO_IkchER`?Rg3cGpqVt8G#pM^kCa?#5 z3xWd$p_-0bw)aA&GZ+ZQg9YGS9TA$KBM>?Pt^=zDvk`DF$k352ByED5t<(wG0=@*l zTDU*TCkw^l-IglZ)&(6w8kh=R){!jq31mJ8=e2*U*owineQ-@dZ_Q+(d`L_OtMn!d zZC42$>>@)4*9@;>YYG@K&Uy5uwp}#nE|u(?YGn3Jch|CSbVh@!+x1?)iaygxecm=c z8z^ARSf|2$}|wIba3YtT!P@s>|^exTamlHYOa7 z4@d!Ry_OL4FqMQejZO&K;NgUz|53VF>BN7RC=VyTG^LVo2GP0<_pmO{P`Z3f>++e0 zb@`dnr93?&u1qHcb;acez$op6pm`8^8f*vu)l3Kq!i+c^RM$=jY7dbvV3^*7py?2t z3)X5U1nq*zUT{%w726SbJX%LqM|m4+%|u4L85hb5mB0U< zVnHZteo-iEPf;i<*jyOOl5%yVP!@iiWGfjf{V44zlV*bW@tX8wko;q6pdddG_;IN8 zV~G6YO6f{sPLrC5Kwn|FiO zU}zB4mXC+cgxox(-qKd^6}SaT6-0%c#KRgxrUiHqWPzz*O+h+GvE!d1N<05eON9GYYD?FQwmkw4O)WUV3L(nxDu!E^ALIo zyax^_Q&y?)N>V7Ra1!@N+e3e*3&;Qyl>I61hf)fsaBZa-=qYd$L|`^o)qdYek-~L2 zg@;0D1dz@_c>!z!-zbGm92IWJxn!j=BdP$JvGc*^++ffLBK?%5?)SnSUF8?7`z;#|$5BO6`sTT&Z!toPD^>J)jnwC`2l`JVGAqKZu|qS8!Kr46pBRE&QY^sI_L7f5|#W4u1V1=QBF8@Qrd0S6tEGb2I}x@sTmT?lA{ zuc9Lu#Kvj@IZxsVh|B`Z!6sH*Z6RPU1P_5LYy*BFAfg1G3Xlw1me9En@E`>Hg7Itv zej(slh`a#a0bj7K57DnsOM&;s;g#nl!9vLJsr3e0C4@CyNNL1Yuy z4bHIQWmWEf3xan*xj5%34Y+?3h_nO`fZ?ooqRRcJKyW5_g>6uoyZ=sz>;b32O;)^$ z%KanbG4}v<;+Y1?-2J;lq&LU{Pq5;5tK5Gn1XqA$p%xvbF6qhmHV%U;Je^3+n^D5|LYLB4U zohu>&zk`#(D|-a(T87w@LM-qBjk7Z?#Q^~wv-vJ*0RhpIV=z;H+uG({Is>~LXa*kA zH1|^=F;gib;zM&^@EE)OXw`SW5SN2#50xJLM8f8izcAY9mxbx74LbVT=nr+#=m!^c zjof-3Y4x`i*XsX>hCgdreW^l|l**O}nrmDAM<6l~JgQ`<>9YE(y>0a`QC7bsZS~vH zR(}L8k5T61Zvm+(l+%wO5Ei*CsH^0rIkoy@l@r;PYFqtxA+lA;Z8HUGS^c{qQ48Gn z7n5EwJONXan=$Ku{l&e2Too^19O(tD{F{0K>{w^SSZzcqaiJ%05FPt9xTWn0l(E>h zI@SlB-Sq@S^oH{|KtQ5>ARwJ`2cD$efe&bR;5;t>2trw_&AS8DAd&)lfDxMRz!FF- zS4xPxlinJK0fx?Je#6A-qnvw8wFdgZNk4(!PY+(*7y!PF$nii3FJSNJpf`}_($A7x+BwI~DjglV6&wdQ0&TOsdde6-0E`DqEe;BB z$03M2A+QI3{Jj~{|Cfs3k_PEEXZa|H2 z3JlFMl}@2v$6r8_5hxo0)DUtkc_8(mI{8^47^XO+u+X><#GM z^!FIPo8ECvaWJLJ0$P`630vrS_ViM| zj^~Ge5ZM9FvZ88rJnuj-FdWVXd$bK-$Fl`Q+JSUdRIQHZWC%_LE7=CxTNI6qh{jR_ zpAqAp`)Sbr4PEvj;M|Za_}xV4t^^*Fwn_? znxWg;kZ1@V@a;-&kn(gH@NhLSIDI=pdH!pq*5@p>+V6}u)a7A{>VeLG0YjbTayFOJ zJGN;CX{War*G^wS!(X-Rv;dQ40hK^2Z9AO?k-=ahSg6-dukp5>K1bQK596cKTt6q$y=eU)8kJUqa$2_(iXsj#jbLB}qHo z+6Q)8#0%hYGtCS|Mhv8e=30+L$BzYzw5{~p5ZMg&DkWyUW2JwitaMe{O82C#^kiI~ z3RY@c=?@{Y14wJKW=$(CEydOa-F%#HWqY`cc(&X>FTueOhbvD%VWU-kWweQZPJk7v z3p)J;O!RP<_gC9l=%+{v{ZVl(^kp>sMax3pfj}S(T1C)O+d}t;$RIEQEYNGAU-Pzw z{*JQHQM83_PFv_qT$c7&PY27uMsN(=(qW-XE7@4hv@LWWi1Y(9z$#4(EtMIUX4BX7 zTIdKB3mr>Z=oUV(&;edB(2nDOkP&03p&8NAX7fDzI`HcD`AvvyRH~kw_L_aZN!jO0 zw0-VI+vkZ&?fDnA?X#3ZCC#MI0zuP0Cqtqp=;Gro(1w|3gVUkyoYUO2fvR(8hu`_< z(99fK>K*?a+CPW>N6w+~aQ~&|(6*P&{ejfbTxI_p`kyg}<{$QAJzMU77g;5jouS}h z&PuEP(!VBczb0MKJ^nT6zsZ{P@BTGuSM0QT@L$4Ev!js_qp6{po&GiHf54iw@^l&T za2Z@h)b9Du8=af2YN{Q7={MDksg}FPZ>s&K`X6bkrKkHZWvZ3e&Hd5TpFZX{)tsp& z9{1urTn!CQ9}{b5WI0@ah{uJRwmnKxqm&^TnS+Pq*;{FIJ^Z%`XbZY(S!+=q=pV8* z#!m}`!tJ2D1VMSqEz(IH5uh@-2lNM%P3(Xgz<$Aj(m5C}gZIEed#e`QbwoyPT3${r z|5Sv;!w8fEO+YU&2FwNTgD=5_00)O5oO@PmJNT?3HB{CY4Ie6h12VFl4wR#R3f@pw;}oJgwJL=)QN3?WR8ahfcoG}%UL@+qN7p(lLV;$=^` zUJ#+V!|C8fnr8%&W_vy^F9sV}>&m+(2Ox3;1P2R3m0(A+ZQVW&eP%vA6Ik|ZY_!3+z*o>;S@jk%{ zmmjoZca`$zL)#SW3&C`d&oS#-o-%8=~B4-_WXfQDuxO|BD?dK*z*mMwxACf!HRos&o{NZ`E7c4 z^C^0Fb7+`c7gvn z4S!+|RggO)O^ND(e-})D9O}|=mMug|Z_QT@_mif7PA9>2AQk*c1^0>$f0%!UJQQ~g zl)K(mO2EabLts+ji4Jqf3B&uY&7+hFL*eA?2lA$IuFXPRE$-s^Zf3v*UZkMYg5fqm$q^D5W`XGB;ADS3ST`R-8Y+Hy1PWF?)LtQcp$pQJR|LTmCNp-EvM{t)ElKCBr`X#P+zsd@ik%JHzy#^tBL zn_xGP3IqjX0+a|ED3hcd#|aT1;Fu4A#bASfMj0Pz)(DX!AP7!fWviq2!mojJfkY25 zlASp5^;70TWFc73it_bSY;NUV2p$4g*#?{wWet~HNl+Vf0hwSHcnNF<2f)=(hfd;Z zu!%A7z)FDztS44pMZxY6>f`%sU!_vsUOP2~x^Nj`y6F(zZ5zyVTNTeB0R-TV^5bS^J;$LH$} zMze*X_!!-aHsC5rniC=fp%Q2Wx<=Rbr9JA4uLC?j<%IwNG%;D2o*rH zD6Lfqu@6N0fk~`rX--5i{JW`* zoL&7yC6<+@6U*Aug{E_Hc^p^_-Uj=?We{Y>0|)AZURvi?jDx^`!1LM}W}6|h4V(vN z&2uYKAW;`|bNAc|cG2J7y(50-s(Y8ElGrwiOl*6>=yNN~(z|8IdWf@u*>RXNVu&_0 zyVc3#@zt`sKOJi