From 795305b33386048007f5bd642784491a32dc9616 Mon Sep 17 00:00:00 2001 From: open-schnick Date: Mon, 10 Apr 2023 23:28:28 +0200 Subject: [PATCH] add prettier and reformat project --- frontend/.prettierrc | 15 + frontend/README.md | 1 - frontend/deploy.sh | 1 - frontend/src/App.tsx | 41 +-- frontend/src/background/constants.ts | 18 +- frontend/src/background/cookies.ts | 26 +- .../src/background/jitsi/eventListeners.ts | 28 +- frontend/src/background/style/colorednames.ts | 17 +- frontend/src/background/types/roomData.ts | 18 +- frontend/src/components/chat/Chat.css | 63 ++-- frontend/src/components/chat/Chat.tsx | 49 +-- .../src/components/jitsi/JitsiEntrypoint.tsx | 101 +++--- frontend/src/components/jitsi/types.ts | 4 +- frontend/src/components/meeting/Meeting.tsx | 32 +- .../components/meeting/MeetingNameInput.tsx | 34 +- frontend/src/components/sidebar/Sidebar.tsx | 44 +-- .../src/components/sidebar/SidebarHeader.tsx | 16 +- .../sidebar/useSidebarVisibility.ts | 35 +- frontend/src/hooks/useAllChat.tsx | 10 +- frontend/src/hooks/useBackendData.ts | 35 +- frontend/src/hooks/useConferenceData.ts | 24 +- frontend/src/hooks/useJitsiEventCapture.tsx | 22 +- frontend/src/hooks/useLocalUser.ts | 38 +-- frontend/src/hooks/useMeetingStarted.ts | 4 +- frontend/src/hooks/useRoomData.ts | 10 +- frontend/src/hooks/useRoomName.ts | 44 ++- frontend/src/hooks/useWebSocketConnection.ts | 46 ++- frontend/src/index.css | 3 +- frontend/src/main.tsx | 2 +- frontend/yarn.lock | 308 ++++++------------ 30 files changed, 473 insertions(+), 616 deletions(-) create mode 100644 frontend/.prettierrc diff --git a/frontend/.prettierrc b/frontend/.prettierrc new file mode 100644 index 0000000..b7a7e53 --- /dev/null +++ b/frontend/.prettierrc @@ -0,0 +1,15 @@ +{ + "useTabs": false, + "tabWidth": 2, + "semi": false, + "singleQuote": true, + "jsxSingleQuote": false, + "trailingComma": "es5", + "bracketSpacing": true, + "bracketSameLine": false, + "arrowParens": "always", + "embeddedLanguageFormatting": "auto", + "endOfLine": "lf", + "printWidth": 100, + "vueIndentScriptAndStyle": false +} diff --git a/frontend/README.md b/frontend/README.md index 2e1e6d3..27f8deb 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -6,7 +6,6 @@ Using vite and react plus the jitsi react sdk for the frontend. Use yarn: - ```sh yarn run dev ``` diff --git a/frontend/deploy.sh b/frontend/deploy.sh index 45ee4f6..c2bea08 100755 --- a/frontend/deploy.sh +++ b/frontend/deploy.sh @@ -1,5 +1,4 @@ #!/usr/bin/env sh - yarn build scp -r dist/* ffs:/home/ffsys/apps/static/jitsi-rooms diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 92bf62a..e8880bc 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,39 +1,34 @@ -import { Provider } from "jotai"; -import { useState } from "react"; -import "./App.css"; -import Meeting from "./components/meeting/Meeting"; -import Sidebar from "./components/sidebar/Sidebar"; -import useBackendData from "./hooks/useBackendData"; -import useConferenceData from "./hooks/useConferenceData"; -import useLocalUser from "./hooks/useLocalUser"; -import { useRoomName } from "./hooks/useRoomName"; +import { Provider } from 'jotai' +import { useState } from 'react' +import './App.css' +import Meeting from './components/meeting/Meeting' +import Sidebar from './components/sidebar/Sidebar' +import useBackendData from './hooks/useBackendData' +import useConferenceData from './hooks/useConferenceData' +import useLocalUser from './hooks/useLocalUser' +import { useRoomName } from './hooks/useRoomName' function App() { - const { userInfo, setUserInfo } = useLocalUser(); - const { roomData, sendMessage } = useBackendData(userInfo); - const { conferenceData, setConferenceData } = useConferenceData( - sendMessage, - setUserInfo - ); - const [meetingStarted, setMeetingStarted] = useState(false); + const { userInfo, setUserInfo } = useLocalUser() + const { roomData, sendMessage } = useBackendData(userInfo) + const { conferenceData, setConferenceData } = useConferenceData(sendMessage, setUserInfo) + const [meetingStarted, setMeetingStarted] = useState(false) - console.log(roomData); + console.log(roomData) if (roomData && userInfo) { return (
- +
- ); + ) } - return

🌀 Loading...

; + return

