From ac8297ae9bf10b7132321c364bbb0c2065da52b2 Mon Sep 17 00:00:00 2001 From: Kaustubh Kumar Date: Fri, 12 Apr 2024 18:23:35 +0530 Subject: [PATCH 1/2] Dev to Main (#2817) * fix: transcription text color * fix: screenshare getting hidden, add scroll to dialog (#2783) * fix: screenshare button getting hidden on smaller screens * fix: set max height on dialog --------- Co-authored-by: Kaustubh Kumar * fix: show leaderboard summary based on poll read/write permissions * feat: upgrade effects sdk version * fix: mweb vb sidepane * feat: hls multiple variants * fix: hls initialzation * fix: hls brightness issue * fix: hide emoji based on prebuilt layout --------- Co-authored-by: Ravi theja Co-authored-by: Amar Bathwal <110378139+amar-1995@users.noreply.github.com> --- .../prebuilt-react-integration/src/App.jsx | 6 +-- .../src/analytics/stats/BaseStatsAnalytics.ts | 2 +- packages/hms-video-store/src/index.ts | 2 +- .../hms-video-store/src/interfaces/room.ts | 6 +++ .../notification-manager/HMSNotifications.ts | 7 +++- .../managers/RoomUpdateManager.ts | 28 +++++++++---- .../HMSInteractivityCenter.ts | 5 ++- packages/hms-virtual-background/package.json | 2 +- .../src/HMSEffectsPlugin.ts | 4 +- .../hms-virtual-background/src/constants.ts | 2 +- .../roomkit-react/src/Modal/DialogContent.tsx | 2 + .../src/Prebuilt/common/constants.ts | 1 - .../Prebuilt/components/AppData/AppData.tsx | 7 +--- .../src/Prebuilt/components/EmojiReaction.jsx | 4 +- .../src/Prebuilt/components/Footer/Footer.tsx | 1 + .../Prebuilt/components/HMSVideo/HMSVideo.jsx | 3 +- .../SplitComponents/MwebOptions.tsx | 8 +++- .../components/Preview/PreviewJoin.tsx | 2 +- .../RoleChangeRequest/RequestPrompt.tsx | 4 +- .../Prebuilt/components/ScreenShareToggle.jsx | 2 +- .../src/Prebuilt/layouts/HLSView.jsx | 8 +++- .../src/Prebuilt/layouts/SidePane.tsx | 7 ++++ yarn.lock | 39 ++++--------------- 23 files changed, 84 insertions(+), 68 deletions(-) diff --git a/examples/prebuilt-react-integration/src/App.jsx b/examples/prebuilt-react-integration/src/App.jsx index 3fa281fbb4..e49ddcb9b1 100644 --- a/examples/prebuilt-react-integration/src/App.jsx +++ b/examples/prebuilt-react-integration/src/App.jsx @@ -4,9 +4,5 @@ import { getRoomCodeFromUrl } from './utils'; export default function App() { const roomCode = getRoomCodeFromUrl(); - return ( - - ); + return ; } diff --git a/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts b/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts index b0d16adb0c..563765e536 100644 --- a/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts +++ b/packages/hms-video-store/src/analytics/stats/BaseStatsAnalytics.ts @@ -39,7 +39,7 @@ export abstract class BaseStatsAnalytics { this.stop(); this.shouldSendEvent = true; this.eventBus.statsUpdate.subscribe(this.handleStatsUpdate.bind(this)); - this.startLoop().catch(e => HMSLogger.e('[StatsAnanlytics]', e.message)); + this.startLoop().catch(e => HMSLogger.e('[StatsAnalytics]', e.message)); } stop = () => { diff --git a/packages/hms-video-store/src/index.ts b/packages/hms-video-store/src/index.ts index 69f95cf389..9c1e76c758 100644 --- a/packages/hms-video-store/src/index.ts +++ b/packages/hms-video-store/src/index.ts @@ -56,7 +56,7 @@ export type { export { EventBus } from './events/EventBus'; export { HMSReactiveStore } from './reactive-store/HMSReactiveStore'; -export { HMSPluginUnsupportedTypes, HMSRecordingState, HLSPlaylistType } from './internal'; +export { HMSPluginUnsupportedTypes, HMSRecordingState, HLSPlaylistType, HLSStreamType } from './internal'; export type { HMSVideoPlugin, HMSAudioPlugin, diff --git a/packages/hms-video-store/src/interfaces/room.ts b/packages/hms-video-store/src/interfaces/room.ts index 63d9725463..b81c8dd604 100644 --- a/packages/hms-video-store/src/interfaces/room.ts +++ b/packages/hms-video-store/src/interfaces/room.ts @@ -102,6 +102,11 @@ export enum HLSPlaylistType { NO_DVR = 'no-dvr', } +export enum HLSStreamType { + REGULAR = 'regular', + SCREEN = 'screen', + COMPOSITE = 'composite', +} export interface HLSVariant { url: string; playlist_type?: HLSPlaylistType; @@ -110,4 +115,5 @@ export interface HLSVariant { startedAt?: Date; initialisedAt?: Date; state?: HMSStreamingState; + stream_type?: HLSStreamType; } diff --git a/packages/hms-video-store/src/notification-manager/HMSNotifications.ts b/packages/hms-video-store/src/notification-manager/HMSNotifications.ts index 9fbfe894d9..1909a3d052 100644 --- a/packages/hms-video-store/src/notification-manager/HMSNotifications.ts +++ b/packages/hms-video-store/src/notification-manager/HMSNotifications.ts @@ -285,7 +285,11 @@ export enum HLSPlaylistType { DVR = 'dvr', NO_DVR = 'no-dvr', } - +export enum HLSStreamType { + REGULAR = 'regular', + SCREEN = 'screen', + COMPOSITE = 'composite', +} export interface HLSVariantInfo { url: string; meeting_url?: string; @@ -294,6 +298,7 @@ export interface HLSVariantInfo { started_at?: number; initialised_at?: number; state?: HMSStreamingState; + stream_type?: HLSStreamType; } export interface MetadataChangeNotification { diff --git a/packages/hms-video-store/src/notification-manager/managers/RoomUpdateManager.ts b/packages/hms-video-store/src/notification-manager/managers/RoomUpdateManager.ts index d367681eac..60e26e9f9d 100644 --- a/packages/hms-video-store/src/notification-manager/managers/RoomUpdateManager.ts +++ b/packages/hms-video-store/src/notification-manager/managers/RoomUpdateManager.ts @@ -149,11 +149,24 @@ export class RoomUpdateManager { if (!notification?.variants) { return hls; } - notification.variants.forEach((_: HLSVariant, index: number) => { - hls.variants.push({ - initialisedAt: convertDateNumToDate(notification?.variants?.[index].initialised_at), - url: '', - }); + notification.variants.forEach((variant: HLSVariant, index: number) => { + if (variant.state !== HMSStreamingState.INITIALISED) { + hls.variants.push({ + meetingURL: variant?.meetingURL, + url: variant?.url, + metadata: variant?.metadata, + playlist_type: variant?.playlist_type, + startedAt: convertDateNumToDate(notification?.variants?.[index].started_at), + initialisedAt: convertDateNumToDate(notification?.variants?.[index].initialised_at), + state: variant.state, + stream_type: variant?.stream_type, + }); + } else { + hls.variants.push({ + initialisedAt: convertDateNumToDate(notification?.variants?.[index].initialised_at), + url: '', + }); + } }); return hls; } @@ -161,7 +174,7 @@ export class RoomUpdateManager { const room = this.store.getRoom(); const running = notification.variants && notification.variants.length > 0 - ? this.isStreamingRunning(notification.variants[0].state) + ? notification.variants.some(variant => this.isStreamingRunning(variant.state)) : false; if (!room) { HMSLogger.w(this.TAG, 'on hls - room not present'); @@ -175,7 +188,7 @@ export class RoomUpdateManager { private convertHls(hlsNotification?: HLSNotification) { const isInitialised = hlsNotification?.variants && hlsNotification.variants.length > 0 - ? hlsNotification.variants[0].state === HMSStreamingState.INITIALISED + ? hlsNotification.variants.some(variant => variant.state === HMSStreamingState.INITIALISED) : false; // handling for initialized state if (isInitialised) { @@ -195,6 +208,7 @@ export class RoomUpdateManager { startedAt: convertDateNumToDate(variant?.started_at), initialisedAt: convertDateNumToDate(variant?.initialised_at), state: variant.state, + stream_type: variant?.stream_type, }); }); return hls; diff --git a/packages/hms-video-store/src/session-store/interactivity-center/HMSInteractivityCenter.ts b/packages/hms-video-store/src/session-store/interactivity-center/HMSInteractivityCenter.ts index 95fc81de7a..e87fb3f486 100644 --- a/packages/hms-video-store/src/session-store/interactivity-center/HMSInteractivityCenter.ts +++ b/packages/hms-video-store/src/session-store/interactivity-center/HMSInteractivityCenter.ts @@ -128,9 +128,10 @@ export class InteractivityCenter implements HMSInteractivityCenter { throw new Error('Invalid poll ID - Poll not found'); } - const canReadPolls = this.store.getLocalPeer()?.role?.permissions.pollRead || false; + const localPeerPermissions = this.store.getLocalPeer()?.role?.permissions; + const canViewSummary = !!(localPeerPermissions?.pollRead || localPeerPermissions?.pollWrite); - if (poll.anonymous || poll.state !== HMSPollStates.STOPPED || !canReadPolls) { + if (poll.anonymous || poll.state !== HMSPollStates.STOPPED || !canViewSummary) { return { entries: [], hasNext: false }; } const pollLeaderboard = await this.transport.signal.fetchPollLeaderboard({ diff --git a/packages/hms-virtual-background/package.json b/packages/hms-virtual-background/package.json index ae77d3190e..ae1e789f3b 100755 --- a/packages/hms-virtual-background/package.json +++ b/packages/hms-virtual-background/package.json @@ -45,7 +45,7 @@ "@tensorflow/tfjs-core": "^3.19.0", "@webassemblyjs/helper-wasm-bytecode": "1.11.1", "@webassemblyjs/wasm-gen": "1.11.1", - "effects-sdk": "2.6.8", + "effects-sdk": "3.1.5", "gifuct-js": "^2.1.2", "wasm-check": "^2.0.2" }, diff --git a/packages/hms-virtual-background/src/HMSEffectsPlugin.ts b/packages/hms-virtual-background/src/HMSEffectsPlugin.ts index 372d167ff3..131fbfdc1b 100644 --- a/packages/hms-virtual-background/src/HMSEffectsPlugin.ts +++ b/packages/hms-virtual-background/src/HMSEffectsPlugin.ts @@ -25,10 +25,10 @@ export class HMSEffectsPlugin implements HMSMediaStreamPlugin { wasmPaths: { 'ort-wasm.wasm': `${EFFECTS_SDK_ASSETS}ort-wasm.wasm`, 'ort-wasm-simd.wasm': `${EFFECTS_SDK_ASSETS}ort-wasm-simd.wasm`, - 'ort-wasm-threaded.wasm': `${EFFECTS_SDK_ASSETS}ort-wasm-threaded.wasm`, - 'ort-wasm-simd-threaded.wasm': `${EFFECTS_SDK_ASSETS}ort-wasm-simd-threaded.wasm`, }, + provider: 'webgpu', }); + this.effects.onError(err => console.error('[HMSEffectsPlugin]', err)); } getName(): string { diff --git a/packages/hms-virtual-background/src/constants.ts b/packages/hms-virtual-background/src/constants.ts index b6070950de..3cfc7d2c45 100644 --- a/packages/hms-virtual-background/src/constants.ts +++ b/packages/hms-virtual-background/src/constants.ts @@ -1 +1 @@ -export const EFFECTS_SDK_ASSETS = 'https://assets.100ms.live/effectsdk/'; +export const EFFECTS_SDK_ASSETS = 'https://assets.100ms.live/effectsdk/3.1.5/'; diff --git a/packages/roomkit-react/src/Modal/DialogContent.tsx b/packages/roomkit-react/src/Modal/DialogContent.tsx index 8631bae8a7..fa88a3ada7 100644 --- a/packages/roomkit-react/src/Modal/DialogContent.tsx +++ b/packages/roomkit-react/src/Modal/DialogContent.tsx @@ -32,6 +32,8 @@ export const CustomDialogContent = styled(DialogPrimitive.Content, { position: 'absolute', top: '50%', left: '50%', + maxHeight: '95%', + overflowY: 'auto', border: '$space$px solid $border_bright', boxShadow: '0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23)', transform: 'translate(-50%, -50%)', diff --git a/packages/roomkit-react/src/Prebuilt/common/constants.ts b/packages/roomkit-react/src/Prebuilt/common/constants.ts index ccbba0d456..0961b63e89 100644 --- a/packages/roomkit-react/src/Prebuilt/common/constants.ts +++ b/packages/roomkit-react/src/Prebuilt/common/constants.ts @@ -117,7 +117,6 @@ export enum SESSION_STORE_KEY { CHAT_PEER_BLACKLIST = 'chatPeerBlacklist', CHAT_MESSAGE_BLACKLIST = 'chatMessageBlacklist', CHAT_STATE = 'chatState', - SHARED_LEADERBOARDS = 'sharedLeaderboards', } export enum INTERACTION_TYPE { diff --git a/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx b/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx index d5798180b1..37d44ac495 100644 --- a/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx +++ b/packages/roomkit-react/src/Prebuilt/components/AppData/AppData.tsx @@ -1,5 +1,4 @@ import React, { useEffect, useMemo, useRef } from 'react'; -import { useMedia } from 'react-use'; import { HMSRoomState, selectFullAppData, @@ -11,7 +10,6 @@ import { useHMSStore, useRecordingStreaming, } from '@100mslive/react-sdk'; -import { config as cssConfig } from '../../../Theme'; import { LayoutMode } from '../Settings/LayoutSettings'; import { useRoomLayoutConferencingScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen'; //@ts-ignore @@ -77,7 +75,6 @@ export const AppData = React.memo(() => { const appData = useHMSStore(selectFullAppData); const { elements } = useRoomLayoutConferencingScreen(); const toggleVB = useSidepaneToggle(SIDE_PANE_OPTIONS.VB); - const isMobile = useMedia(cssConfig.media.md); const { isLocalVideoEnabled } = useAVToggle(); const sidepaneOpenedRef = useRef(false); @@ -123,12 +120,12 @@ export const AppData = React.memo(() => { }, [preferences.subscribedNotifications, hmsActions]); useEffect(() => { - if (defaultMediaURL && !sidepaneOpenedRef.current && !isMobile && isLocalVideoEnabled) { + if (defaultMediaURL && !sidepaneOpenedRef.current && isLocalVideoEnabled) { hmsActions.setAppData(APP_DATA.background, defaultMediaURL); sidepaneOpenedRef.current = true; toggleVB(); } - }, [hmsActions, toggleVB, isLocalVideoEnabled, isMobile, defaultMediaURL]); + }, [hmsActions, toggleVB, isLocalVideoEnabled, defaultMediaURL]); return ; }); diff --git a/packages/roomkit-react/src/Prebuilt/components/EmojiReaction.jsx b/packages/roomkit-react/src/Prebuilt/components/EmojiReaction.jsx index 7de2809605..cf145ee4a1 100644 --- a/packages/roomkit-react/src/Prebuilt/components/EmojiReaction.jsx +++ b/packages/roomkit-react/src/Prebuilt/components/EmojiReaction.jsx @@ -17,6 +17,7 @@ import { Box } from '../../Layout'; import { config as cssConfig } from '../../Theme'; import { Tooltip } from '../../Tooltip'; import IconButton from '../IconButton'; +import { useRoomLayoutConferencingScreen } from '../provider/roomLayoutProvider/hooks/useRoomLayoutScreen'; import { useDropdownList } from './hooks/useDropdownList'; import { useLandscapeHLSStream, useMobileHLSStream } from '../common/hooks'; import { EMOJI_REACTION_TYPE } from '../common/constants'; @@ -26,6 +27,7 @@ init({ data }); export const EmojiReaction = ({ showCard = false }) => { const [open, setOpen] = useState(false); const isConnected = useHMSStore(selectIsConnectedToRoom); + const { elements } = useRoomLayoutConferencingScreen(); useDropdownList({ open: open, name: 'EmojiReaction' }); // const hmsActions = useHMSActions(); const roles = useHMSStore(selectAvailableRoleNames); @@ -64,7 +66,7 @@ export const EmojiReaction = ({ showCard = false }) => { } */ }; - if (!isConnected) { + if (!isConnected || !elements.emoji_reactions) { return null; } diff --git a/packages/roomkit-react/src/Prebuilt/components/Footer/Footer.tsx b/packages/roomkit-react/src/Prebuilt/components/Footer/Footer.tsx index c4b32bdca3..937449b3c5 100644 --- a/packages/roomkit-react/src/Prebuilt/components/Footer/Footer.tsx +++ b/packages/roomkit-react/src/Prebuilt/components/Footer/Footer.tsx @@ -87,6 +87,7 @@ export const Footer = ({ > {isMobile ? ( <> + {elements?.chat && } diff --git a/packages/roomkit-react/src/Prebuilt/components/HMSVideo/HMSVideo.jsx b/packages/roomkit-react/src/Prebuilt/components/HMSVideo/HMSVideo.jsx index 7a4c4cb304..89b123df0d 100644 --- a/packages/roomkit-react/src/Prebuilt/components/HMSVideo/HMSVideo.jsx +++ b/packages/roomkit-react/src/Prebuilt/components/HMSVideo/HMSVideo.jsx @@ -17,7 +17,8 @@ export const HMSVideo = forwardRef(({ children, ...props }, videoRef) => { }, }, '& video::cue': { - color: 'white', + // default for on-surface-high + color: '#EFF0FA', whiteSpace: 'pre-line', fontSize: '$sm', fontStyle: 'normal', diff --git a/packages/roomkit-react/src/Prebuilt/components/MoreSettings/SplitComponents/MwebOptions.tsx b/packages/roomkit-react/src/Prebuilt/components/MoreSettings/SplitComponents/MwebOptions.tsx index 30cb6393fb..8e8f310687 100644 --- a/packages/roomkit-react/src/Prebuilt/components/MoreSettings/SplitComponents/MwebOptions.tsx +++ b/packages/roomkit-react/src/Prebuilt/components/MoreSettings/SplitComponents/MwebOptions.tsx @@ -4,6 +4,7 @@ import { ConferencingScreen, DefaultConferencingScreen_Elements } from '@100msli import { match } from 'ts-pattern'; import { selectIsConnectedToRoom, + selectIsLocalVideoEnabled, selectPeerCount, selectPermissions, useHMSActions, @@ -23,6 +24,7 @@ import { QuizIcon, RecordIcon, SettingsIcon, + VirtualBackgroundIcon, } from '@100mslive/react-icons'; import { Box, Loading, Tooltip } from '../../../..'; import { Sheet } from '../../../../Sheet'; @@ -98,6 +100,8 @@ export const MwebOptions = ({ const toggleDetailsSheet = useSheetToggle(SHEET_OPTIONS.ROOM_DETAILS); const isMobileHLSStream = useMobileHLSStream(); const isLandscapeHLSStream = useLandscapeHLSStream(); + const toggleVB = useSidepaneToggle(SIDE_PANE_OPTIONS.VB); + const isLocalVideoEnabled = useHMSStore(selectIsLocalVideoEnabled); useDropdownList({ open: openModals.size > 0 || openOptionsSheet || openSettingsSheet, name: 'MoreSettings' }); @@ -184,7 +188,7 @@ export const MwebOptions = ({ ) : null} - {/* {isLocalVideoEnabled && !!elements?.virtual_background ? ( + {isLocalVideoEnabled && !!elements?.virtual_background ? ( { toggleVB(); @@ -194,7 +198,7 @@ export const MwebOptions = ({ Virtual Background - ) : null} */} + ) : null} {elements?.emoji_reactions && !(isLandscapeHLSStream || isMobileHLSStream) && ( - {vbEnabled && !isMobile ? : null} + {vbEnabled ? : null} {!hideSettings ? : null} diff --git a/packages/roomkit-react/src/Prebuilt/components/RoleChangeRequest/RequestPrompt.tsx b/packages/roomkit-react/src/Prebuilt/components/RoleChangeRequest/RequestPrompt.tsx index 6328d87059..0d1f534b78 100644 --- a/packages/roomkit-react/src/Prebuilt/components/RoleChangeRequest/RequestPrompt.tsx +++ b/packages/roomkit-react/src/Prebuilt/components/RoleChangeRequest/RequestPrompt.tsx @@ -60,8 +60,8 @@ const RequestActions = ({ }) => ( - - diff --git a/packages/roomkit-react/src/Prebuilt/components/ScreenShareToggle.jsx b/packages/roomkit-react/src/Prebuilt/components/ScreenShareToggle.jsx index 5eef7dacae..9d8d145bef 100644 --- a/packages/roomkit-react/src/Prebuilt/components/ScreenShareToggle.jsx +++ b/packages/roomkit-react/src/Prebuilt/components/ScreenShareToggle.jsx @@ -22,7 +22,7 @@ export const ScreenshareToggle = ({ css = {} }) => { return ( - + { justify="between" css={{ position: 'absolute', - bg: '#00000066', + bg: `${ + hoverControlsVisible.pausePlay || + hoverControlsVisible.seekBackward || + hoverControlsVisible.seekForward + ? '#00000066' + : '' + }`, display: 'inline-flex', gap: '$2', zIndex: 1, diff --git a/packages/roomkit-react/src/Prebuilt/layouts/SidePane.tsx b/packages/roomkit-react/src/Prebuilt/layouts/SidePane.tsx index 3225467f98..fed6b13432 100644 --- a/packages/roomkit-react/src/Prebuilt/layouts/SidePane.tsx +++ b/packages/roomkit-react/src/Prebuilt/layouts/SidePane.tsx @@ -80,6 +80,12 @@ const Wrapper = styled('div', { hideControls: { true: {}, }, + virtualBackground: { + true: { + maxHeight: '100%', + background: '$surface_dim', + }, + }, }, compoundVariants: [ { @@ -157,6 +163,7 @@ const SidePane = ({ hideControls, overlayChat: !!elements?.chat?.is_overlay, roomDescription: isMobile && sidepane === SIDE_PANE_OPTIONS.ROOM_DETAILS, + virtualBackground: sidepane === SIDE_PANE_OPTIONS.VB, }; const SidepaneComponent = match(sidepane) diff --git a/yarn.lock b/yarn.lock index d4618acd48..22ec6adf09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8493,10 +8493,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -effects-sdk@2.6.8: - version "2.6.8" - resolved "https://registry.yarnpkg.com/effects-sdk/-/effects-sdk-2.6.8.tgz#ab34f9c83ce28d6b2d5db9fe522611db697009d4" - integrity sha512-zNJxruPxmbyTc+T43PBmCqQ4m//FvSr90DzYnuWu7r8C78tle9Ile35xmFfNBuKixbEt0ul4IDAmpqQkO3IrcQ== +effects-sdk@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/effects-sdk/-/effects-sdk-3.1.5.tgz#1cbfdb6ecf6381bc1dfd5b49b6552783a89f495a" + integrity sha512-X95BOoc8GGkvlxxSO+PhS3RTH17JNAiF3cTLRLx2MsQp5zMO9zsi67xjo3q8OTyNKuSGHzK+QOg8E+voMN213g== ejs@^3.1.7, ejs@^3.1.8: version "3.1.9" @@ -15781,16 +15781,7 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -15890,14 +15881,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -17194,7 +17178,7 @@ worker-timers@^7.0.40: worker-timers-broker "^6.0.95" worker-timers-worker "^7.0.59" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -17212,15 +17196,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From cc9d1fa2804d266e26226b250edc0fc7b76f0691 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:27:11 +0530 Subject: [PATCH 2/2] build: update versions for release --- .../prebuilt-react-integration/package.json | 2 +- packages/hls-player/package.json | 4 +-- packages/hls-stats/package.json | 2 +- packages/hms-video-store/package.json | 2 +- packages/hms-virtual-background/package.json | 6 ++-- packages/react-icons/package.json | 2 +- packages/react-sdk/package.json | 4 +-- packages/roomkit-react/package.json | 10 +++--- packages/roomkit-web/package.json | 4 +-- yarn.lock | 31 +++++++++++++++++-- 10 files changed, 46 insertions(+), 21 deletions(-) diff --git a/examples/prebuilt-react-integration/package.json b/examples/prebuilt-react-integration/package.json index f99407625f..f8a7bc0f0f 100644 --- a/examples/prebuilt-react-integration/package.json +++ b/examples/prebuilt-react-integration/package.json @@ -10,7 +10,7 @@ "preview": "vite preview" }, "dependencies": { - "@100mslive/roomkit-react": "0.3.6", + "@100mslive/roomkit-react": "0.3.7", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/packages/hls-player/package.json b/packages/hls-player/package.json index 82291f859f..856bc9916b 100644 --- a/packages/hls-player/package.json +++ b/packages/hls-player/package.json @@ -1,6 +1,6 @@ { "name": "@100mslive/hls-player", - "version": "0.3.6", + "version": "0.3.7", "description": "HLS client library which uses HTML5 Video element and Media Source Extension for playback", "main": "dist/index.cjs.js", "module": "dist/index.js", @@ -36,7 +36,7 @@ "author": "100ms", "license": "MIT", "dependencies": { - "@100mslive/hls-stats": "0.4.6", + "@100mslive/hls-stats": "0.4.7", "eventemitter2": "^6.4.9", "hls.js": "1.4.12" } diff --git a/packages/hls-stats/package.json b/packages/hls-stats/package.json index f2de72b5f9..6bbf87b7ab 100644 --- a/packages/hls-stats/package.json +++ b/packages/hls-stats/package.json @@ -1,6 +1,6 @@ { "name": "@100mslive/hls-stats", - "version": "0.4.6", + "version": "0.4.7", "description": "A simple library that provides stats for your hls stream", "main": "dist/index.cjs.js", "module": "dist/index.js", diff --git a/packages/hms-video-store/package.json b/packages/hms-video-store/package.json index b35bdeecc7..620eb139e5 100644 --- a/packages/hms-video-store/package.json +++ b/packages/hms-video-store/package.json @@ -1,5 +1,5 @@ { - "version": "0.12.6", + "version": "0.12.7", "license": "MIT", "repository": { "type": "git", diff --git a/packages/hms-virtual-background/package.json b/packages/hms-virtual-background/package.json index ae1e789f3b..225d126ecf 100755 --- a/packages/hms-virtual-background/package.json +++ b/packages/hms-virtual-background/package.json @@ -1,5 +1,5 @@ { - "version": "1.13.6", + "version": "1.13.7", "license": "MIT", "name": "@100mslive/hms-virtual-background", "author": "100ms", @@ -32,10 +32,10 @@ "format": "prettier --write src/**/*.ts" }, "peerDependencies": { - "@100mslive/hms-video-store": "0.12.6" + "@100mslive/hms-video-store": "0.12.7" }, "devDependencies": { - "@100mslive/hms-video-store": "0.12.6" + "@100mslive/hms-video-store": "0.12.7" }, "dependencies": { "@mediapipe/selfie_segmentation": "^0.1.1632777926", diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json index 35eacdffc4..67d406a503 100644 --- a/packages/react-icons/package.json +++ b/packages/react-icons/package.json @@ -4,7 +4,7 @@ "main": "dist/index.cjs.js", "module": "dist/index.js", "typings": "dist/index.d.ts", - "version": "0.10.6", + "version": "0.10.7", "author": "100ms", "license": "MIT", "repository": { diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index 54c6a20eb5..aed03bf43d 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -4,7 +4,7 @@ "main": "dist/index.cjs.js", "module": "dist/index.js", "typings": "dist/index.d.ts", - "version": "0.10.6", + "version": "0.10.7", "author": "100ms", "license": "MIT", "repository": { @@ -48,7 +48,7 @@ "react": ">=16.8 <19.0.0" }, "dependencies": { - "@100mslive/hms-video-store": "0.12.6", + "@100mslive/hms-video-store": "0.12.7", "react-resize-detector": "^7.0.0", "zustand": "^3.6.2" } diff --git a/packages/roomkit-react/package.json b/packages/roomkit-react/package.json index a246f760ba..eea2759790 100644 --- a/packages/roomkit-react/package.json +++ b/packages/roomkit-react/package.json @@ -10,7 +10,7 @@ "prebuilt", "roomkit" ], - "version": "0.3.6", + "version": "0.3.7", "author": "100ms", "license": "MIT", "repository": { @@ -82,11 +82,11 @@ "react": ">=17.0.2 <19.0.0" }, "dependencies": { - "@100mslive/hls-player": "0.3.6", + "@100mslive/hls-player": "0.3.7", "@100mslive/hms-noise-cancellation": "0.0.1", - "@100mslive/hms-virtual-background": "1.13.6", - "@100mslive/react-icons": "0.10.6", - "@100mslive/react-sdk": "0.10.6", + "@100mslive/hms-virtual-background": "1.13.7", + "@100mslive/react-icons": "0.10.7", + "@100mslive/react-sdk": "0.10.7", "@100mslive/types-prebuilt": "0.12.8", "@emoji-mart/data": "^1.0.6", "@emoji-mart/react": "^1.0.1", diff --git a/packages/roomkit-web/package.json b/packages/roomkit-web/package.json index ea9de0abbc..4c666a50f9 100644 --- a/packages/roomkit-web/package.json +++ b/packages/roomkit-web/package.json @@ -1,6 +1,6 @@ { "name": "@100mslive/roomkit-web", - "version": "0.2.6", + "version": "0.2.7", "description": "A web component implementation of 100ms Prebuilt component", "keywords": [ "web-components", @@ -33,7 +33,7 @@ "build": "rm -rf dist && node ../../scripts/build-webapp" }, "dependencies": { - "@100mslive/roomkit-react": "0.3.6", + "@100mslive/roomkit-react": "0.3.7", "@r2wc/react-to-web-component": "2.0.2" } } diff --git a/yarn.lock b/yarn.lock index 22ec6adf09..dadc4ba0a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15781,7 +15781,16 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -15881,7 +15890,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -17178,7 +17194,7 @@ worker-timers@^7.0.40: worker-timers-broker "^6.0.95" worker-timers-worker "^7.0.59" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -17196,6 +17212,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"