diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.editorconfig b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.editorconfig old mode 100755 new mode 100644 diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.eslintrc b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.eslintrc old mode 100755 new mode 100644 index 13d1c0f..64735be --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.eslintrc +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.eslintrc @@ -6,6 +6,10 @@ "prettier", "react-hooks" ], + "env": { + "browser": true, + "node": true + }, "extends": [ "eslint:recommended", "plugin:@typescript-eslint/recommended", @@ -20,6 +24,7 @@ "allowTemplateLiterals": true } ], + "react/display-name": "off", "react-hooks/rules-of-hooks": "error", // Checks rules of Hooks "react-hooks/exhaustive-deps": "warn", // Checks effect dependencies "react/prop-types": "off", diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.gitignore b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.gitignore old mode 100755 new mode 100644 index 95d18c2..b6784ff --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.gitignore +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.gitignore @@ -9,6 +9,7 @@ # production /dist dist.zip +/output # misc @@ -17,3 +18,5 @@ dist.zip # umi .umi .umi-production + +.idea/ \ No newline at end of file diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.umirc.dev.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.umirc.dev.ts new file mode 100644 index 0000000..c92796b --- /dev/null +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.umirc.dev.ts @@ -0,0 +1,10 @@ +export default { + define: { + 'process.env': { + ENV: 'test', + SOCKETURL: 'wss://rtcio.bytedance.com', + ICEURL: + 'https://rtc-access.bytedance.com/dispatch/v1/AccessInfo?Action=GetAccessInfo', + }, + }, +}; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.umirc.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.umirc.ts index eee2c4f..e7b5f4c 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.umirc.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/.umirc.ts @@ -46,12 +46,4 @@ export default defineConfig({ chainWebpack: function (memo) { memo.resolve.extensions.add('.tsx'); }, - define: { - 'process.env': { - ENV: 'PROD', - SOCKETURL: 'wss://rtcio.bytedance.com', - ICEURL: - 'https://rtc-access.bytedance.com/dispatch/v1/AccessInfo?Action=GetAccessInfo', - }, - } }); diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/LICENSE b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/LICENSE new file mode 100644 index 0000000..f193e6e --- /dev/null +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 Volcengine + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/package.json b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/package.json index 5da3155..b57e0c7 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/package.json +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/package.json @@ -1,7 +1,9 @@ { "private": true, "scripts": { - "start": "cross-env umi dev", + "start": "cross-env UMI_ENV=dev umi dev", + "build": "cross-env UMI_ENV=build umi build", + "build_test": "cross-env UMI_ENV=dev umi build", "postinstall": "umi generate tmp", "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'", "test": "umi-test", @@ -24,13 +26,16 @@ "@ant-design/icons": "^4.7.0", "@ant-design/pro-layout": "^6.5.0", "@umijs/hooks": "^1.9.3", + "@volcengine/rtc": "^4.36.0", "antd": "^4.16.6", "debug": "^4.3.1", "dva-model-creator": "^0.4.3", "eventemitter3": "^4.0.7", + "lodash": "^4.17.21", "lodash.chunk": "^4.2.0", "lodash.debounce": "^4.0.8", "socket.io-client": "2.3.1", + "styled-components": "^5.3.3", "umi": "^3.5.0", "uuid": "^8.3.2" }, @@ -42,6 +47,7 @@ "@types/react-dom": "^17.0.0", "@types/react-test-renderer": "^16.0.3", "@types/socket.io-client": "1.4.32", + "@types/styled-components": "^5.1.24", "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "^4.26.0", "@typescript-eslint/parser": "^4.26.0", diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app-interfaces.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app-interfaces.ts index 01ad25b..38b2df5 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app-interfaces.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app-interfaces.ts @@ -3,14 +3,11 @@ import { MeetingModelState } from './models/meeting'; import { MeetingSettingsState } from './models/meeting-settings'; import { RTCClientControlModelState } from './models/meeting-client'; -import { MeetingControlModelState } from '@@/plugin-dva/connect'; -import {ImmerReducer} from '@@/plugin-dva/connect'; -import {Action} from 'dva-model-creator'; -import {EffectsMapObject, SubscriptionsMapObject} from 'dva'; +import { MeetingControlModelState, ImmerReducer } from '@@/plugin-dva/connect'; +import { Action } from 'dva-model-creator'; +import { EffectsMapObject, SubscriptionsMapObject } from 'dva'; import { AudioStats } from '@/lib/socket-interfaces'; -import { - RTCStream, -} from '@volcengine/rtc'; +import { RTCStream } from '@volcengine/rtc'; import { ConnectedProps, connector } from '@/pages/Meeting/configs/config'; export interface AppState { @@ -25,14 +22,15 @@ export interface AppModel { namespace: string; state: S; reducers: { - [K in string]: ImmerReducer> - }, - effects?: EffectsMapObject, - subscriptions?: SubscriptionsMapObject, + [K in string]: ImmerReducer>; + }; + effects?: EffectsMapObject; + subscriptions?: SubscriptionsMapObject; } export enum FitType { - cover, contain + cover, + contain, } type EncoderConfiguration = { @@ -113,8 +111,8 @@ export interface RTCClint { ) => void; leave: (onSuccess?: () => void, onFailure?: (err: Error) => void) => void; on: (event: string, callback: (param: any) => void) => void; - getRemoteAudioStats(callback: (param: AudioStats) => void): void; - getLocalAudioStats(callback: (param: AudioStats) => void): void; + getRemoteAudioStats: (callback: (param: AudioStats) => void) => void; + getLocalAudioStats: (callback: (param: AudioStats) => void) => void; } export interface ConnectStatus { @@ -166,9 +164,7 @@ export interface IMeetingState { users: any[]; } - -export type MeetingProps = ConnectedProps - +export type MeetingProps = ConnectedProps; export type LocalStats = { audioStats: { diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app.less index fd6b9ac..daedc71 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/app.less @@ -1,14 +1,14 @@ - #root { - height:100%; - >div{ + height: 100%; + > div { height: inherit; } } /*reset antd theme css*/ #root { - .ant-input:focus, .ant-input-focused { + .ant-input:focus, + .ant-input-focused { border-color: transparent; box-shadow: none; } diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.less index b93a2a4..811bd75 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.less @@ -1,5 +1,5 @@ -.feedback{ - .title{ +.feedback { + .title { font-family: PingFang SC; font-size: 14px; font-style: normal; @@ -9,16 +9,17 @@ text-align: left; margin-bottom: 16px; } - .good, .bad{ + .good, + .bad { width: 28px; height: 28px; display: inline-block; text-align: center; } - .good{ + .good { background-image: url('../../../assets/images/good.png'); background-size: contain; - &:hover{ + &:hover { background-image: url('../../../assets/images/good_selected.png'); } } @@ -30,13 +31,13 @@ background-image: url('../../../assets/images/bad_selected.png'); } } - .questions{ + .questions { margin-bottom: 24px; - span{ + span { width: 80px; height: 32px; padding: 6px 16px; - background: #F2F3F8; + background: #f2f3f8; border-radius: 2px; font-family: PingFang SC; font-size: 12px; @@ -47,21 +48,21 @@ text-align: left; margin-right: 16px; cursor: pointer; - color: #1D2129; - &.span-selected{ - background: #E8F3FF; - color: #165DFF; + color: #1d2129; + &.span-selected { + background: #e8f3ff; + color: #165dff; } } } - .bottom{ + .bottom { text-align: center; margin-top: 24px; - span{ + span { font-size: 12px; } } - .text{ + .text { position: relative; textarea::placeholder { font-family: PingFang SC; @@ -71,8 +72,8 @@ line-height: 20px; } } - :global{ - .ant-input-textarea-show-count::after{ + :global { + .ant-input-textarea-show-count::after { position: absolute; bottom: 4px; right: 10px; @@ -80,4 +81,4 @@ line-height: 20px; } } -} \ No newline at end of file +} diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.tsx index e19cdef..ecf65e9 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/FeedBack/index.tsx @@ -25,7 +25,9 @@ const ToggleButton = () => { clickDom(item)} - className={selected.indexOf(item) == -1 ? '' : styles['span-selected']} + className={ + selected.indexOf(item) === -1 ? '' : styles['span-selected'] + } > {item} @@ -35,7 +37,7 @@ const ToggleButton = () => { }; const FeedBack: FC<{ status: string }> = ({ status }) => { - const [ visible, setVisible ] = useState(status === 'end'); + const [visible, setVisible] = useState(status === 'end'); const [detailVisible, setDetailVisible] = useState(false); const openDetail = () => { diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/icon-btn.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/icon-btn.less index 2aa2bb5..c4bbc39 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/icon-btn.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/icon-btn.less @@ -1,14 +1,14 @@ .icon-btn { - background: #F2F3F5; + background: #f2f3f5; margin-left: 16px; display: flex; justify-content: center; align-items: center; cursor: pointer; - transition: background-color .3s ease; + transition: background-color 0.3s ease; user-select: none; &:hover { - background: darken(#F2F3F5, 5%); + background: darken(#f2f3f5, 5%); } &:last-child { diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/index.tsx index 70a36ff..c8dfb59 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/IconBtn/index.tsx @@ -1,17 +1,17 @@ -import React, {ReactEventHandler, CSSProperties} from 'react'; +import React, { ReactEventHandler, CSSProperties } from 'react'; import styles from './icon-btn.less'; export interface IconBtnProps { - onClick?: ReactEventHandler, - onMouseEnter?: ReactEventHandler, - width?: number, - height?: number, - shape?: 'circle' | 'square', - radius?: number, - style?: CSSProperties + onClick?: ReactEventHandler; + onMouseEnter?: ReactEventHandler; + width?: number; + height?: number; + shape?: 'circle' | 'square'; + radius?: number; + style?: CSSProperties; } -const IconBtn: React.FC = props => { - const {radius = 0, shape = 'circle', style = {}} = props; +const IconBtn: React.FC = (props) => { + const { radius = 0, shape = 'circle', style = {} } = props; const finalRadius = shape === 'circle' ? '50%' : radius; return (
= props => { ...style, width: props.width || 24, height: props.height || 24, - borderRadius: finalRadius - }} + borderRadius: finalRadius, + }} > {props.children}
diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/Logo/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/Logo/index.tsx index 3ae9719..6f8f15b 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/Logo/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/Logo/index.tsx @@ -5,12 +5,7 @@ import styles from './index.less'; const Logo: React.FC = () => { return (
- logo + logo
); }; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.less index 01f7241..a1f69a3 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.less @@ -25,14 +25,14 @@ box-sizing: border-box; font-variant: tabular-nums; list-style: none; - font-feature-settings: 'tnum', "tnum"; + font-feature-settings: 'tnum', 'tnum'; position: relative; width: 56px; min-width: 0; color: rgba(0, 0, 0, 0.85); font-size: 14px; line-height: 1.5715; - background-color: #F2F3F5; + background-color: #f2f3f5; background-image: none; transition: all 0.3s; display: inline-block; @@ -47,7 +47,7 @@ img { display: none; } - + &:hover { img { display: block; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.tsx index 04da173..38efd7a 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/SettingsModal/index.tsx @@ -1,6 +1,14 @@ import React, { FC, useState, useEffect, useMemo, useCallback } from 'react'; -import { StreamIndex } from '@volcengine/rtc'; -import { Modal, Form, Select, Switch, Slider, Row, Col, notification } from 'antd'; +import { + Modal, + Form, + Select, + Switch, + Slider, + Row, + Col, + notification, +} from 'antd'; import { connect, bindActionCreators } from 'dva'; import { injectIntl } from 'umi'; import { ConnectedProps } from 'react-redux'; @@ -15,7 +23,7 @@ import deleteIcon from '/assets/images/deleteIcon.png'; import moment from 'moment'; import Logger from '@/utils/Logger'; import Utils from '@/utils/utils'; -import VERTC, {RTCDevice} from '@volcengine/rtc'; +import VERTC, { RTCDevice, StreamIndex } from '@volcengine/rtc'; const logger = new Logger('Settings'); @@ -24,20 +32,21 @@ function mapStateToProps(state: AppState) { user: state.user, mc: state.meetingControl.sdk, settings: state.meetingSettings, - rtc: state.rtcClientControl.rtc + rtc: state.rtcClientControl.rtc, }; } function mapDispatchToProps(dispatch: Dispatch) { return { dispatch, - ...bindActionCreators(meetingSettingsActions, dispatch) + ...bindActionCreators(meetingSettingsActions, dispatch), }; } const connector = connect(mapStateToProps, mapDispatchToProps); -export type SettingsModalProps = ConnectedProps & WrappedComponentProps & { visible: boolean, close: () => void, }; +export type SettingsModalProps = ConnectedProps & + WrappedComponentProps & { visible: boolean; close: () => void }; const commonCol = { labelCol: { span: 8 }, @@ -96,7 +105,12 @@ const SettingsModal: FC = (props) => { }); }, [form, initialValues]); - const formatStreamSettings = (res: string, fps: number, bps: number, bpsMin: number) => { + const formatStreamSettings = ( + res: string, + fps: number, + bps: number, + bpsMin: number + ) => { return { resolution: { width: parseInt(res.split(' * ')[0]), @@ -112,15 +126,33 @@ const SettingsModal: FC = (props) => { const onOk = async () => { const data = form.getFieldsValue(true); - const streamConfigs = formatStreamSettings(data.resolution, data.FPS, data.BPS, 250); - const screenConfigs = formatStreamSettings(data.shareResolution, data.shareFPS, data.shareBPS, 800); + const streamConfigs = formatStreamSettings( + data.resolution, + data.FPS, + data.BPS, + 250 + ); + const screenConfigs = formatStreamSettings( + data.shareResolution, + data.shareFPS, + data.shareBPS, + 800 + ); const isolation = ['width', 'height', 'max', 'min']; - const streamDiff = Utils.diff(settings.streamSettings, streamConfigs, isolation); - const screenDiff = Utils.diff(settings.screenStreamSettings, screenConfigs, isolation); + const streamDiff = Utils.diff( + settings.streamSettings, + streamConfigs, + isolation + ); + const screenDiff = Utils.diff( + settings.screenStreamSettings, + screenConfigs, + isolation + ); const caseToDo = (key: string, type: string) => { - switch(key) { + switch (key) { case 'frameRate': case 'resolution': engine.setVideoCaptureConfig({ @@ -129,16 +161,18 @@ const SettingsModal: FC = (props) => { }); break; case 'bitrate': - if (type === 'stream') engine.setVideoEncoderConfig(StreamIndex.STREAM_INDEX_MAIN, [ - { - maxKbps: streamConfigs.bitrate.max, - }, - ]); - else engine.setVideoEncoderConfig(StreamIndex.STREAM_INDEX_SCREEN, [ - { - maxKbps: screenConfigs.bitrate.max, - }, - ]); + if (type === 'stream') + engine.setVideoEncoderConfig(StreamIndex.STREAM_INDEX_MAIN, [ + { + maxKbps: streamConfigs.bitrate.max, + }, + ]); + else + engine.setVideoEncoderConfig(StreamIndex.STREAM_INDEX_SCREEN, [ + { + maxKbps: screenConfigs.bitrate.max, + }, + ]); break; default: break; @@ -146,17 +180,17 @@ const SettingsModal: FC = (props) => { }; //TODO 如果有变化, 则做对应的处理 - for(const diffKey in streamDiff) { + for (const diffKey in streamDiff) { caseToDo(diffKey, 'stream'); } - for(const diffKey in screenDiff) { + for (const diffKey in screenDiff) { caseToDo(diffKey, 'screen'); } if (settings.mic && settings.mic !== data.mic) { await engine?.switchMicrophone(data.mic); } - if (settings.camera && settings.camera !== data.camera) { + if (settings.camera && settings.camera !== data.camera) { await engine.switchCamera(data.camera); engine.setLocalVideoMirrorType(1); } @@ -177,30 +211,32 @@ const SettingsModal: FC = (props) => { setLoading(false); }); }); - },[mc]); + }, [mc]); - const devicesEmu = useCallback(async() =>{ + const devicesEmu = useCallback(async () => { const devices = await props.rtc.getDevices(); setDevices(devices); - },[props.rtc]); + }, [props.rtc]); useEffect(() => { devicesEmu(); getHistoryVideoRecord(); - props.rtc.engine.on(VERTC.events.onMediaDeviceStateChanged, (e: RTCDevice) => { - - if(e.deviceType === 'audioinput'){ - setMic(e.deviceState === 'inactive' ? '' : e.deviceId); - } - if(e.deviceType === 'videoinput'){ - setCamera(e.deviceState === 'inactive' ? '' : e.deviceId); + props.rtc.engine.on( + VERTC.events.onMediaDeviceStateChanged, + (e: RTCDevice) => { + if (e.deviceType === 'audioinput') { + setMic(e.deviceState === 'inactive' ? '' : e.deviceId); + } + if (e.deviceType === 'videoinput') { + setCamera(e.deviceState === 'inactive' ? '' : e.deviceId); + } + devicesEmu(); } - devicesEmu(); - }); + ); }, []); const myVideoList = useMemo(() => { - return videoList?.filter(item => item.video_holder); + return videoList?.filter((item) => item.video_holder); }, [videoList]); return ( diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.less index b1c4f7d..74cf062 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.less @@ -1,4 +1,4 @@ -@import "~@/utils/utils.less"; +@import '~@/utils/utils.less'; .container { .flex-box(); @@ -42,7 +42,6 @@ width: 100%; height: 100%; position: relative; - } .username2 { position: absolute; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.tsx index bd4b65b..bcdb0d8 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/components/View/index.tsx @@ -3,7 +3,7 @@ import { Tooltip } from 'antd'; import { v4 as uuid } from 'uuid'; import { useSize } from '@umijs/hooks'; import Logger from '@/utils/Logger'; -import type { ActiveMeetingUser } from '../../pages/Meeting/components/MeetingViews'; +import type { ActiveMeetingUser } from '@/pages/Meeting/components/MeetingViews'; import shareOffIcon from '/assets/images/shareOffIcon.png'; import styles from './index.less'; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/config.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/config.ts index 876f2bf..0acecd1 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/config.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/config.ts @@ -1,3 +1,3 @@ export * from './constant'; -export const DEMO_VERSION = '1.0.0'; \ No newline at end of file +export const DEMO_VERSION = '1.0.0'; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/constant.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/constant.ts index 4ce7ec0..c738d81 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/constant.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/constant.ts @@ -1,151 +1,157 @@ export const DEFAULTCONFIG = { - resolution: { + resolution: { + width: 640, + height: 360, + }, + resolutionsText: '640x360', + frameRate: { + min: 15, + max: 15, + }, + bitrate: { + min: 800, + max: 800, + }, +}; + +export const RESOLUTIOIN_LIST = [ + { + text: '160 * 160', + val: { + width: 160, + height: 160, + }, + bitrateRange: { + min: 40, + max: 150, + }, + }, + { + text: '320 * 180', + val: { + width: 320, + height: 180, + }, + bitrateRange: { + min: 80, + max: 350, + }, + }, + { + text: '320 * 240', + val: { + width: 320, + height: 240, + }, + bitrateRange: { + min: 100, + max: 400, + }, + }, + { + text: '640 * 360', + val: { width: 640, - height: 360 + height: 360, + }, + bitrateRange: { + min: 200, + max: 1000, }, - resolutionsText: '640x360', - frameRate: { - min: 15, - max: 15 + }, + { + text: '480 * 480', + val: { + width: 480, + height: 480, }, - bitrate: { + bitrateRange: { + min: 200, + max: 1000, + }, + }, + { + text: '640 * 480', + val: { + width: 640, + height: 480, + }, + bitrateRange: { + min: 250, + max: 1000, + }, + }, + { + text: '960 * 540', + val: { + width: 960, + height: 540, + }, + bitrateRange: { + min: 400, + max: 1600, + }, + }, + { + text: '1280 * 720', + val: { + width: 1280, + height: 720, + }, + bitrateRange: { + min: 500, + max: 2000, + }, + }, + { + text: '1920 * 1080', + val: { + width: 1920, + height: 1080, + }, + bitrateRange: { min: 800, - max: 800 - } - }; - - export const RESOLUTIOIN_LIST = [ - { - text: '160 * 160', - val: { - width: 160, - height: 160 - }, - bitrateRange: { - min: 40, - max: 150 - } - }, { - text: '320 * 180', - val: { - width: 320, - height: 180 - }, - bitrateRange: { - min: 80, - max: 350 - } - }, { - text: '320 * 240', - val: { - width: 320, - height: 240 - }, - bitrateRange: { - min: 100, - max: 400 - } - }, { - text: '640 * 360', - val: { - width: 640, - height: 360 - }, - bitrateRange: { - min: 200, - max: 1000 - } - }, { - text: '480 * 480', - val: { - width: 480, - height: 480 - }, - bitrateRange: { - min: 200, - max: 1000 - } - }, { - text: '640 * 480', - val: { - width: 640, - height: 480 - }, - bitrateRange: { - min: 250, - max: 1000 - } - }, { - text: '960 * 540', - val: { - width: 960, - height: 540 - }, - bitrateRange: { - min: 400, - max: 1600 - } - }, { - text: '1280 * 720', - val: { - width: 1280, - height: 720 - }, - bitrateRange: { - min: 500, - max: 2000 - } - }, - { - text: '1920 * 1080', - val: { - width: 1920, - height: 1080 - }, - bitrateRange: { - min: 800, - max: 3000 - } - } - ]; - - export const BITRATEMAP: { [key: string]: number[] } = { - '160 * 160': [40, 150], - '320 * 180': [80, 350], - '320 * 240': [100, 400], - '640 * 360': [200, 1000], - '480 * 480': [200, 1000], - '640 * 480': [250, 1000], - '960 * 540': [400, 1600], - '1280 * 720': [500, 2000], - '1920 * 1080': [800, 3000] - }; - - export const FRAMERATE = [15, 20, 24]; - export const FEEDBACKINFO = { - video: '视频故障', - context: '共享内容故障', - audio: '音频故障', - accident: '意外结束' - }; - - export const SOCKETURL = process.env.SOCKETURL as string; - export const SOCKETPATH = '/vc_control'; - export const TOASTS = { - token_error: '服务端Token生成失败，请重试', - mic_right: '麦克风权限已关闭，请至设备设置页开启', - mic_setting_right: '麦克风打开失败，请检查设备', - car_right: '摄像头权限已关闭，请至设备设置页开启', - car_setting_right: '摄像头打开失败，请检查设备', - screen_error: '屏幕共享失败', - screen_not_allow: '没有屏幕共享权限', - tick: '相同ID用户已登录，您已被强制下线！', - mute: '你已被主持人静音', - unmute: '主持人邀请你打开麦克风', - give_host_error: '移交主持人失败，请重试', - mute_error: '静音失败，请重试', - network_error: '网络链接已断开，请检查设置', - record: '如需录制会议，请提醒主持人开启录制', - lock_error_track: '流中断，请刷新页面后恢复', - }; - \ No newline at end of file + max: 3000, + }, + }, +]; + +export const BITRATEMAP: { [key: string]: number[] } = { + '160 * 160': [40, 150], + '320 * 180': [80, 350], + '320 * 240': [100, 400], + '640 * 360': [200, 1000], + '480 * 480': [200, 1000], + '640 * 480': [250, 1000], + '960 * 540': [400, 1600], + '1280 * 720': [500, 2000], + '1920 * 1080': [800, 3000], +}; + +export const FRAMERATE = [15, 20, 24]; +export const FEEDBACKINFO = { + video: '视频故障', + context: '共享内容故障', + audio: '音频故障', + accident: '意外结束', +}; + +export const SOCKETURL = process.env.SOCKETURL as string; +export const SOCKETPATH = '/vc_control'; +export const TOASTS = { + token_error: '服务端Token生成失败，请重试', + mic_right: '麦克风权限已关闭，请至设备设置页开启', + mic_setting_right: '麦克风打开失败，请检查设备', + car_right: '摄像头权限已关闭，请至设备设置页开启', + car_setting_right: '摄像头打开失败，请检查设备', + screen_error: '屏幕共享失败', + screen_not_allow: '没有屏幕共享权限', + tick: '相同ID用户已登录，您已被强制下线！', + mute: '你已被主持人静音', + unmute: '主持人邀请你打开麦克风', + give_host_error: '移交主持人失败，请重试', + mute_error: '静音失败，请重试', + network_error: '网络链接已断开，请检查设置', + record: '如需录制会议，请提醒主持人开启录制', + lock_error_track: '流中断，请刷新页面后恢复', +}; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.less index 7136c61..598bd27 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.less @@ -7,7 +7,7 @@ justify-content: space-between; height: 50px; margin: 0; - padding: .6em 24px; + padding: 0.6em 24px; background: #1e2128; color: white; font-weight: normal; @@ -16,7 +16,7 @@ color: #fff; } } -.content{ +.content { height: calc(100% - 50px); background: #282e3a; -} \ No newline at end of file +} diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.tsx index 0b9e801..032f54d 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/layouts/index.tsx @@ -6,12 +6,14 @@ import VERTC from '@volcengine/rtc'; const { Header, Content } = Layout; -const BasicLayout: React.FC = props => { +const BasicLayout: React.FC = (props) => { return (
- Demo版本 V1.0.1 / SDK版本 v{VERTC.getSdkVersion()} + + Demo版本 V1.0.1 / SDK版本 v{VERTC.getSdkVersion()} +
{props.children} diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/DeviceController.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/DeviceController.ts index 1541b2e..756073c 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/DeviceController.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/DeviceController.ts @@ -1,7 +1,5 @@ import { StreamIndex } from '@volcengine/rtc'; -import { - MeetingProps, -} from '@/app-interfaces'; +import { MeetingProps } from '@/app-interfaces'; import { TOASTS } from '@/constant'; import { message } from 'antd'; import { UserModelState } from '../models/user'; @@ -9,7 +7,6 @@ import { MeetingSettingsState } from '../models/meeting-settings'; import { ICreateStreamRes } from '../rtcApi/types'; import { MeetingModelState } from '../models/meeting'; - /** * @brief 设备管理 * @function DeviceController diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/MeetingController.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/MeetingController.ts index e77b05c..86cda9c 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/MeetingController.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/lib/MeetingController.ts @@ -1,12 +1,11 @@ import io from 'socket.io-client'; import { EventEmitter } from 'eventemitter3'; import { v4 as uuid } from 'uuid'; -import { SOCKETURL, SOCKETPATH } from '@/config'; +import { SOCKETURL, SOCKETPATH, TOASTS } from '@/config'; import Utils from '@/utils/utils'; import Logger from '@/utils/Logger'; import type { MeetingInfo, MeetingUser } from '@/models/meeting'; import { Stream, RTCClint, ConnectStatus } from '@/app-interfaces'; -import { TOASTS } from '@/config'; import VRTC from '@volcengine/rtc'; import type { @@ -94,7 +93,6 @@ class MettingController extends EventEmitter { } this.socket.on('connect', () => { - this._handleSocket(); if (this.reconnect) { @@ -197,15 +195,15 @@ class MettingController extends EventEmitter { public leaveMeeting(payload: VerifyLoginToken): Promise { return new Promise((resolve, reject) => { // this.clientLeave( - // () => { + // () => { this.sendSignaling('leaveMeeting', payload).finally(() => { this.disconnect(); resolve(null); }); - // }, - // () => { - // reject('Leave RTC Room failed'); - // } + // }, + // () => { + // reject('Leave RTC Room failed'); + // } // ); }); } @@ -333,7 +331,7 @@ class MettingController extends EventEmitter { }; } - public checkSocket(): Promise { + public checkSocket(): Promise { const socketStatus = this.getConnectStatus(); if (socketStatus.connected) { logger.debug('已连接'); diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-client.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-client.ts index 08f9dd5..1fa0863 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-client.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-client.ts @@ -13,15 +13,11 @@ export const rtcClientInitialState: RTCClientControlModelState = { rtc: new RtcClient(), }; - - const LoginModel: AppModel = { namespace: 'rtcClientControl', state: rtcClientInitialState, - subscriptions: { - }, - reducers: { - }, + subscriptions: {}, + reducers: {}, }; export default LoginModel; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-control.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-control.ts index 65e635d..aa44c5d 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-control.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-control.ts @@ -2,13 +2,13 @@ * @author fuyuhao */ -import {actionCreatorFactory} from 'dva-model-creator'; +import { actionCreatorFactory } from 'dva-model-creator'; import { AppModel } from '@/app-interfaces'; -import {setFieldReducer} from '@/utils/redux-utils'; +import { setFieldReducer } from '@/utils/redux-utils'; import MeetingControlSDK from '@/lib/MeetingController'; export interface MeetingControlModelState { - sdk: Nullable, + sdk: Nullable; } export const meetingControlInitialState: MeetingControlModelState = { @@ -25,14 +25,13 @@ const LoginModel: AppModel = { namespace: 'meetingControl', state: meetingControlInitialState, subscriptions: { - setup({dispatch}) { + setup({ dispatch }) { dispatch(meetingControlActions.initSDK(new MeetingControlSDK())); }, }, reducers: { initSDK: setFieldReducer(meetingControlInitialState, 'sdk'), - } + }, }; - export default LoginModel; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-settings.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-settings.ts index a3d43e1..cbcae46 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-settings.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting-settings.ts @@ -67,25 +67,37 @@ export const meetingSettingsInitialState: MeetingSettingsState = { const factory = actionCreatorFactory('meetingSettings'); export const meetingSettingsActions = { - setStreamSettings: factory('setStreamSettings'), - setScreenStreamSettings: factory('setScreenStreamSettings'), + setStreamSettings: + factory('setStreamSettings'), + setScreenStreamSettings: factory< + MeetingSettingsState['screenStreamSettings'] + >('setScreenStreamSettings'), setMic: factory('setMic'), setCamera: factory('setCamera'), - setRealtimeParam: factory('setRealtimeParam'), + setRealtimeParam: + factory('setRealtimeParam'), }; - const MeetingSettingsModel: AppModel = { namespace: 'meetingSettings', state: meetingSettingsInitialState, subscriptions: {}, reducers: { - setStreamSettings: setFieldReducer(meetingSettingsInitialState, 'streamSettings'), - setScreenStreamSettings: setFieldReducer(meetingSettingsInitialState, 'screenStreamSettings'), + setStreamSettings: setFieldReducer( + meetingSettingsInitialState, + 'streamSettings' + ), + setScreenStreamSettings: setFieldReducer( + meetingSettingsInitialState, + 'screenStreamSettings' + ), setMic: setFieldReducer(meetingSettingsInitialState, 'mic'), setCamera: setFieldReducer(meetingSettingsInitialState, 'camera'), - setRealtimeParam: setFieldReducer(meetingSettingsInitialState, 'realtimeParam'), - } + setRealtimeParam: setFieldReducer( + meetingSettingsInitialState, + 'realtimeParam' + ), + }, }; export default MeetingSettingsModel; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting.ts index 6392768..5ee1554 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/models/meeting.ts @@ -1,5 +1,5 @@ import { IVolume } from './../app-interfaces'; -import {actionCreatorFactory} from 'dva-model-creator'; +import { actionCreatorFactory } from 'dva-model-creator'; import { AppModel } from '@/app-interfaces'; import { setFieldReducer } from '@/utils/redux-utils'; @@ -120,7 +120,7 @@ const meetingInitialState: MeetingModelState = { volume: 0, userId: '', }, - volumeSortList: [] + volumeSortList: [], // hasTrackError: null, }, meetingUsers: [], @@ -144,9 +144,9 @@ export const meetingActions = { setLocalAudioVideoCaptureSuccess: factory< MeetingModelState['localAudioVideoCaptureSuccess'] >('setLocalAudioVideoCaptureSuccess'), - setMeetingIsSharing: factory< - MeetingModelState['isSharing'] - >('setMeetingIsSharing'), + setMeetingIsSharing: factory( + 'setMeetingIsSharing' + ), }; const MeetingModel: AppModel = { diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.less index a186f90..7891ff0 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.less @@ -35,7 +35,8 @@ margin-bottom: 0; } - .ant-form-item-explain, .ant-form-item-extra { + .ant-form-item-explain, + .ant-form-item-extra { display: none; } } @@ -47,13 +48,13 @@ font-weight: normal; font-size: 14px; line-height: 22px; - color: #86909C; + color: #86909c; position: relative; left: 20px; } .home-tool-bar-button { - background: #165DFF; + background: #165dff; border-radius: 2px; width: 88px; height: 32px; @@ -62,7 +63,7 @@ font-weight: normal; font-size: 14px; line-height: 22px; - color: #FFFFFF; + color: #ffffff; margin-left: 16px; } @@ -76,7 +77,7 @@ .home-tool-bar-icon-circle { width: 32px; height: 32px; - background: #F2F3F5; + background: #f2f3f5; border-radius: 16px; display: flex; justify-content: center; @@ -102,7 +103,7 @@ bottom: 70px; background: white; border-radius: 2px; - box-shadow:0px 0px 10px #000; + box-shadow: 0px 0px 10px #000; display: flex; flex-direction: column; justify-content: flex-start; @@ -126,7 +127,7 @@ font-weight: normal; font-size: 12px; line-height: 20px; - color: #F53F3F; + color: #f53f3f; } .home-tool-bar-subhint2 { @@ -138,7 +139,7 @@ font-weight: normal; font-size: 12px; line-height: 20px; - color: #1D2129; + color: #1d2129; } .home-tool-bar-cross { @@ -146,7 +147,7 @@ width: 14px; height: 14px; bottom: 33px; - background: #E63F3F; + background: #e63f3f; border-radius: 50%; display: flex; justify-content: center; @@ -166,18 +167,18 @@ height: 6px; } -.modal{ +.modal { text-align: center; - .icon{ + .icon { margin-bottom: 25px; - img{ + img { width: 68px; height: 68px; display: block; margin: auto; } } - p.tips{ + p.tips { margin-bottom: 20px; } } diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.tsx index ce56976..31661fb 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/JoinRoom/index.tsx @@ -20,7 +20,11 @@ import Utils from '@/utils/utils'; import { StoreValue } from 'rc-field-form/lib/interface'; import { modalWarning } from '@/pages/Meeting/components/MessageTips'; import { LocalPlayer } from '../Meeting/components/MediaPlayer'; -import { injectProps, ConnectedProps, connector } from '../Meeting/configs/config'; +import { + injectProps, + ConnectedProps, + connector, +} from '../Meeting/configs/config'; import DeviceController from '@/lib/DeviceController'; const logger = new Logger('JoinRoom'); @@ -70,30 +74,31 @@ export class Login extends Component { } componentDidMount(): void { - const { - currentUser, - settings - } = this.props; + const { currentUser, settings } = this.props; const param = { currentUser, settings, }; this.props.rtc.createEngine(); - this.deviceLib.openCamera(param, () => { - this.props.setLocalAudioVideoCaptureSuccess(true); - this.setState({ - cameraStream: { - playerComp: ( - - ), - }, - }); - }, false); + this.deviceLib.openCamera( + param, + () => { + this.props.setLocalAudioVideoCaptureSuccess(true); + this.setState({ + cameraStream: { + playerComp: ( + + ), + }, + }); + }, + false + ); } /** diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.less index 3db656c..71a65fc 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.less @@ -1,4 +1,4 @@ -@import "~@/utils/utils.less"; +@import '~@/utils/utils.less'; .container { .flex-box(); @@ -7,7 +7,7 @@ min-width: 800px; min-height: 600px; justify-content: center; - background-color: #272E3B; + background-color: #272e3b; &::before { content: ''; padding-top: 100%; @@ -18,18 +18,18 @@ display: block; clear: both; } - .main{ + .main { text-align: left; display: flex; flex-direction: column; align-items: center; - .main-title{ + .main-title { text-align: center; margin-bottom: 60px; } - .login-input{ + .login-input { border-radius: 8px; - color: #FFF; + color: #fff; height: 48px; &:hover { border-color: #40a9ff; @@ -38,80 +38,82 @@ &-focused { border-color: #40a9ff !important; box-shadow: 0 0 0 2px #1890ff33 !important; - background: #1C222D; + background: #1c222d; } } .login-input::placeholder { - .place-holder() + .place-holder(); } - .login-check{ + .login-check { border-radius: 24px; width: 320px; height: 48px; - color: #FFF; + color: #fff; } - .login-agree{ - :global{ - .ant-checkbox-wrapper{ + .login-agree { + :global { + .ant-checkbox-wrapper { color: #fff; } } } :global { .ant-form-item-explain, - .ant-form-item-extra{ + .ant-form-item-extra { line-height: 24px; } - .ant-btn-primary[disabled]{ - background-color: #4080FF; + .ant-btn-primary[disabled] { + background-color: #4080ff; opacity: 0.3; - border-color: #4080FF; + border-color: #4080ff; } - .ant-form-item{ + .ant-form-item { margin-bottom: 32px; } - .ant-form-item-with-help{ + .ant-form-item-with-help { margin-bottom: 8px; } .ant-form-item-has-error :not(.ant-input-disabled).ant-input, - .ant-form-item-has-error :not(.ant-input-affix-wrapper-disabled).ant-input-affix-wrapper, + .ant-form-item-has-error + :not(.ant-input-affix-wrapper-disabled).ant-input-affix-wrapper, .ant-form-item-has-error :not(.ant-input-disabled).ant-input:hover, - .ant-form-item-has-error :not(.ant-input-affix-wrapper-disabled).ant-input-affix-wrapper:hover{ - background: #1C222D; - color: #FFF; + .ant-form-item-has-error + :not(.ant-input-affix-wrapper-disabled).ant-input-affix-wrapper:hover { + background: #1c222d; + color: #fff; border-color: #ff4d4f; } - .ant-input-affix-wrapper{ + .ant-input-affix-wrapper { height: 48px; border-radius: 8px; - background: #1C222D; - color: #FFF; + background: #1c222d; + color: #fff; &:hover { border-color: #40a9ff; } input::placeholder { - .place-holder() + .place-holder(); } button { background: rgba(255, 255, 255, 0.1); - color: #FFF; + color: #fff; border: none; border-radius: 4px; } - :global{ - input{ - color: #FFF; + :global { + input { + color: #fff; &:focus, &-focused { - background: #1C222D; + background: #1c222d; } } } } .ant-input { - background: #1C222D; + background: #1c222d; input::placeholder { - .place-holder() + .place-holder(); } } .ant-checkbox input, @@ -122,4 +124,4 @@ } } } -} \ No newline at end of file +} diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.tsx index 375a9b6..12404ad 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Login/index.tsx @@ -1,10 +1,10 @@ -import React, {Component, ReactNode} from 'react'; +import React, { Component, ReactNode } from 'react'; import { Dispatch } from '@@/plugin-dva/connect'; import { injectIntl, history } from 'umi'; import { connect, bindActionCreators } from 'dva'; import { ConnectedProps } from 'react-redux'; import { WrappedComponentProps } from 'react-intl'; -import {userActions} from '@/models/user'; +import { userActions } from '@/models/user'; import { AppState } from '@/app-interfaces'; import styles from './index.less'; import { Button, Form, Input, Checkbox, message } from 'antd'; @@ -43,7 +43,7 @@ function mapStateToProps(state: AppState) { return { currentUser: state.user, mc: state.meetingControl.sdk, - rtc: state.rtcClientControl.rtc + rtc: state.rtcClientControl.rtc, }; } @@ -70,7 +70,7 @@ export class Login extends Component { super(props); this.state = { time: 60, - loading: false + loading: false, }; } @@ -130,7 +130,7 @@ export class Login extends Component { history.push('/'); }); }) - .catch( (error) =>{ + .catch((error) => { message.error(`${error}`); }); }); @@ -140,21 +140,21 @@ export class Login extends Component { } }; - count(): void{ + count(): void { let { time } = this.state; const siv = setInterval(() => { - this.setState({ time: (time--) }, () => { - if (time <= -1) { - clearInterval(siv); - this.setState({ loading: false, time: 60 }); - } - }); + this.setState({ time: time-- }, () => { + if (time <= -1) { + clearInterval(siv); + this.setState({ loading: false, time: 60 }); + } + }); }, 1000); } validator( value: StoreValue, - errorTypeKey: 'phoneErrType' | 'codeErrType', + errorTypeKey: 'phoneErrType' | 'codeErrType', regRes: boolean ): Promise | void { let result: Promise; @@ -182,13 +182,15 @@ export class Login extends Component { { - const res = !/^[1][3,4,5,7,8,9][0-9]{9}$/.test(value); - return this.validator(value, 'phoneErrType', res); + rules={[ + { + required: true, + validator: (_, value) => { + const res = !/^[1][3,4,5,7,8,9][0-9]{9}$/.test(value); + return this.validator(value, 'phoneErrType', res); + }, }, - }]} + ]} > void; } -export type ControlBarProps = ConnectedProps & IControlBarProps +export type ControlBarProps = ConnectedProps & + IControlBarProps; const ControlBar: React.FC = (props) => { - const { currentUser, meeting, openUsersDrawer, leaveMeeting } = props; const deviceController = useRef( @@ -36,13 +40,13 @@ const ControlBar: React.FC = (props) => { const commonProps = { width: 36, height: 36, - style: { background: 'transparent', margin: 0 } + style: { background: 'transparent', margin: 0 }, }; /** * @param visible 设置窗口是否可见 */ - const [ visible, setVisible ] = useState(false); + const [visible, setVisible] = useState(false); /** * @brief 麦克风切换状态 @@ -52,8 +56,7 @@ const ControlBar: React.FC = (props) => { if (deviceController.current) { deviceController.current.changeAudioState(micState); } - },[]); - + }, []); /** * @brief 摄像头切换状态 @@ -143,7 +146,13 @@ const ControlBar: React.FC = (props) => { onClick={() => changeShareState(!currentUser.isSharing)} > - + diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.less index 635e18c..13bd7e9 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.less @@ -1,4 +1,4 @@ -@import "~@/utils/utils.less"; +@import '~@/utils/utils.less'; .container { .flex-box(); diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.tsx index 3f2f5ba..39c67a5 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/GalleryView/index.tsx @@ -8,19 +8,18 @@ interface IGalleryViewProps { views: React.ReactNode[]; } - const getRowCount = (total: number) => { if (total >= 7) { return 3; } - if (total >=3) { + if (total >= 3) { return 2; } return 1; }; const getColCount = (total: number) => { - if ( total >=5 ) { + if (total >= 5) { return 3; } if (total >= 2) { @@ -35,14 +34,16 @@ const GalleryView: React.FC = ({ views }) => { cols: getColCount(views.length) || 1, }); - const updateView = useCallback( // eslint-disable-line react-hooks/exhaustive-deps - debounce((len)=> { + const updateView = useCallback( + // eslint-disable-line react-hooks/exhaustive-deps + debounce((len) => { updateLayout({ rows: getRowCount(len), cols: getColCount(len), }); - },500), - []); + }, 500), + [] + ); useEffect(() => { const len = views.length; @@ -69,7 +70,7 @@ const GalleryView: React.FC = ({ views }) => { className={styles.galleryView} key={(view as React.ReactElement)?.key} style={{ - padding: groups.length ===1?'0px':'12px', + padding: groups.length === 1 ? '0px' : '12px', width: `${100 / layout.cols}%`, }} > @@ -85,12 +86,7 @@ const GalleryView: React.FC = ({ views }) => { return []; }; - return ( -
- {renderViews()} -
- ); + return
{renderViews()}
; }; export default GalleryView; - diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/Header/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/Header/index.tsx index 292a602..e2e5c7b 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/Header/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/Header/index.tsx @@ -1,7 +1,6 @@ import React, { useState, useEffect } from 'react'; import Logo from '@/components/Logo'; -import { MeetingModelState } from '@/models/meeting'; -import { ViewMode } from '@/models/meeting'; +import { MeetingModelState, ViewMode } from '@/models/meeting'; import { UpOutlined, DownOutlined } from '@ant-design/icons'; import Utils from '@/utils/utils'; import { Badge } from 'antd'; @@ -24,7 +23,7 @@ const Header: React.FC = ({ now, roomId, meeting, - changeSpeakCollapse + changeSpeakCollapse, }) => { const [duration, updateDuration] = useState(0); @@ -72,7 +71,12 @@ const Header: React.FC = ({ ) : null} <> - { meeting.meetingInfo.record ? REC : null} + {meeting.meetingInfo.record ? ( + + + REC + + ) : null} diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.less index 69f9503..0edc5f4 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.less @@ -1,7 +1,6 @@ -@import "~@/utils/utils.less"; +@import '~@/utils/utils.less'; .container { - .mark { display: inline-block; width: 20px; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.tsx index b0f9141..7fc5d39 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/LeavingConfirm/index.tsx @@ -29,44 +29,41 @@ const LeavingConfirm: React.FC = ({ bodyStyle={{ display: 'flex', flexDirection: 'column', - alignItems: 'center' + alignItems: 'center', }} >
-
- exclamationMarkIcon +
+ exclamationMarkIcon
- { - isHost ? '请移交主持人给指定参会者，方能离开会议' : '请再次确认是否离开会议？' - } + {isHost + ? '请移交主持人给指定参会者，方能离开会议' + : '请再次确认是否离开会议？'}
- { - isHost && + {isHost && ( - } + > + 结束全部会议 + + )} - + > + 离开会议 + + ); }; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MediaPlayer/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MediaPlayer/index.tsx index 73ad724..a7b13ce 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MediaPlayer/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MediaPlayer/index.tsx @@ -86,11 +86,10 @@ export const MediaPlayer: React.FC = ({ return (
-
+ >
); }; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetEvent/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetEvent/index.tsx index 5dcc62a..266cedf 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetEvent/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetEvent/index.tsx @@ -5,47 +5,43 @@ import { TOASTS } from '@/config'; import type { UserStatusChangePayload, HostChangePayload, + JoinMeetingResponse, } from '@/lib/socket-interfaces'; -import { ViewMode } from '@/models/meeting'; -import { showOpenMicConfirm, sendMutedInfo } from '@/pages/Meeting/components/MessageTips'; +import { ViewMode, MeetingUser } from '@/models/meeting'; +import { + showOpenMicConfirm, + sendMutedInfo, +} from '@/pages/Meeting/components/MessageTips'; import React from 'react'; import DeviceController from '@/lib/DeviceController'; import { injectProps } from '@/pages/Meeting/configs/config'; -import { MeetingProps } from '@/app-interfaces'; import Utils from '@/utils/utils'; import { history } from 'umi'; import VideoAudioSubscribe from '@/lib/VideoAudioSubscribe'; -import { - IMeetingState, - IVolume, -} from '@/app-interfaces'; +import { IMeetingState, IVolume, MeetingProps } from '@/app-interfaces'; import { RTCStream, RemoteStreamStats, LocalStreamStats, } from '@volcengine/rtc'; -import type { MeetingUser } from '@/models/meeting'; -import type { JoinMeetingResponse } from '@/lib/socket-interfaces'; -import { - MediaPlayer, -} from '../MediaPlayer'; +import { MediaPlayer } from '../MediaPlayer'; import MeetingViews from '../MeetingViews'; import StreamStats from '../StreamStats'; const logger = new Logger('meeting-event'); interface IEvent { - end(): void; + end: () => void; leavingMeeting: () => void; } type IProps = MeetingProps & IEvent; /** - * @param drawerVisible 用户列表抽屉是否可见 - * @param exitVisible 退出会议弹窗是否可见 - * @param volumeSortList 音量根据大到小排序的对象数组 - */ + * @param drawerVisible 用户列表抽屉是否可见 + * @param exitVisible 退出会议弹窗是否可见 + * @param volumeSortList 音量根据大到小排序的对象数组 + */ const initState = { usersDrawerVisible: false, cameraStream: null, @@ -63,10 +59,9 @@ const initState = { streamStatses: { local: {}, localScreen: undefined, - remoteStreams: { - } + remoteStreams: {}, }, - users: [] + users: [], }; class MeetingEvent extends React.Component { @@ -130,7 +125,7 @@ class MeetingEvent extends React.Component { }); history.listen((location, action) => { - if (action == 'POP') { + if (action === 'POP') { if (location.pathname === '/meeting') { this.setState({ refresh: true, diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetingViews/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetingViews/index.tsx index b3a2c18..e4d862a 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetingViews/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MeetingViews/index.tsx @@ -1,13 +1,16 @@ import React, { useState, useEffect } from 'react'; import { UserModelState } from '@/models/user'; -import { MeetingUser } from '@/models/meeting'; -import { ViewMode } from '@/models/meeting'; +import { MeetingUser, ViewMode } from '@/models/meeting'; import { Stream } from '@/app-interfaces'; import View from '@/components/View'; import Logger from '@/utils/Logger'; import { WrappedComponentProps } from 'react-intl'; -import { injectProps, ConnectedProps, connector } from '../../configs/config'; -import { LocalPlayer, ShareView } from '../../components/MediaPlayer'; +import { + injectProps, + ConnectedProps, + connector, +} from '@/pages/Meeting/configs/config'; +import { LocalPlayer, ShareView } from '@/pages/Meeting/components/MediaPlayer'; import GalleryView from '../GalleryView'; import SpeakerView from '../SpeakerView'; @@ -42,16 +45,12 @@ export type MeetingViewsProps = ConnectedProps & WrappedComponentProps & IMeetingViewsProps; - const MeetingViews: React.FC = (props) => { - const { - meeting, - currentUser, - cameraStream, - screenStream, - remoteStreams, - } = props; - const [activeUsersViews, updateActiveUsersViews] = useState([]); + const { meeting, currentUser, cameraStream, screenStream, remoteStreams } = + props; + const [activeUsersViews, updateActiveUsersViews] = useState< + React.ReactNode[] + >([]); const [screenView, updateScreenView] = useState(null); const [localView, updateLocalView] = useState(null); @@ -59,28 +58,27 @@ const MeetingViews: React.FC = (props) => { const volumeSortList = meeting.meetingInfo.volumeSortList; if (volumeSortList?.length) { //按声音大小来排序 - const activeUsersViews = volumeSortList - .map(({ userId, volume }) => { - const localProps: any = {}; - const activeUser = meeting.meetingUsers.find( - (i) => i.user_id === `${userId}` - ); - return activeUser ? ( - - ) : null; - }); + const activeUsersViews = volumeSortList.map(({ userId, volume }) => { + const localProps: any = {}; + const activeUser = meeting.meetingUsers.find( + (i) => i.user_id === `${userId}` + ); + return activeUser ? ( + + ) : null; + }); updateActiveUsersViews(activeUsersViews.filter((i) => i)); } }, [ @@ -90,7 +88,7 @@ const MeetingViews: React.FC = (props) => { currentUser, remoteStreams, meeting.meetingInfo.screen_shared_uid, - meeting.meetingInfo + meeting.meetingInfo, ]); //分享流View @@ -173,7 +171,6 @@ const MeetingViews: React.FC = (props) => { props.rtc, ]); - //宫格模式 if (meeting.viewMode === ViewMode.GalleryView) { const galleryUser = activeUsersViews.slice(0, 8); diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MessageTips/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MessageTips/index.tsx index 7861734..019b917 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MessageTips/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/MessageTips/index.tsx @@ -32,8 +32,10 @@ export const sendInfo = (): void => { message.info('你已发送请求'); }; - -export const hostChangeInfo = (user_name: string, callback: () => void): void => { +export const hostChangeInfo = ( + user_name: string, + callback: () => void +): void => { Modal.info({ title: `是否将主持人移交给: ${user_name}`, okText: '确定', diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/SpeakerView/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/SpeakerView/index.tsx index b6c0a85..6f54a34 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/SpeakerView/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/SpeakerView/index.tsx @@ -11,7 +11,7 @@ interface ISpeakerViewProps { const SpeakerView: React.FC = ({ views, screenView, - meeting + meeting, }) => { return (
diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.less index 8957eb9..7bb1f62 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.less @@ -1,17 +1,17 @@ -.status{ +.status { position: fixed; bottom: 10px; left: 12px; - background: #1D2129; + background: #1d2129; opacity: 0.5; padding: 8px 12px; min-width: 180px; - div{ + div { font-family: Nunito Sans; font-style: normal; font-weight: normal; font-size: 12px; line-height: 18px; - color: #FFFFFF; + color: #ffffff; } -} \ No newline at end of file +} diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.tsx index 4047caf..f1407d9 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/StreamStats/index.tsx @@ -1,7 +1,4 @@ -import React, { - FC, - useMemo -} from 'react'; +import React, { FC, useMemo } from 'react'; import { Dispatch } from '@@/plugin-dva/connect'; import { injectIntl } from 'umi'; import { connect, bindActionCreators } from 'dva'; @@ -49,21 +46,14 @@ function mapDispatchToProps(dispatch: Dispatch) { const connector = connect(mapStateToProps, mapDispatchToProps); type IProps = { - streamStatses: IMeetingState['streamStatses'] + streamStatses: IMeetingState['streamStatses']; }; - - - export type StatsProps = ConnectedProps & WrappedComponentProps & IProps; -const StreamStats: FC = ({ - settings, - streamStatses, -}) => { - +const StreamStats: FC = ({ settings, streamStatses }) => { const local = useMemo( () => streamStatses.local, [streamStatses.local] diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.less index a7eb21e..0d2aa04 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.less @@ -1,4 +1,4 @@ -@import "~@/utils/utils.less"; +@import '~@/utils/utils.less'; .container { color: #fff; @@ -48,7 +48,7 @@ margin-right: 4px; padding: 2px; color: #4d82f7; - background-color: #1D2129; + background-color: #1d2129; user-select: none; } } @@ -56,7 +56,7 @@ .right { .flex-box(); - .micOnIcon{ + .micOnIcon { background: url('../../../../../assets/images/micOnIcon.png'); background-size: contain; display: inline-block; @@ -80,7 +80,7 @@ } } } - .useContainerWrapper{ + .useContainerWrapper { height: calc(100% - 40px); overflow-y: scroll; } @@ -88,28 +88,28 @@ .useContainerWrapper::-webkit-scrollbar { width: 10px; height: 100%; - background-color: rgba(255,255,255,.3); + background-color: rgba(255, 255, 255, 0.3); border-radius: 2px; } .useContainerWrapper::-webkit-scrollbar-thumb { - background-color: #272E3B; + background-color: #272e3b; } - .useMuteAll{ + .useMuteAll { position: absolute; bottom: 0; left: 0; padding: 16px; width: 100%; - .useMuteAllButton{ - border: 1px solid #272E3B; - background: #272E3B; + .useMuteAllButton { + border: 1px solid #272e3b; + background: #272e3b; border-radius: 2px; - color: #FFFFFF; + color: #ffffff; font-size: 12px; width: 100%; - >span:nth-of-type(1) { + > span:nth-of-type(1) { width: 16px; height: 16px; margin-right: 5px; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.tsx index 4d00c87..f7be416 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/components/UsersDrawer/index.tsx @@ -1,8 +1,4 @@ -import React, { - useMemo, - useCallback, - useRef, -} from 'react'; +import React, { useMemo, useCallback, useRef } from 'react'; import { Drawer, Tooltip, Button, message } from 'antd'; import IconBtn from '@/components/IconBtn'; import { MeetingUser } from '@/models/meeting'; @@ -13,7 +9,11 @@ import camOnIcon from '/assets/images/camOnIcon.png'; import camOffIcon from '/assets/images/camOffIcon.png'; import changeHostIcon from '/assets/images/changeHostIcon.png'; import muteAllIcon from '/assets/images/muteAllIcon.png'; -import { connector, injectProps, ConnectedProps } from '../../configs/config'; +import { + connector, + injectProps, + ConnectedProps, +} from '@/pages/Meeting/configs/config'; import styles from './index.less'; import { TOASTS } from '@/constant'; @@ -22,7 +22,7 @@ import DeviceController from '@/lib/DeviceController'; import { sendInfo, hostChangeInfo, -} from '../../components/MessageTips'; +} from '@/pages/Meeting/components/MessageTips'; interface IProps { visible: boolean; @@ -34,14 +34,7 @@ const logger = new Logger('UsersDrawer'); export type IUsersDrawerProps = ConnectedProps & IProps; const UsersDrawer: React.FC = (props) => { - - const { - currentUser, - mc, - meeting, - visible, - closeUserDrawer, - } = props; + const { currentUser, mc, meeting, visible, closeUserDrawer } = props; logger.debug('meeting.meetingUsers %o', meeting.meetingUsers); @@ -70,61 +63,70 @@ const UsersDrawer: React.FC = (props) => { } catch (error) { message.error({ content: `${error}` }); } - },[mc]); + }, [mc]); /** * @brief 更换主持人 * @function changeHost */ - const changeHost = useCallback((uid: string, name: string): void => { - hostChangeInfo(name, () => - mc - ?.changeHost({ - user_id: uid, - }) - .catch(() => message.error(TOASTS['give_host_error'])) - ); - },[mc]); + const changeHost = useCallback( + (uid: string, name: string): void => { + hostChangeInfo(name, () => + mc + ?.changeHost({ + user_id: uid, + }) + .catch(() => message.error(TOASTS['give_host_error'])) + ); + }, + [mc] + ); /** * @brief 请求某用户打开麦克风 * @function askMicOn */ - const askMicOn = useCallback((user_id: string): void => { - try { - mc?.askMicOn({ - user_id, - }); - sendInfo(); - } catch (error) { - message.error({ content: `${error}` }); - } - },[mc]); + const askMicOn = useCallback( + (user_id: string): void => { + try { + mc?.askMicOn({ + user_id, + }); + sendInfo(); + } catch (error) { + message.error({ content: `${error}` }); + } + }, + [mc] + ); /** * @brief 静音某用户 * @function muteUser */ - const muteClick = useCallback((user: MeetingUser): void => { - if (currentUser.userId === user.user_id) { - // 如果操作的是自己 - if (deviceController.current) { - deviceController.current.changeAudioState(!user.is_mic_on); - } - } else { - if (currentUser.isHost) { - // 请求对应用户打开 mic - if (!user.is_mic_on) askMicOn(user.user_id); - else { - mc?.muteUser({ - user_id: user.user_id, - }); + const muteClick = useCallback( + (user: MeetingUser): void => { + if (currentUser.userId === user.user_id) { + // 如果操作的是自己 + if (deviceController.current) { + deviceController.current.changeAudioState(!user.is_mic_on); } } else { - message.warn('您不是主持人, 请联系主持人进行操作'); + if (currentUser.isHost) { + // 请求对应用户打开 mic + if (!user.is_mic_on) askMicOn(user.user_id); + else { + mc?.muteUser({ + user_id: user.user_id, + }); + } + } else { + message.warn('您不是主持人, 请联系主持人进行操作'); + } } - } - },[askMicOn, currentUser.isHost, currentUser.userId, mc]); + }, + [askMicOn, currentUser.isHost, currentUser.userId, mc] + ); /** * @brief 判断传入的 user_id 是否有声音 @@ -136,10 +138,14 @@ const UsersDrawer: React.FC = (props) => { if (currentUser.userId && localUser) { // 获取 user_id 用户的音量 - const speaker = audioLevels.find(item => item.userId === user_id); - if(user_id === currentUser.userId && currentUser.isMicOn && localUser.volume > 0.2){ + const speaker = audioLevels.find((item) => item.userId === user_id); + if ( + user_id === currentUser.userId && + currentUser.isMicOn && + localUser.volume > 0.2 + ) { return true; - }else{ + } else { return speaker && speaker.volume > 0 ? true : false; } } @@ -150,7 +156,7 @@ const UsersDrawer: React.FC = (props) => { * @brief 操作摄像头 * @function onCameraChange */ - const onCameraChange = (user: MeetingUser):void => { + const onCameraChange = (user: MeetingUser): void => { if (currentUser.userId === user.user_id) { // 如果操作的是自己 if (deviceController.current) { @@ -159,7 +165,7 @@ const UsersDrawer: React.FC = (props) => { } else { if (currentUser.isHost) { // 请求对应用户打开摄像头 - if (!user.is_camera_on) mc?.askCameraOn({user_id: user.user_id}); + if (!user.is_camera_on) mc?.askCameraOn({ user_id: user.user_id }); else message.warn('对方摄像头已打开'); } else { message.warn('您不是主持人, 请联系主持人进行操作'); diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/configs/config.tsx b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/configs/config.tsx index 18ae03e..efaeaba 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/configs/config.tsx +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/configs/config.tsx @@ -7,7 +7,6 @@ import { ConnectedProps } from 'react-redux'; import { injectIntl } from 'umi'; import React from 'react'; - /** * @brief 获取 Redux 中信息 * @function mapStateToProps @@ -29,10 +28,10 @@ const mapStateToProps = (state: AppState) => { * @returns */ const mapDispatchToProps = (dispatch: Dispatch) => { - return { - dispatch, - ...bindActionCreators({ ...userActions, ...meetingActions }, dispatch), - }; + return { + dispatch, + ...bindActionCreators({ ...userActions, ...meetingActions }, dispatch), + }; }; const connector = connect(mapStateToProps, mapDispatchToProps); @@ -46,10 +45,10 @@ const injectProps = (comp: React.FC | React.ComponentType) => { }; export { - mapStateToProps, - mapDispatchToProps, - connect, - connector, - injectProps, - ConnectedProps, + mapStateToProps, + mapDispatchToProps, + connect, + connector, + injectProps, + ConnectedProps, }; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/index.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/index.less index defeebc..128eaa5 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/index.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/Meeting/index.less @@ -1,4 +1,4 @@ -@import "~@/utils/utils.less"; +@import '~@/utils/utils.less'; .container { .flex-box(); diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/document.ejs b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/document.ejs new file mode 100644 index 0000000..9756ad0 --- /dev/null +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/pages/document.ejs @@ -0,0 +1,17 @@ + + + + + + + + +
+ + + diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/rtc-client.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/rtc-client.ts index f6843cc..ba19be7 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/rtc-client.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/rtc-client.ts @@ -7,7 +7,7 @@ import VERTC, { LocalStreamStats, RemoteStreamStats, StreamIndex, - RTCDevice + RTCDevice, } from '@volcengine/rtc'; import { IVolume } from '@/app-interfaces'; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/types.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/types.ts index 7e9ae6f..84ab7c5 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/types.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/rtcApi/types.ts @@ -5,4 +5,4 @@ export type ICreateStreamRes = { video: number; audio: number; }; -} +}; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/hook.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/hook.ts index 560443b..e92817b 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/hook.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/hook.ts @@ -26,4 +26,4 @@ function useInterval( }, [delay]); } -export { useInterval }; \ No newline at end of file +export { useInterval }; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/redux-utils.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/redux-utils.ts index b0c19eb..605aa1f 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/redux-utils.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/redux-utils.ts @@ -1,7 +1,10 @@ -import {Action} from 'dva-model-creator'; -import {ImmerReducer, Dispatch} from '@@/plugin-dva/connect'; +import { Action } from 'dva-model-creator'; +import { ImmerReducer, Dispatch } from '@@/plugin-dva/connect'; -export const setFieldsReducer = >(): ImmerReducer>> => { +export const setFieldsReducer = >(): ImmerReducer< + T, + Action> +> => { return (state: T, action: Action>) => { const { payload } = action; for (const key in payload) { @@ -12,7 +15,10 @@ export const setFieldsReducer = >(): ImmerReducer< }; }; -export const setFieldReducer = (state: T, key: keyof T): ImmerReducer> => { +export const setFieldReducer = ( + state: T, + key: keyof T +): ImmerReducer> => { return (state: T, action: Action) => { const { payload } = action; state[key] = payload; @@ -25,10 +31,12 @@ export const setFieldReducer = (state: T, key: keyof T): ImmerRed * @param {Dispatch

} originDispatch * @return {Dispatch

} */ -export const asyncDispatch =

(originDispatch: Dispatch

): Dispatch

=> { +export const asyncDispatch =

( + originDispatch: Dispatch

+): Dispatch

=> { return (action) => { return new Promise((res, rej) => { - originDispatch({...action, resolve: res, reject: rej}); + originDispatch({ ...action, resolve: res, reject: rej }); }); }; }; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/utils.less b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/utils.less index 9f7e9c0..f40916a 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/utils.less +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/src/utils/utils.less @@ -11,17 +11,17 @@ display: inline-block; height: @h; width: 0; - border-right: 1px solid #4E5969; + border-right: 1px solid #4e5969; margin: 0 @m; } -.place-holder{ +.place-holder { font-family: PingFang SC; font-style: normal; font-weight: normal; font-size: 14px; line-height: 22px; - color: #86909C; + color: #86909c; position: relative; left: 5px; -} \ No newline at end of file +} diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/typings.d.ts b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/typings.d.ts index 85326a3..20d4394 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/typings.d.ts +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/typings.d.ts @@ -4,7 +4,7 @@ declare module '*.scss'; declare module '*.png'; declare module '*.svg' { export function ReactComponent( - props: React.SVGProps, + props: React.SVGProps ): React.ReactElement; const url: string; export default url; diff --git a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/yarn.lock b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/yarn.lock index 529e1b4..f4057ed 100644 --- a/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/yarn.lock +++ b/Web/veRTCScenesDemo/veRTC_Demo/MeetingDemo/yarn.lock @@ -10,6 +10,14 @@ lodash.debounce "^4.0.8" lodash.throttle "^4.1.1" +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + dependencies: + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@ant-design/colors@^6.0.0": version "6.0.0" resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" @@ -34,50 +42,51 @@ rc-util "^5.9.4" "@ant-design/pro-layout@^6.5.0": - version "6.31.7" - resolved "https://registry.yarnpkg.com/@ant-design/pro-layout/-/pro-layout-6.31.7.tgz#04470f60ec76b7211800bec34c1c7ea47aaa8d16" - integrity sha512-MU9vX6o9ZCv2MIGSbvdEkKJe0Ou1jWL/30rCM83dQjYRKhBcguZ9/W+AStoomupftjycKbtrWlmkMKFTVC8arQ== + version "6.38.2" + resolved "https://registry.yarnpkg.com/@ant-design/pro-layout/-/pro-layout-6.38.2.tgz#c99dc6f052e5147ffd13b7450454ce0679c7a508" + integrity sha512-HyxDuqV+JsagzSXYwduGvjPo0sfTrUHwgSSSa5DOhP5pUyqFEVq+oBMom1tDzoN19eTdY3NNFTKhnc6HhHdeqQ== dependencies: "@ant-design/icons" "^4.0.0" - "@ant-design/pro-provider" "1.5.4" - "@ant-design/pro-utils" "1.28.9" + "@ant-design/pro-provider" "1.6.5" + "@ant-design/pro-utils" "1.41.2" "@babel/runtime" "^7.16.3" - "@umijs/route-utils" "^2.0.1" + "@umijs/route-utils" "^2.1.0" + "@umijs/ssr-darkreader" "^4.9.44" "@umijs/use-params" "^1.0.9" classnames "^2.2.6" lodash.merge "^4.6.2" omit.js "^2.0.2" path-to-regexp "2.4.0" - rc-resize-observer "^0.2.1" + rc-resize-observer "^1.1.0" rc-util "^5.0.6" - swr "1.1.0" + swr "^1.2.0" unstated-next "^1.1.0" use-json-comparison "^1.0.3" use-media-antd-query "^1.0.6" warning "^4.0.3" -"@ant-design/pro-provider@1.5.4": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@ant-design/pro-provider/-/pro-provider-1.5.4.tgz#09174029f9fbfa6cc0077cac3c643a80fcfd9f21" - integrity sha512-xibR+nFw7IFFIVo5MnYx/mvXAAqZTDDdoJuhrPahDhzSO8nN4dgEinvStYEylOooQwPw312uNOmIK8x3AWKTbg== +"@ant-design/pro-provider@1.6.5": + version "1.6.5" + resolved "https://registry.yarnpkg.com/@ant-design/pro-provider/-/pro-provider-1.6.5.tgz#e30af6eec4602bd33b3cec894e918ea347f266ee" + integrity sha512-83hy+q5vCQLRT7QY/3Wo4YL6eAWWi+Svqc7B7Mxw73WT7yPqzhOaRqLyyytPtQrSCT5ldJsqtfWgJBtWIkoNYw== dependencies: "@babel/runtime" "^7.16.3" rc-util "^5.0.1" - swr "1.1.0" + swr "^1.2.0" -"@ant-design/pro-utils@1.28.9": - version "1.28.9" - resolved "https://registry.yarnpkg.com/@ant-design/pro-utils/-/pro-utils-1.28.9.tgz#92f1b14faab39fb07f6e1f5cee29d38b05cdaa8f" - integrity sha512-/OvTIFM45xeyDyIUNqfUMj5xFqynWC2ZvNql3NhVWc8HEQqEY84dXS92zDIZ1cGrKFq15yPMVwNgj2QJkC0mBQ== +"@ant-design/pro-utils@1.41.2": + version "1.41.2" + resolved "https://registry.yarnpkg.com/@ant-design/pro-utils/-/pro-utils-1.41.2.tgz#a0c76c7a1201d26e385e7b6b56fbf708306bcd4a" + integrity sha512-wVDMwFrLVP0Ng7yDUGrZqot0zCdN1wtpVtGdF6KTZzjMwZ5glWBQWWZ2oFNFqhgRZ9QlojkNWISQl4NnDS/4LA== dependencies: "@ant-design/icons" "^4.3.0" - "@ant-design/pro-provider" "1.5.4" + "@ant-design/pro-provider" "1.6.5" "@babel/runtime" "^7.16.3" classnames "^2.2.6" moment "^2.27.0" rc-util "^5.0.6" react-sortable-hoc "^2.0.0" - swr "1.1.0" + swr "^1.2.0" "@ant-design/react-slick@~0.28.1": version "0.28.4" @@ -97,17 +106,17 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: - "@babel/highlight" "^7.16.0" + "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.16.0": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" - integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== +"@babel/compat-data@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" + integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== "@babel/core@7.12.10": version "7.12.10" @@ -131,147 +140,146 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c" - integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ== - dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.5" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helpers" "^7.16.5" - "@babel/parser" "^7.16.5" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.12.tgz#b4eb2d7ebc3449b062381644c93050db545b70ee" + integrity sha512-44ODe6O1IVz9s2oJE3rZ4trNNKTX9O7KpQpfAP4t8QII/zwrVRHL7i2pxhqtcY7tqMLrrKfMlBKnm1QlrRFs5w== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.12" + "@babel/helper-compilation-targets" "^7.17.10" + "@babel/helper-module-transforms" "^7.17.12" + "@babel/helpers" "^7.17.9" + "@babel/parser" "^7.17.12" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.12" + "@babel/types" "^7.17.12" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" + json5 "^2.2.1" semver "^6.3.0" - source-map "^0.5.0" -"@babel/generator@^7.12.10", "@babel/generator@^7.16.5", "@babel/generator@^7.4.0": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf" - integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA== +"@babel/generator@^7.12.10", "@babel/generator@^7.17.12", "@babel/generator@^7.4.0": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.12.tgz#5970e6160e9be0428e02f4aba62d8551ec366cc8" + integrity sha512-V49KtZiiiLjH/CnIW6OjJdrenrGoyh6AmKQ3k2AZFKozC1h846Q4NYlZ5nqAigPDUXfGzC88+LOUuG8yKd2kCw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.17.12" + "@jridgewell/gen-mapping" "^0.3.0" jsesc "^2.5.1" - source-map "^0.5.0" -"@babel/helper-compilation-targets@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" - integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== +"@babel/helper-annotate-as-pure@^7.16.0": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" + integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.17.5" - semver "^6.3.0" + "@babel/types" "^7.16.7" -"@babel/helper-environment-visitor@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8" - integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg== +"@babel/helper-compilation-targets@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe" + integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ== dependencies: - "@babel/types" "^7.16.0" + "@babel/compat-data" "^7.17.10" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.20.2" + semver "^6.3.0" -"@babel/helper-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" - integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== dependencies: - "@babel/helper-get-function-arity" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" - integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== +"@babel/helper-function-name@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" + integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== dependencies: - "@babel/types" "^7.16.0" + "@babel/template" "^7.16.7" + "@babel/types" "^7.17.0" -"@babel/helper-hoist-variables@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" - integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== +"@babel/helper-hoist-variables@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" - integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29" - integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ== +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.12.tgz#bec00139520cb3feb078ef7a4578562480efb77e" + integrity sha512-t5s2BeSWIghhFRPh9XMn6EIGmvn8Lmw5RVASJzkIx1mSemubQQBNIZiQD7WzaFmaHIrjAec4x8z9Yx8SjJ1/LA== dependencies: - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-simple-access" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/helper-validator-identifier" "^7.15.7" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.12" + "@babel/types" "^7.17.12" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074" - integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ== + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96" + integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA== -"@babel/helper-simple-access@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" - integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== +"@babel/helper-simple-access@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" + integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.17.0" -"@babel/helper-split-export-declaration@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" - integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== -"@babel/helpers@^7.12.5", "@babel/helpers@^7.16.5": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd" - integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" + integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== dependencies: - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.9" + "@babel/types" "^7.17.0" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351" + integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.5", "@babel/parser@^7.4.3": - version "7.16.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314" - integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ== +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.12", "@babel/parser@^7.4.3": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.12.tgz#36c2ed06944e3691ba82735fc4cf62d12d491a23" + integrity sha512-FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -364,44 +372,44 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.5.tgz#7f3e34bf8bdbbadf03fbb7b1ea0d929569c9487a" - integrity sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" + integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.12.7", "@babel/template@^7.16.0", "@babel/template@^7.3.3", "@babel/template@^7.4.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" - integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== - dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" - -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.10", "@babel/traverse@^7.16.5", "@babel/traverse@^7.4.3": - version "7.16.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3" - integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ== - dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.5" - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.5" - "@babel/types" "^7.16.0" +"@babel/template@^7.12.7", "@babel/template@^7.16.7", "@babel/template@^7.3.3", "@babel/template@^7.4.0": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.10", "@babel/traverse@^7.17.12", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.12.tgz#011874d2abbca0ccf1adbe38f6f7a4ff1747599c" + integrity sha512-zULPs+TbCvOkIFd4FrG53xrpxvCBwLIgo6tO0tJorY7YV2IWFxUfS/lXDJbGgfyYt9ery/Gxj2niwttNnB0gIw== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.12" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.17.12" + "@babel/types" "^7.17.12" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.10", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" - integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== +"@babel/types@^7.0.0", "@babel/types@^7.12.10", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.12.tgz#1210690a516489c0200f355d87619157fbbd69a0" + integrity sha512-rH8i29wcZ6x9xjzI5ILHL/yZkbQnCERdHlogKuIb4PUr7do4iT8DPekrTbBLWTnRQm6U0GYABbTMSzijmEqlAg== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -428,9 +436,31 @@ integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== "@ctrl/tinycolor@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f" - integrity sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ== + version "3.4.1" + resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz#75b4c27948c81e88ccd3a8902047bcd797f38d32" + integrity sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw== + +"@emotion/is-prop-valid@^1.1.0": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" + integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== + dependencies: + "@emotion/memoize" "^0.7.4" + +"@emotion/memoize@^0.7.4": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" + integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== + +"@emotion/stylis@^0.8.4": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" + integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== + +"@emotion/unitless@^0.7.4": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" + integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== "@eslint/eslintrc@^0.4.3": version "0.4.3" @@ -765,6 +795,46 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@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" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" + integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" + integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== + +"@jridgewell/set-array@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" + integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -811,9 +881,9 @@ integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.17" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.17.tgz#f50ac9d20d64153b510578d84f9643f9a3afbe64" - integrity sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A== + version "7.1.19" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" + integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -822,9 +892,9 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5" - integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA== + version "7.6.4" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" + integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== dependencies: "@babel/types" "^7.0.0" @@ -837,9 +907,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" - integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== + version "7.17.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.17.1.tgz#1a0e73e8c28c7e832656db372b779bfd2ef37314" + integrity sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA== dependencies: "@babel/types" "^7.3.0" @@ -858,11 +928,18 @@ "@types/node" "*" "@types/history@*": - version "4.7.9" - resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.9.tgz#1cfb6d60ef3822c589f18e70f8b12f9a28ce8724" - integrity sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ== + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/history/-/history-5.0.0.tgz#29f919f0c8e302763798118f45b19cab4a886f14" + integrity sha512-hy8b7Y1J8OGe6LbAjj3xniQrj3v6lsivCcrmf4TzSgPzLkhIeKgc5IZnT7ReIqmEuodjfO8EYAuoFvIrHi/+jQ== + dependencies: + history "*" -"@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1": +"@types/history@^4.7.11": + version "4.7.11" + resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" + integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== + +"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1": version "3.3.1" resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== @@ -881,9 +958,9 @@ integrity sha512-DaZNUvLDCAnCTjgwxgiL1eQdxIKEpNLOlTNtAgnZc50bG2copGhRrFN9/PxPBuJe+tZVLCbQ7ls0xveXVRPkvw== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" - integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-report@*": version "3.0.0" @@ -908,28 +985,28 @@ "@types/istanbul-lib-report" "*" "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/lodash.chunk@^4.2.6": - version "4.2.6" - resolved "https://registry.yarnpkg.com/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz#9d35f05360b0298715d7f3d9efb34dd4f77e5d2a" - integrity sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ== + version "4.2.7" + resolved "https://registry.yarnpkg.com/@types/lodash.chunk/-/lodash.chunk-4.2.7.tgz#df52478072f0673d9fe8d3dd43af8f490d07a56a" + integrity sha512-//tmaWHiANgToom/YYYKKqiCtlNz11fwYtMUUbaemNSbWTI+2zHtYW5nt1PHNCRWHPAJHHhn4UVFD9LKUFvatA== dependencies: "@types/lodash" "*" "@types/lodash.debounce@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz#c5a2326cd3efc46566c47e4c0aa248dc0ee57d60" - integrity sha512-4WTmnnhCfDvvuLMaF3KV4Qfki93KebocUF45msxhYyjMttZDQYzHkO639ohhk8+oco2cluAFL3t5+Jn4mleylQ== + version "4.0.7" + resolved "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.7.tgz#0285879defb7cdb156ae633cecd62d5680eded9f" + integrity sha512-X1T4wMZ+gT000M2/91SYj0d/7JfeNZ9PeeOldSNoE/lunLeQXKvkmIumI29IaKMotU/ln/McOIvgzZcQ/3TrSA== dependencies: "@types/lodash" "*" "@types/lodash@*": - version "4.14.178" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" - integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== + version "4.14.182" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2" + integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q== "@types/ms@*": version "0.7.31" @@ -937,9 +1014,9 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "17.0.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.3.tgz#4b086e316ed4504f49bd78135d48642bf50aa135" - integrity sha512-bAKB1GcA28FR/D8HHQ5U4FYk7nvoZdp7TZSy9oIyQ8gpYCzpeESa3LCK2TbeocXic7GwIXCkCItJg0DttO3ZaQ== + version "17.0.34" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.34.tgz#3b0b6a50ff797280b8d000c6281d229f9c538cef" + integrity sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -952,40 +1029,40 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.0.0": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.2.tgz#4c62fae93eb479660c3bd93f9d24d561597a8281" - integrity sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA== + version "2.6.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.1.tgz#76e72d8a775eef7ce649c63c8acae1a0824bbaed" + integrity sha512-XFjFHmaLVifrAKaZ+EKghFHtHSUonyw8P2Qmy2/+osBnrKbH9UYtlK10zg8/kCt47MFilll/DEDKy3DHfJ0URw== "@types/prop-types@*": - version "15.7.4" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" - integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + version "15.7.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== "@types/react-dom@^16.9.8": - version "16.9.14" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.14.tgz#674b8f116645fe5266b40b525777fc6bb8eb3bcd" - integrity sha512-FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A== + version "16.9.16" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.16.tgz#c591f2ed1c6f32e9759dfa6eb4abfd8041f29e39" + integrity sha512-Oqc0RY4fggGA3ltEgyPLc3IV9T73IGoWjkONbsyJ3ZBn+UPPCYpU2ec0i3cEbJuEdZtkqcCF2l1zf2pBdgUGSg== dependencies: "@types/react" "^16" "@types/react-dom@^17.0.0": - version "17.0.11" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466" - integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q== + version "17.0.17" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1" + integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg== dependencies: - "@types/react" "*" + "@types/react" "^17" "@types/react-helmet@^6.1.0": - version "6.1.4" - resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" - integrity sha512-jyx50RNZXVaTGHY3MsoRPNpeiVk8b0XTPgD/O6KHF6COTDnG/+lRjPYvTK5nfWtR3xDOux0w6bHLAsaHo2ZLTA== + version "6.1.5" + resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.5.tgz#35f89a6b1646ee2bc342a33a9a6c8777933f9083" + integrity sha512-/ICuy7OHZxR0YCAZLNg9r7I9aijWUWvxaPR6uTuyxe8tAj5RL4Sw1+R6NhXUtOsarkGYPmaHdBDvuXh2DIN/uA== dependencies: "@types/react" "*" "@types/react-redux@^7.1.0", "@types/react-redux@^7.1.20": - version "7.1.20" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.20.tgz#42f0e61ababb621e12c66c96dda94c58423bd7df" - integrity sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw== + version "7.1.24" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0" + integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" @@ -1002,11 +1079,11 @@ "@types/react-router" "*" "@types/react-router-config@^5.0.2": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@types/react-router-config/-/react-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" - integrity sha512-38vpjXic0+E2sIBEKUe+RrCmbc8RqcQhNV8OmU3KUcwgy/yzTeo67MhllP+0zjZWNr7Lhw+RnUkL0hzkf63nUQ== + version "5.0.6" + resolved "https://registry.yarnpkg.com/@types/react-router-config/-/react-router-config-5.0.6.tgz#87c5c57e72d241db900d9734512c50ccec062451" + integrity sha512-db1mx37a1EJDf1XeX8jJN7R3PZABmJQXR8r28yUjVMFSjkmnQo6X6pOEEmNl+Tp2gYQOGPdYbFIipBtdElZ3Yg== dependencies: - "@types/history" "*" + "@types/history" "^4.7.11" "@types/react" "*" "@types/react-router" "*" @@ -1020,20 +1097,20 @@ "@types/react-router" "*" "@types/react-router-dom@^5.1.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" - integrity sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ== + version "5.3.3" + resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83" + integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw== dependencies: - "@types/history" "*" + "@types/history" "^4.7.11" "@types/react" "*" "@types/react-router" "*" "@types/react-router@*": - version "5.1.17" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.17.tgz#087091006213b11042f39570e5cd414863693968" - integrity sha512-RNSXOyb3VyRs/EOGmjBhhGKTbnN6fHWvy5FNLzWfOWOGjgVUKqJZXfpKzLmgoU8h6Hj8mpALj/mbXQASOb92wQ== + version "5.1.18" + resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3" + integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g== dependencies: - "@types/history" "*" + "@types/history" "^4.7.11" "@types/react" "*" "@types/react-router@5.1.12": @@ -1051,19 +1128,28 @@ dependencies: "@types/react" "^16" -"@types/react@*", "@types/react@^17.0.0": - version "17.0.37" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.37.tgz#6884d0aa402605935c397ae689deed115caad959" - integrity sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg== +"@types/react@*": + version "18.0.9" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" + integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" "@types/react@^16", "@types/react@^16.9.43": - version "16.14.21" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.21.tgz#35199b21a278355ec7a3c40003bd6a334bd4ae4a" - integrity sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg== + version "16.14.26" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.26.tgz#82540a240ba7207ebe87d9579051bc19c9ef7605" + integrity sha512-c/5CYyciOO4XdFcNhZW1O2woVx86k4T+DO2RorHZL7EhitkNQgSD/SgpdZJAUJa/qjVgOmTM44gHkAdZSXeQuQ== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/react@^17", "@types/react@^17.0.0": + version "17.0.45" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.45.tgz#9b3d5b661fd26365fefef0e766a1c6c30ccf7b3f" + integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -1089,15 +1175,24 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/styled-components@^5.1.24": + version "5.1.25" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.25.tgz#0177c4ab5fa7c6ed0565d36f597393dae3f380ad" + integrity sha512-fgwl+0Pa8pdkwXRoVPP9JbqF0Ivo9llnmsm+7TCI330kbPIFd9qv1Lrhr37shf4tnxCOSu+/IgqM7uJXLWZZNQ== + dependencies: + "@types/hoist-non-react-statics" "*" + "@types/react" "*" + csstype "^3.0.2" + "@types/uuid@^8.3.0": - version "8.3.3" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.3.tgz#c6a60686d953dbd1b1d45e66f4ecdbd5d471b4d0" - integrity sha512-0LbEEx1zxrYB3pgpd1M5lEhLcXjKJnYghvhTRgaBeUivLHMDM1TzF3IJ6hXU2+8uA4Xz+5BA63mtZo5DjVT8iA== + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== "@types/yargs-parser@*": - version "20.2.1" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" - integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^13.0.0": version "13.0.12" @@ -1183,72 +1278,72 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" -"@umijs/ast@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/ast/-/ast-3.5.20.tgz#f07bebddccc99b50146250de52d89aa1e612518c" - integrity sha512-bDKofiykO9xT6QWLeauv9B8XOd32SUlRDXVGcLEOhR8ZPPWR2LYgJaYZAnpxEbRmCrfVokiB69uZ2/qcvIvjmQ== +"@umijs/ast@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/ast/-/ast-3.5.23.tgz#bc223653e35b8ddb5b81e980a8b428757a5e863a" + integrity sha512-hEzCsaxBBRt68ygjBuGckEXfseHaG4a8/4wbiLy5pLCBaNrbDaqOA9W9Qljj6DrTpzUyiW4mBCdogq7FqLjQqA== dependencies: - "@umijs/utils" "3.5.20" + "@umijs/utils" "3.5.23" -"@umijs/babel-plugin-auto-css-modules@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-auto-css-modules/-/babel-plugin-auto-css-modules-3.5.20.tgz#5f423cebe0deab2c108949d71c4694c0788348b9" - integrity sha512-mN/ueXm7KHCmrfK8nluPqx3JGNftNj/wWPUKpcDiheagVNz+PJ++aIFI9ikfqK8ukHVVBisWltEJwOrDM8QUdQ== +"@umijs/babel-plugin-auto-css-modules@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-auto-css-modules/-/babel-plugin-auto-css-modules-3.5.23.tgz#f5469099c3468d29ab8ae34882b430811248b1e6" + integrity sha512-dMrprGgbKHN2gvqGYa9D20514KetAmD+WHaYgu9PWApddYs/GIrAWuFv16yi1N9nm6GBF6k3obX64rp/mZXHnw== dependencies: - "@umijs/utils" "3.5.20" + "@umijs/utils" "3.5.23" -"@umijs/babel-plugin-import-to-await-require@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-import-to-await-require/-/babel-plugin-import-to-await-require-3.5.20.tgz#1947f0533703d8dfd7442a383020621e7e871667" - integrity sha512-cZma+jLAQ0FeHpezTYJLELSyKMMtrYNIjFeTLxDT6Pw5Z1Ei3cJHf8ERYV4kDBzu/rvuUFx1AC5UPGwYmqsVxw== +"@umijs/babel-plugin-import-to-await-require@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-import-to-await-require/-/babel-plugin-import-to-await-require-3.5.23.tgz#b07e6d92c3c8de045744cdebbd7ab7c5629e4d1c" + integrity sha512-4dmcX6Q2ReYoO1qS/gpKF3V/0RgLSmQu2NskkdAVeENK84ayJwnuqdMe+hW59L0C4hLbq9JO+GLUE1mGp+54Fw== dependencies: - "@umijs/utils" "3.5.20" + "@umijs/utils" "3.5.23" -"@umijs/babel-plugin-lock-core-js-3@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-lock-core-js-3/-/babel-plugin-lock-core-js-3-3.5.20.tgz#a0bd894b953a0820f6883aa863170ceae3fbc8a7" - integrity sha512-bbyg0QLSeNXVrnFZIx2TgOalDUMBPVIHtR6G7aeBmSsiUSFRwsCNprjc/NPEBwOFG10J4XmJFETzcgig3hKLoA== +"@umijs/babel-plugin-lock-core-js-3@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-lock-core-js-3/-/babel-plugin-lock-core-js-3-3.5.23.tgz#1f6213607e1ebb2fa705764d6bee586f7a6cc43e" + integrity sha512-F3wNVGycIE/bjxhkMz4SyONqrc0M2GbmZOMIo0x+QNdeNzoQ9Y6t3LM18+0M1i834z4QZbR0EBrXWaqYo2FpLQ== dependencies: - "@umijs/utils" "3.5.20" + "@umijs/utils" "3.5.23" core-js "3.6.5" -"@umijs/babel-plugin-no-anonymous-default-export@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-no-anonymous-default-export/-/babel-plugin-no-anonymous-default-export-3.5.20.tgz#f1eb524fa433d0fa19590715fec70dd79b51b25d" - integrity sha512-ufM+mcDrRJMTWWqP/C73NLqeW7CrgxrXlSKnmJ+CCNTT1GPex5+5Ou2IM6HLqXukm+7W+xdDepMEWrYGmdGQRg== +"@umijs/babel-plugin-no-anonymous-default-export@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/babel-plugin-no-anonymous-default-export/-/babel-plugin-no-anonymous-default-export-3.5.23.tgz#a50534ab724e964f0658a2e5c623554b0c15c13f" + integrity sha512-wBWOHx+bo3G/OfFYBTD+r4v/7tGMF7Ut2ry8SL11nmhX3eRgb5OIHbnbfLEUPmH6s/meBiiHZOLccFagW6SOKg== dependencies: - "@umijs/utils" "3.5.20" + "@umijs/utils" "3.5.23" -"@umijs/babel-preset-umi@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/babel-preset-umi/-/babel-preset-umi-3.5.20.tgz#722c41b64b5656e46be36a569da0a1e95c50e10e" - integrity sha512-EBvLi2aVkIiKAGmdDXkyx/pW4OJXqxvnSz54Za9r+kVZMbG5kT50ieqMk9yciNa+1JzHGiY+XZl0f0YF9pStAg== +"@umijs/babel-preset-umi@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/babel-preset-umi/-/babel-preset-umi-3.5.23.tgz#0f3494aefc1f77afc1b791d06bed5f412597f4d0" + integrity sha512-RRPhP5jmhvZnfGDV0jpBMw6eV7oFjdxVd47++Gt1N3L8QVhHpSDn9AZ3ww0xg5Ffn7SK7wfsgMiEXKzfuKbqGw== dependencies: "@babel/runtime" "7.12.5" - "@umijs/babel-plugin-auto-css-modules" "3.5.20" - "@umijs/babel-plugin-import-to-await-require" "3.5.20" - "@umijs/babel-plugin-lock-core-js-3" "3.5.20" - "@umijs/babel-plugin-no-anonymous-default-export" "3.5.20" - "@umijs/deps" "3.5.20" - -"@umijs/bundler-utils@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/bundler-utils/-/bundler-utils-3.5.20.tgz#0f553c3519b793082498364135d6b96ea65c245b" - integrity sha512-9tg8Dq3ufChaeLVE3RaMNrdtzru7ev/JX9lFUgUXnTladGp4mhPiBHv1bbx0X2I+ZTlRJAplQDKMAq4zkonUXw== - dependencies: - "@umijs/babel-preset-umi" "3.5.20" - "@umijs/types" "3.5.20" - "@umijs/utils" "3.5.20" - -"@umijs/bundler-webpack@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/bundler-webpack/-/bundler-webpack-3.5.20.tgz#4cfb9f21ba3e55d6e1ce002a0b64e7a24ba6a1aa" - integrity sha512-eGcxaUKTuAXd46uu6d9/B0SwqgR06zaay3iD1AQCle8x3zKilVBT62L+H8IbM0mB/3XFvIXMOxOBGMHPVr+tCQ== - dependencies: - "@umijs/bundler-utils" "3.5.20" - "@umijs/deps" "3.5.20" - "@umijs/types" "3.5.20" - "@umijs/utils" "3.5.20" + "@umijs/babel-plugin-auto-css-modules" "3.5.23" + "@umijs/babel-plugin-import-to-await-require" "3.5.23" + "@umijs/babel-plugin-lock-core-js-3" "3.5.23" + "@umijs/babel-plugin-no-anonymous-default-export" "3.5.23" + "@umijs/deps" "3.5.23" + +"@umijs/bundler-utils@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/bundler-utils/-/bundler-utils-3.5.23.tgz#16c5bfb543bc1fff64741a793c89f78c309029ee" + integrity sha512-kz1RdnTTQ0CL2vP562W2FxPliq9jfUMQYXi6V23/yL6pJwHgfeJG5z5qIB3rDg1ZC0u3bmxyD5Psa0ILs69ooA== + dependencies: + "@umijs/babel-preset-umi" "3.5.23" + "@umijs/types" "3.5.23" + "@umijs/utils" "3.5.23" + +"@umijs/bundler-webpack@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/bundler-webpack/-/bundler-webpack-3.5.23.tgz#1c950dee615c119dcc49aeffe8ca73e0ffdf86eb" + integrity sha512-9o25KjriAmfffhbBiLXTny607sX6PLOVYPH5RUXDoktquE4goTBc4j3m3bNYaYUvrCMjk8Rrm6K0ytS20Yyl3g== + dependencies: + "@umijs/bundler-utils" "3.5.23" + "@umijs/deps" "3.5.23" + "@umijs/types" "3.5.23" + "@umijs/utils" "3.5.23" jest-worker "26.6.2" node-libs-browser "2.2.1" normalize-url "1.9.1" @@ -1260,20 +1355,20 @@ terser "5.6.0" webpack-chain "6.5.1" -"@umijs/core@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/core/-/core-3.5.20.tgz#c320baa50016a103c163225dafd977c6d80e4038" - integrity sha512-XiNHL3cZ8tQAG3FFGkCcIyJGZADM/F53JMgshtKmWmpLWPmd623LUJP5Tz3ifad+4QhxkY3tOKBIoVbnCxwGkA== +"@umijs/core@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/core/-/core-3.5.23.tgz#cd8819ce6dd0a9fc6c8e775d2086c9416bcb51ba" + integrity sha512-Qr9hhXfTZETKqCcvxglw20CQCYz5/KyEo+IiOsYKbIbbFcUYooS6/YTtBtqcgzxkiKhYHQRAvUSlTdh2srBbSA== dependencies: - "@umijs/ast" "3.5.20" - "@umijs/babel-preset-umi" "3.5.20" - "@umijs/deps" "3.5.20" - "@umijs/utils" "3.5.20" + "@umijs/ast" "3.5.23" + "@umijs/babel-preset-umi" "3.5.23" + "@umijs/deps" "3.5.23" + "@umijs/utils" "3.5.23" -"@umijs/deps@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/deps/-/deps-3.5.20.tgz#002ad616fbe5c8b238f80fc9289d0aceb9b89c3c" - integrity sha512-75iqB0+ITFtxlLb945W2b6lVEgLWRFXaSQZD+wH6c4/WDiagOdYMWX9aiPs2JSzoM/yCtKpMaLeGbmVXsb7y4g== +"@umijs/deps@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/deps/-/deps-3.5.23.tgz#cb29269b7874d2c9645f60aad9e120a180b9be04" + integrity sha512-Z4Tq0GG6PQaguPWIVVtfi+ehruD4JJjTibPXIASxuMT9Xey076ZMY9rjCd5ZBlecFDde2lC53MOkyOcGniCAaQ== dependencies: "@bloomberg/record-tuple-polyfill" "0.0.3" chokidar "3.5.1" @@ -1281,6 +1376,7 @@ esbuild "0.12.15" jest-worker "24.9.0" prettier "2.2.1" + regenerate-unicode-properties "9.0.0" "@umijs/hooks@^1.9.3": version "1.9.3" @@ -1293,10 +1389,10 @@ resize-observer-polyfill "^1.5.1" screenfull "^5.0.0" -"@umijs/plugin-access@2.4.2": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@umijs/plugin-access/-/plugin-access-2.4.2.tgz#0bc4b63d9dc0a2a04a303a352556721c891a8b30" - integrity sha512-cP00Uh2kDEAgvQ/PwiR9d09js5x0k1PDvHqXN6B/kFt/Tz3u2C4yPy71d2C7KLWDIm1HTsWcoQtIqvJZwLmLJQ== +"@umijs/plugin-access@2.4.3": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@umijs/plugin-access/-/plugin-access-2.4.3.tgz#6bccbfe4969f43e58bc552a5ffbe247a2c33779a" + integrity sha512-6FON4aHzVFs/vtFK5Sdnw+FBolfoYi8wV8V9Q8x2T19NwjZtjXSPjt0gtrG4jdx4LRsSV2DKLaMGoJYbNr94aA== "@umijs/plugin-analytics@0.2.2": version "0.2.2" @@ -1393,21 +1489,21 @@ dependencies: "@umijs/test" "~3.5.14" -"@umijs/preset-built-in@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/preset-built-in/-/preset-built-in-3.5.20.tgz#e1f2eeb50152e14a48b317e7fd5e5915d5c65d4c" - integrity sha512-4qrYPdEDi0ewZ1gYyfbg9bRmbPtvaNTs3WlA574VPf77ntsZDsMUNNUfJSd/acQTzzbEajte2u8uq8q0yvZ4mA== +"@umijs/preset-built-in@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/preset-built-in/-/preset-built-in-3.5.23.tgz#b8245950074a1064b8e84be8ad3a0e2fb7198026" + integrity sha512-I2PlEiH4Llu4i4txw+01Cr2hWLUBZUxtJN3fzUR3vOsS6aT9nWppTLxJ3QQXA0o9USKKpmtnLyUzRpu0eg1PWQ== dependencies: "@types/react-router-config" "5.0.2" - "@umijs/babel-preset-umi" "3.5.20" - "@umijs/bundler-webpack" "3.5.20" - "@umijs/deps" "3.5.20" - "@umijs/renderer-mpa" "3.5.20" - "@umijs/renderer-react" "3.5.20" - "@umijs/runtime" "3.5.20" - "@umijs/server" "3.5.20" - "@umijs/types" "3.5.20" - "@umijs/utils" "3.5.20" + "@umijs/babel-preset-umi" "3.5.23" + "@umijs/bundler-webpack" "3.5.23" + "@umijs/deps" "3.5.23" + "@umijs/renderer-mpa" "3.5.23" + "@umijs/renderer-react" "3.5.23" + "@umijs/runtime" "3.5.23" + "@umijs/server" "3.5.23" + "@umijs/types" "3.5.23" + "@umijs/utils" "3.5.23" ansi-html "^0.0.7" core-js "3.6.5" core-js-pure "^3.8.1" @@ -1425,11 +1521,11 @@ schema-utils "^3.0.0" "@umijs/preset-react@1.x": - version "1.8.30" - resolved "https://registry.yarnpkg.com/@umijs/preset-react/-/preset-react-1.8.30.tgz#eebf9b1e7195f598f6b6e183c2e50208d712d8df" - integrity sha512-l+l5r+x9cyqNxbtmUNqoibfV9UK/daiD2HjFiTql3wyKzR6cEIq+h8RQ+ehO9DmzU8Tu5LPRimT97MuOsMciOQ== + version "1.8.31" + resolved "https://registry.yarnpkg.com/@umijs/preset-react/-/preset-react-1.8.31.tgz#3f5a5604c8f9353685e990475bc15814059df6ce" + integrity sha512-zQRYJw68mgG6pPcy6GwAXFRC/XxATIGmiaFAZHt7aYDy3VCccmjNKjs1pXqrcHYmGhoa7TyjCHUYEuJSv0n8uw== dependencies: - "@umijs/plugin-access" "2.4.2" + "@umijs/plugin-access" "2.4.3" "@umijs/plugin-analytics" "0.2.2" "@umijs/plugin-antd" "0.13.0" "@umijs/plugin-crossorigin" "1.2.1" @@ -1442,40 +1538,40 @@ "@umijs/plugin-request" "2.8.0" "@umijs/plugin-test" "1.0.2" -"@umijs/renderer-mpa@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/renderer-mpa/-/renderer-mpa-3.5.20.tgz#2961ffe20dd27a46709ba9fdbd2c21f89fc8d115" - integrity sha512-lE1EA8kciz8YTpeRGPd2ZY+owH1lAuj6nkhvID9QRR8qTPRRunU0lZHMAW0C8NcnQ9kECbHblkPPbDG3NayZZA== +"@umijs/renderer-mpa@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/renderer-mpa/-/renderer-mpa-3.5.23.tgz#cf0809e58f31ecba70ed3c57b41f1c331846ce05" + integrity sha512-0IRYqU/dBxaOd62OtwdI6AjMZlTBf1jK+MQLLgyp4T5/Bl86YD7s3rpIiZ5ovGQcp3skpUTj48RCbnCgM19Qag== dependencies: "@types/react" "^16.9.43" "@types/react-dom" "^16.9.8" - "@umijs/runtime" "3.5.20" + "@umijs/runtime" "3.5.23" -"@umijs/renderer-react@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/renderer-react/-/renderer-react-3.5.20.tgz#50d17b1f63a6bf292d1891b9e9eca729ea58a57d" - integrity sha512-8ZEHxMmF0Rm5il9RjTbzn4DLd7FU8KkqAwRGcpNhMcsPxXkbieTfnQC+a0D7nvor0+vakygfCG7ZgXDkcO1W0Q== +"@umijs/renderer-react@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/renderer-react/-/renderer-react-3.5.23.tgz#bbed637151694f7c2f590ea0481550253f6a0870" + integrity sha512-7XSBbeMykdvIZd8MHWeRrLPZU+kkxaEHtPrTP++xd2sxH+0dLLcf+5Ze9sUuBfgZFylMT2ULxikBceOL2fgttw== dependencies: "@types/react" "^16.9.43" "@types/react-dom" "^16.9.8" "@types/react-router-config" "^5.0.2" - "@umijs/runtime" "3.5.20" + "@umijs/runtime" "3.5.23" react-router-config "5.1.1" -"@umijs/route-utils@^2.0.0", "@umijs/route-utils@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@umijs/route-utils/-/route-utils-2.0.4.tgz#951bf55c826d670c3acfff0566ceac63b7b74fea" - integrity sha512-YWxGHZhIMLrsiydu8P/v2SNuuqRfRbLaZ5mc1K9snTf6yQ+TEGFrpU8uLxp2iRBijMBD0CFyrWNuhlB/bvluUQ== +"@umijs/route-utils@^2.0.0", "@umijs/route-utils@^2.1.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@umijs/route-utils/-/route-utils-2.1.1.tgz#85d19351f888f105ce348aecfdc1234e13a93220" + integrity sha512-N2ftgkqDEPBau1WyAxJfTQOs78OAVJY/Grl90fDo6ui75Eww563FhWcTrribS8sJS33mv9gtSlBLJ3F9WPLVog== dependencies: "@qixian.cs/path-to-regexp" "^6.1.0" fast-deep-equal "^3.1.3" lodash.isequal "^4.5.0" memoize-one "^5.1.1" -"@umijs/runtime@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/runtime/-/runtime-3.5.20.tgz#d93adc55c9babe8e36638538146faef9aec87551" - integrity sha512-AADBzjzbydjMBpaA9nw1vNsaBA7YoUTV45tmUAf47Mn3sPlEknbUFOPryhZEsOFfkBvag7GysRNzgCJPxYiWIQ== +"@umijs/runtime@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/runtime/-/runtime-3.5.23.tgz#6c9a6df4b704022cc41dd3a6916595d3b344a44f" + integrity sha512-pRZNkaD3E0dowzJGlZNRlSsIwuE2B36Zij6MnZvUvkSkh9/4Zt1paxWu4AagLFVUsaPF0dkGeG/Ra8kjtUygTg== dependencies: "@types/react-router" "5.1.12" "@types/react-router-dom" "5.1.7" @@ -1484,22 +1580,27 @@ react-router-dom "5.2.0" use-subscription "1.5.1" -"@umijs/server@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/server/-/server-3.5.20.tgz#fa6d8b17688b1fceb4aef14e1bc383eeaa899d9d" - integrity sha512-upIahEP5+Xb4e9GIjFWWF5boHRvINuVgtn21ySt9335JkT24wIRsInMgrQJ6WvqCxckSg0g0/hpxIJWCcIhIkw== +"@umijs/server@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/server/-/server-3.5.23.tgz#c0f0cc4f03f9927282c4e2ab579caff66d6f921e" + integrity sha512-xHVzVykIS17vQQUNQPXvTREm62Zlqsqzkh3xq2JdKgo84Gdf11BRtOSBrVsn3FpnURf4mXwcv8ccVYbs9l90Rw== dependencies: - "@umijs/deps" "3.5.20" - "@umijs/utils" "3.5.20" + "@umijs/deps" "3.5.23" + "@umijs/utils" "3.5.23" + +"@umijs/ssr-darkreader@^4.9.44": + version "4.9.45" + resolved "https://registry.yarnpkg.com/@umijs/ssr-darkreader/-/ssr-darkreader-4.9.45.tgz#7f13cfc89616f3203290775eb61b53047ece1733" + integrity sha512-XlcwzSYQ/SRZpHdwIyMDS4FOGX5kP4U/2g2mykyn/iPQTK4xTiQAyBu6UnnDnn7d5P8s7Atzh1C7H0ETNOypJg== "@umijs/test@^3.4.25", "@umijs/test@~3.5.14": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/test/-/test-3.5.20.tgz#124ee8dd614b56b7774afa3f5dd8df5167de3d8a" - integrity sha512-nxDdKDJYPMgYCEugvbyXbFjwNF/RL+TOLsBUmWzmciiz6PWVghJXrkSkDu2Ii5XO88G7l4xPo4cmReCWBw5I3A== + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/test/-/test-3.5.23.tgz#ed1b1b0e077e9e013d7d543385f3feefd8b05f56" + integrity sha512-ipglpweW2wEwc+8sER3DdEI/x8n71Dlc70WIkmNMKYbdnYHhgprY58ayR2HKCyjb1t5pBj24j9Vhw8B5anJ9GQ== dependencies: "@babel/core" "7.12.10" - "@umijs/babel-preset-umi" "3.5.20" - "@umijs/utils" "3.5.20" + "@umijs/babel-preset-umi" "3.5.23" + "@umijs/utils" "3.5.23" babel-core "7.0.0-bridge.0" babel-jest "^26.6.3" core-js "3.8.2" @@ -1510,17 +1611,17 @@ regenerator-runtime "^0.13.7" whatwg-fetch "^3.5.0" -"@umijs/types@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/types/-/types-3.5.20.tgz#3a459ec8e85b2ab53e21a4907ff76f544648f522" - integrity sha512-g2Eesf6tLfKdS6lRNDG4YYG3cEYKYsD5FWcziM12fpAV9u8wEmxxhpc+GeSgtQ5s/FT7B7A1WoX8YmSJgupM/w== - dependencies: - "@umijs/babel-preset-umi" "3.5.20" - "@umijs/core" "3.5.20" - "@umijs/deps" "3.5.20" - "@umijs/renderer-react" "3.5.20" - "@umijs/server" "3.5.20" - "@umijs/utils" "3.5.20" +"@umijs/types@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/types/-/types-3.5.23.tgz#725c2c3bdf869a3e5cb7d6404a0addb83d6da8fa" + integrity sha512-kgx1tRfNH8OqZMHBEgEoJnxGBS2kBw15yYv8aqHR6B7fLrT3WL4Ds/asE8Apq5WN+6/qzpiT8z1RdkoEdyLPsQ== + dependencies: + "@umijs/babel-preset-umi" "3.5.23" + "@umijs/core" "3.5.23" + "@umijs/deps" "3.5.23" + "@umijs/renderer-react" "3.5.23" + "@umijs/server" "3.5.23" + "@umijs/utils" "3.5.23" webpack-chain "6.5.1" "@umijs/use-params@^1.0.9": @@ -1537,17 +1638,24 @@ lodash.throttle "^4.1.1" umi-request "^1.2.17" -"@umijs/utils@3.5.20": - version "3.5.20" - resolved "https://registry.yarnpkg.com/@umijs/utils/-/utils-3.5.20.tgz#45e89eeac734a3963205d55b0f533bd96492f3b9" - integrity sha512-Y0i27zZTCKoqdHHyTuebO/GOIY4gGLUwDFs1eoH+m4etPn+uRq0iax9KJOkelmax2K3YLsT4KbRwM1enlSsv3A== +"@umijs/utils@3.5.23": + version "3.5.23" + resolved "https://registry.yarnpkg.com/@umijs/utils/-/utils-3.5.23.tgz#5c26746380c4f3db21631f3ae0c38cc7d3b1ec6a" + integrity sha512-3uGD7DeuQrhfWZBnm3ry7PvP7jZwmdps5na+7TsI1/XpjyIWLWxbuy5vYQszi/1spKA3eIB0UNW9PrroAVxMIg== dependencies: - "@umijs/deps" "3.5.20" + "@umijs/deps" "3.5.23" + +"@volcengine/rtc@^4.36.0": + version "4.38.1" + resolved "https://registry.yarnpkg.com/@volcengine/rtc/-/rtc-4.38.1.tgz#58fa3f75a18c01cc6fb5b4ee3488fc3966bf0017" + integrity sha512-9nRWxHFW9wz856Y7KpCyu4X0oQD/3n8lw+w5ebe0v7RRLqIrczISDfkJU0xUmfZ8+KdXj6O7bN9T3ednerbKzg== + dependencies: + eventemitter3 "^4.0.7" abab@^2.0.0, abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== acorn-globals@^4.3.0: version "4.3.4" @@ -1591,9 +1699,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.6.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895" - integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw== + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== add-dom-event-listener@^1.1.0: version "1.1.0" @@ -1605,7 +1713,7 @@ add-dom-event-listener@^1.1.0: after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= + integrity sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA== agent-base@6: version "6.0.2" @@ -1643,9 +1751,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.8.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" - integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== + version "8.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" + integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1653,9 +1761,9 @@ ajv@^8.0.1: uri-js "^4.2.2" ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + version "4.1.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: version "4.3.2" @@ -1667,7 +1775,7 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: ansi-html@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= + integrity sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA== ansi-regex@^5.0.0, ansi-regex@^5.0.1: version "5.0.1" @@ -1718,52 +1826,53 @@ antd-mobile@^2.3.1: rmc-tooltip "~1.0.0" antd@^4.1.2, antd@^4.1.3, antd@^4.16.6: - version "4.17.4" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.17.4.tgz#fa409aa45f4ea2992fd6832889b4ac6d82d4786a" - integrity sha512-aiWi7TxAc7qAxbL412GSKpkWkL/wIhQe6ABuLLCiE1vqXnGTvav2Z0PiOUdFclZcfz2M2IofsUl2pLVN9I8iCg== + version "4.20.5" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.20.5.tgz#ac6a35f8ed2703dc94ac4661d5d10a88912be457" + integrity sha512-43bV1y9pXsccMBmThEPnk0FdPPl5oqEZs8wneKEtdUm6RusmAHxxWnWGgoqdVsEP2ASRDcwyhECTLu2oPw88ug== dependencies: "@ant-design/colors" "^6.0.0" "@ant-design/icons" "^4.7.0" "@ant-design/react-slick" "~0.28.1" "@babel/runtime" "^7.12.5" "@ctrl/tinycolor" "^3.4.0" - array-tree-filter "^2.1.0" classnames "^2.2.6" copy-to-clipboard "^3.2.0" lodash "^4.17.21" memoize-one "^6.0.0" - moment "^2.25.3" - rc-cascader "~2.3.0" + moment "^2.29.2" + rc-cascader "~3.5.0" rc-checkbox "~2.3.0" rc-collapse "~3.1.0" - rc-dialog "~8.6.0" + rc-dialog "~8.8.1" rc-drawer "~4.4.2" - rc-dropdown "~3.2.0" - rc-field-form "~1.21.0" - rc-image "~5.2.5" + rc-dropdown "~3.5.0" + rc-field-form "~1.26.1" + rc-image "~5.6.0" + rc-input "~0.0.1-alpha.5" rc-input-number "~7.3.0" - rc-mentions "~1.6.1" - rc-menu "~9.0.12" - rc-motion "^2.4.4" - rc-notification "~4.5.7" + rc-mentions "~1.7.0" + rc-menu "~9.5.5" + rc-motion "^2.5.1" + rc-notification "~4.6.0" rc-pagination "~3.1.9" - rc-picker "~2.5.17" - rc-progress "~3.1.0" + rc-picker "~2.6.4" + rc-progress "~3.2.1" rc-rate "~2.9.0" - rc-resize-observer "^1.1.2" - rc-select "~13.2.1" - rc-slider "~9.7.4" + rc-resize-observer "^1.2.0" + rc-segmented "~2.1.0 " + rc-select "~14.1.1" + rc-slider "~10.0.0" rc-steps "~4.1.0" rc-switch "~3.2.0" - rc-table "~7.19.0" - rc-tabs "~11.10.0" + rc-table "~7.24.0" + rc-tabs "~11.13.0" rc-textarea "~0.3.0" rc-tooltip "~5.1.1" - rc-tree "~5.3.0" - rc-tree-select "~4.8.0" + rc-tree "~5.5.0" + rc-tree-select "~5.3.0" rc-trigger "^5.2.10" rc-upload "~4.3.0" - rc-util "^5.14.0" + rc-util "^5.20.0" scroll-into-view-if-needed "^2.2.25" anymatch@^2.0.0: @@ -1797,7 +1906,7 @@ argparse@^1.0.7: arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== arr-flatten@^1.1.0: version "1.1.0" @@ -1807,21 +1916,21 @@ arr-flatten@^1.1.0: arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" - integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= + integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA== -array-includes@^3.1.3, array-includes@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" - integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== +array-includes@^3.1.4: + version "3.1.5" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb" + integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" + define-properties "^1.1.4" + es-abstract "^1.19.5" get-intrinsic "^1.1.1" is-string "^1.0.7" @@ -1838,16 +1947,17 @@ array-union@^2.1.0: array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== array.prototype.flatmap@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" - integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f" + integrity sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.19.0" + es-abstract "^1.19.2" + es-shim-unscopables "^1.0.0" arraybuffer.slice@~0.0.7: version "0.0.7" @@ -1857,7 +1967,7 @@ arraybuffer.slice@~0.0.7: asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= + integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== asn1.js@^5.2.0: version "5.4.1" @@ -1879,7 +1989,7 @@ asn1@~0.2.3: assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== assert@^1.1.1: version "1.5.0" @@ -1892,7 +2002,7 @@ assert@^1.1.1: assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== astral-regex@^2.0.0: version "2.0.0" @@ -1904,15 +2014,15 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async-validator@^4.0.2: - version "4.0.7" - resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.0.7.tgz#034a0fd2103a6b2ebf010da75183bec299247afe" - integrity sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ== +async-validator@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.1.1.tgz#3cd1437faa2de64743f7d56649dd904c946a18fe" + integrity sha512-p4DO/JXwjs8klJyJL8Q2oM4ks5fUTze/h5k10oPPKMiLe1fj3G1QMzPHNmN1Py4ycOk7WlO2DcGXv1qiESJCZA== asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== atob@^2.1.2: version "2.1.2" @@ -1935,7 +2045,7 @@ autoprefixer@^9.6.1: aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.8.0: version "1.11.0" @@ -2009,6 +2119,22 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" +"babel-plugin-styled-components@>= 1.12.0": + version "2.0.7" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086" + integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.0" + "@babel/helper-module-imports" "^7.16.0" + babel-plugin-syntax-jsx "^6.18.0" + lodash "^4.17.11" + picomatch "^2.3.0" + +babel-plugin-syntax-jsx@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw== + babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" @@ -2038,7 +2164,7 @@ babel-preset-jest@^26.6.2: babel-runtime@6.x, babel-runtime@^6.23.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== dependencies: core-js "^2.4.0" regenerator-runtime "^0.11.0" @@ -2046,7 +2172,7 @@ babel-runtime@6.x, babel-runtime@^6.23.0, babel-runtime@^6.26.0: backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA== balanced-match@^1.0.0: version "1.0.2" @@ -2056,7 +2182,7 @@ balanced-match@^1.0.0: base64-arraybuffer@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" - integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= + integrity sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg== base64-js@^1.0.2: version "1.5.1" @@ -2079,7 +2205,7 @@ base@^0.11.1: bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== dependencies: tweetnacl "^0.14.3" @@ -2139,7 +2265,7 @@ braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -2149,7 +2275,7 @@ braces@^3.0.1, braces@~3.0.2: brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== browser-process-hrtime@^1.0.0: version "1.0.0" @@ -2217,15 +2343,15 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4.6.4: - version "4.19.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" - integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== +browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.6.4: + version "4.20.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf" + integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg== dependencies: - caniuse-lite "^1.0.30001286" - electron-to-chromium "^1.4.17" + caniuse-lite "^1.0.30001332" + electron-to-chromium "^1.4.118" escalade "^3.1.1" - node-releases "^2.0.1" + node-releases "^2.0.3" picocolors "^1.0.0" bser@2.1.1: @@ -2243,7 +2369,7 @@ buffer-from@^1.0.0: buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== buffer@^4.3.0: version "4.9.2" @@ -2257,7 +2383,7 @@ buffer@^4.3.0: builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== cache-base@^1.0.1: version "1.0.1" @@ -2285,21 +2411,21 @@ call-bind@^1.0.0, call-bind@^1.0.2: caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= + integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ== dependencies: callsites "^2.0.0" caller-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= + integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A== dependencies: caller-callsite "^2.0.0" callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ== callsites@^3.0.0: version "3.1.0" @@ -2312,14 +2438,19 @@ camelcase@^5.0.0, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== camelcase@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +camelize@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" + integrity sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg== -caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286: - version "1.0.30001292" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz#4a55f61c06abc9595965cfd77897dc7bc1cdc456" - integrity sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw== +caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001332: + version "1.0.30001341" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz#59590c8ffa8b5939cf4161f00827b8873ad72498" + integrity sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA== capture-exit@^2.0.0: version "2.0.0" @@ -2331,7 +2462,7 @@ capture-exit@^2.0.0: caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2: version "2.4.2" @@ -2371,9 +2502,9 @@ chokidar@3.5.1: fsevents "~2.3.1" "chokidar@>=3.0.0 <4.0.0": - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -2610,9 +2741,9 @@ copy-to-clipboard@^3.2.0: toggle-selection "^1.0.6" core-js-pure@^3.8.1: - version "3.20.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.20.0.tgz#7253feccf8bb05b72c153ddccdbe391ddbffbe03" - integrity sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg== + version "3.22.5" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.5.tgz#bdee0ed2f9b78f2862cda4338a07b13a49b6c9a9" + integrity sha512-8xo9R00iYD7TcV7OrC98GwxiUEAabVWO3dix+uyWjnYrx9fyASLlIX+f/3p5dW5qByaP2bcZ8X/T47s55et/tA== core-js@3.6.5: version "3.6.5" @@ -2772,6 +2903,11 @@ css-blank-pseudo@^0.1.4: dependencies: postcss "^7.0.5" +css-color-keywords@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" + integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= + css-has-pseudo@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee" @@ -2787,6 +2923,15 @@ css-prefers-color-scheme@^3.1.1: dependencies: postcss "^7.0.5" +css-to-react-native@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" + integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ== + dependencies: + camelize "^1.0.0" + css-color-keywords "^1.0.0" + postcss-value-parser "^4.0.2" + cssdb@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0" @@ -2827,9 +2972,9 @@ cssstyle@^2.3.0: cssom "~0.3.6" csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" + integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== dashdash@^1.12.0: version "1.14.1" @@ -2857,19 +3002,19 @@ data-urls@^2.0.0: whatwg-url "^8.0.0" date-fns@2.x: - version "2.27.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.27.0.tgz#e1ff3c3ddbbab8a2eaadbb6106be2929a5a2d92b" - integrity sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q== + version "2.28.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2" + integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw== dayjs@1.x: - version "1.10.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" - integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== + version "1.11.2" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" + integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -2922,12 +3067,13 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== +define-properties@^1.1.3, define-properties@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== dependencies: - object-keys "^1.0.12" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" define-property@^0.2.5: version "0.2.5" @@ -3005,9 +3151,9 @@ doctrine@^3.0.0: esutils "^2.0.2" dom-align@1.x, dom-align@^1.7.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.2.tgz#0f8164ebd0c9c21b0c790310493cd855892acd4b" - integrity sha512-pHuazgqrsTFrGU2WLDdXxCFabkdQDx72ddkraZNih1KsMcN5qsRSTR9O4VJRlwTPCPb5COYg3LOfiMHHcPInHg== + version "1.12.3" + resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.3.tgz#a36d02531dae0eefa2abb0c4db6595250526f103" + integrity sha512-Gj9hZN3a07cbR6zviMUBOMPdWxYhbMI+x+WS0NAIu2zFZmbK8ys9R79g+iG9qLnlCwpFoaB+fKy8Pdv470GsPA== dom-walk@^0.1.0: version "0.1.2" @@ -3095,10 +3241,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.4.17: - version "1.4.27" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.27.tgz#bfc6e798d8a56a17d658312f4b7ae1a7ca87724f" - integrity sha512-uZ95szi3zUbzRDx1zx/xnsCG+2xgZyy57pDOeaeO4r8zx5Dqe8Jv1ti8cunvBwJHVI5LzPuw8umKwZb3WKYxSQ== +electron-to-chromium@^1.4.118: + version "1.4.137" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" + integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== elliptic@^6.5.3: version "6.5.4" @@ -3185,43 +3331,53 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" error-stack-parser@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" - integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== + version "2.0.7" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.7.tgz#b0c6e2ce27d0495cf78ad98715e0cad1219abb57" + integrity sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA== dependencies: stackframe "^1.1.1" -es-abstract@^1.19.0, es-abstract@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" - integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== +es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: + version "1.20.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" + integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + function.prototype.name "^1.1.5" get-intrinsic "^1.1.1" get-symbol-description "^1.0.0" has "^1.0.3" - has-symbols "^1.0.2" + has-property-descriptors "^1.0.0" + has-symbols "^1.0.3" internal-slot "^1.0.3" is-callable "^1.2.4" - is-negative-zero "^2.0.1" + is-negative-zero "^2.0.2" is-regex "^1.1.4" - is-shared-array-buffer "^1.0.1" + is-shared-array-buffer "^1.0.2" is-string "^1.0.7" - is-weakref "^1.0.1" - object-inspect "^1.11.0" + is-weakref "^1.0.2" + object-inspect "^1.12.0" object-keys "^1.1.1" object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.1" + regexp.prototype.flags "^1.4.3" + string.prototype.trimend "^1.0.5" + string.prototype.trimstart "^1.0.5" + unbox-primitive "^1.0.2" es-module-lexer@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== +es-shim-unscopables@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" + integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== + dependencies: + has "^1.0.3" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -3286,9 +3442,9 @@ escodegen@^2.0.0: source-map "~0.6.1" eslint-config-prettier@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" - integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== + version "8.5.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" + integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== eslint-plugin-prettier@^3.4.0: version "3.4.1" @@ -3298,26 +3454,26 @@ eslint-plugin-prettier@^3.4.0: prettier-linter-helpers "^1.0.0" eslint-plugin-react-hooks@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" - integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== + version "4.5.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz#5f762dfedf8b2cf431c689f533c9d3fa5dcf25ad" + integrity sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw== eslint-plugin-react@^7.11.1: - version "7.28.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz#8f3ff450677571a659ce76efc6d80b6a525adbdf" - integrity sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw== + version "7.29.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2" + integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ== dependencies: array-includes "^3.1.4" array.prototype.flatmap "^1.2.5" doctrine "^2.1.0" estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" - minimatch "^3.0.4" + minimatch "^3.1.2" object.entries "^1.1.5" object.fromentries "^2.0.5" object.hasown "^1.1.0" object.values "^1.1.5" - prop-types "^15.7.2" + prop-types "^15.8.1" resolve "^2.0.0-next.3" semver "^6.3.0" string.prototype.matchall "^4.0.6" @@ -3609,10 +3765,10 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== +fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -3715,9 +3871,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.4" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2" - integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw== + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== flatten@^1.0.2: version "1.0.3" @@ -3789,11 +3945,26 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function.prototype.name@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" + integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.0" + functions-have-names "^1.2.2" + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +functions-have-names@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + gensync@^1.0.0-beta.1, 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" @@ -3870,14 +4041,14 @@ glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: is-glob "^4.0.1" glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" @@ -3895,28 +4066,28 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e" - integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg== + version "13.15.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac" + integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog== dependencies: type-fest "^0.20.2" globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" slash "^3.0.0" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.4: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== growly@^1.3.0: version "1.3.0" @@ -3941,10 +4112,10 @@ harmony-reflect@^1.4.6: resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g== -has-bigints@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== +has-bigints@^1.0.1, has-bigints@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== has-binary2@~1.0.2: version "1.0.3" @@ -3968,10 +4139,17 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + +has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-tostringtag@^1.0.0: version "1.0.0" @@ -4048,6 +4226,13 @@ history-with-query@4.10.4: tiny-warning "^1.0.0" value-equal "^1.0.1" +history@*: + version "5.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" + integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== + dependencies: + "@babel/runtime" "^7.7.6" + history@^4.7.2, history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" @@ -4069,7 +4254,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -4096,9 +4281,9 @@ html-encoding-sniffer@^2.0.1: whatwg-encoding "^1.0.5" html-entities@^2.1.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" - integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== + version "2.3.3" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" + integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== html-escaper@^2.0.0: version "2.0.2" @@ -4129,9 +4314,9 @@ https-browserify@^1.0.0: integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -4181,7 +4366,7 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4, ignore@^5.1.8: +ignore@^5.1.8, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -4232,9 +4417,9 @@ import-from@^2.1.0: resolve-from "^3.0.0" import-local@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" - integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -4393,10 +4578,10 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== +is-core-module@^2.2.0, is-core-module@^2.8.1: + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== dependencies: has "^1.0.3" @@ -4483,15 +4668,15 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-negative-zero@^2.0.1: +is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== dependencies: has-tostringtag "^1.0.0" @@ -4542,10 +4727,12 @@ is-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= -is-shared-array-buffer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" - integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== +is-shared-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" @@ -4581,7 +4768,7 @@ is-unicode-supported@^0.1.0: resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== -is-weakref@^1.0.1: +is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== @@ -4679,9 +4866,9 @@ istanbul-lib-instrument@^4.0.3: semver "^6.3.0" istanbul-lib-instrument@^5.0.4: - version "5.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" - integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== + version "5.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f" + integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -4708,9 +4895,9 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.1.tgz#7085857f17d2441053c6ce5c3b8fdf6882289397" - integrity sha512-q1kvhAXWSsXfMjCdNHNPKZZv94OlspKnoGv+R9RGbnqOOQ0VbNfLFgQDVgi7hHenKsndGq3/o0OBdzDXthWcNw== + version "3.1.4" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" + integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -5318,12 +5505,10 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" +json5@^2.1.2, json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== jsprim@^1.2.2: version "1.4.2" @@ -5336,11 +5521,11 @@ jsprim@^1.2.2: verror "1.10.0" "jsx-ast-utils@^2.4.1 || ^3.0.0": - version "3.2.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" - integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== + version "3.3.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz#e624f259143b9062c92b6413ff92a164c80d3ccb" + integrity sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q== dependencies: - array-includes "^3.1.3" + array-includes "^3.1.4" object.assign "^4.1.2" kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: @@ -5420,16 +5605,16 @@ lint-staged@^10.0.7: stringify-object "^3.3.0" listr2@^3.2.2: - version "3.13.5" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.13.5.tgz#105a813f2eb2329c4aae27373a281d610ee4985f" - integrity sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA== + version "3.14.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e" + integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g== dependencies: cli-truncate "^2.1.0" colorette "^2.0.16" log-update "^4.0.0" p-map "^4.0.0" rfdc "^1.3.0" - rxjs "^7.4.0" + rxjs "^7.5.1" through "^2.3.8" wrap-ansi "^7.0.0" @@ -5502,7 +5687,7 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= -lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: +lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5597,7 +5782,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0: +merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -5622,12 +5807,12 @@ micromatch@^3.1.10, micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" miller-rabin@^4.0.0: version "4.0.1" @@ -5637,17 +5822,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.51.0: - version "1.51.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" - integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.34" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" - integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: - mime-db "1.51.0" + mime-db "1.52.0" mime@1.3.6: version "1.3.6" @@ -5684,17 +5869,17 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mixin-deep@^1.2.0: version "1.3.2" @@ -5705,16 +5890,16 @@ mixin-deep@^1.2.0: is-extendable "^1.0.1" mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" -moment@^2.24.0, moment@^2.25.3, moment@^2.27.0, moment@^2.29.1: - version "2.29.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" - integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== +moment@^2.24.0, moment@^2.27.0, moment@^2.29.1, moment@^2.29.2: + version "2.29.3" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" + integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== ms@2.0.0: version "2.0.0" @@ -5817,10 +6002,10 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" - integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== +node-releases@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476" + integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ== normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" @@ -5912,12 +6097,12 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.11.0, object-inspect@^1.9.0: +object-inspect@^1.12.0, object-inspect@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== -object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -5967,12 +6152,12 @@ object.getownpropertydescriptors@^2.1.1: es-abstract "^1.19.1" object.hasown@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" - integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3" + integrity sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A== dependencies: - define-properties "^1.1.3" - es-abstract "^1.19.1" + define-properties "^1.1.4" + es-abstract "^1.19.5" object.pick@^1.3.0: version "1.3.0" @@ -6177,7 +6362,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: +path-parse@^1.0.6, path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -6232,10 +6417,10 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.0, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^3.0.0: version "3.0.0" @@ -6243,9 +6428,9 @@ pify@^3.0.0: integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= pirates@^4.0.1: - version "4.0.4" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6" - integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw== + version "4.0.5" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== pkg-dir@^4.2.0: version "4.2.0" @@ -6579,14 +6764,14 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: uniq "^1.0.1" postcss-selector-parser@^6.0.2: - version "6.0.8" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz#f023ed7a9ea736cd7ef70342996e8e78645a7914" - integrity sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ== + version "6.0.10" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" + integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -6645,9 +6830,9 @@ prettier@2.2.1: integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== prettier@^2.2.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" - integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== + version "2.6.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" + integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== pretty-format@^26.6.2: version "26.6.2" @@ -6689,10 +6874,10 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2: - version "15.8.0" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588" - integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g== +prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" @@ -6744,16 +6929,16 @@ punycode@^2.1.0, punycode@^2.1.1: integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== qs@^6.9.1: - version "6.10.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe" - integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw== + version "6.10.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" + integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== dependencies: side-channel "^1.0.4" qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.5.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== query-string@^4.1.0: version "4.3.4" @@ -6821,9 +7006,9 @@ rc-align@^2.4.0: rc-util "^4.0.4" rc-align@^4.0.0: - version "4.0.11" - resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.11.tgz#8198c62db266bc1b8ef05e56c13275bf72628a5e" - integrity sha512-n9mQfIYQbbNTbefyQnRHZPWuTEwG1rY4a9yKlIWHSTbgwI+XUMGRYd0uJ5pE2UbrNX0WvnMBA1zJ3Lrecpra/A== + version "4.0.12" + resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.12.tgz#065b5c68a1cc92a00800c9239320d9fdf5f16207" + integrity sha512-3DuwSJp8iC/dgHzwreOQl52soj40LchlfUHtgACOUtwGuoFIOVh6n/sCpfqCU8kO5+iz6qR0YKvjgB8iPdE3aQ== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -6845,18 +7030,17 @@ rc-animate@2.x, rc-animate@^2.4.4: rc-util "^4.15.3" react-lifecycles-compat "^3.0.4" -rc-cascader@~2.3.0: - version "2.3.3" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-2.3.3.tgz#605d04ef469cdd5d892e38cce291157d5a8af941" - integrity sha512-ckD8rKJjS8mdXxylWh1PtIHSFhbj/yf1NimyooqeJlvtLhzRZXIHCj4IuOjwYZ6J1DqoOCCdJfVtc7UeZia38w== +rc-cascader@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.5.0.tgz#a49b632bc2d0c8ef31b212c8ddd0bea346e64877" + integrity sha512-rpXnWCfvk7Frh2dBzMoA0c7i0nn6aJU7L2NZo8R8pNkrT0sKgytQSpdtPWP+Pq8IkvwbEd8BU8Z8OnOljcqgZg== dependencies: "@babel/runtime" "^7.12.5" array-tree-filter "^2.1.0" classnames "^2.3.1" - rc-tree-select "~4.8.0" - rc-trigger "^5.0.4" + rc-select "~14.1.0" + rc-tree "~5.5.0" rc-util "^5.6.1" - warning "^4.0.1" rc-checkbox@~2.0.0: version "2.0.3" @@ -6887,9 +7071,9 @@ rc-collapse@~1.9.1: rc-animate "2.x" rc-collapse@~3.1.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.2.tgz#76028a811b845d03d9460ccc409c7ea8ad09db14" - integrity sha512-HujcKq7mghk/gVKeI6EjzTbb8e19XUZpakrYazu1MblEZ3Hu3WBMSN4A3QmvbF6n1g7x6lUlZvsHZ5shABWYOQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.4.tgz#063e33fcc427a378e63da757898cd1fba6269679" + integrity sha512-WayrhswKMwuJab9xbqFxXTgV0m6X8uOPEO6zm/GJ5YJiJ/wIh/Dd2VtWeI06HYUEnTFv0HNcYv+zWbB+p6OD2A== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -6897,15 +7081,15 @@ rc-collapse@~3.1.0: rc-util "^5.2.1" shallowequal "^1.1.0" -rc-dialog@~8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.6.0.tgz#3b228dac085de5eed8c6237f31162104687442e7" - integrity sha512-GSbkfqjqxpZC5/zc+8H332+q5l/DKUhpQr0vdX2uDsxo5K0PhvaMEVjyoJUTkZ3+JstEADQji1PVLVb/2bJeOQ== +rc-dialog@~8.8.0, rc-dialog@~8.8.1: + version "8.8.1" + resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.8.1.tgz#cd8897fbee1de0eab6d237a6abe1e4db8d09dd72" + integrity sha512-7M1WKZCjfIABKEaJVskdYvb80z+RX7I11PeSjPVfLOOaJAmIepvDEd0alBtOZvOL3fZFWlMs4JVZtp9LZgONxA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" rc-motion "^2.3.0" - rc-util "^5.6.1" + rc-util "^5.21.0" rc-drawer@~4.4.2: version "4.4.3" @@ -6916,22 +7100,23 @@ rc-drawer@~4.4.2: classnames "^2.2.6" rc-util "^5.7.0" -rc-dropdown@^3.2.0, rc-dropdown@~3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-3.2.0.tgz#da6c2ada403842baee3a9e909a0b1a91ba3e1090" - integrity sha512-j1HSw+/QqlhxyTEF6BArVZnTmezw2LnSmRk6I9W7BCqNCKaRwleRmMMs1PHbuaG8dKHVqP6e21RQ7vPBLVnnNw== +rc-dropdown@~3.5.0: + version "3.5.2" + resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-3.5.2.tgz#2f1f4eeb36c07fb67cd599c0cb8e861da3de5527" + integrity sha512-Ty4LsXjkspZuFJSRx3blCLLCDicXM5qds6F1odgEa+jcjC+OJKHQGnvE4FqtoljPaqWm4wG78pbgXH6Ddh2DkA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" rc-trigger "^5.0.4" + rc-util "^5.17.0" -rc-field-form@~1.21.0: - version "1.21.2" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.21.2.tgz#85bda1ee006ae9f1d146e1000337c69b4bb6d101" - integrity sha512-LR/bURt/Tf5g39mb0wtMtQuWn42d/7kEzpzlC5fNC7yaRVmLTtlPP4sBBlaViETM9uZQKLoaB0Pt9Mubhm9gow== +rc-field-form@~1.26.1: + version "1.26.4" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.26.4.tgz#78553e0f317f0ed7ceea70b1b89d43865dddeb83" + integrity sha512-eCCyiNNaN0NTYTyoziQHD4Fj6mUED21lWkw66vg+kttg0eDw+miD6LsaJbTD5c2bzKjUJTf10AitPG+f5zT4+A== dependencies: "@babel/runtime" "^7.8.4" - async-validator "^4.0.2" + async-validator "^4.1.0" rc-util "^5.8.0" rc-gesture@~0.0.18, rc-gesture@~0.0.22: @@ -6941,14 +7126,14 @@ rc-gesture@~0.0.18, rc-gesture@~0.0.22: dependencies: babel-runtime "6.x" -rc-image@~5.2.5: - version "5.2.5" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.2.5.tgz#44e6ffc842626827960e7ab72e1c0d6f3a8ce440" - integrity sha512-qUfZjYIODxO0c8a8P5GeuclYXZjzW4hV/5hyo27XqSFo1DmTCs2HkVeQObkcIk5kNsJtgsj1KoPThVsSc/PXOw== +rc-image@~5.6.0: + version "5.6.2" + resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.6.2.tgz#31892b0b22aa5122fd9b1a067e9a4ba627004214" + integrity sha512-qhKOVvivCZkd6CrzS/4ST2+Auu16mtPSFVqVzwE7sELWfuvzcLGTzGv8UsVvm6qRNIz6SeaueUetqi4Ii16XQA== dependencies: "@babel/runtime" "^7.11.2" classnames "^2.2.6" - rc-dialog "~8.6.0" + rc-dialog "~8.8.0" rc-util "^5.0.6" rc-input-number@~7.3.0: @@ -6960,35 +7145,31 @@ rc-input-number@~7.3.0: classnames "^2.2.5" rc-util "^5.9.8" -rc-mentions@~1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.6.1.tgz#46035027d64aa33ef840ba0fbd411871e34617ae" - integrity sha512-LDzGI8jJVGnkhpTZxZuYBhMz3avcZZqPGejikchh97xPni/g4ht714Flh7DVvuzHQ+BoKHhIjobHnw1rcP8erg== +rc-input@~0.0.1-alpha.5: + version "0.0.1-alpha.7" + resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.0.1-alpha.7.tgz#53e3f13871275c21d92b51f80b698f389ad45dd3" + integrity sha512-eozaqpCYWSY5LBMwlHgC01GArkVEP+XlJ84OMvdkwUnJBSv83Yxa15pZpn7vACAj84uDC4xOA2CoFdbLuqB08Q== + dependencies: + "@babel/runtime" "^7.11.1" + classnames "^2.2.1" + rc-util "^5.18.1" + +rc-mentions@~1.7.0: + version "1.7.1" + resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.7.1.tgz#480ad04af4460ee01b6ccd9137fcea23067aa9be" + integrity sha512-JbCS9bTqt6BYN2vfTPythlScLuc42rIlX85n7975RnkfawXlJjskHOlR3o8EpD4asl4KuA2jKTy0dj39DtSVqg== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" - rc-menu "^9.0.0" + rc-menu "~9.5.1" rc-textarea "^0.3.0" rc-trigger "^5.0.4" rc-util "^5.0.1" -rc-menu@^9.0.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.1.0.tgz#784ee93f2453f6472b9245a39fd522a4a853dab5" - integrity sha512-y5NSQf7dyfRkihrqX3kU+Fa9Mq6z2mP420gDtEDo0COg5gV9b3oMBGlbPpVB+ZfH/8/EOnrv9rGWYKJdIi5Ujw== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-motion "^2.4.3" - rc-overflow "^1.2.0" - rc-trigger "^5.1.2" - rc-util "^5.12.0" - shallowequal "^1.1.0" - -rc-menu@~9.0.12: - version "9.0.14" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.0.14.tgz#289bda4a2f6c5ebb3248e2e305d52cf0c73cb9d5" - integrity sha512-CIox5mZeLDAi32SlHrV7UeSjv7tmJJhwRyxQtZCKt351w3q59XlL4WMFOmtT9gwIfP9h0XoxdBZUMe/xzkp78A== +rc-menu@~9.5.1, rc-menu@~9.5.5: + version "9.5.5" + resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.5.5.tgz#aa2f151d4191ed089dc1a8141fe365c9b77d61a9" + integrity sha512-wj2y2BAKwSMyWXO3RBf9sNN5V+DFWxFl45Ma6qQEHA5nwwh7p07bNgc6AAJc+L1+LAz+rWz3AU8PYyT17hMHCw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -6998,47 +7179,47 @@ rc-menu@~9.0.12: rc-util "^5.12.0" shallowequal "^1.1.0" -rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4: - version "2.4.4" - resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.4.4.tgz#e995d5fa24fc93065c24f714857cf2677d655bb0" - integrity sha512-ms7n1+/TZQBS0Ydd2Q5P4+wJTSOrhIrwNxLXCZpR7Fa3/oac7Yi803HDALc2hLAKaCTQtw9LmQeB58zcwOsqlQ== +rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.5.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.6.0.tgz#c60c3e7f15257f55a8cd7794a539f0e2cc751399" + integrity sha512-1MDWA9+i174CZ0SIDenSYm2Wb9YbRkrexjZWR0CUFu7D6f23E8Y0KsTgk9NGOLJsGak5ELZK/Y5lOlf5wQdzbw== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" - rc-util "^5.2.1" + rc-util "^5.21.0" -rc-notification@~4.5.7: - version "4.5.7" - resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.5.7.tgz#265e6e6a0c1a0fac63d6abd4d832eb8ff31522f1" - integrity sha512-zhTGUjBIItbx96SiRu3KVURcLOydLUHZCPpYEn1zvh+re//Tnq/wSxN4FKgp38n4HOgHSVxcLEeSxBMTeBBDdw== +rc-notification@~4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.6.0.tgz#4e76fc2d0568f03cc93ac18c9e20763ebe29fa46" + integrity sha512-xF3MKgIoynzjQAO4lqsoraiFo3UXNYlBfpHs0VWvwF+4pimen9/H1DYLN2mfRWhHovW6gRpla73m2nmyIqAMZQ== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.2.0" - rc-util "^5.0.1" + rc-util "^5.20.1" rc-overflow@^1.0.0, rc-overflow@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.2.2.tgz#95b0222016c0cdbdc0db85f569c262e7706a5f22" - integrity sha512-X5kj9LDU1ue5wHkqvCprJWLKC+ZLs3p4He/oxjZ1Q4NKaqKBaYf5OdSzRSgh3WH8kSdrfU8LjvlbWnHgJOEkNQ== + version "1.2.6" + resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.2.6.tgz#e99fabea04ce4fb13f0dd8835aef4e4cdd4c15a2" + integrity sha512-YqbocgzuQxfq2wZy72vdAgrgzzEuM/5d4gF9TBEodCpXPbUeXGrUXNm1J6G1MSkCU2N0ePIgCEu5qD/0Ldi63Q== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" rc-resize-observer "^1.0.0" - rc-util "^5.5.1" + rc-util "^5.19.2" rc-pagination@~3.1.9: - version "3.1.14" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.14.tgz#1f7d0342edb80dca0989e4ddbe937b1d4657d88d" - integrity sha512-tcugvxrtPiVU00Uh0IwC8NIUlxa4KtA9pXcaMNJdSHeO2uQqVkHEwllsULTAWRF3zRV2ozo2weP/DRKIUrX+Zg== + version "3.1.16" + resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.16.tgz#b0082108cf027eded18ed61d818d31897c343e81" + integrity sha512-GFcHXJ7XxeJDf9B+ndP4PRDt46maSSgYhiwofBMiIGKIlBhJ0wfu8DMCEvaWJJLpI2u4Gb6zF1dHpiqPFrosPg== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" -rc-picker@~2.5.17: - version "2.5.19" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.5.19.tgz#73d07546fac3992f0bfabf2789654acada39e46f" - integrity sha512-u6myoCu/qiQ0vLbNzSzNrzTQhs7mldArCpPHrEI6OUiifs+IPXmbesqSm0zilJjfzrZJLgYeyyOMSznSlh0GKA== +rc-picker@~2.6.4: + version "2.6.9" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.9.tgz#2f2f82c5340adbe3b30875a25e015c120eb88c9c" + integrity sha512-yH3UYXCADf7REtOAB5cwe1cyFKtB0p204RCN8JdZGG4uuSOZ1IPTkk/GJS6HOpxspZeJCLGzzajuQMDwck9dsw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" @@ -7049,13 +7230,14 @@ rc-picker@~2.5.17: rc-util "^5.4.0" shallowequal "^1.1.0" -rc-progress@~3.1.0: - version "3.1.4" - resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.1.4.tgz#66040d0fae7d8ced2b38588378eccb2864bad615" - integrity sha512-XBAif08eunHssGeIdxMXOmRQRULdHaDdIFENQ578CMb4dyewahmmfJRyab+hw4KH4XssEzzYOkAInTLS7JJG+Q== +rc-progress@~3.2.1: + version "3.2.4" + resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.2.4.tgz#4036acdae2566438545bc4df2203248babaf7549" + integrity sha512-M9WWutRaoVkPUPIrTpRIDpX0SPSrVHzxHdCRCbeoBFrd9UFWTYNWRlHsruJM5FH1AZI+BwB4wOJUNNylg/uFSw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" + rc-util "^5.16.1" rc-rate@~2.9.0: version "2.9.1" @@ -7066,39 +7248,50 @@ rc-rate@~2.9.0: classnames "^2.2.5" rc-util "^5.0.1" -rc-resize-observer@^0.2.1: - version "0.2.6" - resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-0.2.6.tgz#c1b642f6d1293e34c4e3715f47f69443a167b825" - integrity sha512-YX6nYnd6fk7zbuvT6oSDMKiZjyngjHoy+fz+vL3Tez38d/G5iGdaDJa2yE7345G6sc4Mm1IGRUIwclvltddhmA== +rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.2.0.tgz#9f46052f81cdf03498be35144cb7c53fd282c4c7" + integrity sha512-6W+UzT3PyDM0wVCEHfoW3qTHPTvbdSgiA43buiy8PzmeMnfgnDeb9NjdimMXMl3/TcrvvWl5RRVdp+NqcR47pQ== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" - rc-util "^5.0.0" + rc-util "^5.15.0" resize-observer-polyfill "^1.5.1" -rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.1.2.tgz#214bc5d0de19e0a5fcd7d8352d9c1560dd7531b7" - integrity sha512-Qp+1x6D88FxyWBFRYP95IV9A1o0xlkC6qhiTX3YakE+o86QH9IzC7UVnltwmm4Q8uYH+E3F/HRmEiuxXJECdSw== +"rc-segmented@~2.1.0 ": + version "2.1.0" + resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.1.0.tgz#0e0afe646c1a0e44a0e18785f518c42633ec8efc" + integrity sha512-hUlonro+pYoZcwrH6Vm56B2ftLfQh046hrwif/VwLIw1j3zGt52p5mREBwmeVzXnSwgnagpOpfafspzs1asjGw== dependencies: - "@babel/runtime" "^7.10.1" + "@babel/runtime" "^7.11.1" classnames "^2.2.1" - rc-util "^5.15.0" - resize-observer-polyfill "^1.5.1" + rc-motion "^2.4.4" + rc-util "^5.17.0" -rc-select@~13.2.1: - version "13.2.1" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-13.2.1.tgz#d69675f8bc72622a8f3bc024fa21bfee8d56257d" - integrity sha512-L2cJFAjVEeDiNVa/dlOVKE79OUb0J7sUBvWN3Viav3XHcjvv9Ovn4D8J9QhBSlDXeGuczZ81CZI3BbdHD25+Gg== +rc-select@~14.1.0, rc-select@~14.1.1: + version "14.1.3" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.3.tgz#36c5231f6c9a7f0a81a3d24d5eb412d06858781c" + integrity sha512-LfH493Ty4cSHGTDYPNepT5mOobu7I4TaDI/wGDm1tnqvxkiIkSdWfqYmysXR8bZDuyGcXi6D83xPauFu6an4zw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.0.1" rc-overflow "^1.0.0" rc-trigger "^5.0.4" - rc-util "^5.9.8" + rc-util "^5.16.1" rc-virtual-list "^3.2.0" +rc-slider@~10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.0.0.tgz#8ffe1dd3c8799c9d1f81ac808976f18af3dca206" + integrity sha512-Bk54UIKWW4wyhHcL8ehAxt+wX+n69dscnHTX6Uv0FMxSke/TGrlkZz1LSIWblCpfE2zr/dwR2Ca8nZGk3U+Tbg== + dependencies: + "@babel/runtime" "^7.10.1" + classnames "^2.2.5" + rc-tooltip "^5.0.1" + rc-util "^5.18.1" + shallowequal "^1.1.0" + rc-slider@~8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.2.0.tgz#ae37d17144cad60e1da6eac0ee4ffcfea0b0a6e8" @@ -7112,17 +7305,6 @@ rc-slider@~8.2.0: shallowequal "^1.0.1" warning "^3.0.0" -rc-slider@~9.7.4: - version "9.7.5" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.7.5.tgz#193141c68e99b1dc3b746daeb6bf852946f5b7f4" - integrity sha512-LV/MWcXFjco1epPbdw1JlLXlTgmWpB9/Y/P2yinf8Pg3wElHxA9uajN21lJiWtZjf5SCUekfSP6QMJfDo4t1hg== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.5" - rc-tooltip "^5.0.1" - rc-util "^5.16.1" - shallowequal "^1.1.0" - rc-steps@~4.1.0: version "4.1.4" resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-4.1.4.tgz#0ba82db202d59ca52d0693dc9880dd145b19dc23" @@ -7151,38 +7333,39 @@ rc-switch@~3.2.0: classnames "^2.2.1" rc-util "^5.0.1" -rc-table@~7.19.0: - version "7.19.2" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.19.2.tgz#976337a5dace3b8e04bea9554d72bc83aa5ab301" - integrity sha512-NdpnoM50MK02H5/hGOsObfxCvGFUG5cHB9turE5BKJ81T5Ycbq193w5tLhnpILXe//Oanzr47MdMxkUnVGP+qg== +rc-table@~7.24.0: + version "7.24.2" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.24.2.tgz#fbccf5ef4b84cdb38c8a0b416365de157483bf51" + integrity sha512-yefqhtc4V3BeWG2bnDhWYxWX1MOckvW2KU1J55pntZmIGrov5Hx8tQn2gcs6OM0fJ6NgEwUvVEknsCsWI24zUg== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" - rc-resize-observer "^1.0.0" + rc-resize-observer "^1.1.0" rc-util "^5.14.0" shallowequal "^1.1.0" -rc-tabs@~11.10.0: - version "11.10.5" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.10.5.tgz#53bbb642d04b307f8ce86e318ab99d519507b29b" - integrity sha512-DDuUdV6b9zGRYLtjI5hyejWLKoz1QiLWNgMeBzc3aMeQylZFhTYnFGdDc6HRqj5IYearNTsFPVSA+6VIT8g5cg== +rc-tabs@~11.13.0: + version "11.13.0" + resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.13.0.tgz#083eed578f8ad02dc0d462d73da487fe32e3a573" + integrity sha512-aUw1Pq0B1a2zGX4o/m3yrQycZcCLgDp6gKwn8IAU07q148RRONsVGxi0oLVVe5SE51kOB+j0bk1RX43ZBdZNgA== dependencies: "@babel/runtime" "^7.11.2" classnames "2.x" - rc-dropdown "^3.2.0" - rc-menu "^9.0.0" + rc-dropdown "~3.5.0" + rc-menu "~9.5.1" rc-resize-observer "^1.0.0" rc-util "^5.5.0" rc-textarea@^0.3.0, rc-textarea@~0.3.0: - version "0.3.6" - resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.6.tgz#b255a9dd78648033bac8daa281ad95249122420a" - integrity sha512-6esiDE4AG3lqnmCdgAp/nutrZAqZEfRT3K749H8vMzNtxy9JScuMJ9MMtWN2DDQh+LCDvX4dgflaRjDCqtDHWw== + version "0.3.7" + resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.7.tgz#987142891efdedb774883c07e2f51b318fde5a11" + integrity sha512-yCdZ6binKmAQB13hc/oehh0E/QRwoPP1pjF21aHBxlgXO3RzPF6dUu4LG2R4FZ1zx/fQd2L1faktulrXOM/2rw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" rc-resize-observer "^1.0.0" rc-util "^5.7.0" + shallowequal "^1.1.0" rc-tooltip@^3.4.2: version "3.7.3" @@ -7201,27 +7384,27 @@ rc-tooltip@^5.0.1, rc-tooltip@~5.1.1: "@babel/runtime" "^7.11.2" rc-trigger "^5.0.0" -rc-tree-select@~4.8.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-4.8.0.tgz#bcbcfb45553f84a878e4ff037ff00b526a4afa62" - integrity sha512-evuVIF7GHCGDdvISdBWl4ZYmG/8foof/RDtzCu/WFLA1tFKZD77RRC3khEsjh4WgsB0vllLe7j+ODJ7jHRcDRQ== +rc-tree-select@~5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.3.0.tgz#6edd19d1066ad2bfa212f043c3ff701b93828026" + integrity sha512-UN6CUBulmch+CsihnJ73+DtWijEB1hVTC8sdVxq6E0teVAkHQZUvDj+cwZShtShAKvWwXy73PZ1hIHEUrmVcKw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" - rc-select "~13.2.1" - rc-tree "~5.3.0" - rc-util "^5.7.0" + rc-select "~14.1.0" + rc-tree "~5.5.0" + rc-util "^5.16.1" -rc-tree@~5.3.0: - version "5.3.5" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.3.5.tgz#99e5af72a619d2520961e16ee63049c67d27b894" - integrity sha512-nMlR7YArdL1m+FJXjl6Mt4n6S2+sVY6op2K3roB34YdVyq/Q4gDy5XT2cpiKGZrfCifX79N2LCihRrOGMO2UTw== +rc-tree@~5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.5.0.tgz#ba7c8aea2ad29f40a9c7168e490300f7a50c0f22" + integrity sha512-vpKeFsDyj7weik8UPseCTaSNAPt939qn1dQd8goSbRDajbjJEja0v/WFXyRhOiF1HLemNTfqMz4MYc9qlqyNXg== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.0.1" rc-util "^5.16.1" - rc-virtual-list "^3.4.1" + rc-virtual-list "^3.4.2" rc-trigger@^2.2.2: version "2.6.5" @@ -7237,15 +7420,15 @@ rc-trigger@^2.2.2: react-lifecycles-compat "^3.0.4" rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10: - version "5.2.10" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.10.tgz#8a0057a940b1b9027eaa33beec8a6ecd85cce2b1" - integrity sha512-FkUf4H9BOFDaIwu42fvRycXMAvkttph9AlbCZXssZDVzz2L+QZ0ERvfB/4nX3ZFPh1Zd+uVGr1DEDeXxq4J1TA== + version "5.2.18" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.18.tgz#adab51918e4569b174d4fc5044186200d97a542c" + integrity sha512-hi2yZ7umtbAGLxgSph1az9BR9i4Pb4fiQa4pdvFQuKN7U//3nwwygHQKHfexnM+0APBnzZwVlEHA5I8BpWrygw== dependencies: "@babel/runtime" "^7.11.2" classnames "^2.2.6" rc-align "^4.0.0" rc-motion "^2.0.0" - rc-util "^5.5.0" + rc-util "^5.19.2" rc-upload@~4.3.0: version "4.3.3" @@ -7267,23 +7450,23 @@ rc-util@4.x, rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0: react-lifecycles-compat "^3.0.4" shallowequal "^1.1.0" -rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8: - version "5.16.1" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.16.1.tgz#374db7cb735512f05165ddc3d6b2c61c21b8b4e3" - integrity sha512-kSCyytvdb3aRxQacS/71ta6c+kBWvM1v8/2h9d/HaNWauc3qB8pLnF20PJ8NajkNN8gb+rR1l0eWO+D4Pz+LLQ== +rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.14.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8: + version "5.21.4" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.21.4.tgz#61e24ad297f679ca0796b618a3ef30eca959d904" + integrity sha512-rq11ap3NnOIdywFhcMQ9J7DXRJJ1c1Id1Hvr/1Dphr+5X75ERJBJybuh779DdurP4LJQqAhT6Aie0AjrBc5Vqw== dependencies: "@babel/runtime" "^7.12.5" react-is "^16.12.0" shallowequal "^1.1.0" -rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.2.tgz#1078327aa7230b5e456d679ed2ce99f3c036ebd1" - integrity sha512-OyVrrPvvFcHvV0ssz5EDZ+7Rf5qLat/+mmujjchNw5FfbJWNDwkpQ99EcVE6+FtNRmX9wFa1LGNpZLUTvp/4GQ== +rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.2: + version "3.4.8" + resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.8.tgz#c24c10c6940546b7e2a5e9809402c6716adfd26c" + integrity sha512-qSN+Rv4i/E7RCTvTMr1uZo7f3crJJg/5DekoCagydo9zsXrxj07zsFSxqizqW+ldGA16lwa8So/bIbV9Ofjddg== dependencies: classnames "^2.2.6" rc-resize-observer "^1.0.0" - rc-util "^5.0.7" + rc-util "^5.15.0" react-dom@16.x, react-dom@^16.8.4: version "16.14.0" @@ -7353,9 +7536,9 @@ react-native-swipeout@^2.2.2: react-tween-state "^0.1.5" react-redux@^7.1.0: - version "7.2.6" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa" - integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ== + version "7.2.8" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.8.tgz#a894068315e65de5b1b68899f9c6ee0923dd28de" + integrity sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw== dependencies: "@babel/runtime" "^7.15.4" "@types/react-redux" "^7.1.20" @@ -7390,15 +7573,15 @@ react-router-dom@5.2.0: tiny-warning "^1.0.0" react-router-dom@^5.1.2: - version "5.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" - integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== + version "5.3.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.2.tgz#93a82c95732963d137c02b3aee0505956baeb69e" + integrity sha512-j8sAq4YdWsrkM2DfDX26GnjtDKWUSd65LzHyBz8NcgFcK0ct7oTvYlwhOr532xpXsYP1HONq6QqUGA7GhbAY5w== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" loose-envify "^1.3.1" prop-types "^15.6.2" - react-router "5.2.1" + react-router "5.3.2" tiny-invariant "^1.0.2" tiny-warning "^1.0.0" @@ -7418,10 +7601,10 @@ react-router@5.2.0: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" - integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== +react-router@5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.2.tgz#87614394781e75cc6aa3b61cdfd147a1361cd890" + integrity sha512-GlsSUckZ4JthgsW5lV9oSCs5CoQ7q0t0Ump/Y5YQ8qhiS+WjaAhaoJhc7otpZW9eVhO6N06vYPt40SpEzuuZeg== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" @@ -7550,12 +7733,24 @@ redux-saga@^0.16.0: integrity sha512-iIjKnRThI5sKPEASpUvySemjzwqwI13e3qP7oLub+FycCRDysLSAOwt958niZW6LhxfmS6Qm1BzbU70w/Koc4w== redux@^4.0.0, redux@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104" - integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13" + integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== dependencies: "@babel/runtime" "^7.9.2" +regenerate-unicode-properties@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== + dependencies: + regenerate "^1.4.2" + +regenerate@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + regenerator-runtime@0.13.5: version "0.13.5" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" @@ -7579,13 +7774,14 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== +regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" + integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" + functions-have-names "^1.2.2" regexpp@^3.1.0: version "3.2.0" @@ -7702,12 +7898,13 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.10.0, resolve@^1.18.1: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" resolve@^2.0.0-next.3: version "2.0.0-next.3" @@ -7919,12 +8116,12 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@^7.4.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" - integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w== +rxjs@^7.5.1: + version "7.5.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f" + integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw== dependencies: - tslib "~2.1.0" + tslib "^2.1.0" safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.1" @@ -7975,9 +8172,9 @@ sass-loader@^8.0.2: semver "^6.3.0" sass@^1.26.2: - version "1.45.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.1.tgz#fa03951f924d1ba5762949567eaf660e608a1ab0" - integrity sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA== + version "1.51.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.51.0.tgz#25ea36cf819581fe1fe8329e8c3a4eaaf70d2845" + integrity sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -8038,9 +8235,9 @@ screenfull@^5.0.0: integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA== scroll-into-view-if-needed@^2.2.25: - version "2.2.28" - resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.28.tgz#5a15b2f58a52642c88c8eca584644e01703d645a" - integrity sha512-8LuxJSuFVc92+0AdNv4QOxRL4Abeo1DgLnGNkn1XlaujPH/3cCFz3QI60r2VNu4obJJROzgnIUw5TKQkZvZI1w== + version "2.2.29" + resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz#551791a84b7e2287706511f8c68161e4990ab885" + integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg== dependencies: compute-scroll-into-view "^1.0.17" @@ -8065,9 +8262,9 @@ semver@^6.0.0, semver@^6.3.0: integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.2.1, semver@^7.3.2, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" @@ -8155,9 +8352,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.6" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" - integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== sisteransi@^1.0.5: version "1.0.5" @@ -8256,9 +8453,9 @@ sort-keys@^1.0.0: is-plain-obj "^1.0.0" "source-map-js@>=0.6.2 <2.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" - integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== source-map-resolve@^0.5.0: version "0.5.3" @@ -8343,9 +8540,9 @@ sprintf-js@~1.0.2: integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + version "1.17.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" + integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -8372,9 +8569,9 @@ stack-utils@^2.0.2: escape-string-regexp "^2.0.0" stackframe@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" - integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== + version "1.2.1" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.1.tgz#1033a3473ee67f08e2f2fc8eba6aef4f845124e1" + integrity sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg== static-extend@^0.1.1: version "0.1.2" @@ -8446,34 +8643,36 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: strip-ansi "^6.0.1" string.prototype.matchall@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" - integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d" + integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" es-abstract "^1.19.1" get-intrinsic "^1.1.1" - has-symbols "^1.0.2" + has-symbols "^1.0.3" internal-slot "^1.0.3" - regexp.prototype.flags "^1.3.1" + regexp.prototype.flags "^1.4.1" side-channel "^1.0.4" -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== +string.prototype.trimend@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" + integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" + define-properties "^1.1.4" + es-abstract "^1.19.5" -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== +string.prototype.trimstart@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" + integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" + define-properties "^1.1.4" + es-abstract "^1.19.5" string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" @@ -8535,7 +8734,23 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -supports-color@^5.3.0: +styled-components@^5.3.3: + version "5.3.5" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.5.tgz#a750a398d01f1ca73af16a241dec3da6deae5ec4" + integrity sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/traverse" "^7.4.5" + "@emotion/is-prop-valid" "^1.1.0" + "@emotion/stylis" "^0.8.4" + "@emotion/unitless" "^0.7.4" + babel-plugin-styled-components ">= 1.12.0" + css-to-react-native "^3.0.0" + hoist-non-react-statics "^3.0.0" + shallowequal "^1.1.0" + supports-color "^5.5.0" + +supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -8564,10 +8779,15 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" -swr@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/swr/-/swr-1.1.0.tgz#7710cdbc5ff664c13e41fba6a1fa4734f82aba35" - integrity sha512-MFL3mkl752Uap81nLA1tEu7vQmikPamSziW+6dBidYKAo4oLOlUx/x5GZy4ZCkCwfZe2uedylkz1UMGnatUX4g== +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" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +swr@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/swr/-/swr-1.3.0.tgz#c6531866a35b4db37b38b72c45a63171faf9f4e8" + integrity sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw== symbol-tree@^3.2.2, symbol-tree@^3.2.4: version "3.2.4" @@ -8575,9 +8795,9 @@ symbol-tree@^3.2.2, symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.9: - version "6.7.5" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz#f04478c351ef3d8c7904f0e8be90a1b62417d238" - integrity sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw== + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== dependencies: ajv "^8.0.1" lodash.truncate "^4.4.2" @@ -8746,15 +8966,10 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - -tslib@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tslib@^2.1.0, tslib@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== tsutils@^3.21.0: version "3.21.0" @@ -8832,9 +9047,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typescript@^4.3.2: - version "4.5.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8" - integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg== + version "4.6.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" + integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== ua-parser-js@^0.7.30: version "0.7.31" @@ -8850,29 +9065,29 @@ umi-request@^1.2.14, umi-request@^1.2.17: qs "^6.9.1" umi@^3.5.0: - version "3.5.20" - resolved "https://registry.yarnpkg.com/umi/-/umi-3.5.20.tgz#7380d4dd62b9b5b3e6da303a3312a7b68a10eb51" - integrity sha512-rliZTS2LoudsIelaSipZrPUEjPOi2HDlj1VCNXt63YFxeqSXQkijKmM1+hSVEDDRwPLq4L+RZhuVnCasZA9Nng== - dependencies: - "@umijs/bundler-webpack" "3.5.20" - "@umijs/core" "3.5.20" - "@umijs/deps" "3.5.20" - "@umijs/preset-built-in" "3.5.20" - "@umijs/runtime" "3.5.20" - "@umijs/types" "3.5.20" - "@umijs/utils" "3.5.20" + version "3.5.23" + resolved "https://registry.yarnpkg.com/umi/-/umi-3.5.23.tgz#98d0a6f70d844f5828c2acf7f378bad2449f71ab" + integrity sha512-oluqABEGXQXO47jwyfDqkZI+BbeDBAvH17gUOkWXcXYTqFi0WJoFhMvXNr9ym0LgBcHQJb/Ge3OGcEIoSFJNAQ== + dependencies: + "@umijs/bundler-webpack" "3.5.23" + "@umijs/core" "3.5.23" + "@umijs/deps" "3.5.23" + "@umijs/preset-built-in" "3.5.23" + "@umijs/runtime" "3.5.23" + "@umijs/types" "3.5.23" + "@umijs/utils" "3.5.23" react "16.x" react-dom "16.x" v8-compile-cache "2.3.0" -unbox-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.1" - has-symbols "^1.0.2" + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" union-value@^1.0.0: @@ -9068,7 +9283,7 @@ warning@^3.0.0: dependencies: loose-envify "^1.0.0" -warning@^4.0.1, warning@^4.0.3: +warning@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== @@ -9218,9 +9433,9 @@ ws@^6.1.2: async-limiter "~1.0.0" ws@^7.4.6: - version "7.5.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" - integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== + version "7.5.7" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== ws@~6.1.0: version "6.1.4"