🌀 Loading...

} -export default App; +export default App diff --git a/frontend/src/background/constants.ts b/frontend/src/background/constants.ts index d7afff5..2da5e5d 100644 --- a/frontend/src/background/constants.ts +++ b/frontend/src/background/constants.ts @@ -1,13 +1,13 @@ -const ISPROD = window.location.protocol == "https:"; -const JITSI_DOMAIN = "thisisnotajitsi.filefighter.de"; -const USE_REMOTE_BACKEND = true; +const ISPROD = window.location.protocol == 'https:' +const JITSI_DOMAIN = 'thisisnotajitsi.filefighter.de' +const USE_REMOTE_BACKEND = true const getWebsocketUrl = () => { - if (ISPROD) return "wss://" + window.location.host + "/ws" - if (USE_REMOTE_BACKEND) return "wss://" + "discord.filefighter.de/ws" - return "ws://" + "localhost:9160/ws" + if (ISPROD) return 'wss://' + window.location.host + '/ws' + if (USE_REMOTE_BACKEND) return 'wss://' + 'discord.filefighter.de/ws' + return 'ws://' + 'localhost:9160/ws' } -const WEBSOCKET_URL = getWebsocketUrl(); +const WEBSOCKET_URL = getWebsocketUrl() -const USER_COOKIE_NAME = "jitsi-rooms-user"; +const USER_COOKIE_NAME = 'jitsi-rooms-user' -export { JITSI_DOMAIN, WEBSOCKET_URL, USER_COOKIE_NAME }; +export { JITSI_DOMAIN, WEBSOCKET_URL, USER_COOKIE_NAME } diff --git a/frontend/src/background/cookies.ts b/frontend/src/background/cookies.ts index a758c61..2f54039 100644 --- a/frontend/src/background/cookies.ts +++ b/frontend/src/background/cookies.ts @@ -1,24 +1,24 @@ function getCookie(cname: string) { - let name = cname + "="; - let decodedCookie = decodeURIComponent(document.cookie); - let ca = decodedCookie.split(";"); + let name = cname + '=' + let decodedCookie = decodeURIComponent(document.cookie) + let ca = decodedCookie.split(';') for (let i = 0; i < ca.length; i++) { - let c = ca[i]; - while (c.charAt(0) == " ") { - c = c.substring(1); + let c = ca[i] + while (c.charAt(0) == ' ') { + c = c.substring(1) } if (c.indexOf(name) == 0) { - return c.substring(name.length, c.length); + return c.substring(name.length, c.length) } } - return ""; + return '' } function setCookie(cname: string, cvalue: string, exdays = 30) { - const d = new Date(); - d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000); - let expires = "expires=" + d.toUTCString(); - document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/"; + const d = new Date() + d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000) + let expires = 'expires=' + d.toUTCString() + document.cookie = cname + '=' + cvalue + ';' + expires + ';path=/' } -export { getCookie, setCookie }; +export { getCookie, setCookie } diff --git a/frontend/src/background/jitsi/eventListeners.ts b/frontend/src/background/jitsi/eventListeners.ts index 0194efe..85a0917 100644 --- a/frontend/src/background/jitsi/eventListeners.ts +++ b/frontend/src/background/jitsi/eventListeners.ts @@ -1,28 +1,28 @@ export interface ConferenceData { - roomName: string; // the room name of the conference - id: string; // the id of the local participant - displayName: string; // the display name of the local participant - avatarURL: string; // the avatar URL of the local participant - breakoutRoom: boolean; // whether the current room is a breakout room + roomName: string // the room name of the conference + id: string // the id of the local participant + displayName: string // the display name of the local participant + avatarURL: string // the avatar URL of the local participant + breakoutRoom: boolean // whether the current room is a breakout room } export interface DisplayNameChangeEvent { - id: string; // the id of the participant that changed their display name - displayname: string; // the new display name (WTF why is capilization different) + id: string // the id of the participant that changed their display name + displayname: string // the new display name (WTF why is capilization different) } function videoConferenceJoinedListener( setConferenceData: (newData: ConferenceData) => void, videoConferenceJoinedEvent: ConferenceData ) { - setConferenceData(videoConferenceJoinedEvent); + setConferenceData(videoConferenceJoinedEvent) } function displayNameChangeListenerWrapper( setDisplayNameChangedEvent: (newData: DisplayNameChangeEvent) => void, displayNameChangeEvent: DisplayNameChangeEvent ) { - setDisplayNameChangedEvent(displayNameChangeEvent); + setDisplayNameChangedEvent(displayNameChangeEvent) } function displayNameChangeListener( @@ -30,20 +30,16 @@ function displayNameChangeListener( setConferenceData: (newData: ConferenceData) => void, displayNameChangeEvent: DisplayNameChangeEvent ) { - console.log( - "[Rooms] displayNameChangeListener", - displayNameChangeEvent, - conferenceData - ); + console.log('[Rooms] displayNameChangeListener', displayNameChangeEvent, conferenceData) if (conferenceData && conferenceData.id == displayNameChangeEvent.id) setConferenceData({ ...conferenceData, displayName: displayNameChangeEvent.displayname, - } as ConferenceData); + } as ConferenceData) } export { videoConferenceJoinedListener, displayNameChangeListenerWrapper, displayNameChangeListener, -}; +} diff --git a/frontend/src/background/style/colorednames.ts b/frontend/src/background/style/colorednames.ts index b8843ff..14a99a9 100644 --- a/frontend/src/background/style/colorednames.ts +++ b/frontend/src/background/style/colorednames.ts @@ -1,14 +1,13 @@ function getHslColor(i: number) { - return "hsl(" + i % 360 + ',' + - '70%,' + - '72%)' + return 'hsl(' + (i % 360) + ',' + '70%,' + '72%)' } -function hashCode(str: string) { // java String#hashCode - var hash = 0; +function hashCode(str: string) { + // java String#hashCode + var hash = 0 for (var i = 0; i < str.length; i++) { - hash = str.charCodeAt(i) + ((hash << 5) - hash); + hash = str.charCodeAt(i) + ((hash << 5) - hash) } - return hash; + return hash } // function intToRGB(i: number) { @@ -22,8 +21,6 @@ function hashCode(str: string) { // java String#hashCode function getColorForUserName(userName: string) { const hash = hashCode(userName) return getHslColor(hash) - - } -export { getColorForUserName } +export { getColorForUserName } diff --git a/frontend/src/background/types/roomData.ts b/frontend/src/background/types/roomData.ts index d6cd819..15c154c 100644 --- a/frontend/src/background/types/roomData.ts +++ b/frontend/src/background/types/roomData.ts @@ -1,21 +1,21 @@ export interface RoomData { - roomName: string; - participants: Participant[]; + roomName: string + participants: Participant[] } export interface Participant { - avatarURL: string; - displayName: string; - jid: string; - email: string; + avatarURL: string + displayName: string + jid: string + email: string } export interface User { - uuid: string, + uuid: string name: string } export interface UsersData { - roomsData: RoomData[]; - usersWithOutRoom: User[]; + roomsData: RoomData[] + usersWithOutRoom: User[] } diff --git a/frontend/src/components/chat/Chat.css b/frontend/src/components/chat/Chat.css index 9d37bdc..7e04028 100644 --- a/frontend/src/components/chat/Chat.css +++ b/frontend/src/components/chat/Chat.css @@ -1,46 +1,43 @@ -.chat-input{ - min-width: 0; +.chat-input { + min-width: 0; } -.chat{ - background-color: #181c25; - border-radius: 8px; - padding: 0.5em 0; - width: 100%; - margin: 0 -3px; +.chat { + background-color: #181c25; + border-radius: 8px; + padding: 0.5em 0; + width: 100%; + margin: 0 -3px; } -.chat-sender{ - font-size: 0.9em; - /* color: #213547; */ +.chat-sender { + font-size: 0.9em; + /* color: #213547; */ } -.chat-input-form{ - display: flex; +.chat-input-form { + display: flex; } - -.chat-messages{ - max-height: 220px; - overflow-y: scroll; +.chat-messages { + max-height: 220px; + overflow-y: scroll; display: flex; flex-direction: column-reverse; } -.chat-bubble{ - background-color: #2b2a33; - overflow-wrap: break-word; - margin-bottom: 7px; - border-radius: 8px; - padding: 3px 4px ; +.chat-bubble { + background-color: #2b2a33; + overflow-wrap: break-word; + margin-bottom: 7px; + border-radius: 8px; + padding: 3px 4px; - - white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - white-space: pre-wrap; /* css-3 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ - white-space: -webkit-pre-wrap; /* Newer versions of Chrome/Safari*/ - word-break: break-all; - white-space: normal; + white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: pre-wrap; /* css-3 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ + white-space: -webkit-pre-wrap; /* Newer versions of Chrome/Safari*/ + word-break: break-all; + white-space: normal; } - diff --git a/frontend/src/components/chat/Chat.tsx b/frontend/src/components/chat/Chat.tsx index 4e82b8a..5345980 100644 --- a/frontend/src/components/chat/Chat.tsx +++ b/frontend/src/components/chat/Chat.tsx @@ -1,27 +1,27 @@ -import { useState } from "react"; -import { FormEventHandler } from "react"; -import useAllChat from "../../hooks/useAllChat"; -import "./Chat.css" +import { useState } from 'react' +import { FormEventHandler } from 'react' +import useAllChat from '../../hooks/useAllChat' +import './Chat.css' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import { faPaperPlane } from "@fortawesome/free-regular-svg-icons"; -import { getColorForUserName } from "../../background/style/colorednames"; +import { faPaperPlane } from '@fortawesome/free-regular-svg-icons' +import { getColorForUserName } from '../../background/style/colorednames' interface Props { sendMessage: Function } function Chat({ sendMessage }: Props) { - const [chatInput, setChatInput] = useState("") + const [chatInput, setChatInput] = useState('') const { chatMesages } = useAllChat() const onInput: React.ChangeEventHandler = (event) => { - setChatInput(event.target.value); - event.preventDefault(); - }; + setChatInput(event.target.value) + event.preventDefault() + } const onSubmit: FormEventHandler = (event) => { - event.preventDefault(); - sendMessage(JSON.stringify({ content: chatInput })); - setChatInput("") + event.preventDefault() + sendMessage(JSON.stringify({ content: chatInput })) + setChatInput('') } return ( @@ -30,15 +30,20 @@ function Chat({ sendMessage }: Props) { {chatMesages .slice() .reverse() // reverse because of css, don't aks me - .map(message => { + .map((message) => { const nameStyle = { - color: getColorForUserName(message.sender.name) + color: getColorForUserName(message.sender.name), } return ( -
{message.sender.name}
{message.content}
- ); - }) - } +
+ {' '} + + {message.sender.name}
{' '} +
{' '} + {message.content}{' '} +
+ ) + })}
- +
- ); + ) } export default Chat diff --git a/frontend/src/components/jitsi/JitsiEntrypoint.tsx b/frontend/src/components/jitsi/JitsiEntrypoint.tsx index a2230d1..9975e78 100644 --- a/frontend/src/components/jitsi/JitsiEntrypoint.tsx +++ b/frontend/src/components/jitsi/JitsiEntrypoint.tsx @@ -1,61 +1,56 @@ -import { JitsiMeeting } from "@jitsi/react-sdk"; -import { JITSI_DOMAIN } from "../../background/constants"; -import { UserInfo } from "./types"; -import curry from "just-curry-it"; +import { JitsiMeeting } from '@jitsi/react-sdk' +import { JITSI_DOMAIN } from '../../background/constants' +import { UserInfo } from './types' +import curry from 'just-curry-it' import { - ConferenceData, - displayNameChangeListener, - displayNameChangeListenerWrapper, - videoConferenceJoinedListener, -} from "../../background/jitsi/eventListeners"; -import useJitsiEventCapture from "../../hooks/useJitsiEventCapture"; + ConferenceData, + displayNameChangeListener, + displayNameChangeListenerWrapper, + videoConferenceJoinedListener, +} from '../../background/jitsi/eventListeners' +import useJitsiEventCapture from '../../hooks/useJitsiEventCapture' interface Props { - roomName: string; - userInfo: UserInfo; - conferenceData: ConferenceData | undefined; - setConferenceData: (newData: ConferenceData) => void; + roomName: string + userInfo: UserInfo + conferenceData: ConferenceData | undefined + setConferenceData: (newData: ConferenceData) => void } -function JitsiEntrypoint({ - roomName, - userInfo, - conferenceData, - setConferenceData, -}: Props) { - const { setDisplayNameChangeEvent } = useJitsiEventCapture( - curry(displayNameChangeListener)(conferenceData)(setConferenceData) - ); +function JitsiEntrypoint({ roomName, userInfo, conferenceData, setConferenceData }: Props) { + const { setDisplayNameChangeEvent } = useJitsiEventCapture( + curry(displayNameChangeListener)(conferenceData)(setConferenceData) + ) - return ( - { - externalApi.addEventListener( - "videoConferenceJoined", - curry(videoConferenceJoinedListener)(setConferenceData) - ); - externalApi.addEventListener( - "displayNameChange", - curry(displayNameChangeListenerWrapper)(setDisplayNameChangeEvent) - ); - }} - getIFrameRef={(iframeRef) => { - iframeRef.style.height = "100%"; - iframeRef.style.width = "100%"; - }} - /> - ); + return ( + { + externalApi.addEventListener( + 'videoConferenceJoined', + curry(videoConferenceJoinedListener)(setConferenceData) + ) + externalApi.addEventListener( + 'displayNameChange', + curry(displayNameChangeListenerWrapper)(setDisplayNameChangeEvent) + ) + }} + getIFrameRef={(iframeRef) => { + iframeRef.style.height = '100%' + iframeRef.style.width = '100%' + }} + /> + ) } -export default JitsiEntrypoint; +export default JitsiEntrypoint diff --git a/frontend/src/components/jitsi/types.ts b/frontend/src/components/jitsi/types.ts index 85852ef..e087571 100644 --- a/frontend/src/components/jitsi/types.ts +++ b/frontend/src/components/jitsi/types.ts @@ -1,4 +1,4 @@ export interface UserInfo { - displayName: string; - email: string; + displayName: string + email: string } diff --git a/frontend/src/components/meeting/Meeting.tsx b/frontend/src/components/meeting/Meeting.tsx index 23c2f9a..e34acd0 100644 --- a/frontend/src/components/meeting/Meeting.tsx +++ b/frontend/src/components/meeting/Meeting.tsx @@ -1,19 +1,18 @@ -import { useCallback, useState } from "react"; -import { ConferenceData } from "../../background/jitsi/eventListeners"; -import useMeetingStarted from "../../hooks/useMeetingStarted"; -import { useRoomName } from "../../hooks/useRoomName"; -import JitsiEntrypoint from "../jitsi/JitsiEntrypoint"; -import { UserInfo } from "../jitsi/types"; -import MeetingNameInput from "./MeetingNameInput"; +import { useCallback, useState } from 'react' +import { ConferenceData } from '../../background/jitsi/eventListeners' +import useMeetingStarted from '../../hooks/useMeetingStarted' +import { useRoomName } from '../../hooks/useRoomName' +import JitsiEntrypoint from '../jitsi/JitsiEntrypoint' +import { UserInfo } from '../jitsi/types' +import MeetingNameInput from './MeetingNameInput' interface Props { - conferenceData: ConferenceData | undefined; - setConferenceData: (newData: ConferenceData) => void; - userInfo: UserInfo; + conferenceData: ConferenceData | undefined + setConferenceData: (newData: ConferenceData) => void + userInfo: UserInfo } function Meeting({ conferenceData, setConferenceData, userInfo }: Props) { - const [meetingStarted, setMeetingStarted] = useMeetingStarted() const { roomName } = useRoomName() @@ -25,15 +24,10 @@ function Meeting({ conferenceData, setConferenceData, userInfo }: Props) { userInfo={userInfo} setConferenceData={setConferenceData} /> - ); + ) } - return ( - - ); + return } -export default Meeting; +export default Meeting diff --git a/frontend/src/components/meeting/MeetingNameInput.tsx b/frontend/src/components/meeting/MeetingNameInput.tsx index 38a3531..0da3d15 100644 --- a/frontend/src/components/meeting/MeetingNameInput.tsx +++ b/frontend/src/components/meeting/MeetingNameInput.tsx @@ -1,41 +1,33 @@ -import { FormEventHandler } from "react"; -import useMeetingStarted from "../../hooks/useMeetingStarted"; -import { useRoomName } from "../../hooks/useRoomName"; -import "./MeetingNameInput.css"; - -function MeetingNameInput(props: { - roomName: string; currentUser: string; -}) { +import { FormEventHandler } from 'react' +import useMeetingStarted from '../../hooks/useMeetingStarted' +import { useRoomName } from '../../hooks/useRoomName' +import './MeetingNameInput.css' +function MeetingNameInput(props: { roomName: string; currentUser: string }) { const { roomName, updateRoomName, updateAndSubmitRoomName, submitRoomName } = useRoomName() const [_, setMeetingStarted] = useMeetingStarted() const onInput: React.ChangeEventHandler = (event) => { - updateRoomName(event.target.value); - event.preventDefault(); - }; + updateRoomName(event.target.value) + event.preventDefault() + } const onSubmit: FormEventHandler = (event) => { submitRoomName() setMeetingStarted(true) - event.preventDefault(); + event.preventDefault() } - console.log("[Rooms] MeetingName input comp"); + console.log('[Rooms] MeetingName input comp') return (

Greetings {props.currentUser}

- +
- ); + ) } -export default MeetingNameInput; +export default MeetingNameInput diff --git a/frontend/src/components/sidebar/Sidebar.tsx b/frontend/src/components/sidebar/Sidebar.tsx index 77057d9..e67f381 100644 --- a/frontend/src/components/sidebar/Sidebar.tsx +++ b/frontend/src/components/sidebar/Sidebar.tsx @@ -1,21 +1,20 @@ -import SidebarHeader from "./SidebarHeader"; -import useSidebarVisibility from "./useSidebarVisibility"; -import "./Sidebar.css"; -import { UsersData } from "../../background/types/roomData"; -import useMeetingStarted from "../../hooks/useMeetingStarted"; -import { useRoomName } from "../../hooks/useRoomName"; -import Chat from "../chat/Chat"; +import SidebarHeader from './SidebarHeader' +import useSidebarVisibility from './useSidebarVisibility' +import './Sidebar.css' +import { UsersData } from '../../background/types/roomData' +import useMeetingStarted from '../../hooks/useMeetingStarted' +import { useRoomName } from '../../hooks/useRoomName' +import Chat from '../chat/Chat' interface Props { - usersData: UsersData; + usersData: UsersData sendMessage: Function } function Sidebar(props: Props) { - const { sidebarVisibility, toggleSidebarVisibility, sidebarToggleText } = - useSidebarVisibility(); + const { sidebarVisibility, toggleSidebarVisibility, sidebarToggleText } = useSidebarVisibility() const [_, setMeetingStarted] = useMeetingStarted() - const { updateAndSubmitRoomName: updateAndSubmitRoomName } = useRoomName(); + const { updateAndSubmitRoomName: updateAndSubmitRoomName } = useRoomName() return (
@@ -25,10 +24,13 @@ function Sidebar(props: Props) { return ( <>

- { - updateAndSubmitRoomName(roomData.roomName) - setMeetingStarted(true) - }}> + { + updateAndSubmitRoomName(roomData.roomName) + setMeetingStarted(true) + }} + > {roomData.roomName}

@@ -36,7 +38,7 @@ function Sidebar(props: Props) {
{participant.displayName}
))} - ); + ) })}
@@ -46,11 +48,13 @@ function Sidebar(props: Props) { ))}
- {sidebarVisibility === "full" && } - + {sidebarVisibility === 'full' && } +
- ); + ) } -export default Sidebar; +export default Sidebar diff --git a/frontend/src/components/sidebar/SidebarHeader.tsx b/frontend/src/components/sidebar/SidebarHeader.tsx index 40010d6..15ccb69 100644 --- a/frontend/src/components/sidebar/SidebarHeader.tsx +++ b/frontend/src/components/sidebar/SidebarHeader.tsx @@ -1,16 +1,16 @@ -import { sidebarVisibilityOptions } from "./useSidebarVisibility"; +import { sidebarVisibilityOptions } from './useSidebarVisibility' interface props { - sidebarVisibility: sidebarVisibilityOptions; + sidebarVisibility: sidebarVisibilityOptions } function SidebarHeader({ sidebarVisibility }: props) { - if (sidebarVisibility == "full") { - return

hi there :)

; - } else if (sidebarVisibility == "small") { - return

hi

; + if (sidebarVisibility == 'full') { + return

hi there :)

+ } else if (sidebarVisibility == 'small') { + return

hi

} - return <>; + return <> } -export default SidebarHeader; +export default SidebarHeader diff --git a/frontend/src/components/sidebar/useSidebarVisibility.ts b/frontend/src/components/sidebar/useSidebarVisibility.ts index 18f5b38..2cbdbff 100644 --- a/frontend/src/components/sidebar/useSidebarVisibility.ts +++ b/frontend/src/components/sidebar/useSidebarVisibility.ts @@ -1,28 +1,27 @@ -import { useCallback, useState } from "react"; +import { useCallback, useState } from 'react' -export type sidebarVisibilityOptions = "full" | "small" | "hidden"; +export type sidebarVisibilityOptions = 'full' | 'small' | 'hidden' function useSidebarVisibility() { - const [sidebarVisibility, setSideBarVisibility] = - useState("full"); + const [sidebarVisibility, setSideBarVisibility] = useState('full') - const sidebarToggleText = getSidebarToggleText(sidebarVisibility); + const sidebarToggleText = getSidebarToggleText(sidebarVisibility) const toggleSidebarVisibility = useCallback(() => { - if (sidebarVisibility === "full") { - setSideBarVisibility("small"); - } else if (sidebarVisibility === "small") { - setSideBarVisibility("hidden"); - } else if (sidebarVisibility === "hidden") { - setSideBarVisibility("full"); + if (sidebarVisibility === 'full') { + setSideBarVisibility('small') + } else if (sidebarVisibility === 'small') { + setSideBarVisibility('hidden') + } else if (sidebarVisibility === 'hidden') { + setSideBarVisibility('full') } - }, [setSideBarVisibility, sidebarVisibility, sidebarToggleText]); + }, [setSideBarVisibility, sidebarVisibility, sidebarToggleText]) - return { sidebarVisibility, toggleSidebarVisibility, sidebarToggleText }; + return { sidebarVisibility, toggleSidebarVisibility, sidebarToggleText } } const getSidebarToggleText = (sidebarVisibility: sidebarVisibilityOptions) => { - if (sidebarVisibility === "full") return "<-"; - if (sidebarVisibility === "small") return "<-"; - if (sidebarVisibility === "hidden") return "->"; -}; -export default useSidebarVisibility; + if (sidebarVisibility === 'full') return '<-' + if (sidebarVisibility === 'small') return '<-' + if (sidebarVisibility === 'hidden') return '->' +} +export default useSidebarVisibility diff --git a/frontend/src/hooks/useAllChat.tsx b/frontend/src/hooks/useAllChat.tsx index 6c0aef4..8eb9945 100644 --- a/frontend/src/hooks/useAllChat.tsx +++ b/frontend/src/hooks/useAllChat.tsx @@ -1,6 +1,6 @@ -import { atom, useAtom } from "jotai"; +import { atom, useAtom } from 'jotai' import { atomWithReducer, useReducerAtom } from 'jotai/utils' -import { User } from "../background/types/roomData"; +import { User } from '../background/types/roomData' interface ChatMessage { content: string @@ -9,7 +9,9 @@ interface ChatMessage { timestamp: number } -export const allChatMessagesAtom = atomWithReducer([], (list: ChatMessage[], item: ChatMessage) => list.concat(item)) +export const allChatMessagesAtom = atomWithReducer([], (list: ChatMessage[], item: ChatMessage) => + list.concat(item) +) const useAllChat = () => { const [chatMessages, addChatMessage] = useAtom(allChatMessagesAtom) @@ -17,5 +19,3 @@ const useAllChat = () => { } export default useAllChat - - diff --git a/frontend/src/hooks/useBackendData.ts b/frontend/src/hooks/useBackendData.ts index 3231f4b..85fc479 100644 --- a/frontend/src/hooks/useBackendData.ts +++ b/frontend/src/hooks/useBackendData.ts @@ -1,30 +1,29 @@ -import { useEffect } from "react"; -import { UserInfo } from "../components/jitsi/types"; -import useAllChat from "./useAllChat"; -import useRoomData from "./useRoomData"; -import useWebSocketConnection from "./useWebSocketConnection"; +import { useEffect } from 'react' +import { UserInfo } from '../components/jitsi/types' +import useAllChat from './useAllChat' +import useRoomData from './useRoomData' +import useWebSocketConnection from './useWebSocketConnection' function useBackendData(userInfo: UserInfo) { - console.log("[Rooms] useBackendData"); - const { onMessage, sendMessage, disconnect } = - useWebSocketConnection(userInfo); + console.log('[Rooms] useBackendData') + const { onMessage, sendMessage, disconnect } = useWebSocketConnection(userInfo) - const { roomData, setRoomData } = useRoomData(); + const { roomData, setRoomData } = useRoomData() const { chatMesages, addChatMessage } = useAllChat() useEffect(() => { onMessage((messageString) => { - console.log("[Rooms] message from ws", messageString); - const messageObject = JSON.parse(messageString); + console.log('[Rooms] message from ws', messageString) + const messageObject = JSON.parse(messageString) - !!messageObject.roomsData && setRoomData(messageObject); - !!messageObject.content && addChatMessage(messageObject); - return disconnect; - }); - }, [onMessage, setRoomData, disconnect]); + !!messageObject.roomsData && setRoomData(messageObject) + !!messageObject.content && addChatMessage(messageObject) + return disconnect + }) + }, [onMessage, setRoomData, disconnect]) - return { roomData, sendMessage }; + return { roomData, sendMessage } } -export default useBackendData; +export default useBackendData diff --git a/frontend/src/hooks/useConferenceData.ts b/frontend/src/hooks/useConferenceData.ts index b4a9370..c459a58 100644 --- a/frontend/src/hooks/useConferenceData.ts +++ b/frontend/src/hooks/useConferenceData.ts @@ -1,28 +1,28 @@ -import { useState } from "react"; -import { ConferenceData } from "../background/jitsi/eventListeners"; -import { UserInfo } from "../components/jitsi/types"; +import { useState } from 'react' +import { ConferenceData } from '../background/jitsi/eventListeners' +import { UserInfo } from '../components/jitsi/types' function useConferenceData( sendMessage: (message: string) => void, setUserInfo: (newData: UserInfo) => void ) { - const [conferenceData, setConferenceDataLocal] = useState(); + const [conferenceData, setConferenceDataLocal] = useState() const setConferenceData = (newData: ConferenceData) => { - console.log("[Rooms] set conferenceData", conferenceData); + console.log('[Rooms] set conferenceData', conferenceData) if (conferenceData?.roomName !== newData.roomName) { // We joined a meeting - sendMessage(JSON.stringify({ roomName: newData.roomName })); + sendMessage(JSON.stringify({ roomName: newData.roomName })) } if (conferenceData?.displayName !== newData.displayName) { // We updated the username - sendMessage(JSON.stringify({ displayName: newData.displayName })); + sendMessage(JSON.stringify({ displayName: newData.displayName })) } - setConferenceDataLocal(newData); - setUserInfo({ displayName: newData.displayName, email: "" }); - }; + setConferenceDataLocal(newData) + setUserInfo({ displayName: newData.displayName, email: '' }) + } - return { conferenceData, setConferenceData }; + return { conferenceData, setConferenceData } } -export default useConferenceData; +export default useConferenceData diff --git a/frontend/src/hooks/useJitsiEventCapture.tsx b/frontend/src/hooks/useJitsiEventCapture.tsx index 4d97248..e2cd891 100644 --- a/frontend/src/hooks/useJitsiEventCapture.tsx +++ b/frontend/src/hooks/useJitsiEventCapture.tsx @@ -1,28 +1,28 @@ -import { useCallback, useEffect, useRef, useState } from "react"; -import { DisplayNameChangeEvent } from "../background/jitsi/eventListeners"; +import { useCallback, useEffect, useRef, useState } from 'react' +import { DisplayNameChangeEvent } from '../background/jitsi/eventListeners' function useJitsiEventCapture(displayNameChangeHandler: Function) { const [displayNameChangeEvent, setDisplayNameChangeEventLocal] = - useState(); + useState() const setDisplayNameChangeEvent = useCallback( (newValue: DisplayNameChangeEvent) => { - console.log("[Rooms] newValue", newValue, displayNameChangeEvent); + console.log('[Rooms] newValue', newValue, displayNameChangeEvent) if (displayNameChangeEvent != newValue) { - setDisplayNameChangeEventLocal(newValue); + setDisplayNameChangeEventLocal(newValue) } }, [setDisplayNameChangeEventLocal] - ); + ) useEffect(() => { - console.log("[Rooms] displayNameChangeHandler", displayNameChangeEvent); + console.log('[Rooms] displayNameChangeHandler', displayNameChangeEvent) displayNameChangeHandler && displayNameChangeEvent && - displayNameChangeHandler(displayNameChangeEvent); - }, [displayNameChangeEvent]); + displayNameChangeHandler(displayNameChangeEvent) + }, [displayNameChangeEvent]) - return { setDisplayNameChangeEvent }; + return { setDisplayNameChangeEvent } } -export default useJitsiEventCapture; +export default useJitsiEventCapture diff --git a/frontend/src/hooks/useLocalUser.ts b/frontend/src/hooks/useLocalUser.ts index 9957940..2dcb444 100644 --- a/frontend/src/hooks/useLocalUser.ts +++ b/frontend/src/hooks/useLocalUser.ts @@ -1,34 +1,32 @@ -import { useState } from "react"; -import { USER_COOKIE_NAME } from "../background/constants"; -import { getCookie, setCookie } from "../background/cookies"; -import { UserInfo } from "../components/jitsi/types"; +import { useState } from 'react' +import { USER_COOKIE_NAME } from '../background/constants' +import { getCookie, setCookie } from '../background/cookies' +import { UserInfo } from '../components/jitsi/types' function useLocalUser() { - const [userInfo, setUserInfoLocal] = useState(() => - getUserInfoFromCookie() - ); + const [userInfo, setUserInfoLocal] = useState(() => getUserInfoFromCookie()) const setUserInfo = (newData: UserInfo) => { - storeUserInfoInCookie(newData); - setUserInfoLocal(newData); - }; + storeUserInfoInCookie(newData) + setUserInfoLocal(newData) + } - return { userInfo, setUserInfo }; + return { userInfo, setUserInfo } } function getUserInfoFromCookie(): UserInfo { - let cookie = getCookie(USER_COOKIE_NAME); - console.log("[Rooms] getUserNameFromCookie", cookie); - if (cookie) return JSON.parse(cookie); + let cookie = getCookie(USER_COOKIE_NAME) + console.log('[Rooms] getUserNameFromCookie', cookie) + if (cookie) return JSON.parse(cookie) return { - displayName: "Unknown traveller", - email: "", - }; + displayName: 'Unknown traveller', + email: '', + } } function storeUserInfoInCookie(userInfo: UserInfo) { - console.log("[Rooms] storeUserInfoInCookie", userInfo); - setCookie(USER_COOKIE_NAME, JSON.stringify(userInfo)); + console.log('[Rooms] storeUserInfoInCookie', userInfo) + setCookie(USER_COOKIE_NAME, JSON.stringify(userInfo)) } -export default useLocalUser; +export default useLocalUser diff --git a/frontend/src/hooks/useMeetingStarted.ts b/frontend/src/hooks/useMeetingStarted.ts index 2187ec7..fb944dc 100644 --- a/frontend/src/hooks/useMeetingStarted.ts +++ b/frontend/src/hooks/useMeetingStarted.ts @@ -1,7 +1,7 @@ -import { atom, useAtom } from "jotai"; +import { atom, useAtom } from 'jotai' const meetingStarted = atom(false) -const useMeetingStarted = () => useAtom(meetingStarted); +const useMeetingStarted = () => useAtom(meetingStarted) export default useMeetingStarted diff --git a/frontend/src/hooks/useRoomData.ts b/frontend/src/hooks/useRoomData.ts index 2709b93..f8a66f4 100644 --- a/frontend/src/hooks/useRoomData.ts +++ b/frontend/src/hooks/useRoomData.ts @@ -1,10 +1,10 @@ -import { useState } from "react"; -import { UsersData } from "../background/types/roomData"; +import { useState } from 'react' +import { UsersData } from '../background/types/roomData' function useRoomData() { - const [roomData, setRoomData] = useState(); + const [roomData, setRoomData] = useState() - return { roomData, setRoomData }; + return { roomData, setRoomData } } -export default useRoomData; +export default useRoomData diff --git a/frontend/src/hooks/useRoomName.ts b/frontend/src/hooks/useRoomName.ts index dfdc685..459b201 100644 --- a/frontend/src/hooks/useRoomName.ts +++ b/frontend/src/hooks/useRoomName.ts @@ -1,5 +1,5 @@ -import { atom, useAtom } from "jotai"; -import { useCallback, useState } from "react"; +import { atom, useAtom } from 'jotai' +import { useCallback, useState } from 'react' const roomNameAtom = atom(getRoomNameFromUrl()) @@ -8,48 +8,46 @@ function useRoomName() { const updateRoomName = useCallback( (newName: string) => { - setRoomName(newName); - console.log("[Rooms] update room name", newName); + setRoomName(newName) + console.log('[Rooms] update room name', newName) }, [setRoomName] - ); + ) const updateAndSubmitRoomName = useCallback( (newName: string) => { - setRoomName(newName); - setRoomNameInUrl(newName); - setRoomNameInTitle(newName); - console.log("[Rooms] update and submit room name", newName); + setRoomName(newName) + setRoomNameInUrl(newName) + setRoomNameInTitle(newName) + console.log('[Rooms] update and submit room name', newName) }, [setRoomName] ) const submitRoomName = useCallback(() => { - setRoomNameInUrl(roomName); - setRoomNameInTitle(roomName); - }, [roomName]); + setRoomNameInUrl(roomName) + setRoomNameInTitle(roomName) + }, [roomName]) - return { roomName, updateRoomName, updateAndSubmitRoomName, submitRoomName }; + return { roomName, updateRoomName, updateAndSubmitRoomName, submitRoomName } } function getRoomNameFromUrl(): string { - const pathName = location.pathname; - const roomName = pathName - .substring(pathName.lastIndexOf("/"), pathName.length) - .replace("/", ""); - console.log("[Rooms] Got roomName from url", roomName); - setRoomNameInTitle(roomName); - return roomName; + const pathName = location.pathname + const roomName = pathName.substring(pathName.lastIndexOf('/'), pathName.length).replace('/', '') + console.log('[Rooms] Got roomName from url', roomName) + setRoomNameInTitle(roomName) + return roomName } function setRoomNameInUrl(roomName: string) { - history.pushState(history.state, "_", roomName); + history.pushState(history.state, '_', roomName) } function setRoomNameInTitle(roomName: string) { if (!!roomName) { - document.title = roomName; + document.title = roomName } } -export { useRoomName }; +export { useRoomName } diff --git a/frontend/src/hooks/useWebSocketConnection.ts b/frontend/src/hooks/useWebSocketConnection.ts index 0e21a1b..77aa0b1 100644 --- a/frontend/src/hooks/useWebSocketConnection.ts +++ b/frontend/src/hooks/useWebSocketConnection.ts @@ -1,50 +1,44 @@ -import { useCallback, useState } from "react"; -import { WEBSOCKET_URL } from "../background/constants"; -import { UserInfo } from "../components/jitsi/types"; +import { useCallback, useState } from 'react' +import { WEBSOCKET_URL } from '../background/constants' +import { UserInfo } from '../components/jitsi/types' const createWebSocketConnection = (userInfo: UserInfo) => { - const webSocket = new WebSocket(WEBSOCKET_URL); - console.log("[Rooms] createWebSocketConnection"); - webSocket.addEventListener("open", (_: Event) => - webSocket.send(JSON.stringify(userInfo)) - ); + const webSocket = new WebSocket(WEBSOCKET_URL) + console.log('[Rooms] createWebSocketConnection') + webSocket.addEventListener('open', (_: Event) => webSocket.send(JSON.stringify(userInfo))) - return webSocket; -}; + return webSocket +} function useWebSocketConnection(userInfo: UserInfo) { - console.log("[Rooms] useWebSocketConnection"); + console.log('[Rooms] useWebSocketConnection') - const [webSocketConnection] = useState(() => - createWebSocketConnection(userInfo) - ); + const [webSocketConnection] = useState(() => createWebSocketConnection(userInfo)) const sendMessage = useCallback( (message: string) => { //if the socket's open, send a message: if (webSocketConnection.readyState === WebSocket.OPEN) { - console.log("[Rooms] sending to ws", message); - webSocketConnection.send(message); + console.log('[Rooms] sending to ws', message) + webSocketConnection.send(message) } }, [webSocketConnection] - ); + ) const onMessage = useCallback( (messageHandler: (messageHandler: string) => void) => { const wsMessageHandler = (ev: MessageEvent) => { - messageHandler(ev.data); - }; - webSocketConnection.addEventListener("message", wsMessageHandler); + messageHandler(ev.data) + } + webSocketConnection.addEventListener('message', wsMessageHandler) }, [webSocketConnection] - ); + ) - const disconnect = useCallback(webSocketConnection.close, [ - webSocketConnection, - ]); + const disconnect = useCallback(webSocketConnection.close, [webSocketConnection]) - return { onMessage, sendMessage, disconnect }; + return { onMessage, sendMessage, disconnect } } -export default useWebSocketConnection; +export default useWebSocketConnection diff --git a/frontend/src/index.css b/frontend/src/index.css index a79fd43..a51a5c0 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -78,7 +78,6 @@ button:focus-visible { width: 100%; } - input { font-size: 1em; margin: 0.3em; @@ -88,7 +87,7 @@ input { box-shadow: none; box-sizing: border-box; font-size: 17px; - font-family: "Oxygen", sans-serif; + font-family: 'Oxygen', sans-serif; transition: top 0.1s ease-in-out; background-color: #2b2a33; border-color: #646cff; diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index 2ed612a..124d61c 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -9,5 +9,5 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( - , + ) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 651546b..d389464 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4,34 +4,27 @@ "@ampproject/remapping@^2.1.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz" integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== dependencies: "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" - integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== - dependencies: - "@babel/highlight" "^7.18.6" - "@babel/code-frame@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz" integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== dependencies: "@babel/highlight" "^7.18.6" "@babel/compat-data@^7.20.5": version "7.20.10" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz" integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== "@babel/core@^7.20.7": version "7.20.12" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz" integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== dependencies: "@ampproject/remapping" "^2.1.0" @@ -52,7 +45,7 @@ "@babel/generator@^7.20.7": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz" integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== dependencies: "@babel/types" "^7.20.7" @@ -61,7 +54,7 @@ "@babel/helper-compilation-targets@^7.20.7": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz" integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: "@babel/compat-data" "^7.20.5" @@ -72,12 +65,12 @@ "@babel/helper-environment-visitor@^7.18.9": version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== "@babel/helper-function-name@^7.19.0": version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz" integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== dependencies: "@babel/template" "^7.18.10" @@ -85,21 +78,21 @@ "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz" integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== dependencies: "@babel/types" "^7.18.6" "@babel/helper-module-imports@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz" integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== dependencies: "@babel/types" "^7.18.6" "@babel/helper-module-transforms@^7.20.11": version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz" integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== dependencies: "@babel/helper-environment-visitor" "^7.18.9" @@ -113,41 +106,41 @@ "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0": version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz" integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== "@babel/helper-simple-access@^7.20.2": version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz" integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: "@babel/types" "^7.20.2" "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz" integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== dependencies: "@babel/types" "^7.18.6" "@babel/helper-string-parser@^7.19.4": version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== "@babel/helper-validator-option@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz" integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== "@babel/helpers@^7.20.7": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz" integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== dependencies: "@babel/template" "^7.20.7" @@ -156,7 +149,7 @@ "@babel/highlight@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz" integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== dependencies: "@babel/helper-validator-identifier" "^7.18.6" @@ -165,33 +158,26 @@ "@babel/parser@^7.20.7": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz" integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== "@babel/plugin-transform-react-jsx-self@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz#3849401bab7ae8ffa1e3e5687c94a753fc75bda7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz" integrity sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig== dependencies: "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-jsx-source@^7.19.6": version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.19.6.tgz#88578ae8331e5887e8ce28e4c9dc83fb29da0b86" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.19.6.tgz" integrity sha512-RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ== dependencies: "@babel/helper-plugin-utils" "^7.19.0" -"@babel/runtime@^7.12.5": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" - integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== - dependencies: - regenerator-runtime "^0.13.11" - "@babel/template@^7.18.10", "@babel/template@^7.20.7": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz" integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: "@babel/code-frame" "^7.18.6" @@ -200,7 +186,7 @@ "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7": version "7.20.12" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz" integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ== dependencies: "@babel/code-frame" "^7.18.6" @@ -216,7 +202,7 @@ "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz" integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: "@babel/helper-string-parser" "^7.19.4" @@ -300,7 +286,7 @@ "@esbuild/linux-x64@0.16.15": version "0.16.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.15.tgz#0a4cb4f62379f839ef2c79d94f13ca0b76469d8a" + resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.15.tgz" integrity sha512-t7/fOXBUKfigvhJLGKZ9TPHHgqNgpIpYaAbcXQk1X+fPeUG7x0tpAbXJ2wST9F/gJ02+CLETPMnhG7Tra2wqsQ== "@esbuild/netbsd-x64@0.16.15": @@ -335,38 +321,38 @@ "@fortawesome/fontawesome-common-types@6.4.0": version "6.4.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz#88da2b70d6ca18aaa6ed3687832e11f39e80624b" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz" integrity sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ== "@fortawesome/fontawesome-svg-core@^6.4.0": version "6.4.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz#3727552eff9179506e9203d72feb5b1063c11a21" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz" integrity sha512-Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw== dependencies: "@fortawesome/fontawesome-common-types" "6.4.0" "@fortawesome/free-regular-svg-icons@^6.4.0": version "6.4.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.0.tgz#cacc53bd8d832d46feead412d9ea9ce80a55e13a" + resolved "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.0.tgz" integrity sha512-ZfycI7D0KWPZtf7wtMFnQxs8qjBXArRzczABuMQqecA/nXohquJ5J/RCR77PmY5qGWkxAZDxpnUFVXKwtY/jPw== dependencies: "@fortawesome/fontawesome-common-types" "6.4.0" "@fortawesome/react-fontawesome@^0.2.0": version "0.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz#d90dd8a9211830b4e3c08e94b63a0ba7291ddcf4" + resolved "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz" integrity sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw== dependencies: prop-types "^15.8.1" "@jitsi/react-sdk@^1.3.0": version "1.3.0" - resolved "https://registry.yarnpkg.com/@jitsi/react-sdk/-/react-sdk-1.3.0.tgz#9013921896c2830806ffdd449d7487e05d9c99ad" + resolved "https://registry.npmjs.org/@jitsi/react-sdk/-/react-sdk-1.3.0.tgz" integrity sha512-f+xtk/j0iXIMJscJeGt3OXnocFeG1pX6OMjv7H/9AaTnCUNsDc/jfDSPme+h0RmdymzJdkSwyHjmkhDK9aehzw== "@jridgewell/gen-mapping@^0.1.0": version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz" integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== dependencies: "@jridgewell/set-array" "^1.0.0" @@ -374,7 +360,7 @@ "@jridgewell/gen-mapping@^0.3.2": version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz" integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== dependencies: "@jridgewell/set-array" "^1.0.1" @@ -383,47 +369,42 @@ "@jridgewell/resolve-uri@3.1.0": version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== "@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== "@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13": version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== "@jridgewell/trace-mapping@^0.3.9": version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz" integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== dependencies: "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - "@types/prop-types@*": version "15.7.5" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== "@types/react-dom@^18.0.9": version "18.0.10" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.10.tgz#3b66dec56aa0f16a6cc26da9e9ca96c35c0b4352" + resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz" integrity sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg== dependencies: "@types/react" "*" "@types/react@*", "@types/react@^18.0.26": version "18.0.26" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.26.tgz#8ad59fc01fef8eaf5c74f4ea392621749f0b7917" + resolved "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz" integrity sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug== dependencies: "@types/prop-types" "*" @@ -432,12 +413,12 @@ "@types/scheduler@*": version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== "@vitejs/plugin-react@^3.0.0": version "3.0.1" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-3.0.1.tgz#ad21fb81377970dd4021a31cd95a03eb6f5c4c48" + resolved "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-3.0.1.tgz" integrity sha512-mx+QvYwIbbpOIJw+hypjnW1lAbKDHtWK5ibkF/V1/oMBu8HU/chb+SnqJDAsLq1+7rGqjktCEomMTM5KShzUKQ== dependencies: "@babel/core" "^7.20.7" @@ -448,23 +429,14 @@ ansi-styles@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" -babel-plugin-macros@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" - integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg== - dependencies: - "@babel/runtime" "^7.12.5" - cosmiconfig "^7.0.0" - resolve "^1.19.0" - browserslist@^4.21.3: version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz" integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== dependencies: caniuse-lite "^1.0.30001400" @@ -472,19 +444,14 @@ browserslist@^4.21.3: node-releases "^2.0.6" update-browserslist-db "^1.0.9" -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - caniuse-lite@^1.0.30001400: version "1.0.30001442" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz#40337f1cf3be7c637b061e2f78582dc1daec0614" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz" integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow== chalk@^2.0.0: version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== dependencies: ansi-styles "^3.2.1" @@ -493,59 +460,41 @@ chalk@^2.0.0: color-convert@^1.9.0: version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== dependencies: color-name "1.1.3" color-name@1.1.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== convert-source-map@^1.7.0: version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== -cosmiconfig@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" - integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - csstype@^3.0.2: version "3.1.1" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" + resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== debug@^4.1.0: version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" electron-to-chromium@^1.4.251: version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz" integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - esbuild@^0.16.3: version "0.16.15" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.15.tgz#02663f41eac47433879f09894dbe97c2dc837ecf" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.16.15.tgz" integrity sha512-v+3ozjy9wyj8cOElzx3//Lsb4TCxPfZxRmdsfm0YaEkvZu7y6rKH7Zi1UpDx4JI7dSQui+U1Qxhfij9KBbHfrA== optionalDependencies: "@esbuild/android-arm" "0.16.15" @@ -573,12 +522,12 @@ esbuild@^0.16.3: escalade@^3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== escape-string-regexp@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== fsevents@~2.3.2: @@ -588,162 +537,117 @@ fsevents@~2.3.2: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== gensync@^1.0.0-beta.2: version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== globals@^11.1.0: version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" -import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-core-module@^2.11.0, is-core-module@^2.9.0: +is-core-module@^2.9.0: version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" jotai@^2.0.3: version "2.0.3" - resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.0.3.tgz#3b67cda9f6d5feb70a14db0b842a9873aacda8b5" + resolved "https://registry.npmjs.org/jotai/-/jotai-2.0.3.tgz" integrity sha512-MMjhSPAL3RoeZD9WbObufRT2quThEAEknHHridf2ma8Ml7ZVQmUiHk0ssdbR3F0h3kcwhYqSGJ59OjhPge7RRg== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== jsesc@^2.5.1: version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - json5@^2.2.2: version "2.2.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== just-curry-it@^5.3.0: version "5.3.0" - resolved "https://registry.yarnpkg.com/just-curry-it/-/just-curry-it-5.3.0.tgz#1463602e932c5beb431a2a384dddcd48bb3c9c42" + resolved "https://registry.npmjs.org/just-curry-it/-/just-curry-it-5.3.0.tgz" integrity sha512-silMIRiFjUWlfaDhkgSzpuAyQ6EX/o09Eu8ZBfmFwQMbax7+LQzeIU2CBrICT6Ne4l86ITCGvUCBpCubWYy0Yw== -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== dependencies: js-tokens "^3.0.0 || ^4.0.0" lru-cache@^5.1.1: version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz" integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== dependencies: yallist "^3.0.2" magic-string@^0.27.0: version "0.27.0" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz" integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== dependencies: "@jridgewell/sourcemap-codec" "^1.4.13" ms@2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== nanoid@^3.3.4: version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== node-releases@^2.0.6: version "2.0.8" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" + resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz" integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - path-parse@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== postcss@^8.4.20: version "8.4.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz" integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== dependencies: nanoid "^3.3.4" @@ -752,7 +656,7 @@ postcss@^8.4.20: prop-types@^15.8.1: version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" @@ -761,7 +665,7 @@ prop-types@^15.8.1: react-dom@^18.2.0: version "18.2.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz" integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" @@ -769,43 +673,24 @@ react-dom@^18.2.0: react-is@^16.13.1: version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== react-refresh@^0.14.0: version "0.14.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e" + resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz" integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ== react@^18.2.0: version "18.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz" integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" -regenerator-runtime@^0.13.11: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve@^1.19.0: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== - dependencies: - is-core-module "^2.11.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - resolve@^1.22.1: version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: is-core-module "^2.9.0" @@ -814,53 +699,53 @@ resolve@^1.22.1: rollup@^3.7.0: version "3.9.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.9.1.tgz#27501d3d026418765fe379d5620d25954ff2a011" + resolved "https://registry.npmjs.org/rollup/-/rollup-3.9.1.tgz" integrity sha512-GswCYHXftN8ZKGVgQhTFUJB/NBXxrRGgO2NCy6E8s1rwEJ4Q9/VttNqcYfEvx4dTo4j58YqdC3OVztPzlKSX8w== optionalDependencies: fsevents "~2.3.2" scheduler@^0.23.0: version "0.23.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz" integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== dependencies: loose-envify "^1.1.0" semver@^6.3.0: version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== source-map-js@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== supports-color@^5.3.0: version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== to-fast-properties@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== typescript@^4.9.3: version "4.9.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz" integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== update-browserslist-db@^1.0.9: version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz" integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== dependencies: escalade "^3.1.1" @@ -868,7 +753,7 @@ update-browserslist-db@^1.0.9: vite@^4.0.0: version "4.0.4" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.0.4.tgz#4612ce0b47bbb233a887a54a4ae0c6e240a0da31" + resolved "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz" integrity sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw== dependencies: esbuild "^0.16.3" @@ -880,10 +765,5 @@ vite@^4.0.0: yallist@^3.0.2: version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==