From 0112c59f90a600018ad897f84cf2febc072f91d5 Mon Sep 17 00:00:00 2001 From: Kaustubh Kumar Date: Wed, 9 Aug 2023 16:15:17 +0530 Subject: [PATCH 01/11] fix: prebuilt footer update --- src/components/Header/ParticipantList.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Header/ParticipantList.jsx b/src/components/Header/ParticipantList.jsx index bb1c7a057..06cf5204d 100644 --- a/src/components/Header/ParticipantList.jsx +++ b/src/components/Header/ParticipantList.jsx @@ -373,8 +373,8 @@ export const ParticipantSearch = ({ onSearch, placeholder }) => { { event.stopPropagation(); From 9447b9662682b1b8dc698a4c604459eb34776a73 Mon Sep 17 00:00:00 2001 From: Ravi theja Date: Fri, 11 Aug 2023 13:27:03 +0530 Subject: [PATCH 02/11] fix: use peerId for spotlight --- src/components/AppData/useUISettings.js | 16 +++++++++++-- src/components/TileMenu.jsx | 32 +++++++------------------ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/components/AppData/useUISettings.js b/src/components/AppData/useUISettings.js index 863a219dd..f39c484e4 100644 --- a/src/components/AppData/useUISettings.js +++ b/src/components/AppData/useUISettings.js @@ -2,12 +2,14 @@ import { useCallback, useMemo } from "react"; import { selectAppData, selectAppDataByPath, + selectAudioTrackByPeerID, selectIsAllowedToPublish, selectLocalPeerRoleName, selectPermissions, selectPolls, selectSessionStore, selectTrackByID, + selectVideoTrackByPeerID, useHMSActions, useHMSStore, useHMSVanillaStore, @@ -112,10 +114,20 @@ export const useResetEmbedConfig = () => { }; export const usePinnedTrack = () => { const pinnedTrackId = useHMSStore(selectAppData(APP_DATA.pinnedTrackId)); - const spotlightTrackId = useHMSStore( + const spotlightPeerId = useHMSStore( selectSessionStore(SESSION_STORE_KEY.SPOTLIGHT) ); - return useHMSStore(selectTrackByID(pinnedTrackId || spotlightTrackId)); + const spotlightVideoTrackId = useHMSStore( + selectVideoTrackByPeerID(spotlightPeerId) + )?.id; + const spotlightAudioTrackId = useHMSStore( + selectAudioTrackByPeerID(spotlightPeerId) + )?.id; + return useHMSStore( + selectTrackByID( + pinnedTrackId || spotlightVideoTrackId || spotlightAudioTrackId + ) + ); }; export const useSubscribedNotifications = notificationKey => { diff --git a/src/components/TileMenu.jsx b/src/components/TileMenu.jsx index 0a33009bf..330dbcb46 100644 --- a/src/components/TileMenu.jsx +++ b/src/components/TileMenu.jsx @@ -47,28 +47,22 @@ const isSameTile = ({ trackId, videoTrackID, audioTrackID }) => ((videoTrackID && videoTrackID === trackId) || (audioTrackID && audioTrackID === trackId)); -const SpotlightActions = ({ audioTrackID, videoTrackID }) => { +const SpotlightActions = ({ peerId }) => { const hmsActions = useHMSActions(); - const spotlightTrackId = useHMSStore( + const spotlightPeerId = useHMSStore( selectSessionStore(SESSION_STORE_KEY.SPOTLIGHT) ); - const isTileSpotlighted = isSameTile({ - trackId: spotlightTrackId, - videoTrackID, - audioTrackID, - }); + const isTileSpotlighted = spotlightPeerId === peerId; - const setSpotlightTrackId = trackId => + const setSpotlightPeerId = peer => hmsActions.sessionStore - .set(SESSION_STORE_KEY.SPOTLIGHT, trackId) + .set(SESSION_STORE_KEY.SPOTLIGHT, peer) .catch(err => ToastManager.addToast({ title: err.description })); return ( - isTileSpotlighted - ? setSpotlightTrackId() - : setSpotlightTrackId(videoTrackID || audioTrackID) + isTileSpotlighted ? setSpotlightPeerId() : setSpotlightPeerId(peerId) } > @@ -186,12 +180,7 @@ const TileMenu = ({ audioTrackID={audioTrackID} videoTrackID={videoTrackID} /> - {showSpotlight && ( - - )} + {showSpotlight && } ) ) : ( @@ -244,12 +233,7 @@ const TileMenu = ({ audioTrackID={audioTrackID} videoTrackID={videoTrackID} /> - {showSpotlight && ( - - )} + {showSpotlight && } )} From 53ede37519b8e85846ca6c779d9c5fb3c16c832f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 13:28:30 +0530 Subject: [PATCH 03/11] build: update versions for release --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b4bd2396e..919471f8f 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,11 @@ "src" ], "dependencies": { - "@100mslive/hls-player": "0.1.11", - "@100mslive/hms-virtual-background": "1.11.11", - "@100mslive/react-icons": "0.8.11", - "@100mslive/react-sdk": "0.8.11", - "@100mslive/roomkit-react": "0.1.2", + "@100mslive/hls-player": "0.1.12", + "@100mslive/hms-virtual-background": "1.11.12", + "@100mslive/react-icons": "0.8.12", + "@100mslive/react-sdk": "0.8.12", + "@100mslive/roomkit-react": "0.1.3", "@emoji-mart/data": "^1.0.6", "@emoji-mart/react": "^1.0.1", "@tldraw/tldraw": "^1.18.4", From 2d7dfec75e9b5ae943c0a405cee299be7e3d17d9 Mon Sep 17 00:00:00 2001 From: Saikat Mitra Date: Wed, 16 Aug 2023 16:56:08 +0530 Subject: [PATCH 04/11] fix: ui is freezing after opening any pop up --- src/components/MoreSettings/MoreSettings.jsx | 3 +++ src/components/pdfAnnotator/shareScreenOptions.jsx | 1 + 2 files changed, 4 insertions(+) diff --git a/src/components/MoreSettings/MoreSettings.jsx b/src/components/MoreSettings/MoreSettings.jsx index 5b512d91f..c1883b96e 100644 --- a/src/components/MoreSettings/MoreSettings.jsx +++ b/src/components/MoreSettings/MoreSettings.jsx @@ -85,6 +85,8 @@ export const MoreSettings = () => { setOpenModals(modals => { const copy = new Set(modals); if (value) { + // avoiding extra set state trigger which removes currently open dialog by clearing set. + copy.clear(); copy.add(modalName); } else { copy.delete(modalName); @@ -98,6 +100,7 @@ export const MoreSettings = () => { updateState(MODALS.MORE_SETTINGS, value)} + modal={false} > diff --git a/src/components/pdfAnnotator/shareScreenOptions.jsx b/src/components/pdfAnnotator/shareScreenOptions.jsx index ffcd62962..c9a554a10 100644 --- a/src/components/pdfAnnotator/shareScreenOptions.jsx +++ b/src/components/pdfAnnotator/shareScreenOptions.jsx @@ -45,6 +45,7 @@ export function ShareScreenOptions() { updateState(MODALS.SHARE, value)} + modal={false} > Date: Wed, 16 Aug 2023 21:40:17 +0530 Subject: [PATCH 05/11] fix: point to qa room endpoint (#1632) * fix: header design parity and bugs * feat: minimise inset tile * fix: remove screen share and pdf share icons from react-icons (#1624) * fix: max depth error in equal prominence * fix: header design parity and bugs * fix: remove screen share and pdf share icons from react-icons * fix: image and style of screen share options component --------- Co-authored-by: Ravi theja * fix: remove hls.js dependency from web app and roomkit (#1622) * fix: max depth error in equal prominence * fix: header design parity and bugs * fix: web-1934: remove hls.js dependency from web app and roomkit * fix: lint error * fix: lint errors --------- Co-authored-by: Ravi theja * fix: show end session proper info * fix: point to qa room endpoint * feat: add endpoints to environment variables * fix: move qa endpoints to environment variabled * fix: add configurability on userid and user name --------- Co-authored-by: Ravi theja Co-authored-by: Saikat Mitra --- package.json | 1 - src/components/MoreSettings/MoreSettings.jsx | 4 +-- .../pdfAnnotator/shareScreenOptions.jsx | 25 +++++++++--------- src/images/pdf-share.png | Bin 0 -> 19045 bytes src/images/screen-share.png | Bin 0 -> 23333 bytes 5 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 src/images/pdf-share.png create mode 100644 src/images/screen-share.png diff --git a/package.json b/package.json index 919471f8f..716d6ec8d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@tldraw/tldraw": "^1.18.4", "emoji-mart": "^5.2.2", "eventemitter2": "^6.4.7", - "hls.js": "^1.3.0", "js-confetti": "^0.10.2", "mobx": "^6.3.12", "pusher-js": "^7.0.3", diff --git a/src/components/MoreSettings/MoreSettings.jsx b/src/components/MoreSettings/MoreSettings.jsx index c1883b96e..2f00a3bb9 100644 --- a/src/components/MoreSettings/MoreSettings.jsx +++ b/src/components/MoreSettings/MoreSettings.jsx @@ -1,6 +1,6 @@ import React, { Fragment, useState } from "react"; import { useMedia } from "react-use"; -import Hls from "hls.js"; +import { HMSHLSPlayer } from "@100mslive/hls-player"; import { selectAppData, selectIsAllowedToPublish, @@ -195,7 +195,7 @@ export const MoreSettings = () => { {FeatureFlags.enableStatsForNerds && isSFNEnabled && (localPeerRole === "hls-viewer" ? ( - Hls.isSupported() ? ( + HMSHLSPlayer.isSupported() ? ( diff --git a/src/components/pdfAnnotator/shareScreenOptions.jsx b/src/components/pdfAnnotator/shareScreenOptions.jsx index c9a554a10..2134a8745 100644 --- a/src/components/pdfAnnotator/shareScreenOptions.jsx +++ b/src/components/pdfAnnotator/shareScreenOptions.jsx @@ -1,11 +1,6 @@ import React, { Fragment, useState } from "react"; import { useScreenShare } from "@100mslive/react-sdk"; -import { - PdfShare, - ScreenShare, - StarIcon, - VerticalMenuIcon, -} from "@100mslive/react-icons"; +import { StarIcon, VerticalMenuIcon } from "@100mslive/react-icons"; import { Box, Button, @@ -15,6 +10,8 @@ import { Text, Tooltip, } from "@100mslive/roomkit-react"; +import PDFShareImg from "./../../images/pdf-share.png"; +import ScreenShareImg from "./../../images/screen-share.png"; import { ShareMenuIcon } from "../ScreenShare"; import { PDFFileOptions } from "./pdfFileOptions"; @@ -117,12 +114,14 @@ export function ShareScreenOptions() { pb: "0", }} > - @@ -161,12 +160,14 @@ export function ShareScreenOptions() { pb: "0", }} > - 003+V1^@s6?d7@R002rXNklU8G(B1dD zUp(Il&vVXsHPLAFcXT=(wq;vBX(^Y>(5$SiR5gVH^b=#Kw6>vavGAh`wDAE{Y@LAK zi2{lkPTxS6r4tsd_0|rm)he`Ft@`)V5{*XlP{+Sx`*Hz>_s*bfGNRDGA9|As`Fs|7 zy&gK90hLNcUEc%mZQ{rjKl4f{Ann@b`8W(~6GBy0{3O2rb41_ScNJPdj>N|hq&YHE;5#F5D4;B?rL z%Vkk1lu)dc;dD7r%9oKZ@x|6t2`dH!YW0tNrPiYTX8 zKz)^OW2sbvhX3(Llts5_8ML%}C?(a~nl9u~&=irY6qNGG-#!mgFu9K}N4`)-B$7fbnLt~;4-@mtD3^-p-?ImyNDLa@s|Eg^&1R9x zX0V%<^xUN(G`XD^nw~?A$BkqzkEf6B$N1zpUwaKK^fE?^2^u+v&&j>qiYUDs9v-fW z@)^cQQEq5N+2Mq?T7)4nfReS94=I3bC4;N^Ve}X~;m|tpc@lAjsYC>Nvl&jO4|!TL zotEyG_n=B;G14t()9Y^8Kx>sR7uDNq;@?ZfB1(K?b^Kjx(9!DUsaRH&3OTxPJ(afr zjou({Ie*t+c{PfF&x2x-uHR%Eq46Z+5vFeEy|+*T0*u zS#zIlHMo7x?)C4zzWc?NB41!lI-UM}1a#Z-nUf6j4?Vs>QlLxRh`EeR2DDpD05&rJ zdnIFex?yq8cgx1M;=UjB?+fz_xF1B8WvI~D*r=}KlN6P~^FE45SR(&D%Dz4~3b?$y ztg=-F4e7LKXlS_Ob9un;zxO_BYip5CrBPE?gQljYJGQxT;|4P6%q?XQMcPedV6&o4 zOiW;5ZXOjvEXR)>`H%ugV7*xZ<-6f3xiYYxF&mH@+*{!^e zM%+sl7ZyL21ZI-gAC1Ofx7(EkJ8ht>$C(N>0#Jb5% zfA0Ac=-b_k`T2SLB1t3?>bzpH^@q0kyd-lLrL);=N>OvU+&%YEVrD*YZQ!1t75SY) zNvu+i=a<9d7Cn~7OlW~WyZIJ|_`q7ada$>*`$H$x(%OQN8zXr8t&_yK^gMV` z;bIrgp2hJOUO-*IcgOY>LOI2X5jIU0fAtrC0gKgvN;w0wJHWeHAq%diTQGl+6x z35l`^4vP`VYzcqxhrbOs_kBOH^E0tXa%1jRz%bw1d^V>ZdYP6o6kg+T@3bH;Dz4n5 z>({PBXVAmz^?v9W8&bBQ3lck6TKm@`o~b0q|3NfzzoetSm>6POidWw$RfwBj7UO z^0`Ye88tZi^mDKp*S~v*3wFDGaC!Zhoe!a^uY%j6)#XD;Qz9Z*fy-{Y=gG(eGxO$( zb)w$$AffC~8ngcUY+k_-KH^YR2ru96Gw1(c094bgqn8 zxB^Sbj@>(&u@YLtM^T3IK*gfzsW=;MZL{?D?1aTcNJOvW`PtAIPw<5?+_6n05>YXY z*XLFH2(O0G)6;Y7bLA$z9-KdSURgAU%Z0Y~Hhh$b;)&9U@`(lAu=WN4w)wl6@XyA% z-|d2L-!lzbI(OdV1Hwdnm>Mdu%k5E$@wg?&bFL6<*AvT>>)Mb?SqrD#K`gYOfciqA zh=#UKxLtPMHyvy=G|es41$o|Be~$9v-I)c;L)(aVHvjw!WMk6@{mN$LsBSu*X7lfx zw!Iyw-+%vN+2nz4h**@n1LX1XaTIU5-KOSdwasRcH}dY|-%IH?&WSW8YRHIe7ID#= zU6Y8MS3Dk9e;0+^xPCdF{JmPK-m=~svJpGpz5fjfg+l85MS(v_Sy>6;^1uMCvK}pr zp}V^}Z-0360Y%qBNTv&DZf@G7Pq-7!qsUAAslYJzizgpMo^%>etl7s^+!2q()&4ew zdG~F%ua%I&h0k&!i724{lg^~%rk*}?M#V-CD{`}sA3X+-&x0pbHi`{C4sketG3)eM zrt(w_xZ$=WCV3Rg^q^w3S<%wc!WbccJFC5$grQ4XrjL8)3GEop*=N+%3Q zA}19=Mpz70Ois-~sI#6O9XS8qThMwM*C|88gQ?EK;*w&YR+zaTKCu5oP~Wx%{5%T* zHfeg==c`2x6)}`aZu}V)DuPZ^!HtnCSXf%X>ii_aBnif@4MA%r!=lwF<|PnpLLlIQ zR!7Cr8sYZ`NEsR)_!NBP&KDLI;P?6Ni8F6oz|XOi3G_}!lQ8NHxV*N6eqTL;RtJnG zEBbnO(unEs%yVDD(ri>n$_5NyI|MVzyHG|gyDAelgs1h zf7r5o6vMWyfS+UWn=R@;5wqp~yz-~XfNjTs+w!T(wgPU;rz+bDxGkTmeC!ICOvFC) zH<<)b+4QqaAIO)=sFaIHrPIu?vbVM^ZQAxuDWmYAo{1{K(mYA|k}B_#(lV)x-jMY+ z%=Hqb0gmPC|b4pTCc(`7qoy4GQD28HxzUE4X&?6b?Rn9NA0-skIm~#R`r;y&rRP zVR%g?TpyoBCKg534 zT)Z%et^)_**OxFcyNI&Z01IIOhp~icEQ4sa0*k%?!dvLx+mCZ^pH!nV_8vKc$*Th> zS}kbsc~M9u(7j_P&Yrsjoy`nAx0jBzuFgiR#d4UR58>D|hcP;M1&vLum>^7%&z4c; z>)O!L1h>PC1#aVU8R4zpiHRH6kWR<>a`Azu%W!yIFdJ>K87sUF16EeTC?=zL`K70E z^2`lX^cn=+F2vJW{NeBa7IcrP3^RZBeN@k#Lvi;`;Kp?nd_fr7yHP0>FmUxMsyY*T zcXaV(DZ*$l^M%PF9$!PiR|AbskMQaurlw|9>3^|Yf!%5%R+z=!zFydE)(1L=BwqsQ z6O#Usdo_7&SpoYF9)_zn#1pZgVz9!=r>Hd~(e<705LwqV)h{CH_rqwlqJ|2ZFKFSm zRM7@Axyih`c!OSxmey7U3Fs;*cnEqP*1zvd-^ArK25oo`;rLSGnj# zrBLL)^yuH+heRw!g^>wXK^W$j;j|g~08H4~-3^PU7FMen8SXckl}+ z$ubTedm8V&`%^f*9Wa?5ycxbiBl7e2PQu}E;HjsMf9Uf^D@f(T%$F)K-G`Q`R7wOx zt0re;<7_st{Mid1yNLof#) zB^w2)QL8ouNjo)_H^42Oo?h?P zi>5O0@TD;b08KW;=dwbhH`8ORVPbv-H9>khw;z6|{h`iV&QB`t?-nUY-LeII_w|3m z`$N;vQ6YRTH{GE;Yz-Pa_n_5N!dqu};ne?c<-IpFtDUoKOcPh88{3ny!wN;@SWfLU0i(gM@SU)Fj$=!y>brCJ3C;t z*brV^#?!C-GO~+f7@1x~mP|oO@5IX|4&dVDOE~i4FXP(DA0nous~#Dl)d=FdzxA8= z`M>-ZcmnOHvsG~V(lDYq1OENL{UbcCP6&{j?{8?jZnm-21MmKCtAn{hy03*BEqRp=TSkLhVeO^n}+jM4h~_S00v(NI@|JqHe} zhVw&hJusG&C|1lUmUMXWrDt*V`Z!fE4;L@e#n>a*?1al{#)%WpV0s~}T$NaqM8$-9 zy3lWa=a*>((lD5usALoTW(Ca_amRTzG%}e=Bhc(dT~j;v|0Sd&A+&Y%!NhGVCOaDI z{fMsmP}kCqj;4BA<1*@(GIYOQ?CI%2B(lty^$<){iX%@yhna;%v)pok$Xal#gcNZG7UjoQall*0(n$snvBPwC-1lsu--kk zHk;z-Ru>G~JNuD~=@{}F8(%zmbE=3Y;_x`vAJ$qp0waTBJKeIlqy$}(Of*;@7F1EL z@m^A9ES9D6*e$o+c_f;kq7`Abxm1I^OiD1C42nE&YHDWulBZ&q)V%yA09>?)&)Q5@<=ZDJnnhE6fO;C^~9k%P_m@-HRq`6+@%b2rVoz;MFk^VQg5o;^pU$ z;r*Zg1p8n5RgAp(A8|cqLx2APGzA=Z`>i+mVDFEUrfM?&#}7Z$}d@Ul>5wp=U5UGK777dvNBRci_+$5$t;wiP<4# z`R%@X{Ja10kH64U1Gj7e=O;#Sc3>DiJv#|eq+m8N^VJ%elvL5#T!SUXZq;lYT4sdF z6mhgdhHj~mkVg@r)d*}38?>~B)p8a;fAc+jgV}Rmx8T zy0$u;2+}PIyr9!n)j8J$+*nvzL545Uo_#wJURp#Vo`#@~HFb3;r6b6c%#2^t7>ViN zHkAqQxKQi1V2#_YhE~;xj7nKD^dP)u0~W(^1Z(TK&lKGH94^nLQDZl#?B8nCBAH&F zwy*U^JoFLtbnlyu`On}DL!;2i17PqT?{6aX$@p7Z6+Q;s-#CtV=eL-K1^b5 z7G||oCM}{&GNPhX%puLVDwRm{VFl>&DwtcGM?-DB>JyGdW2h%YQxFhWI>5AgTALIS z+^^Rrc1XjRErI5S0Klkuii=9n-( z%vKDrn;2s1XDG^i*g0lv%ddOXTfDi_b=m1tpQ5V^#?9)A!FQDNu9HyIv( zUB^QyAfIY_hHzIpbL&r9JC(oX!SK6JLLSKl|K0!de`9!c4Z(mP*-(-wQyNWskHHX` z#2O#?;!GGdO^xX6Zo}B%Y*Ulka`-HfW@`4D$=wtvHA9I{w8*J)ZVQg#?E{~4}W|f}7PhdXI7tD>? zpdVWinfN8W%NzgREnBvLS1(?Gx2^#`W^xkz%fRm0xdpU!w5eqeip1~4+7t_PHH?}Z z=JkoBGV4x;JDP}%iB+pGS&_F@L+d7SzD84(2un>ys4$2ZD`aP^C)Tc7Eh}nG*4HS| zipnG`LG`C6C*UH~Aycii{C=J86daW5;VZn)7zVb`90cYL-nFsi<8{n%}7op*lO^5Ok;FowLJ)Ysnmg^$9uo)i%aC{(nLFGtnJ zWY5Kz+rExKNJcL&UVJq~z}cn%c$d>b09sGNz)Fm87Y46hC(~2p3mhcdv-On`>KH?> zQu+Frh}}ybOW-2xgII-+3a&SsQ# znK+pgQ)8xg((qFqU#vsq-p%w5I|#blZBEr2qJM-JP8gQGd-mS<^DW=0ciw&n5mGpf z0rINE*jhSvV0CF0@l+9Oi^JIc>wMY}G zPo|S}eRaGsMm{_Xw1p_*1!kKby3~9eYiXIJrD05F!NMYOK)PhVo7r_Ti^ld&9yi3~ zAdac|HGJi3UxtaS$?40?dM$PY{bXqpix`+mq1I@Z>-|$`ZR~=Jv0{qkd?G{Y&#Xt8NluxTL#H8^%ZCz4=FrvTMre(R73nH1 z-Pmd(g%bye3}_i!ktxY($dyZrBNHtnlN&9mEiYrM@Z2~|zD69{+l$8`^1fJmy((03 zxEcPKb(=opz4YE2gWOOxpLc66_hDtr3Yd>BU}`3c+3_lxynGm>tg_3an5Kf1sSLr^ zNz5#Vh{G+QuGT?l#EDjK1@E38f{yfSb59GQjwI$5h!vVESXrJzrfh+a?14`c!BpA; zQ*{D;Z7y7&T}74@T|=z_Gn0#$UrpkB-~9%L$3_s(YcMl#ikYrKk?CW7J=oXXPK8>+ zrHf&Lz+QN)MGTLxVaDdcfv$j3_;fOkYnLvfvAZ6nj2Yc^CXA4IDYn&Pc4Sm3%u*yn zcEgTDB*zCCMbYBL;a%N0d+szmd>OR9CfH0#T)sF1r_ahbC&zzn2oe7b=N2(_^$ZHO zTCC2GGv@T6(XB^Z?}cNQF{v?wfw|;kQ$TS)Mjp@jgm+zhEYq=sLD1gA^?lg2R+t#9 zLHbNxF6S*bx3R6_D>rSw;qLC(KV9DJ+zbN2TE;84V??R5+gt=7gnO0A&fQ*iV|j(m z=T$1L7aH7s&JyUWLE18bidM{^H{5q0o87kho%>8PxOd7ld2+=u(lGVGN3$y1Ovomg zo4k(k1rpr^n1gh~MS~TsLAP3tDjbc1#04ocy61Ehs6HRP5xOptOsKW7aVC&$p<+Q4%U!%tRaba)J1?d`C8Y)CK7lR2>w!Z6F*2R%XQ z0>O9*xFeB86p2ato4XO2n@}0QjWl9?Qxi_VcM?^t@X-OxheCv#N_hU6}eYDND4-M1IHnxGtrUNljNK$_dRYJMSiEOD9Fb=URT46U1Osj z@}6m}sAeYVp8C~CW~&3~_%c>Pt7LTuOdCuHGAZ-8y`(c6(9DF%!Wh}+aKq!TQ52`q zE-wD#@95jI1)QF^h8x7zI@<&IU|}jvZJEzWLjTxxT;($qOMom)#YMIfF4i2e~ykpP3fHmT9 zgI6b2^U#53PvG5u{#%%9npD@FURyytk%z@*qS6txb=q)b?{56?jkoaJi4zz)e})v6 zo#$7JLv0qkd2yN%RTW;c2gyPSzwzB~;h+Bh?;{C2!D%g$;bmsZK7#WE(rZ0<=J;_Y zOK)H~lp-J<#WP?3F5Z9Rb#*M0(}(Z<`gdt<9)}|$M{R9JH8Di9R?BBVs?oR(K5Gd% z?caY0Pl9au%3Yoy`uiJDOs}H7xr1y+1{Maw(gjyx=Good4Xb^b0C77_y#YpD6>p!q zz|8W5s)Q+OtYjMO=-%1O@0rPPB-CKzG>5*eh z)WU701g-!0vuc(32t8bh%t}QkOL{qJWm1fzw6q}gd@;<(Wr}DB1o7Jqzz6|YK1~Yt#m0O?oFfnFc%$X zR-TAOU?a`sv6?VBw}_6m)_b0ADi%h?05yJSLI4{WmFAXyaQOVh+0t+aX(;+{d? z1F3H;YshwlW@rVQkk4mS>uHG;UWMoGlx=30nKLDMWJ`{K^0DZ}8{;$NvtirxAbf+rNU7 zufK*X#0kw+EehmlYpl%T0*zRin!>TCj$wFsm{u@_oV5Y}^Pl`4PQCRiE?l1^^_Cf|7-#4EGJ`!ew~0dung&6g%-V6Lslum933c=NTlh<#?UytJyUXOSY1WL-4D+l;h~um9*L z_@&?eJ*2}+s{K=XR3%2t5O*vxmb39Z3i-5xN-}B2j#PwfE)T2O#DqhumU%4|(n#?I zkoYp0EvV&9xfR{I0sepw^Rv@DR~Ic;8O=2wEE60rGjTBS-q_u4j9$B;8n}&&SzQ(_ zmNQ!DdCqCZnn9mSbnMtR|Jk(!74RWYcN27&aJJ z*)8`j3(Dn)VQHi&l!*a(R|m7V^%W`;j0?TQv~(zClSq_w@H!r@Bs~@n^QCgCeT$T6 zQNzg`f_}d$;g?+2dUFO}IJBbX+%&belK)N6Qkqq%)BQy7wR<(e-%lPz0n_B7ZI&ks zb$c`yeC{3mmw$W>!q4kybqqS0EI{%;mnN4Qz%PCMCA|LH&*3o_Fg9P{!>GW+q~TlN z{%`OPfA=?Pb?+cE&yl4Vy!JBcx}Sj~8$#Qzop}9?lYHQ2RO!O^w$)*jl-bnmA}Oza zJl)@oSD8is%CGzqhR(i+nRu4*p`A1wEt=JXU0r^>|IPrd9$hbiEiHA|`tG`&h|FAtv#u3c9;cohaeb{9*GF$qNlP%0|BWs!!Q=8E!~4>6p8p!gPyQI+`d5F7CeP#T(-;}dA~ajT!4nR8h9_$v+SZ$r)*`q@msC?< z3rVI8`t_zASr*{Z#dA1*;$I^zp$m5s?P-vC(N5Xca5mr;jc$OLu8w2q3(& ztck2;@UP>s2d)g^g%@8?F{**6zl%Ka>gpOp1+%KODKLKXxE#b2na1jjv}jgnnAHjn zn5Oj>94rx8MmQQ*=ip_wT`bZk=ZaY*nbF#qt*)gC@O!+f%GR%XIIt}bC=aWEi_{*4+?;;EqBuNs($iy68dg%p>T)T)g6)#sZz+6frqct+N zHsP5ggs(nE1NulVczS9aZ~gNR@ef)TzWh`l-Z@K*k1jA0N+8%^LyYkdT=i%V`mr=K z4!f<2*`xsm;Tx-IH1u@gSHJZeyeXf(;Q6y4!q!9xu$(y|6q=NW6aR?yXJQ7?br zo_(km7`{*mr9@v)gu0p_P266t^)n<7V*w>Z zxOyp}LJYxB3kfZZ&MNv3KX?I$^!BLELgK4h?Z+QGK9*{jZFw@pz(D)Jkw>dWk~upP zCOuBso)Nt*pQ>!x0*((~#VV11X=-*5`42BG3m`_EjikIQfB@-{4=xVCOMtgjEx~TG zph_1Xj;7I3@4#9jgIOjqJ-wYsCdj7vYoH;ooGuAwmu99+pf?gn3%OM(5U|)u@Tb?X zNPaaPS;3A&2QkMiII%p3`sPjqo12l1E|Fth!q48if^UEKE66gFE=z42^VI_fcH!Ll z%LJ7j2zqU}eEAZzwi=i;IR@hv;&Fs*h}#MH-Ph{F*@-y+_2SC4F+~L?Rwhuex1+Z; zfT`(O)s0sqsGcA#=keMRC08swvRzZaayX_M+N043@-X80f)shq=Ei0<3pui~g4S*`%2XaHd-v5e zV0QQlh9@t>S=&NNO3#OT9R{0I%~cr~93p&D!BZz1Na9)x0L+osM8hKJ|2ErD? zY;^VQLu6`@>;r$N67D(#)pH>j+x*4Lc!hA#;>;B0QdR6b)Wb~f2EP}B-sV?jP`%v^ z7@b^%&uKwjeLuWpVMfL#V6<6Cw@LGpnVFsq3xpzi8=u0$^a6IZdJqk-V03&EUcxPj zrEA#H{xY)h2$q+9M3Q4zotwnygiZC5^dEZ~IYSv2&YnS;lp8T3zC2FE$#;)OGI(ic z4Q8h%urfDJ*vf&74AnsuUu5~%l90O_vW4MTpOyUKZKbF{hKp|&HKOC@c#eDR@9txX z=!M~slB$m&_CIPrQW-1^igwdUuAc}0M#U)ITWX1+tou((A_k4?ZkoIJ!C*$LzXz; zz9YvmdSeU@3!#8=m2QrfQF!B24(?zLI_f+a9G-%Ur2Xpf1!Qy%)HXDtqt=b{bl*jz z1J51ag~7p5r3_s=y447`&{7DIcpT4t=>-g39Yj7Jg|nd*J6q~7F)}c{}WHttyCW&~#gnfH< zs2aa$EC+v66DEf*5m45`YAC_qa}?3JF?e|`;h9M_L0+bLX~>D&=(f}8yef3i71IcX z!nk_nGP?Vpf!mlvl9pUo&EfEKFA^(#eCUHH?fIW4$i!ITaT_-NhzyN@EJSFy>*bV! zTA8_%%NOpLcO%S|RE`OV{&8l+TUNk@xhd5eX(kUEr}EX+H)4Ebh_1L6(d9*0`A|}; za~NBWqRCRgg@HjFeDN!o6ZV9xMT{7fsgxl?zl5sY4Tsx{Y=rE}^)dL&?Z`703@wad zsh$ckd|kCXO6k_v$PIG58Mw*uYRGa#LJ?TCIfUsd7fcmQjgP@FV?>@e$z-=79S#$C z%~Cm1$dGd$xjul|rB$@IcB|Rc!$V_e=-7dMjO_*{htWX=%tz-DmZ6gw0~%a93{Hn( zsPOlao-arP#)gKmnu()sXCBw5X7FNTJsA^%?a4JvP8RvXk$asI3td7RLyb~=1>;jw z=>^!oseoiwL;5g>o@|~9_;{$eWKzb;X|OzB!j1#$z05Kdp}=eV;L;@oe15nb z4mCu5ef<&*78mBw)76e^6Z2{yk%boC$?YzGaE1on%omuU60L#VW>-oo#k6TEbC$rh zOwbY!k;~=DGFcVv`HMuuhguaE^{_5j21FW+M&)v(KF;cJ-AbutyqaF7NHO**>r9H) zT3T2@V{51CmXqmI>2!*;ko`m8=4Lk~W&azM^Qu8yr&F#@#sXU`_pU$O_`cKxYVW!p z`Al5vGOc1=L%lkWTb~sQYCVfvA~OKfSy*_3OAwb_QL|L;cdlhMd23Un{ifqfIHDtI ze*5z(3WbuozK3zice~*Bj&`+AX$`oS3%>HMERIv*y_dy-%6RF!Zn!-LQgInvy*7kA z8Ij5P5U){(&bCIR3L4c$dSu@ooIGr3DWo;iVaTaCHRPk_P=f ztqjDcQQ(_h%9b$4WZ-xI=(q6J8}Bj1(x8}2!sMududxM}PQ8T?GseM-7qM$kA8h1A zGx0SwI_=o81NiCB-r<{92VI#apKoT8Tx?=B3Xk7ODymHO+;VvFrG=a3O`Eu?4lJM_qkA@`(`U>B7wh6FE@60F32~{#It# z^C;w0GaudLQ;3XxfE8w|Z44_Ml{iifjG>8EIF-!9AG9)gsmJ2vHMrastcEkF(xo3c z(2KKY&tu1~K166qOconzYCU-SwUemm&8TUt!~R42aQWOt%#({YR&w~(um2vJ16%9v z6KnRfH{ZgE=bru0XL73oO**7w3>R#)QW^5``SrJ1Xf==94NH9!{B<&3#Ka8VjWv28 zX-JZJK6`iXMLd~+x2=Wzw+VroTDaBp2@OW*g*w{WU~aacn2n;QB2%?!RFXMW)vnjH zG5dco=c<}K}+jk;+4wS+18eNj1m^9YAR^$>P4xr4u8l}S~azGScoy> zE2PyV)ku65UwY+5weX9+lt7x#t&BE`r^= zf=mKh5DhIdrcI-5N4**&5{)MqC)p67JCdd?lgWx;T|FvBsgb1Xvbe~F+uYrnPm;yloW=2JtAOiAJMUG2;*Gg7aBX61gB|f>L%~uH50$WDuqFOKfDd;wG4J z^9^w;w;N+TCqw1;2T4#<*F0N{$!CP*E=H~ZGbZ>>KR+aN_o+}fJ z#dxFKx3X}VP*u_zVAS4mFjdT|)yV!NK(DBUbv6QX>5mmRD(9G!Ae^q>X1A*lLyZI0 zL#=is4?;%073rdK#j;uzXe0aH=pNiyDPTicWX512msR~E=0_+<-AD*NvnBakg)+doI7_7 z#}4g4p60tiGp@4*@bxdhOn1A0D?@`wGSLugxJ+O<5@OQOcM$QJYbcrBw1ysd%|*-- z2rk5uSS#qz(dec%$iNqDfgNF-9}Q#wu116w*VL3x2dzz*uHR0g-GCzTyarskIu0X& zXhY2X#(q3mxtKl9I->X|7r#yx=p9Q0ew4LaFwA82z2Y2=wxGY z96h=pKYRPET868(z8OAa3EZ73{W{MqzMaWSfnh~#Evf!i)#;I3Ucr~X_lMY7zxCzF zMUn4q0Y4kEqe9qW<-Wf9mED+TR=cNf2j)XbvJG0gjjAe(mr=Vi z<-WNw$bad=6IS>MFKC!hnYBh*+cIjKT2bSb&N*>AB{j>?$^XiH);?bl%}um+4D7vB z)~jbfPy-%i0Ysb4fGjnyoiAmSAh~qd?O{gm^SF2o26W_8s)1@P%DA@62fyQs+YchL zWgt42Nvqz5GTon)(n}m^qnp`C^+hVTmL}Dx>^H?&$!4{wUI}Rcm*(*G??9E(OF|+J zMMk&<{C+j;r%V@YU@&iFLLwQgY+L2`q=?jTGi#Nj$swbWHO5w6sYNC3w#e@};dR+> zjZ@PxQ7Fk0uGRGlkvw69N}e&4)(Nvwqpn{jg66qz6O}O(7MjhYI@^>~Z;pIZ?FSjU zJ%GhYCq%k}_>ntJkS;Lfo}fng~2(wmb2F^{Crj zahv7Fzz2By^aZ-wG_4kCEKehzKh%L!XU;=w@ndgm1Lo$(ndUE}ok@wi62`^Z60DUp z4!-ar&i>?|kmli=8iH6{NkH=Vn))EZ+&)}1<5!;V$IstAOGT+ba-^^R+V`+@;~c51 z5$OEwh==A?rA8!@$F9CUq#{cwP!)SS7zSK9gUQvhS^-nw0a^D$T1St(@Kxwj^Emy% zWu($&wC>o4==ghB%y}3KX7Qbuj^O<(qfC;Rp%%zFGYkI4um38>uaN>wGM0<2K+ibv z#czHUr{BK7Bx(&hVt9%00`~3iS8Lq8_3A(1>)-tje)_{#k<{AI86>_Lo5J);j@Htx znzxQ0>cx9!E+f9Wj6eFf{~qVZRmr9hVQgr#xltk5T_DUNwQ){|m7f#W ziiL@1Wb7Avh}R+flm zh8Q8U5#uqPPCN0=B%*l@S)d(QT3SLwQ#~$RxCAFNT`xb^5N=smj=^cSsDcMs_-14- ziXCkYXlU;wtMXv?eJd6)o+Hde6KmOQX1Sj@?~zcYR?D5rFRc=r;;W=2aEDC@-u<|K>K#0XDF zma3sbMWQiUzD6vPr6{J;Xz6U{g{D-?Vv_Wgi*b{y_#h0- zgp1q5~&ygGy(-QCRIBXIEktVEJ(Xk~^lkJM|UeK&ezB6=Bg$tR8@_`=xMa!%IJzL|BPoy+5PO~MFblBs!L6ii>W3aXKfo=965}v zR`6_U6|bKjB=DIb_DGDep&j)m4Tg#11&MX7#M5Zs*^5hq8H%Zs}m9M>mbEi%bFl8*J^`WoMisAVM6xLGc>)%1Hx(?^xe-CHh zc^h_SwH*x(41I6~87h4p0reUtN|P5)lk(HU>=Nv8O${<%jzrPDyA#Wy0>1O|Q;ZRF zIQh;+tdcFt^2LMA2RD!EYiq^K#5MfRzxtoh?0-Dt+gxNgY-ZJ6t(vAbjG$olE~k}Q z{Q{=vLc~u^OrYpt$aj|sH?8q`6d8ZZN}=6NHE`ONkj|wraYL3nGoqt=C#J{8i5Peu zc?93qlMpI`aDftJ%lm62sbAnpO1+&dttG^@BpVu8vO!bE#jBIpv#V?U%M9jKV6PQx zMedXqFGs5-mY^V&E)49Av}F0BP*ny+Pe@soxB?lhBi(b-54t+P2ybmI-Es!QH^$K2 z+p8>?Eb*EzFu~#5oudURb3YbdpHOF2vC2gDE!^+?!jhUBBgv3Ms3l&H%)}FJR1y|h zVocH~!TMy)X<2+n{E*;+avoXIiIPx6lUW44PBj@!I8{lQN(v9Osfru1$mN@h^62y? zHE~PI*#vVGPF1UYJQh$S&G1IXhum#s!;!F>Xe&vX%(gbmGhlcj%cVJ;7DU!!^fK!! zor+tQZln}(T(yV~J&sf}iQ?FQ(MXn$kVmqBkImWkQ-?A)B1QEg?sQpsn@XXcUQWfjW&H=#$Cv0WXRkHxuZ z9>c4Kjc575(n*a{q6}k3nOu;fOO~a$TA2troeUWgVKOCFz9>4?UMZlvo=P7HEs+7T zt4RwMJ{(!BS}dQq^Ar_PHKG#~pO~6N(C<@Bg=ES_D!+%n%e?4(PFz3PmJEUIj>kJ> z(`LMPitYD(cv7m-a66_81a31NmYYk^S^^(`vb1FdTwIvK+i$1R)1`0^#ptT5<4P{Ic%-y*NLK3x0_?nhTHprzJ@s*7=8 zdC0@GIqar~99V{!N#a{2(>s2*2G z<`7`k-qzobQ}3LCtG*EpOhN**j`?&97yo%29!n;2H%_-L(-LUGB+D)`(a~tusXNKQ3$%z9ixy|! zJFk`zGl=_F6)a}8ghGkdTCWq=%mjfhNtRrY(HfF0NVs5?l{~A}^>G=rdXuwrstLU= z=vG51)xbx{fxU6%;H- zGU%#zV{CRoE#FYXxNT};92SRLjVTK=dvr_p6`xXy-wBXin4DWCjN!pD-C|o~fJ!Mm zu8Ed+5^L!KI!M#`>C#r0R_OA{a_|LOOcYVu*q{LG^Jg!ixy6sMv3XK@&Cn6oE9jXC zX6Z6{EDNcyqRN1cYPkfeC~65c$TF-N9dS)kAd5>241LHK7o{{Sg&L0o7sh7L#A8UD zmxvRJ$?H+$wjvdeAyrw1S;tsUtfs$>V7eFa@HD1)eL=TRtv{U4Q?hN9!x6Z;(I?UtYgRPpGF?EwE2s7*5i_@py zr{di%rYmkB6;`g=P*dl}nKNf#rb0^GGj5BFTCYRQ*vXEf*c>ovAy^kBiKD8oJXocYR>XJGiBQ5EH z`H^!$?PuedUTE^&&3DmW967>E6CT8K;ObjE}Ca_x4;Dy~C7`!%w zYop^Zm6Ax6nbliqf!0jBtEvw8(=DFA%P8BCfk*Y?ma8y=(6FOpEW{X8t zk!aLPjT(g!-aG|mP0Dnwg;G_GVv|f&z$>Y6$uR?~;x-j#Vg@S}EaIwVY?@dRsm2jE zoF#OiBTOJgq?v49QG(*!B>U7zWy;O!R-O8}tX!{TqjEesUpWUURT8&cxp@v!A1FzL z_0C2lkdq~IOdarJ+03$kSe+`a#(`fppdq3M zxPZy=DK$<*cw7S+fV#RSVqzxz=tpnjYu^DP3f=X30sr*syV%{`isR26#p|#B3|exd zEsgCcBv#PSxeJk{af}U5ke5uOtGfj&p)heYX2nbwT~K&==4rVfk@ zTvq+8%dr&p5jy$DADu*ZX9E)&6ROPU&z^i2-~QeI79D;w{_6XGkH)q(xcoKnF^3wS zB#p>xKG@rgb7W{d%ygHDZ4_=i%d$vK4R-Z(61uU%s9RsOCQEpyv%8nN8%INH2f=PH znHs_>8Z(@xGWX*oGm}GWOEYy}=I*UgIsMpoU?1#;3a@MZnyV%qEQEwcua8nGTUC*Q z*H6l>u@Qv~F+g&$ZH=T4gSBc+;|CRCYGTotf@C}d>ZP(k}+5oiD3J@I<6-Q%A*=g9=_I{}W76$IsKW78d(D zE|$rpN%lL)R-~ZSn-z{G^O(ywaW$z_5q!?TZ7hUhlEeT_($|6NZA$HCBf0D^kxHuy z7#T+)4@?RmOcty9tfE#sC*MmB{q{SDe|~7(O$a#b+nQSM zGQoiCh21KgDEU@tW~vtH8Y|F}G0~YUeA}a#kU{9X`^cuy)yi~xg5OeSSmj&qrn_E_ zMqzc|4arBuN5D54&KQ&7}+Kf!mgt~wYE6YoaE%nM0(k7|KC+Yo_ zm7Xl}d$FqAZ?Nz-c z1uT(flYVI_rZ8Cyqy?|w_M|egoajY8W|ixhOTs2D)l3>9rzVmXx;_ z*9%=W>lH0(otm37P}V!j;&rE+WH zpVSdr91hi-FJt87`4_u(C9d!$t6-CBn9$A(J9=RnnOj;c#aB{E=h-58fKRT7AcwXHzE-Z(Mm64=gu97B-6-7 zBUnoouzz<4LW{GA(9NEB=^0!&bqZOn5&QP{VCeERo;}u!0VW!$cuuXkyQjm2*WMq3 zrI?1+8HBk+%957PVb-IusTp&N5i|s>n4DRGhL-lF-~Kn~Yub8a`e$9XYyrb73%EWq z35UZ%w`Cv?T*R7`Jkx!aj8@dw`Em7wbMQ8_!K21(=+un4K+uC2-JXRODMp1c=Msci ztf+0MM=2deI#+>BlS5W-!RX*1c6N7=?lZzzWzyhmL^{68Y?ws8*^bVxc0xhpbo&Xq z^okk>=CW#-iIVJRKxo!$U}OB|w&^g;ec5V)NUf}5XnF~KJzZ)VR)(R%O38}dt+jkv zq6oO`Sc#@_ZEyf}O>NlO*+k1+#!4iLUP4L}RAd9KehuAwXmJUinp(udtB56wYPHNA z-AzOU!mtn-um$;Dp6|tTXVAUxpju;2XRyFZYcCB@)k+@Sdk@2FdoW&j+XZiu5@SAD z8?M4Q&cPchSl}WpoK9oH$n*@3?%U0*k_m;ysa8fZ5O+%^vv9dxDCW|Pe=2Z0?UUkbXgMvNL9>gGE^$Gh%zCRqAq~lZB7gf4KoHW;`y(!i!K(C3IU5Z%R^z;b1(Iy1kR!ASWrXtLP6U)mX^z7(V zg{%wVm}&&-Aa@&HUSt+sKvPpI_v1o3x{PE|3$sidAl7F0c%dl?Ri|T|IIbFp0$v}& z;jp6OLh%H;n(GMu#%Uc=Fc~Upm2$1wN@!+A;cWFaHQctK)*No{XhSw0Cm39#vS%4W zX(ZH>PDJ4G*QsISIv!6?imzHo@=6VA#*Hu<(!p0@M($Bd%C2|%NlASvokSup3)HNr zF>IMMd0(dy;aCC003+V1^@s6?d7@R003I-NklgpV3rYF65GcU(|8?XTx5D1VWCE*+fi8``u%IDCed~Au96)YW5(jjFX zS(M~I6pw6KGD(>vXeQ7g2@)Ux0tCPX7Q0yNV$)0e^5oRhIaZZ_-*>C3tLM$jyNh^t z`%QOO=v(*x?iYUFcki{n_}FjxU~z08DaV5i3-X0!gMU3}vE=2$vgC-b@AYMS<}@`yTTZe4s2*Wm zo4b5$X`e>7S`mA~zd85b8{o~JW1vi&EXg#!_h7W5E2HKuh(1&5= z<-Nyiy%vwx28g$$sg-Ze_bt=ro^PrlzwZTo9Da_q6yb8P0G(Y0|(Ydjo2#&?B z3xClM+EvQHv(OpXd~8eqljpa5fun62NgF-r3b~obzwYq8oag()m&NZbp6@kn^jCrQ zXEBQ@mJb2MrT{URzt;(mEh~1=mR9$}7Bf z*l?po8#^3t(RbnRnL!bK@5SyFTq`HLoq_qi;KJyh(K!e}HqtZkKO=)9I>qyc$HEg` z0?&1ap!H)Ff&skM-=i`0IjmTF_`8mc+=k}`zb$QeiQwC51>NND-CzEm&1-&>H+Q0g zGC~NLb{|M5L?R9=VcdQ92kBCUMrIDI)GwQ%?~6v2tI4487Rb2u*aIsD9>H( zZX|Rh0fUb5&6jeot}7A|K_eillt@GyM!LZZq@diAf8}M#%NMDb&||)vP-zG+p~w8b zjozw_*6X}~Ed)d&Py?2!4gVx|c96clG%|ETiKnVJ_+G%^tJ<)l#`9yH8kdazE_D|F ze$P=FsK-dXi(2vw2(@AT03fW8be10TjdZdwl!6|C;dKYWxqhJDf)3p+-A2(lsJ(n*=n3Iql8&?t*g69XX@@7+0bYaij9NA}iUL+8AcjB24;CdL0tpD0XIh@x zNmkI2Ue`wFDzD#9X*g+{2GL%#RC>xtPG7!)?!g1WbA_Fan8f3Kya*_Le^)QT@QabbGG;O*nRRy*`Jut*JnC z58v`5sbQ+>t9nJVYt*b2*nOTp)Tm(hBb_n?a{zQ-%z;=l8};gsVk0n3!sm<+TGJl< zyIzB}Su@9icCaFekI2p)-a0;tf_}7y$DQGq;R(ZQdIMF`Mq7rJjP7TEqYbT%;hBTt zkf>_L(2y4u%f|EVpp$IVq1|PIvF9T*YX=P(s&fA9jU_mhZS*H5qK6A@AK%BGQqFW* z=tTIt0OyZ77#KF1`3`|y>W>W6p=9$SbrUsmV4z!}@euC-3(=rale!mxC;r>67l6q8 z?ucC(sx>*M(UuAX107Kt-DDo_{v6&%27P-lYzJ6Fz{jMVdGuY5PxKhPuH6Gxwh#i$ ziZx*PuRr_{2rK|`32DXJT#UF#{Y9NR9C`AmOUGp3@9|_&^A7_S%I`S^&FlP*-^pwat~J#WiFK+9ek-zjLh0}Ca%8-~Y_T0HlA2*XY}I?!Y#q+M2!%< zLJ$sRrTHWjO*ZMlx|J{tEtf#Y%fl(nC+{uS$YRf^U*C!u!vvn%*DF-T1bH&=nT{2& zxLyUWUPpgnKfDMVyHtcfs(GZ-Ba0!{IiZaf)-~b>gR6&qYzW3c%SHDNrCG?;S^98Z zbdTY=-Y!*dMXFani`_RccH9X6h=3FG0`sBOrOImu05ddI)GvB+tac;MX(XQ?eD6{E zdCd;*Y3~wPp{E`6uxG*F1(LAN$_=kq0Ww_YC-=dRQ@_deN_qlG;Nc>9Z%; zv5`?1s=e@e_&ZIiUO#YfMxM)xp5taOdT36CZQ-~23c``%<0ddhn#V`VV5ZHjKpG6aIyok0Y?oeb#)--CJ&MXNcGgEbU%;oj&*7fR z;_z)GHU8k%r-#zewrzYf7uR)%&vTn1)Y9FY7xzx@be>W1cWxhV4^H*ZJ^n%b#G&s& z+S{d~?|?-M)}3+chZ4~8hXzGp(^w%0G4%4}i@v!?LwDg#M(!B^cfkJ|UR%GL%cN2D z`^ctk)cM&ZC*^iLOioT>e0&@$D=TQVT6%6Gkw7k+MZM8Lxm-p*pGU9PL%-igf{o~U zqoKKGvx#D{fG3=3Tz5KfGYRc%X>hqFEOKAh^`Z*PacS_-o_w>)Q%^mK^XJdw;>Fi7 zJ~ay~SA<_=mqs0kk@PQxwF{}-d(hD&P}7s29@ungus-~olZyF;Rx;H zb}ETxG6~0V^jP?8a=hE^>bWVNWAofxE~o9IeZ}L_E^>{$-y#1h*Nu&hX+7k;`qnnw zS=x}6qiQ@ZKK+r-9~yzyURr3cX0{Ydf#qj(OMq?zN-Lx#qGD`-4y9m@0JP)QfAm8} z;SPLba!dL9r;p&5o7eH=@jU*Js;73TiJh}e1z(08Fj-dbgCK09P$;ki3;^Zt2fyb7 zIDg?HjvPL$9rm>sUeLw~i!`=0;$QKO;Zx;0?8gph!zI}v4T7^xJ4zZo{5-B+yQYKNC&}%xJw3Lu znk6H;8&StwBZkN>aNcH&Tc3L5w|y&ioA8Rz#E6G?%xCj4#letq;;esM`nhPiZT#oX z@8K)`*KYaa0s?6?Y4p8l6&Zt0EwhQegW?rwn%8*GPOz~1dW@27a~K&hu8*E#fT zjmr~{QUKV~!NV;n8YeV?{2;7j1s0|uWQ^;tPOF62;6<*!yz9~{PNV{(IbI3hP*ocg z?^i3A@MacK;WEPal8$?oTS?M4yWH>Zid`qy?HH#fd>*MImG(e z-<=C*?IHbc>8OOs2v!i#2jItmXD$vAKfFsAF_8#K-?fIPg+Ppe{N|UR{^_4q^|HG> z`Q(#0a^%QO-%F=G@x&9Dr=7FA?BBniHqsfKK7AUcQt77Sr%s*1Bab|S!?Z_t7Xie{ zlPCB5J-Oe*4?n!;Jr5l^q}R#s&dtr;bX=|xTY0bVW$?Y(#b9ETdkq=2J*C|}bi1PH z;}3t#k8C~!+B^z~54kWa=5$yA%8gg%qmcAXMwKr?01pF?-rS&xpS$|=`0Vyq@Mf0j z>1k}zK>tQawKuAWEi4jlFB&8~9{1>_i0v%4;+ri2zyJ6<@UtKMaTJ^^lIn<9f%>&V zpVO4Mn!T0Ejh8^JJE2zh0ub7vH(~iPMT|f~8pUr1APqf_4&$Y{*kA}9>GAv&4kb^M z2<-)Yls7^jMM;eD5=c>-p}cgGjqK!TXC~PRDdbW)tzo@WrE%S(H%l9n_Y`^~ysM~- zzT49d^&?tf_^;Mq%!!19zIVs(OOKCU^2Q#v4*OLG)vo zAwX(M>YPO`T|l#2XC3?6u1P1U&ok(EBW6H8CjxFRyqmGT{b8(Dq7Zy#(|O*TUVW#= z7w_x!ls*zmdtzc5!`OHb42)=!ShGe)hpiF*rZJ%`V`f=~Aa@8ho7Bs~*x_Lx4gJxZ z?hpSK?{}4m&c)7(U_ z+l0ps?hO!mXMMNN&*Z+cNgCf>{`Mf|eexN2Z@Ngx5`fuM5zSspfisaALm@kcdTR$( znxIU|xi;Dii**_`{;mLCC>~zR=S|oKAg)i)dTG`>iBfKY_snC5bwi4sNY(80Ed^t5 z&<*HTMtrh)WJ`P&cJiQAgWGCr-L#FwJIohgvn~#gk2x7sD@(k80!g-q44MJMn_?9v z68zljnEvxzgxT8Cmx*i&mXk1v5FK)T!Y4*xljAu(E)gD^LL?!MWrBm9_jEWwZF=IR z+}H?w?GQ$HBjrNG1)v?Ja=vb5Vu6XvN7OgiXx8t~nLeoj)mjBzlg5@`;sgo3ZuTt|z8*d&=?7_7J(%*i#HIN?WtjdCHQ zyZBOPJ0Q1dyGe7}q1S74y=x66qyb?lyiH<)Ce!;yE;c1$!5L;zNX*n`Cx|#7h_ql= zdwxeNmLkB|f5;ac)SDtr9GHnsl0{rYt1=+iEcEK@$mC0?aRe7JhA~Q|8l^?XDxfGG zm+8PMdT24S;(A6+9yv9S%E|>)H@7I+5;*h75q#|{7a}RB(pBoij_FfU7SbhxxTXVS zK|o2SYr7<;%4lvbksGP2^lT35utfc%qa8D#^szcNis>=duZC)~g04th&$O*a zNhZ(L541?1&+J+~N=Ij?+ET207Yb69tdx=tqcB$2NbN44Ge>M$PD+L~?39CqBW6j4 z<_m53c10ZA+UY->-W5tQ|_3G>2t^V#Z0BXpqZm9f!Xw86~W9 zd4|u@azX1<>)OZ^DAgz-8(rFJ4tjP6`v)x!5Dq*mgT*!@GJeXK7Gk&f4vv=`?3>Tv z)zuERsh-ua2{ao=EAQOZbpA%Wfp(WfJ+(_Bm=BO3&`uniKyz&ejeZXms(_Xi&|v{E z5`hqLoFIIe;qUXAM1x41_8A(@F=8UqB&4?;hBIw~zRSLn-^dV%3ASBE297@jnoc%@ zAA!so@kCEecDi))hhA? z@Ia?HbZGF8Bk31uAClCjDozq80>VlwM=437mIESrqlZM2AnThD-u?yJecLrmq_Wso zC?Y*gTPs<@`sSM2YDKD{f;bNP+f-ya#f3JJHPB3*6m7=|GVoJ$HpCKJa|%>fp4xMw zzFYz)&%cLDWz?wlHalAcpr?{Y;<0Joe?L3_V2N?u?iS659#ZV=_GX*X*=Fa{ekM>w zMYaYNs^=<_ypPL4EKvdRT_njg#dei+!8C2X0fY2x#mKfQ@fgmsv~gRl4h?uo4NIa*pi<*uqMOH5aUZrD>y(r& z0)%#@XTVmFu$I-pvd;iv;IXC%o+j(P)~YMW^PL<+TGOZ|YwEldDd7hGBo1fI;Pz(5 zarVYGt8JvL-!EXB>N7!fHhPSUm-7TdO`k_SSxE>OD`2VJMT4E5kwMrp2@;~B3klkE zDHn^iKDG$XBAvB?#I*TJ5}e~!A8krd+pltvF(#gI&~LWYF7w!4`~jpo?7V=e@l86M7kHiKTsxpD z%*zet5DRW=jX~hr(^z+tI$AC9CV5Qknpzb~Rfqu}CRDoeazz4CV%B;pp)K{&Z9|*T zk+FTgY&K%2qQ}aG8LIRgn$;AhOF7Jz@;FL+Ykqu&4Q#SO1VEdseVPGDdg%@d^w86M z7ztI4=O^@>>Q;{u!^Q^HTb0t(rT%Z$d-@FWYSbE7n8={jYhaRwRGR9s-DvUoQpVQd zvlmi*J|E2pg2@U%V5pY_8e2^q7|&rcpT!J;Ql`h~x;b#piI6dDTdwp5@hGn`WtYg}xFV(cypKlELm>c>Y3kh#N)J0SZaIAryAyaTG=)`c&pJTAh$4?0yASM8jkwrP9JG@)_jiC3%$p)w57xwJUDrj6igM3ogNm-C3=NEogN1-E^h09 zllsa)YgPHXlNs7^j7IPo&o#Q*IVl?So^L3h7A4f96FF?QYuM^1`P^+Yz+@27TWZu? zJUTt2QvY=V-XfTl^5B4Mxm23n20@lag?y%?8PwD&Rx%*MY+PAe#{>_gL{$vfX7zy% z@Gz0oqju=ieoG~K>S*L#O3ZXp0j!dbgUj-1YEYd}Hlsp_)a(?tn=YQh*fEx_D+EyzK zIxD1KZjghl_BWNJ7SqBHB;oVdHnG#-V4!!pTw9+K;MjU^O;HnR%VC*xCfJ@S#yQCq`CeRBw^fM2|IxjjWQ%orHv;TtCeh|R6=gMY0+x&>Td;6rN@ z$ov62Og)cHC5(J*1Js%E{WQRvsI_+5nRo@QLQO4-o+a@4%0 zT1k@|BZ1rR1U9FwcBH3sODy%2JF3n(Vw*eBV~$f2PE!(YH8&{PnhIhiki{)0>mbgG z09mJV2T>o9jN4Q_`^yJe-wN845Z60-(m%cq3@=*@;TO6wQz%8gShrucm1Vkw;mLBvQL zt1JbDfPACA#(}WJ;orm2;wi)g*3I5*tnc?AUq&TfAU)%0e~uR*GrF%IfGhx!F=~w( z^kS~JPPNntMu;4dxJNAI+Sco6WE+?rTTl;htFfjYYKH2wMHU84J&fnNt5&)pTI_SO{HpbybPz^Q8h0BaX9db2WMEPmP)EZ zdKx<`%NjkAD2EWuU0#>T(|Ql3eR+1SZij(GVv9o+fB` zZANjb6c$NJ_9>-SIt1QkZJhvYu?;B=i)qqPD<2+G3z|Ox6i&8)UHaSI5J6rUmyT}l% zC98tL%ouhyS_HucCdXz;$*f{$r=xbK$2tj3lI(U=5>o3bH|R6os}qZa0JhVClS11o zZKJxr#JX%K04-ZWbdz)>%tB1%c{)3cyttCt&1*Lpv1#=CnmlS^vnKVewXN5qPW z(~xo*PE$0QFEX1=!fHaR7=IVh6@K6;JLI&+@@eIyktWfj(#7{FM3U6CR5m6cU1-Evm};94+>eE5DD96 zhqKdc)F` z+P%drLyF|_YV9ijav*pa69^z!lhX;TExwE@f4|H2PEGFvwzeX^H%V@>-`HYIyo|l1 z-%y(EQDT4$^98N=by1Q5)U1e3FjFxR>1jIxT};}^_nLdphVKh$PY@<0#w+U08_rja z=p0+um=Wql9&S^NT6+^)twrpgI6@%Kv14hBvx9BghbaQ4BMGLwGAS7=NtsBKMw4En zsIP(8K|U!IHqZoVhKz7yIUj2)CJZMbs2){myO*HK$r@9E9X?r{qy+3TVn7a#cHy9H zW0J=9VUodz%Q-C5W_yLShp`3MP^KMe^|$d9r3A?!EYah&ZF!X;8k~&XztQmOi=|V=cn}BEeH`{c#EV1K$ zJW(~KH67#F*pchu`$M$)0T2WBFS^PLh)JEj%MO;sh6Ef50b;VR9G(|&c^yitq{bUf zKAW-aEL7J(R-ZCr|QDQ)&cnx0WzBoyS&nz>%6zP|Zw_W3g%GjX1Qmas{*E zR+jwPRFU2_xxB6Q9j%uPgdN&;Nsgop2ggiifVRCxb6^@XrFk0ItJqql^FZq2;Qlhs zl&7#-+rot%da}ucW|Xw3zDk*ccyek#-m!0%11O14Z7pNPGE1QK`K<3ecmzeN>I6N^ zwe3w@X{FI=c}m4hre<(D*-8o6$S(tXEYvN)#fMVWfwEs*>;%M{eTKB%B*&;O|hIrwj3p3U>t^Sh@oIq&PBgzMFyr7uHX`;3=XGnO5{U;DD+)&poFm~QL*X7=nerW zD~!#I^Wix1N(7D&s*9WJxODY3<-tzQoy7jhDF)zIRGp4zC4?5tTVcoNskROu1(r#J zNGPww>pN5{8bl{pI~?^k>yl%*PBMl&4$0iHA}%fNP=b(t7@H?`LDk~Wi746t$i%&kDKu3SJ9b<7 zPD#14De;gNPnL8K@Biq6NYHiO&r$%V+!UqV4nu-FYU4?$&87t2W;@nv6?B?O688OJ zYCpRqM{U)kWEDn2ezz-e(V+A>FjC2cde{+u!bJ-nq=Xtb$ij~@_>8(V>zSD7h%qj` z;CI92alG&q9=F2t%=P^~J=~rN(u?t%AqTQu9cJx{MBJ`3XfME&tP~owxUp-P&Rp*I3=q2xqMEajX`aKyGXmvki+Yh73?1? zaX?MdL9%iA<#VVgXJ`1-8>`E>vhg~al;$<6=2pcd*@k8D8e`1446-z3B>voK(Lw7E zkGCoP#6h)fD-u|HaWMWJ#o+A<2jqvx{@ed`^oF}6r$2ldH`$6(vcj-jOm->=g&OEl zy`1ZR9alI4yjh)|*rbCqFBMZjbg| zpY~B9Es`OF%PTFD)8-h;KsqoRtuP;|QFl2CamE6ua3_X#1bLrLYV+WsK zX`t2@d2KwtqE6z@VXiQ)9`Q9g9NSGpSczRapQrTVJ&qkX$^kNir!Ozj?u6zS3f)nu zSJj4lY-WaBor{YVv5g%ingu}1bjG$Be|+!Z<8;tkc>dBd?J#5WY8;#(6nbc$b*u6F zHe=5@r>Fx=iX`Z^D4ECj{9El!tZmjs2hi?qVR`#HmUnJY#vtKPaC zmr$EDWSKUVZI@|_)llghXGRv|?2~Vkr)*OtKD)Yxw;g&L&aJP}+oa_3Ynp6YBXdw$ z-NE)(UZM$5!17v+zgZ$cIyyk4Wu9GYVUrP*6~>UokjdN!6#c7|`pD z+ZLjViX?A^d+X77Z&fR(kP>+2;^#DEb!z`(D3ey9uAwv}H>YziVv7RF6lw`ekq{Pc zZQ%BTWjIU%XR}iym61hq-x1n4N0B4>>JylfRNB*}D!Q7CP)*WN@@goJQ?>g&U9vh{ zGFjA9qgO$rQbi$O;_tPo&e96f4ArlIc#$TB#}>{qa#A3G>m3sDj9F*spomxMr74Yt z(rNL1vuk)n{zxV*(*rEVtS?d0vEKC1CuR<#ONT>jI?0R{Vc(#azFytZ&$dIto#edm z`RSl@MVczd+LNr8?hsf(rzTS-Y}f1b%-r9gf6b~{z5+L2l)!+*i3gf)X76DH-sGQH zarYN7ry&GiKTfurQp>DBloo^DZ zysGN~Mgu6MYQx@XC6|(MP~Spv>adc)E>)iCc6|0B zjFIR~_tNSVsI5Z~W(qT!pC`hx;WAP{wKq0)43bRbw9Olbn^SPS3FHxD*N`~LHbxrXrH%_2G!{54bSphtj zlLhWA4QC#neGt#_!OC-2CbciW_u&og?i17--KAM%Hzf4bDuWX@D_*jZCW!=uT#tRG*&>3$QNWh(+` zUef1Nu~o&s0p-Y4!_46^bJ1{cY>Cv7BnNvcSOg#=0x`hBlj)Z*Wo@H-&|pP`uS5W4 zrl)NW`QtSCO}DazWAi3DBTkGg!om$*qMwp={; z9J4L0!2SvC!Vri<3o=;u*fLWo#Wa&tcv<9Hk}J(InfYa7vv1PzGZ~qt<>Jsx2`^oh z7^URA&`Ycij2XcHCGYRXQiI{S0x1p}-vtX52J<~hu#_l5%H;Od2iMVVR|tv(9zOac z!<;@xd6m*hyu=J+oCQ2NVd05|Ls%`9@ap0<>}*{@nfIM27x@gY&{2^oltX~cTSJ{W zH{QOfb7caSlnk$Vf67b=m>M4;weXEDQ{zU0hZs9O8`w6wYRIkYcgk5YZ*sRhMS(Ro zOJvU8yur}!^T=c&|DF;g#aO2Xwq(9*LgogT<#COZ;l-G18&PJ1KXgulofl#bjQFDi z{ZD3+8KTgvsx5%h%o@+rS@(_v*#%b|MeRN`bG=39A+qjT2{Ea--XEvGE z3|-j@p+r@kbGjrjaS6 zZmx#!mba!@KRf%`A^B&NF7neJ{+F+OA3G?4@01cQfhLPdR=2KVdj0R>yXDOe##oo!_ZA%XJE;Kk+p_d!?@pV>UTP! z$KN|D@>UjE1yq(&lcmsvmy_jwWu+;dgB+~AEcO3xd25P;5d`{?4JW1Z?3eXBukaOg zkNzlrb?JBUHy-|bdQ8?L4i^v)0Vd0&Nykb@o?T1PyYjGh;T1hUT#i>d_p!$w!#Aot z_uO;3-rfx3v;x3SfBMsS>Zzx6jbwQiseiN!z<0}=UaWt-?{gvXqTq8Ga+-WNiNEtl z-+$W+*Vor|@x}PM$DxE1kTsiTlNFtD|4mdx#fk)!bp-{0GLU4kM;SEoSyo%EGoXL4 z@iX{tdGm|2d&vz$r`%Zrhy>YPLLdq-<@K#l!g|JSK(|Y-p@Hv~x1czdwL8S=@^l1a5Ox|Mg7iu0Xq1AV7)c$e3XU~%&R zrpGoI({=Gym40n120$shU1Ir2Zmdz?iER}9?O8$^T^>Iz6LayMApvWxBDQN~eBj|P z;2TjKe~(Df$X6t0_c8J;#<>{plHMcKg)ERQhI{x~oRV+l5~qi9b{gL)hcf1H(aGX+QiWR_EXj0XrA(|F1d6|*JQj^*{n^YHuKLZ zeBQW0nW%mY^NEk@dncYU9h!g?X-l7 z5$a`YYYWxt-R|-8jVVWu9@Y9wy@faz>Ak$XjPKNPr~O>2?OB|8>>&F70A{@g4=Fo| z2PxNIIR*q9Jca982gMIk+lQ5MJ5{uAdjz6o2=GKbf2&Bu8#iuf z-Q%0{#ml#&RKHc(tW7c&Z)16TANH45Z+mXF*T9!HUdEHH!M&7MU-R(#B^Uel z*;rd;q^+BPU7A9TUbnM%vQSJ7$%K^VDz=(X33sdVtxI%%Qx^R=RS1HhEIq{`F%*;6J?vuK{TfQmF7hn5ceERDj);S+ZYe30$?>1Y~9%x#ftUvuzknMRL z%w#5TKczfj>1(gDhYJ4Y-unK#?$TwbzE#5Kx1%kq0xzC1Cyy8lyc%Bzj?_c zqeOHt{m{2=uZG_DzW3pgM;_>IwP_U%U<@ASyf@U@WT zr;FF{O6@4_wQTlEc+cd^xYj$Up9j}2!7hx!>ojHRo9R<02}`yc+gw9pdKUJ?6z;V+ zW*(~nL^wmvze6zUXa3PY#G`L})J*nfMP$M2vEta!6Sjsa`Z_Z%nER?LJH_UgMvF08 zW_@G%D|21po8>j67?7Ktzmt;Ptl!(wvG`IF;d`N01c3kU-~M|XJ$7_7)*ZYb?g9Wa z-xj_u5Y%q9P}{x=RKE2SQa8F2`26M*RG)qHJ?EaTolRHp#m&bsnKu)$d|^FSuABLk zGEZo1LiVVoSJ#8LQ-M8R#{HCNjp(qLPPx4V45g1*i`dNM*W}YdUpKk4Vq|u>G^=Eq z$oy2_H)}5Y0r0!MuD)d3(M&3hVyU3}ZJ0&Lq2Ln$oBb}FU>%u2iUo5`;`P#rNl9b# z*iN*y-mawE;8}yPw-JKhes=FhZ%kJyyPvYsnbf~6YfS$-`xh7$b9HrAnSbfCuXP?~ zr;FstGrET1{gl|!9EJn*%tZV<7F{34vM^kPHCQjk3$~03=XnN2X2Hc5Yn9!Ee&r*- zgg+#qU9Z=$vA(GQ{lNR*kAL_xKZD81X+6)<VPj(xDzp1!%t{eo|=V&w`WdeKS--f-%{HqCZwvTVO>A`?!#yvq_wO1Z>~!O#n5 z(#h6T^qh33#z5VMoh#q{;io={fB&!ljqX}GHCDudi5xa|YWV$+e_Ut$|I>f=b5W)> zg5Qd(c4In>I_$dv7@Zl2z)l{2P%s4F=<)k4Uw(Oq^oFc#@1dAWpxPLqkW1)< zb*b8^LwPeT^-V6v3QKASiUX3d`e?dodbcjWYx281UpY#;`%|57RB>vu2ZyXwX_(0h$A9N{@Whi(;4l8A|0rjU%ybpi354qZvoj*PStRR zPRR2+C-HFU3L5!tk?0&CB*M=Fe;Rm#O=+9mg%Yx=zBLFI`3Y1gd`+6rJx9VMiI@nB1ezcF zLR$<0pohDRd%IYF1sh%BDo zN7uc3Zg6>dI7s8g)7|EcX(an?Pfc35dd)+t>0@rr!if`io>h4h4=B3;b^Y7JeW-rT z4&R}qQ($;T&lr!_tOz9zh-?{}bPagE{Pdqt3NoxigLYwZ9I{nGDqBEytc=oZ4uAH& zPvC$5jnC39T*slqN6gyFX8Am|1D*06`>IiiWDtCbC9!njWr5L6MT@UVBYrvI~<1 z-D&-~i>vtBJZjB12&` zBu+d_N4l=rqE*)DGXO9P3~g_2U}QZVLAFBY|Va1Y`7Y8%Ux zc8%6RrI>(hX`_pmF4pxoUOZpN4}EY3i)&r{+4oKJ{0?TzDN4vLvY7@J_GNU3(5uUB zeCVBJtZephujRGcVVuPwl#(s9+zei2M5OJe@bci8w!t{VbhTbVmza~eAWiqq;X0Xa zyMDcnPi%h{KlxV|@Sw#(%u&h#ZQn?AmCn6x3yL)&DdE^(!yE zObIC?zo@&ZJ2Vz#_unEtv&Y}{7`#*#^{s7H!Pn@l2$*FnDg;Z$N=bwgD$e-@#e$99 zn?v0s{`_#uvA_{gThKP7HxI}l!5r?pJa)W*KYDH(|HF?SV1&rQfBx-7y#35LZV+tm zdSp!1@TD7VeD>LG{N+Eh5BsOnO4DRgHXb=vz%(V_>||O!=w#BupS)0^E-f9mWv<=rf;Dr(~{NLLr+~sdoADWu<0H`wnCK+Uq!Y^duTWQ-MJaDh&SbiDVL>F8A5^{--dcFs9Yk0nL zIs)OHiZ~OOulU&9G{0X=z8(MaAN&^kt4+!J1TI`O=-saPxPC+CS<~@wTqM)7Ka7vD z@dOHmTjOasDJh5n-^yN!mr(7-zCgG zE*pjpNgM)l3;)SbN*guDJXI~`%Pr=xCv7Ze79r12~(MZTm^&VasMm>fr zWQ!;ilVO0($rzjJmT|UeaN=QBg)zI@Vzl>U|t5nVT z*UsY4{a{FPMgiubnhk8eXdev3c)-0xA3{^mig{AQ!>x7;OP9|;mfZ#FkVdH@lz#y z=9w-0{U1N7*S>JBhNZO*9zI^gKl;hL%Wm21j^R^l??7{qK_=1D(A=fw{5>Zo#EUqU z^3tu@oY6K)r!DrGg~HUBu8vw^1ZH~r_JE44?a-DBB3`#Gz8^R8U4JrSM^jle3RmpH^c@vkGR+X4um@Z<1p_uXVI3}jb_`|QfsP>Pj$T@E5;tA3Mdv<0nZyk&Y1uq}lTDHUjOh{iOr=PqY)?_2?L8CQ@`p zGWgor8jlrqXDLl-CnfVkADmUE=5EVIZ(O}vaX_|vC6$CjZt(t!*yFOzM!s0k9S`EA z)neaQci>hw;nJaWYdg9!?d?izD3}wiyP#qGh`6<5wxF>i#Z)ng3chYlmCvPg#LKGp z=g(b0KUhtx-R|H|Ub=wU>2W-9{1{4e6UdaZc;V~U@X^mbt0PRv>ng!8kR^Qi&>A`u zP>X~O_U1(p{tLI79fkwLy2c(akaS)|L?hw>L))Xay`>b#^YfI1eLQ}m zi2v{#*YQ{X`~qIR)I_=D;OQ4D_=z9ckJky(^H-aUkfiZ}C(HQxk1f#-Ea4}9cpm@X z=T`Cf=@M2qyL$Y$0NoO`3FbLH6j(ma`I3P zcUvSDTx0xKh-eALiS(0J6UU^KY)~!t?+Soozpkvt#ZpoKt?ATC^Sz{TPV!dOeN)Kq z8@6AYFx&#L;LU`Wuwx=XTH3JKmDFbwQnUerYV2v zNNm#s{x=`FhX3uapTIJC!P&_a*?_y;vBg$fXni9{&N0&dS5d$|!&zfSy zW2rq$DR_6>;`o?_J4_}F!lbf`frQ`gegF^Gh_(XT&I&E2TNjfyZ-8bJ47|XGGTUK= zO9JY90_8KG{(b!Z@BglPUwQiJjanTUs?@28aXfnBsAk2ya(Oudn7rh^vh`K5l%o@4 zHg68Irf;3Cw6{@TKBrkh^ZR7-O$GN`Uc1!LZ741-wrI;$ z@zg_OSljMW^(GZ`5&`+=zjzs!t~W_IXR%Z3D>XAkN%wF6-a~k!N~Kra^ZTXty(L6! z(vC~tVKQ8!=@We9d0+8x^@@jL(Z-{X-kH!JS(;<0x$a~IB2r=EP>4wu?n66J=cBI@ zN#=<>`_(Vui>`YkC}QY4e2#VAK6oy6ku7D?J*yLiiFqsW$7`({eme_&QK zF2ZfDOjINUnHM=kA?0Dxt2~T6N$hddjs&7TPY|f&&c+pVTTNJ$(Dm59x%X2}Qq5i@ zxXxW^(24LAeBb}>Dg4?eS1?0@S)337-892+!n1wool|)A^%|WQA8%xlw0bG~vRkM! z;*qdrarm}6B$a*<3z-es%K#;(i5GTG-10t>1U)fvd#NVfFH$m{k>mwS`(bCtXO!y> zDmeb(&ay8!FHpU*7o03}VG=rrnb0XlGkU!So_XdA_{c|o88>dMqgj_N;caq#ea-F5 z=hM26aD!gc>c*z>W-3twby_H-aNy7+9)I#F4fzdI5rW;Dd_PL+l;2I*CIaGnvFw~s z$i*TaW=n}s?fQW__EA|p50_CK*<7dD>fk}jpL$|KfAmpOChCB(A`df``?voJLt|Hj zW=Z1sfgHX>3Px-##u7cBS3SFSxw?yD|=?%+1zp_n(6WDp#w1We4MZD*| z4`FuxfZ3GKH(aCGcjDX_8pfP2Aw8dx%MGM&Kk$M_=oV|}jKsL;;7bn!)>-JDcB6?C z`=wF0ald7ns`M{>@6F3s9AJF+Z6}9nQ9$@+7Rd!XTRlwhHBf06)gvBrTKIhXacU$- z6B8U=mig{u-|Jh;`1lw83zk=x@MquqWBAkW`}0x6t6aA5&_g!%&)xm~oXA?TVsyk^ z$idJi3!RV{9f)7~rH|m(Kl1BH(gxgTlh;aSQ1#jvC(Y6)N0!Ycm4R%KsQ%5*y?`Hl z|J!tv=z?rs2+1ic;IYT{Vc)_y#)G*bGAL{-5hOy4uFjzj9ZFb z6NVA%s~0g=8pr1P3brac*f%GR!2JX8o23W=Eu}WdN8j!Ai@4t+TBez$g-O2mF~u$eZdY^xZ+=JQ(Ts>hmw)SAY4}(IAOjmIcch z*;sMAc<7M@-PmqjeW@?BuW*gMc7w6bb^cCYv#}SB zJU}4$+qg*EW*4vF%=J2HHJMrfl(IuW%V6%`W75vZ+Az_L?r_oe_O>oa8B!ur%*MxE z{Gb2wU!hK8K1Cp9`~=#Rg0rV)(C@lfU#XIy^iiv{U@FinYYNZVwj1@nGqvZ{Z+btYCbO;x& zNHl~_Rn@fe{C?o&7uv|=Q@Yh_d75g!bZeFDn7FEu5V}&l-0lwPSUZeP$etkL95~6O za&Z#5c=@wm#9*s}G1-KWv~ivQ=`g5%{n8daEr+(@0NKebLD$tle1@$0>0<}5vR*~r zOW{aTl2I?CO-E&?(IJ2;B%yN}LzZxqDe(*#L)i#d7)DM6fRaNfMd~P?ca&h^2NEz2 zK$#@9bOr703O&<0f#1i*_ICjo7D+}ByDm&dsC0dFKk+v|HM&{dRJ z**YZ>y~?II4k?nMHH*f6TOEn7ym$eX>%!I#P@}3%60Cg!XlbPaiN}J)c0=B9>1>Erid0e>G zR7orYN9dVqqp$Yy(pncs=5x5d+EB0wVLeG8O9Ja`d4OfcgoVOs@>r!lP>_yM(!7-b z%J!)FoNULsn7fWhQa{f`>VV=MEn>(y-NZbV~>k z3hIQ!r%~KZ5an~E*LON-wsWZ*%q{Y*eEXCaYr&Zl=u~QjLKk>djk4d}QY;P;cm~)Z2_}R9@nHQOY{2R1aU}C&s8{KTB+?igAIAiZy4jg&RfTMC%+AiB zM}8?kF{?J$cs|cYOzQr=bXQ1za+FsR8fKfBnjknG4O|!UST|DEb+2Seu9e?hXKc8XGivzc!MuK!bgRe63BG)>uDCzQklc+mnlA*ce7{Bs zDofi))I=gF?|Nh$SC(2DT@gttDPEE@_*N9b&DE>7&)c^-uovdpep92#4O4u!{d1P8 z;xIw}x>LnW^F@8{c(HsXP0zoJc!=cV^?IaY>RYM~G8xIk&XK~Xkv7?;N87~VV!6+ zx+6A`&8HI@QVgk8u}>YxR-5zW5lY1#2MbC0!*jW4WAC?}C>bG4(4IKx zD;P~ikqK>`IB591R@;3`mi7pX=bC97w>^i0?drALofHNx!dc3u42kH#7WClXk%pO| z#FNdWt=XeU)*FWEkVH`ez+o6}sxYS1NUIYhi>h}z&>hi#=M#U7FMjHic=$+}QXvVi z-^7(08`xM`#pCaI3h#a2yGhY>(INLIn+QrgIh~n9B9+$VJ~UiM6~BLSN=K9kYayS- z1n4u=vQ}x}K*5BEq>seNx2<3;c+U?OI^x@YkOvgx6dJW`miV~S(j<2(uTZL8ywTLT z9M@?B?lk&p&q+qKsCSus6RQc3?uO9I4SnK8=tx7O8pm!Ua74%rlsrpa+#nX;#c80W*-r6znu^T)u>t z@)` zPm3TMf-$Q*D$^Rum-!u9uqQoVgLRpaX=y`pZe72P}^L_ zffEaO*O^DrXB_zam8&>^V-ZWM+t}KaY>E_4P!-QkPicpw=*YN9N~WYNc4VPTN!Os` z(CxGcl&r3}(BSWj1kCc(^ljOTn zc>lZJO%G`a&wce-T)sgPn&GpnOKX~2n4;towaekeYm&$$%}QA1bPgS=)-I)>&Ck-& z;^2rWC7z-m*&AlfLpQeno+eHN*b}=jlQP_#8)RX~cl#zEEGbkRggH_<4(r%z4^+CP zDeZE!3+JZN94KayCQ-wpdef|f{^j$EWY1?D{k$-nRDww97XA(zcmeixCPZ*z)9oSVG zWt`Hh5P6r+zW6d#Z;p<~0*);lQpqJiaMCFp+&_ou@B1Jl9*6L?Ym1a1tH?THMmVZw zJq{3(Fz|C3s@pytj!7dq+@@x4i~5yyXgWgO_8O!RaNaK-yfnvv9dnGGlDR>slybY`4w znT4I?y-eMdU-6ig^Cnj7MePBSnP&{9L+4!q2iW8&HSCdVnc?tL$ec&XG# z6xaIqbdA_Xhxfm+D)y1F%b3q>;#zB;?uc}>xQuJfeL6{9CM9*eByx5S&+nYNB>+W= z{lfp#$4`CuKjO@(r*SVOllfaXaOA^#94Q2^-K*r^Wl@jOH`6YgjiyRIw^0WpG*l}| z6)ja#GC6W`LL3Od@&xDdR)ZkhhvoGRsK-Q?uugj}X$72G% zLb0qSg~WwBRu{kV2Vcg;#f@mb$5yRH(zmNrj4X(h2!JQa4eEv4qr_6^6)O-$3I_?V zHf>h{{euGVGWoir^YGm4+Rr0T(4DUxB^3Wj$%KB0l@-j{61gRi?%=3=NfZ`eToLU9;2GPMsJpsv65A zawr!M&?`!t7%h!3iHej-oeX+C%q^VON__rHUt(mWj(0wK3g@riK&4t!x@D)@(!>Re z0IgD*_QB5s0y>++3$L%?!pashd~Xvd74m^QyiOdB_dfXq7FSnk8}_2-QCkngE%~D4 z*&r4yJew|n>4~Q&iLrS)KMzL3h)p_Pbnw|{SaRXj$(`qwWjCXmj;nVQAm#?{>^`O);9+urQl z+1F_NQ!>#JIdpJ=V909xDohR-5IkfA>0;Zu?62G}MIARoTkp!NujquNEP*DrWV_zR zeyZN2WX|+kSbhF1qa2lBPH~p@T~=nEs9l+*z39@>*;rd=hcQOFw4#!)NtG>YO@EE{ z%vPm>;<(|V8|=v#LtqU+TieMua5X5Sp`2X?Bm{H{_V4N@dB;i&KK;0Q@!Sw6Q+P&6u= z=#w)v63fS_BS%$-%6BP-?j*jO_}W=1x61P<#*^hmf*B<=^EJb{IpYA9-GkQ0lB`ImHEJ3 zOpKKk1R`P196y3T$SpItsXdVz$B!G z+b#HruNZafQYvIfHDnbSS$5w3iL8oMNhatFq=OyImB*0GGFBV(=E6)FKl~#yp>2)_0Uxrsl+rORvBwX(78#f-OYy&|MojQB~^W#5&RBaO-NyQ-+Hc2|mtgL#|$Km7CIK6)s zl@?VXLpiPOP0g~%=1ZtF8aRLP5-wj|;_o;(dGs(29$tW(_Ap+a#MpKnYs)M6*?;k$ zA{t3oR!G>fIV-*bStYMGQ0GIE9K=@4(k`8wE#uOqtHh_M@CVy~<-28AL^Fl}ltt#_ z?}sZR_+bd{&Hzj}MTWfURFm7huFPOwifFE=B(Y_YN`}oEb;$?Jqcl}e&P}L}^29hk z`g?zbAA9Fz>NM0C_4~q?zJ{}}omXe) z;K@^X?$s+eztKU4YW~a5JckyY50XK!#^y0SJ%iP=FB{PDf601DgsK>Rv^0kZ#BlEL zSV`7$Nt-a7cW)ftcgyXI?5H0~z3{J;nVA{<|4k`559TaN9smFU07*qoM6N<$g6cxz AR{#J2 literal 0 HcmV?d00001 From 8353ab78b068e216258053d0c33e45179a505cab Mon Sep 17 00:00:00 2001 From: Kaustubh Kumar Date: Fri, 18 Aug 2023 12:06:48 +0530 Subject: [PATCH 06/11] fix: dropdown colors --- src/components/Chat/ChatBody.jsx | 4 ++-- src/components/Chat/ChatHeader.jsx | 2 +- src/components/Chat/ChatSelector.jsx | 9 ++++++--- src/components/Header/ParticipantFilter.js | 6 +++--- src/components/Header/ParticipantList.jsx | 13 ++++++++----- src/components/MoreSettings/ChangeSelfRole.jsx | 7 +++++-- src/components/MoreSettings/MoreSettings.jsx | 10 +++++----- 7 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/components/Chat/ChatBody.jsx b/src/components/Chat/ChatBody.jsx index bd7ad4335..5675e4b6b 100644 --- a/src/components/Chat/ChatBody.jsx +++ b/src/components/Chat/ChatBody.jsx @@ -162,9 +162,9 @@ const ChatActions = ({ onPin }) => { - + - + diff --git a/src/components/Chat/ChatHeader.jsx b/src/components/Chat/ChatHeader.jsx index c787eb490..c214f8eb6 100644 --- a/src/components/Chat/ChatHeader.jsx +++ b/src/components/Chat/ChatHeader.jsx @@ -61,7 +61,7 @@ export const ChatHeader = React.memo( w: "$64", overflow: "hidden", maxHeight: "unset", - backgroundColor: "$surface_default", + backgroundColor: "$surface_dim", }} align="start" sideOffset={8} diff --git a/src/components/Chat/ChatSelector.jsx b/src/components/Chat/ChatSelector.jsx index 71d886499..f033df082 100644 --- a/src/components/Chat/ChatSelector.jsx +++ b/src/components/Chat/ChatSelector.jsx @@ -164,7 +164,10 @@ const VirtualizedSelectItemList = ({ }, [onSelect, selectedRole, selectedPeerId, roles, filteredPeers]); return ( - + { const [search, setSearch] = useState(""); return ( - + <> {peers.length > 0 && ( { peers={peers} searchValue={search} /> - + ); }; diff --git a/src/components/Header/ParticipantFilter.js b/src/components/Header/ParticipantFilter.js index ad8e2053d..603954f26 100644 --- a/src/components/Header/ParticipantFilter.js +++ b/src/components/Header/ParticipantFilter.js @@ -64,7 +64,7 @@ export const ParticipantFilter = ({ maxHeight: "$96", boxShadow: "$md", w: "$48", - backgroundColor: "$surface_default", + backgroundColor: "$surface_dim", }} > { +const Item = ({ selected, title, onSelection, value, icon = null }) => { return ( { }} > - {icon && {icon}} + {icon} {title} {selected && ( diff --git a/src/components/Header/ParticipantList.jsx b/src/components/Header/ParticipantList.jsx index 06cf5204d..824698741 100644 --- a/src/components/Header/ParticipantList.jsx +++ b/src/components/Header/ParticipantList.jsx @@ -34,6 +34,7 @@ import { import IconButton from "../../IconButton"; import { ConnectionIndicator } from "../Connection/ConnectionIndicator"; import { RoleChangeModal } from "../RoleChangeModal"; +import { ToastManager } from "../Toast/ToastManager"; import { ParticipantFilter } from "./ParticipantFilter"; import { useIsSidepaneTypeOpen, @@ -283,7 +284,7 @@ const ParticipantMoreActions = ({ onRoleChange, peerId }) => { sideOffset={8} css={{ w: "$64", - backgroundColor: "$surface_default", + backgroundColor: "$surface_dim", }} > {canChangeRole && ( @@ -298,18 +299,20 @@ const ParticipantMoreActions = ({ onRoleChange, peerId }) => { {!isLocal && canRemoveOthers && ( { try { await actions.removePeer(peerId, ""); } catch (error) { - // TODO: Toast here + ToastManager.addToast({ + title: error.message, + variant: "error", + }); } }} > - - Remove Participant - + Remove Participant )} diff --git a/src/components/MoreSettings/ChangeSelfRole.jsx b/src/components/MoreSettings/ChangeSelfRole.jsx index 18210e4cd..9f305f087 100644 --- a/src/components/MoreSettings/ChangeSelfRole.jsx +++ b/src/components/MoreSettings/ChangeSelfRole.jsx @@ -39,7 +39,10 @@ export const ChangeSelfRole = ({ onClick }) => { ) : ( - + Change My Role @@ -50,7 +53,7 @@ export const ChangeSelfRole = ({ onClick }) => { sideOffset={8} alignOffset={-5} css={{ - backgroundColor: "$surface_default", + backgroundColor: "$surface_dim", "@md": { w: "$64" }, }} > diff --git a/src/components/MoreSettings/MoreSettings.jsx b/src/components/MoreSettings/MoreSettings.jsx index 2f00a3bb9..e8d7110f0 100644 --- a/src/components/MoreSettings/MoreSettings.jsx +++ b/src/components/MoreSettings/MoreSettings.jsx @@ -116,7 +116,7 @@ export const MoreSettings = () => { sideOffset={5} align="center" css={{ - backgroundColor: "$surface_default", + backgroundColor: "$surface_dim", maxHeight: "$96", "@md": { w: "$64" }, "div[role='separator']:first-child": { @@ -172,7 +172,7 @@ export const MoreSettings = () => { )} {permissions.mute && ( updateState(MODALS.MUTE_ALL, true)} data-testid="mute_all_btn" > @@ -183,7 +183,7 @@ export const MoreSettings = () => { )} updateState(MODALS.DEVICE_SETTINGS, true)} data-testid="device_settings_btn" > @@ -197,7 +197,7 @@ export const MoreSettings = () => { (localPeerRole === "hls-viewer" ? ( HMSHLSPlayer.isSupported() ? ( hmsActions.setAppData(APP_DATA.hlsStats, !enablHlsStats) } @@ -228,7 +228,7 @@ export const MoreSettings = () => { ) : null ) : ( updateState(MODALS.STATS_FOR_NERDS, true)} data-testid="stats_for_nreds_btn" > From e2ac86d67e2812fae6466ba445bd059a47086561 Mon Sep 17 00:00:00 2001 From: amar-1995 <110378139+amar-1995@users.noreply.github.com> Date: Fri, 18 Aug 2023 14:29:15 +0530 Subject: [PATCH 07/11] fix: ui freezes after role change popup open --- src/components/Header/ParticipantList.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Header/ParticipantList.jsx b/src/components/Header/ParticipantList.jsx index 824698741..a77aeb0f7 100644 --- a/src/components/Header/ParticipantList.jsx +++ b/src/components/Header/ParticipantList.jsx @@ -267,7 +267,11 @@ const ParticipantMoreActions = ({ onRoleChange, peerId }) => { const actions = useHMSActions(); const [open, setOpen] = useState(false); return ( - setOpen(value)}> + setOpen(value)} + modal={false} + > Date: Fri, 18 Aug 2023 15:34:24 +0530 Subject: [PATCH 08/11] fix: ui freeze on end room popup --- src/components/LeaveRoom.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/LeaveRoom.jsx b/src/components/LeaveRoom.jsx index 477aac88e..a034464d4 100644 --- a/src/components/LeaveRoom.jsx +++ b/src/components/LeaveRoom.jsx @@ -99,7 +99,7 @@ export const LeaveRoom = () => { )} - + { } setShowEndRoomModal(value); }} + modal={false} > Date: Wed, 23 Aug 2023 15:07:02 +0530 Subject: [PATCH 09/11] fix: primary_dim token name --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 474e7c28e..45e477a44 100644 --- a/src/App.js +++ b/src/App.js @@ -87,7 +87,7 @@ export function EdtechComponent({ colors: { ...palette[theme], primary_default: color, - primary_dark: shadeColor(color, -30), + primary_dim: shadeColor(color, -30), primary_bright: shadeColor(color, 30), primary_disabled: shadeColor(color, 10), }, From f028a17aa7e542314de268ccab5c86a8dc46adb7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:32:04 +0530 Subject: [PATCH 10/11] build: update versions for release --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 716d6ec8d..57aecd4ff 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,11 @@ "src" ], "dependencies": { - "@100mslive/hls-player": "0.1.12", - "@100mslive/hms-virtual-background": "1.11.12", - "@100mslive/react-icons": "0.8.12", - "@100mslive/react-sdk": "0.8.12", - "@100mslive/roomkit-react": "0.1.3", + "@100mslive/hls-player": "0.1.13", + "@100mslive/hms-virtual-background": "1.11.13", + "@100mslive/react-icons": "0.8.13", + "@100mslive/react-sdk": "0.8.13", + "@100mslive/roomkit-react": "0.1.4", "@emoji-mart/data": "^1.0.6", "@emoji-mart/react": "^1.0.1", "@tldraw/tldraw": "^1.18.4", From 79edde47c1bbdf8eb9a946d9c8c0f83bd646f89b Mon Sep 17 00:00:00 2001 From: raviteja83 Date: Thu, 24 Aug 2023 16:01:27 +0530 Subject: [PATCH 11/11] build: update lock file --- yarn.lock | 572 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 477 insertions(+), 95 deletions(-) diff --git a/yarn.lock b/yarn.lock index acb285d01..df37fb15a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,35 +2,35 @@ # yarn lockfile v1 -"@100mslive/hls-player@0.1.10": - version "0.1.10" - resolved "https://registry.yarnpkg.com/@100mslive/hls-player/-/hls-player-0.1.10.tgz#4b10acedde2e7b3c035135dd4cf9aaa19020ebe0" - integrity sha512-E/93YsdLdd20LD6RSJGWjumSLajBYwaxPosA5m8VTOEcdtrPiCUsZyHZNjrLOCOanten9Tnn5teFvSsbQXafFw== +"@100mslive/hls-player@0.1.13": + version "0.1.13" + resolved "https://registry.yarnpkg.com/@100mslive/hls-player/-/hls-player-0.1.13.tgz#2679c408e82df67dbda92916c5118c2cdd88ff08" + integrity sha512-qbSe/x6ow0+M97LogrNxNFmNW8zF/5hGDLrxE6d+x0YtD6V5eaCHZcuwc6JUFBj4Xcz+6Uw21a8hQQtEJm0qLA== dependencies: - "@100mslive/hls-stats" "0.2.10" + "@100mslive/hls-stats" "0.2.13" eventemitter2 "^6.4.7" hls.js "^1.3.0" -"@100mslive/hls-stats@0.2.10": - version "0.2.10" - resolved "https://registry.yarnpkg.com/@100mslive/hls-stats/-/hls-stats-0.2.10.tgz#a6481cd310a89315dc86359efaa3e8f1d6ba5a15" - integrity sha512-Hf4KWdNxzsCbB+BcNE4Ns24OOzNlcM1qCn1a9HWaqIlgVwSwYjKSFd7jel87X8W8t1ykXEoO9R66pcPX3zlEcQ== +"@100mslive/hls-stats@0.2.13": + version "0.2.13" + resolved "https://registry.yarnpkg.com/@100mslive/hls-stats/-/hls-stats-0.2.13.tgz#b051258fb75c2efe92516df165614bee4cf6bab0" + integrity sha512-YZDiVb9IpgIeaRD4h1V1AdzgsW1Xs99qp2oGSDrS0wHpfJGGBQOPa58TKXfzpwJjlhhYTj+jzoElZSXvpEPBtg== -"@100mslive/hms-video-store@0.10.10": - version "0.10.10" - resolved "https://registry.yarnpkg.com/@100mslive/hms-video-store/-/hms-video-store-0.10.10.tgz#5cb84d4d644d74ddcfd2466403f95b0bc8568e8e" - integrity sha512-HiV0swF/f9fvPYe69vfIeHbpA9kHQeP/oi3YXm1ma2FGhCRwtWgznpiSQUEyDcmOr/SRrBh338NE0DKHVx/htQ== +"@100mslive/hms-video-store@0.10.13": + version "0.10.13" + resolved "https://registry.yarnpkg.com/@100mslive/hms-video-store/-/hms-video-store-0.10.13.tgz#9a39158a4e6c3989cd939fd5098a87cfaec9279d" + integrity sha512-ntSQqOpJcL+mTvYnio1hfgyomW89KTaK7ysz+Zv7FDF3d3xS3mlTqfy7tOwfl4+7C3jGNpMjuGMVuH+DsMHEOg== dependencies: - "@100mslive/hms-video" "0.9.10" + "@100mslive/hms-video" "0.9.13" eventemitter2 "^6.4.7" immer "^9.0.6" reselect "4.0.0" zustand "3.5.7" -"@100mslive/hms-video@0.9.10": - version "0.9.10" - resolved "https://registry.yarnpkg.com/@100mslive/hms-video/-/hms-video-0.9.10.tgz#37f2b09009af850c074e4b81532915791976c07d" - integrity sha512-KiP/bXrJyElbMZ5PnuX6qgsZHL5uvtxa6SmenPGaiFb8CD2fM1BaoDtoVJldP05u7sDO2Opiuac+b2zrPzDVUQ== +"@100mslive/hms-video@0.9.13": + version "0.9.13" + resolved "https://registry.yarnpkg.com/@100mslive/hms-video/-/hms-video-0.9.13.tgz#802fbc16635dd02f80ffb855421dc70836e5f7e0" + integrity sha512-5KJL02YdHZQaC1NAVDBgUiSUT+OaPwgRuCiScJ17Xah9LZui2ZXf3WwmOdCaBWLNJfD8mpNy9EPe7JJZEpSLzA== dependencies: eventemitter2 "^6.4.7" sdp-transform "^2.14.1" @@ -38,10 +38,10 @@ uuid "^8.3.2" webrtc-adapter "^8.0.0" -"@100mslive/hms-virtual-background@1.11.10": - version "1.11.10" - resolved "https://registry.yarnpkg.com/@100mslive/hms-virtual-background/-/hms-virtual-background-1.11.10.tgz#be3ad793aabc44428919adc53acb9e07fb5d4354" - integrity sha512-tF5myZxUbLYw+GYj66rpJQbwCssu0qg1vU7dFzY4dTTT+55rhwNomCdP6hxqayHZf5iprTWmxi2pGQ61fxsjrg== +"@100mslive/hms-virtual-background@1.11.13": + version "1.11.13" + resolved "https://registry.yarnpkg.com/@100mslive/hms-virtual-background/-/hms-virtual-background-1.11.13.tgz#4269fed339e2d4e56d1e0923ff040fab51fe8050" + integrity sha512-Sw8sM8qjZ2BC23BTrfQAQgzo8my7JcgozEd0WCy/YVEj6sOfaksTFAZdVW5B4OBOaXLHgyf2gCT4eEX1Ri5COw== dependencies: "@mediapipe/selfie_segmentation" "^0.1.1632777926" "@tensorflow-models/body-segmentation" "^1.0.1" @@ -53,38 +53,39 @@ gifuct-js "^2.1.2" wasm-check "^2.0.2" -"@100mslive/react-icons@0.8.10": - version "0.8.10" - resolved "https://registry.yarnpkg.com/@100mslive/react-icons/-/react-icons-0.8.10.tgz#b8bd70ed88fd060e7d694174985ea83be3fabb23" - integrity sha512-YD1tFIH+hlFaS10zoyG2c8zgN5CVkZh4KekYEGyMr7pQsEMevJDYhLhiWv3vUkZCnvwmnta5ZueenjeJ83ujGA== +"@100mslive/react-icons@0.8.13": + version "0.8.13" + resolved "https://registry.yarnpkg.com/@100mslive/react-icons/-/react-icons-0.8.13.tgz#252fe3cbd7759c74052a276670224bdd6964625c" + integrity sha512-nNfqXPKRn/XXxSncKavKyiqGWNF+At8/WwjB40u180a6BinRtIiqjdwOAsp3K1G28Asfo3Hcsc90y5U1oc485A== -"@100mslive/react-sdk@0.8.10": - version "0.8.10" - resolved "https://registry.yarnpkg.com/@100mslive/react-sdk/-/react-sdk-0.8.10.tgz#fdf42398b3884b17a0ca73915bbce5509daa11b1" - integrity sha512-XxwdwE2t11fNrN/3A0rDcXsqX/tvbydTZ41sL9mSR1BWjBHNJ+buHrgReJL9aG30eFS3pEg3CXXRg0Mqgbt5Ew== +"@100mslive/react-sdk@0.8.13": + version "0.8.13" + resolved "https://registry.yarnpkg.com/@100mslive/react-sdk/-/react-sdk-0.8.13.tgz#19cfe5757a654960efd45bc0b5a463c1895c8b4e" + integrity sha512-p5vRPHyn7JG7+hWBu2gALrFGKn39I164vSvOp3KuRBFHuaWaNB0sK4kCzq4FQgds6Wz13FeeQt8Ax4967YZ1NQ== dependencies: - "@100mslive/hms-video-store" "0.10.10" + "@100mslive/hms-video-store" "0.10.13" react-resize-detector "^7.0.0" zustand "^3.6.2" -"@100mslive/roomkit-react@0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@100mslive/roomkit-react/-/roomkit-react-0.1.0.tgz#2f71718a43dbcf7bd46f3ffe573e95cd01a7ea44" - integrity sha512-qvH99RdyrWwsbJ+NKNzZkjpSh3tXGX9Z/xKoasvQsv+qix8/TK0ESpSiMcdEcLnYe0s6ctKJQiNFfi01H1yGhw== - dependencies: - "@100mslive/hls-player" "0.1.10" - "@100mslive/hms-virtual-background" "1.11.10" - "@100mslive/react-icons" "0.8.10" - "@100mslive/react-sdk" "0.8.10" +"@100mslive/roomkit-react@0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@100mslive/roomkit-react/-/roomkit-react-0.1.4.tgz#6e5246b1a5ca7941008127bb7775d8d122fcd7d6" + integrity sha512-aQ16Br7nJxO73WpIXwzl5/woOYAsbjkxerKoYOdMrJcBmew7I6zGYoMq+/v61vuUh614Q92WAmjgberIAJiKGQ== + dependencies: + "@100mslive/hls-player" "0.1.13" + "@100mslive/hms-virtual-background" "1.11.13" + "@100mslive/react-icons" "0.8.13" + "@100mslive/react-sdk" "0.8.13" + "@100mslive/types-prebuilt" "0.10.0" "@emoji-mart/data" "^1.0.6" "@emoji-mart/react" "^1.0.1" "@radix-ui/react-accordion" "1.0.0" "@radix-ui/react-checkbox" "1.0.0" "@radix-ui/react-collapsible" "1.0.0" - "@radix-ui/react-dialog" "1.0.0" - "@radix-ui/react-dropdown-menu" "1.0.0" + "@radix-ui/react-dialog" "1.0.4" + "@radix-ui/react-dropdown-menu" "2.0.5" "@radix-ui/react-label" "1.0.0" - "@radix-ui/react-popover" "1.0.0" + "@radix-ui/react-popover" "1.0.6" "@radix-ui/react-progress" "1.0.0" "@radix-ui/react-radio-group" "1.0.0" "@radix-ui/react-select" "1.0.0" @@ -92,15 +93,11 @@ "@radix-ui/react-switch" "1.0.0" "@radix-ui/react-tabs" "1.0.0" "@radix-ui/react-toast" "1.0.0" - "@radix-ui/react-tooltip" "1.0.0" + "@radix-ui/react-tooltip" "1.0.6" "@stitches/react" "^1.2.8" - "@tldraw/tldraw" "^1.18.4" emoji-mart "^5.2.2" eventemitter2 "^6.4.7" - hls.js "^1.3.0" - js-confetti "^0.10.2" lodash.merge "^4.6.2" - mobx "^6.3.12" pusher-js "^7.0.3" qrcode.react "^3.1.0" react-draggable "^4.4.5" @@ -112,9 +109,12 @@ recordrtc "^5.6.2" screenfull "^5.1.0" uuid "^8.3.2" - web-vitals "^1.0.1" worker-timers "^7.0.40" - zipyai "^1.3.24" + +"@100mslive/types-prebuilt@0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@100mslive/types-prebuilt/-/types-prebuilt-0.10.0.tgz#465cf94dd71cf795609f874464ac2294cc241bac" + integrity sha512-9wtHTR1HJdaqj/tTj2DJJDriB5OJj8dg0CKaQxzZGQGN09tNIce+hWLEPGsMNajFyLs/G7RIn9Wdd7UP3sFhKw== "@adobe/css-tools@^4.0.1": version "4.0.1" @@ -1306,6 +1306,13 @@ resolved "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz" integrity sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg== +"@floating-ui/core@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.4.1.tgz#0d633f4b76052668afb932492ac452f7ebe97f17" + integrity sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ== + dependencies: + "@floating-ui/utils" "^0.1.1" + "@floating-ui/dom@^0.5.3": version "0.5.4" resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz" @@ -1313,6 +1320,14 @@ dependencies: "@floating-ui/core" "^0.7.3" +"@floating-ui/dom@^1.3.0": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.1.tgz#88b70defd002fe851f17b4a25efb2d3c04d7a8d7" + integrity sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw== + dependencies: + "@floating-ui/core" "^1.4.1" + "@floating-ui/utils" "^0.1.1" + "@floating-ui/react-dom@0.7.2": version "0.7.2" resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz" @@ -1321,6 +1336,18 @@ "@floating-ui/dom" "^0.5.3" use-isomorphic-layout-effect "^1.1.1" +"@floating-ui/react-dom@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.1.tgz#7972a4fc488a8c746cded3cfe603b6057c308a91" + integrity sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA== + dependencies: + "@floating-ui/dom" "^1.3.0" + +"@floating-ui/utils@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.1.tgz#1a5b1959a528e374e8037c4396c3e825d6cf4a83" + integrity sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw== + "@formatjs/ecma402-abstract@1.12.0": version "1.12.0" resolved "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.12.0.tgz" @@ -1531,6 +1558,13 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/primitive@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.0.1.tgz#e46f9958b35d10e9f6dc71c497305c22e3e55dbd" + integrity sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-accordion@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-accordion/-/react-accordion-1.0.0.tgz#bf69dc1f13fce05d6d7560ff79954c49abc1b71b" @@ -1567,6 +1601,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.0" +"@radix-ui/react-arrow@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz#c24f7968996ed934d57fe6cde5d6ec7266e1d25d" + integrity sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-checkbox@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-checkbox/-/react-checkbox-1.0.0.tgz#8985facb0cfeb740c4751091b8ee42d5c3f7e5e1" @@ -1609,6 +1651,17 @@ "@radix-ui/react-primitive" "1.0.0" "@radix-ui/react-slot" "1.0.0" +"@radix-ui/react-collection@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.0.3.tgz#9595a66e09026187524a36c6e7e9c7d286469159" + integrity sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-slot" "1.0.2" + "@radix-ui/react-compose-refs@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz" @@ -1616,6 +1669,13 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-compose-refs@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz#7ed868b66946aa6030e580b1ffca386dd4d21989" + integrity sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-context-menu@^1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-context-menu/-/react-context-menu-1.0.0.tgz" @@ -1636,6 +1696,13 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-context@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.1.tgz#fe46e67c96b240de59187dcb7a1a50ce3e2ec00c" + integrity sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-dialog@1.0.0", "@radix-ui/react-dialog@^1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.0.tgz" @@ -1657,6 +1724,27 @@ aria-hidden "^1.1.1" react-remove-scroll "2.5.4" +"@radix-ui/react-dialog@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.0.4.tgz#06bce6c16bb93eb36d7a8589e665a20f4c1c52c1" + integrity sha512-hJtRy/jPULGQZceSAP2Re6/4NpKo8im6V8P2hUqZsdFiSL8l35kYsw3qbRI6Ay5mQd2+wlLqje770eq+RJ3yZg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-dismissable-layer" "1.0.4" + "@radix-ui/react-focus-guards" "1.0.1" + "@radix-ui/react-focus-scope" "1.0.3" + "@radix-ui/react-id" "1.0.1" + "@radix-ui/react-portal" "1.0.3" + "@radix-ui/react-presence" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-slot" "1.0.2" + "@radix-ui/react-use-controllable-state" "1.0.1" + aria-hidden "^1.1.1" + react-remove-scroll "2.5.5" + "@radix-ui/react-direction@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.0.tgz" @@ -1664,6 +1752,13 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-direction@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.0.1.tgz#9cb61bf2ccf568f3421422d182637b7f47596c9b" + integrity sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-dismissable-layer@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.0.tgz" @@ -1676,7 +1771,33 @@ "@radix-ui/react-use-callback-ref" "1.0.0" "@radix-ui/react-use-escape-keydown" "1.0.0" -"@radix-ui/react-dropdown-menu@1.0.0", "@radix-ui/react-dropdown-menu@^1.0.0": +"@radix-ui/react-dismissable-layer@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.4.tgz#883a48f5f938fa679427aa17fcba70c5494c6978" + integrity sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-use-escape-keydown" "1.0.3" + +"@radix-ui/react-dropdown-menu@2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.0.5.tgz#19bf4de8ffa348b4eb6a86842f14eff93d741170" + integrity sha512-xdOrZzOTocqqkCkYo8yRPCib5OkTkqN7lqNCdxwPOdE466DOaNl4N8PkUIlsXthQvW5Wwkd+aEmWpfWlBoDPEw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-id" "1.0.1" + "@radix-ui/react-menu" "2.0.5" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-use-controllable-state" "1.0.1" + +"@radix-ui/react-dropdown-menu@^1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-1.0.0.tgz" integrity sha512-Ptben3TxPWrZLbInO7zjAK73kmjYuStsxfg6ujgt+EywJyREoibhZYnsSNqC+UiOtl4PdW/MOHhxVDtew5fouQ== @@ -1697,6 +1818,13 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-focus-guards@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz#1ea7e32092216b946397866199d892f71f7f98ad" + integrity sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-focus-scope@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.0.tgz" @@ -1707,6 +1835,16 @@ "@radix-ui/react-primitive" "1.0.0" "@radix-ui/react-use-callback-ref" "1.0.0" +"@radix-ui/react-focus-scope@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz#9c2e8d4ed1189a1d419ee61edd5c1828726472f9" + integrity sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-icons@^1.1.1": version "1.1.1" resolved "https://registry.npmjs.org/@radix-ui/react-icons/-/react-icons-1.1.1.tgz" @@ -1720,6 +1858,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-use-layout-effect" "1.0.0" +"@radix-ui/react-id@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.0.1.tgz#73cdc181f650e4df24f0b6a5b7aa426b912c88c0" + integrity sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-use-layout-effect" "1.0.1" + "@radix-ui/react-label@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-1.0.0.tgz" @@ -1756,7 +1902,54 @@ aria-hidden "^1.1.1" react-remove-scroll "2.5.4" -"@radix-ui/react-popover@1.0.0", "@radix-ui/react-popover@^1.0.0": +"@radix-ui/react-menu@2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-2.0.5.tgz#a7d78b0808c4d38269240bf5d5c7ffea3e225e16" + integrity sha512-Gw4f9pwdH+w5w+49k0gLjN0PfRDHvxmAgG16AbyJZ7zhwZ6PBHKtWohvnSwfusfnK3L68dpBREHpVkj8wEM7ZA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-collection" "1.0.3" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-direction" "1.0.1" + "@radix-ui/react-dismissable-layer" "1.0.4" + "@radix-ui/react-focus-guards" "1.0.1" + "@radix-ui/react-focus-scope" "1.0.3" + "@radix-ui/react-id" "1.0.1" + "@radix-ui/react-popper" "1.1.2" + "@radix-ui/react-portal" "1.0.3" + "@radix-ui/react-presence" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-roving-focus" "1.0.4" + "@radix-ui/react-slot" "1.0.2" + "@radix-ui/react-use-callback-ref" "1.0.1" + aria-hidden "^1.1.1" + react-remove-scroll "2.5.5" + +"@radix-ui/react-popover@1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@radix-ui/react-popover/-/react-popover-1.0.6.tgz#19bb81e7450482c625b8cd05bf4dcd1d2cd91a8b" + integrity sha512-cZ4defGpkZ0qTRtlIBzJLSzL6ht7ofhhW4i1+pkemjV1IKXm0wgCRnee154qlV6r9Ttunmh2TNZhMfV2bavUyA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-dismissable-layer" "1.0.4" + "@radix-ui/react-focus-guards" "1.0.1" + "@radix-ui/react-focus-scope" "1.0.3" + "@radix-ui/react-id" "1.0.1" + "@radix-ui/react-popper" "1.1.2" + "@radix-ui/react-portal" "1.0.3" + "@radix-ui/react-presence" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-slot" "1.0.2" + "@radix-ui/react-use-controllable-state" "1.0.1" + aria-hidden "^1.1.1" + react-remove-scroll "2.5.5" + +"@radix-ui/react-popover@^1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.0.0.tgz" integrity sha512-osxFFO0TiZ9ABpEOitZu0R1Fdd+tSpJgAqLZxRLLdZQ7ya0onSODcITp5hXDVuYQeVXH6pKEBGwXN6ZGjZ0a5g== @@ -1794,6 +1987,23 @@ "@radix-ui/react-use-size" "1.0.0" "@radix-ui/rect" "1.0.0" +"@radix-ui/react-popper@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.1.2.tgz#4c0b96fcd188dc1f334e02dba2d538973ad842e9" + integrity sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg== + dependencies: + "@babel/runtime" "^7.13.10" + "@floating-ui/react-dom" "^2.0.0" + "@radix-ui/react-arrow" "1.0.3" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-use-layout-effect" "1.0.1" + "@radix-ui/react-use-rect" "1.0.1" + "@radix-ui/react-use-size" "1.0.1" + "@radix-ui/rect" "1.0.1" + "@radix-ui/react-portal@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.0.tgz" @@ -1802,6 +2012,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.0" +"@radix-ui/react-portal@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.3.tgz#ffb961244c8ed1b46f039e6c215a6c4d9989bda1" + integrity sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-presence@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.0.tgz" @@ -1811,6 +2029,15 @@ "@radix-ui/react-compose-refs" "1.0.0" "@radix-ui/react-use-layout-effect" "1.0.0" +"@radix-ui/react-presence@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.0.1.tgz#491990ba913b8e2a5db1b06b203cb24b5cdef9ba" + integrity sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-use-layout-effect" "1.0.1" + "@radix-ui/react-primitive@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.0.tgz" @@ -1819,6 +2046,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-slot" "1.0.0" +"@radix-ui/react-primitive@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz#d49ea0f3f0b2fe3ab1cb5667eb03e8b843b914d0" + integrity sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-slot" "1.0.2" + "@radix-ui/react-progress@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-progress/-/react-progress-1.0.0.tgz#78ef64ee36273eabdae278c4c9580285122d4334" @@ -1862,6 +2097,22 @@ "@radix-ui/react-use-callback-ref" "1.0.0" "@radix-ui/react-use-controllable-state" "1.0.0" +"@radix-ui/react-roving-focus@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.4.tgz#e90c4a6a5f6ac09d3b8c1f5b5e81aab2f0db1974" + integrity sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-collection" "1.0.3" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-direction" "1.0.1" + "@radix-ui/react-id" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-use-controllable-state" "1.0.1" + "@radix-ui/react-select@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-1.0.0.tgz" @@ -1916,6 +2167,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-compose-refs" "1.0.0" +"@radix-ui/react-slot@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab" + integrity sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-switch@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.0.0.tgz" @@ -1965,7 +2224,26 @@ "@radix-ui/react-use-layout-effect" "1.0.0" "@radix-ui/react-visually-hidden" "1.0.0" -"@radix-ui/react-tooltip@1.0.0", "@radix-ui/react-tooltip@^1.0.0": +"@radix-ui/react-tooltip@1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.0.6.tgz#87a7786cd9f2b4de957ac645afae1575339c58b0" + integrity sha512-DmNFOiwEc2UDigsYj6clJENma58OelxD24O4IODoZ+3sQc3Zb+L8w1EP+y9laTuKCLAysPw4fD6/v0j4KNV8rg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "1.0.1" + "@radix-ui/react-compose-refs" "1.0.1" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-dismissable-layer" "1.0.4" + "@radix-ui/react-id" "1.0.1" + "@radix-ui/react-popper" "1.1.2" + "@radix-ui/react-portal" "1.0.3" + "@radix-ui/react-presence" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-slot" "1.0.2" + "@radix-ui/react-use-controllable-state" "1.0.1" + "@radix-ui/react-visually-hidden" "1.0.3" + +"@radix-ui/react-tooltip@^1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.0.0.tgz" integrity sha512-RB06pov+O4Npy10ei1C6fsyB9QoOjz7Ubo8Sl3qdKtLgkL9iI96925DYtH0bxx6MH6YB2FuzLU6B75qn3AQQQw== @@ -1991,6 +2269,13 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-use-callback-ref@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz#f4bb1f27f2023c984e6534317ebc411fc181107a" + integrity sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-use-controllable-state@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.0.tgz" @@ -1999,6 +2284,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-use-callback-ref" "1.0.0" +"@radix-ui/react-use-controllable-state@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz#ecd2ced34e6330caf89a82854aa2f77e07440286" + integrity sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-use-escape-keydown@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.0.tgz" @@ -2007,6 +2300,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-use-callback-ref" "1.0.0" +"@radix-ui/react-use-escape-keydown@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz#217b840c250541609c66f67ed7bab2b733620755" + integrity sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-use-layout-effect@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.0.tgz" @@ -2014,13 +2315,19 @@ dependencies: "@babel/runtime" "^7.13.10" +"@radix-ui/react-use-layout-effect@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz#be8c7bc809b0c8934acf6657b577daf948a75399" + integrity sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-use-previous@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.0.0.tgz" integrity sha512-RG2K8z/K7InnOKpq6YLDmT49HGjNmrK+fr82UCVKT2sW0GYfVnYp4wZWBooT/EYfQ5faA9uIjvsuMMhH61rheg== dependencies: "@babel/runtime" "^7.13.10" - "@radix-ui/rect" "1.0.0" "@radix-ui/react-use-rect@1.0.0": version "1.0.0" @@ -2030,6 +2337,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/rect" "1.0.0" +"@radix-ui/react-use-rect@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz#fde50b3bb9fd08f4a1cd204572e5943c244fcec2" + integrity sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/rect" "1.0.1" + "@radix-ui/react-use-size@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.0.tgz" @@ -2038,6 +2353,14 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-use-layout-effect" "1.0.0" +"@radix-ui/react-use-size@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-1.0.1.tgz#1c5f5fea940a7d7ade77694bb98116fb49f870b2" + integrity sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-use-layout-effect" "1.0.1" + "@radix-ui/react-visually-hidden@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.0.tgz" @@ -2046,12 +2369,27 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.0" +"@radix-ui/react-visually-hidden@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.3.tgz#51aed9dd0fe5abcad7dee2a234ad36106a6984ac" + integrity sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/rect@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.0.tgz" integrity sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg== dependencies: - rrweb-snapshot "^2.0.0-alpha.9" + "@babel/runtime" "^7.13.10" + +"@radix-ui/rect@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.0.1.tgz#bf8e7d947671996da2e30f4904ece343bc4a883f" + integrity sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ== + dependencies: + "@babel/runtime" "^7.13.10" "@remix-run/router@1.0.2": version "1.0.2" @@ -2495,6 +2833,14 @@ dependencies: "@use-gesture/core" "10.2.20" +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ast@1.11.6": version "1.11.6" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" @@ -2511,6 +2857,11 @@ "@webassemblyjs/helper-numbers" "1.11.5" "@webassemblyjs/helper-wasm-bytecode" "1.11.5" +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + "@webassemblyjs/floating-point-hex-parser@1.11.5": version "1.11.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz#e85dfdb01cad16b812ff166b96806c050555f1b4" @@ -2521,6 +2872,11 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + "@webassemblyjs/helper-api-error@1.11.5": version "1.11.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz#1e82fa7958c681ddcf4eabef756ce09d49d442d1" @@ -2536,6 +2892,15 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" + "@webassemblyjs/helper-numbers@1.11.5": version "1.11.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz#23380c910d56764957292839006fecbe05e135a9" @@ -2579,6 +2944,13 @@ "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/wasm-gen" "1.11.6" +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/ieee754@1.11.6": version "1.11.6" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" @@ -2586,6 +2958,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/leb128@1.11.6": version "1.11.6" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" @@ -2593,6 +2972,11 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + "@webassemblyjs/utf8@1.11.6": version "1.11.6" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" @@ -2758,7 +3142,7 @@ ajv-keywords@^5.0.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: +ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -3216,12 +3600,7 @@ commander@^2.20.0: resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^7.0.0: - version "7.2.0" - resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commander@^7.2.0: +commander@^7.0.0, commander@^7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -3488,14 +3867,7 @@ damerau-levenshtein@^1.0.8: resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== -debug@2.6.9: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^2.6.9: +debug@2.6.9, debug@^2.6.9: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -3627,7 +3999,7 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: dependencies: domelementtype "^2.2.0" -domutils@^2.8.0: +domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz" integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== @@ -3636,6 +4008,14 @@ domutils@^2.8.0: domelementtype "^2.2.0" domhandler "^4.2.0" +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + dotenv@^14.2.0: version "14.3.2" resolved "https://registry.npmjs.org/dotenv/-/dotenv-14.3.2.tgz" @@ -4453,7 +4833,7 @@ gifuct-js@^2.1.2: dependencies: js-binary-schema-parser "^2.0.3" -glob-parent@^5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -4467,13 +4847,6 @@ glob-parent@^6.0.1: dependencies: is-glob "^4.0.3" -glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz" @@ -5308,12 +5681,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== dependencies: - yallist "^4.0.0" + tslib "^2.0.3" make-dir@^2.1.0: version "2.1.0" @@ -5712,6 +6085,14 @@ p-try@^2.0.0: resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +param-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== + dependencies: + dot-case "^3.0.4" + tslib "^2.0.3" + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" @@ -6276,6 +6657,17 @@ react-remove-scroll@2.5.4: use-callback-ref "^1.3.0" use-sidecar "^1.1.2" +react-remove-scroll@2.5.5: + version "2.5.5" + resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77" + integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw== + dependencies: + react-remove-scroll-bar "^2.3.3" + react-style-singleton "^2.2.1" + tslib "^2.1.0" + use-callback-ref "^1.3.0" + use-sidecar "^1.1.2" + react-resize-detector@^7.0.0: version "7.1.2" resolved "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-7.1.2.tgz" @@ -6720,7 +7112,7 @@ semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: - node-forge "^1" + lru-cache "^6.0.0" send@0.18.0: version "0.18.0" @@ -7272,11 +7664,6 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -"typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", typescript@^4.7: - version "4.8.4" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz" - integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== - ua-parser-js@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz" @@ -7653,11 +8040,6 @@ ws@^8.4.2: resolved "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz" integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg== -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - yaml@^1.10.0, yaml@^1.10.2: version "1.10.2" resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"