From 24be550fc4068a2abfa1c8106a183e5458bbb4e2 Mon Sep 17 00:00:00 2001 From: cheerchen Date: Wed, 20 Jul 2022 17:58:36 +0800 Subject: [PATCH 1/2] refactor(project): optimize code structure of the flat-web --- packages/flat-pages/package.json | 2 +- .../src/AppRoutes/AppRouteContainer.tsx | 0 .../src/AppRoutes/AppRouteErrorBoundary.tsx | 0 .../flat-pages}/src/AppRoutes/index.tsx | 0 .../flat-pages}/src/AppRoutes/route-pages.ts | 38 +- packages/flat-pages/src/ReplayPage/index.tsx | 2 +- .../src/assets/image/app-store.svg | 0 .../src/assets/image/class-interaction.svg | 0 .../src/assets/image/class-lecture.svg | 0 .../src/assets/image/cloud-storage.svg | 0 .../flat-pages}/src/assets/image/cocos.svg | 0 .../src/assets/image/code-editor.svg | 0 .../src/assets/image/countdown.svg | 0 .../src/assets/image/default-avatars/0.png | Bin .../src/assets/image/default-avatars/1.png | Bin .../src/assets/image/default-avatars/2.png | Bin .../src/assets/image/default-avatars/3.png | Bin .../src/assets/image/default-avatars/4.png | Bin .../flat-pages}/src/assets/image/folder.svg | 0 .../flat-pages}/src/assets/image/geogebra.svg | 0 .../src/assets/image/invite-active.svg | 0 .../flat-pages}/src/assets/image/invite.svg | 0 .../flat-pages}/src/assets/image/pages.svg | 0 .../src/assets/image/tool-countdown.svg | 0 .../src/assets/image/tool-geogebra.svg | 0 .../src/assets/image/tool-monaco.svg | 0 .../src/assets/image/tool-presets.svg | 0 .../src/assets/image/tool-save.svg | 0 .../src/assets/image/video-play.svg | 0 .../src/components/MainPageLayout.tsx | 2 +- .../index.tsx | 4 +- .../src/components/StoreProvider.tsx | 2 +- .../flat-pages/src/components}/page-store.ts | 4 +- packages/flat-stores/package.json | 2 +- pnpm-lock.yaml | 431 +++++++++++++----- web/flat-web/package.json | 1 + web/flat-web/src/tasks/init-ui.tsx | 8 +- 37 files changed, 351 insertions(+), 145 deletions(-) rename {web/flat-web => packages/flat-pages}/src/AppRoutes/AppRouteContainer.tsx (100%) rename {web/flat-web => packages/flat-pages}/src/AppRoutes/AppRouteErrorBoundary.tsx (100%) rename {web/flat-web => packages/flat-pages}/src/AppRoutes/index.tsx (100%) rename {web/flat-web => packages/flat-pages}/src/AppRoutes/route-pages.ts (67%) rename {web/flat-web => packages/flat-pages}/src/assets/image/app-store.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/class-interaction.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/class-lecture.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/cloud-storage.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/cocos.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/code-editor.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/countdown.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/default-avatars/0.png (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/default-avatars/1.png (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/default-avatars/2.png (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/default-avatars/3.png (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/default-avatars/4.png (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/folder.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/geogebra.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/invite-active.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/invite.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/pages.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/tool-countdown.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/tool-geogebra.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/tool-monaco.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/tool-presets.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/tool-save.svg (100%) rename {web/flat-web => packages/flat-pages}/src/assets/image/video-play.svg (100%) rename {web/flat-web/src/stores => packages/flat-pages/src/components}/page-store.ts (86%) diff --git a/packages/flat-pages/package.json b/packages/flat-pages/package.json index b4f36677509..62749f5afaa 100644 --- a/packages/flat-pages/package.json +++ b/packages/flat-pages/package.json @@ -1,5 +1,5 @@ { - "name": "flat-pages", + "name": "@netless/flat-pages", "version": "0.1.0", "license": "MIT", "dependencies": { diff --git a/web/flat-web/src/AppRoutes/AppRouteContainer.tsx b/packages/flat-pages/src/AppRoutes/AppRouteContainer.tsx similarity index 100% rename from web/flat-web/src/AppRoutes/AppRouteContainer.tsx rename to packages/flat-pages/src/AppRoutes/AppRouteContainer.tsx diff --git a/web/flat-web/src/AppRoutes/AppRouteErrorBoundary.tsx b/packages/flat-pages/src/AppRoutes/AppRouteErrorBoundary.tsx similarity index 100% rename from web/flat-web/src/AppRoutes/AppRouteErrorBoundary.tsx rename to packages/flat-pages/src/AppRoutes/AppRouteErrorBoundary.tsx diff --git a/web/flat-web/src/AppRoutes/index.tsx b/packages/flat-pages/src/AppRoutes/index.tsx similarity index 100% rename from web/flat-web/src/AppRoutes/index.tsx rename to packages/flat-pages/src/AppRoutes/index.tsx diff --git a/web/flat-web/src/AppRoutes/route-pages.ts b/packages/flat-pages/src/AppRoutes/route-pages.ts similarity index 67% rename from web/flat-web/src/AppRoutes/route-pages.ts rename to packages/flat-pages/src/AppRoutes/route-pages.ts index b2828e6d480..69f1db4071b 100644 --- a/web/flat-web/src/AppRoutes/route-pages.ts +++ b/packages/flat-pages/src/AppRoutes/route-pages.ts @@ -12,59 +12,59 @@ export type RoutePages = { /** * NOTE: If you see error from "loadable-component", the real error * message may be hidden by `import()` below. You can change - * `import("../pages/SomePage")` to + * `import("../SomePage")` to * `Promise.resolve({ default: SomePage })` to see the real error. */ export const routePages: RoutePages = { [RouteNameType.LoginPage]: { title: "LoginPage", - component: () => import("../pages/LoginPage"), + component: () => import("../LoginPage"), }, [RouteNameType.HomePage]: { title: "HomePage", hasHeader: true, - component: () => import("../pages/HomePage"), + component: () => import("../HomePage"), }, [RouteNameType.BigClassPage]: { title: "BigClassPage", - component: () => import("../pages/BigClassPage"), + component: () => import("../BigClassPage"), }, [RouteNameType.SmallClassPage]: { title: "SmallClassPage", - component: () => import("../pages/SmallClassPage"), + component: () => import("../SmallClassPage"), }, [RouteNameType.OneToOnePage]: { title: "OneToOnePage", - component: () => import("../pages/OneToOnePage"), + component: () => import("../OneToOnePage"), }, [RouteNameType.RoomDetailPage]: { title: "RoomDetailPage", hasHeader: true, - component: () => import("../pages/RoomDetailPage"), + component: () => import("../RoomDetailPage"), }, [RouteNameType.PeriodicRoomDetailPage]: { title: "PeriodicRoomDetailPage", hasHeader: true, - component: () => import("../pages/PeriodicRoomDetailPage"), + component: () => import("../PeriodicRoomDetailPage"), }, [RouteNameType.UserScheduledPage]: { title: "UserScheduledPage", hasHeader: true, - component: () => import("../pages/UserScheduledPage"), + component: () => import("../UserScheduledPage"), }, [RouteNameType.ModifyOrdinaryRoomPage]: { title: "ModifyOrdinaryRoomPage", hasHeader: true, - component: () => import("../pages/ModifyOrdinaryRoomPage"), + component: () => import("../ModifyOrdinaryRoomPage"), }, [RouteNameType.ModifyPeriodicRoomPage]: { title: "ModifyPeriodicRoomPage", hasHeader: true, - component: () => import("../pages/ModifyPeriodicRoomPage"), + component: () => import("../ModifyPeriodicRoomPage"), }, [RouteNameType.ReplayPage]: { title: "ReplayPage", - component: () => import("../pages/ReplayPage"), + component: () => import("../ReplayPage"), }, [RouteNameType.SystemCheckPage]: { title: "SystemCheckPage", @@ -74,33 +74,33 @@ export const routePages: RoutePages = { [RouteNameType.GeneralSettingPage]: { title: "GeneralSettingPage", hasHeader: true, - component: () => import("../pages/UserSettingPage/GeneralSettingPage"), + component: () => import("../UserSettingPage/GeneralSettingPage"), }, [RouteNameType.HotKeySettingPage]: { title: "HotKeySettingPage", hasHeader: true, - component: () => import("../pages/UserSettingPage/HotKeySettingPage"), + component: () => import("../UserSettingPage/HotKeySettingPage"), }, [RouteNameType.AboutPage]: { title: "AboutPage", hasHeader: true, - component: () => import("../pages/UserSettingPage/AboutPage"), + component: () => import("../UserSettingPage/AboutPage"), }, [RouteNameType.CloudStoragePage]: { title: "CloudStoragePage", hasHeader: true, - component: () => import("../pages/CloudStoragePage"), + component: () => import("../CloudStoragePage"), }, [RouteNameType.JoinPage]: { title: "JoinPage", - component: () => import("../pages/JoinPage"), + component: () => import("../JoinPage"), }, [RouteNameType.ResourcePreviewPage]: { title: "ResourcePreviewPage", - component: () => import("../pages/ResourcePreviewPage"), + component: () => import("../ResourcePreviewPage"), }, [RouteNameType.DevicesTestPage]: { title: "DevicesTestPage", - component: () => import("../pages/DevicesTestPage"), + component: () => import("../DevicesTestPage"), }, }; diff --git a/packages/flat-pages/src/ReplayPage/index.tsx b/packages/flat-pages/src/ReplayPage/index.tsx index f0a27d345a4..4703a034186 100644 --- a/packages/flat-pages/src/ReplayPage/index.tsx +++ b/packages/flat-pages/src/ReplayPage/index.tsx @@ -7,7 +7,7 @@ import { OrdinaryRoomInfo, RoomType } from "@netless/flat-server-api"; import { observer } from "mobx-react-lite"; import { RouteNameType, RouteParams } from "../utils/routes"; -import videoPlaySVG from "../../assets/image/video-play.svg"; +import videoPlaySVG from "../assets/image/video-play.svg"; import "video.js/dist/video-js.min.css"; import "./ReplayPage.less"; import { ExitReplayConfirmModal } from "../components/Modal/ExitReplayConfirmModal"; diff --git a/web/flat-web/src/assets/image/app-store.svg b/packages/flat-pages/src/assets/image/app-store.svg similarity index 100% rename from web/flat-web/src/assets/image/app-store.svg rename to packages/flat-pages/src/assets/image/app-store.svg diff --git a/web/flat-web/src/assets/image/class-interaction.svg b/packages/flat-pages/src/assets/image/class-interaction.svg similarity index 100% rename from web/flat-web/src/assets/image/class-interaction.svg rename to packages/flat-pages/src/assets/image/class-interaction.svg diff --git a/web/flat-web/src/assets/image/class-lecture.svg b/packages/flat-pages/src/assets/image/class-lecture.svg similarity index 100% rename from web/flat-web/src/assets/image/class-lecture.svg rename to packages/flat-pages/src/assets/image/class-lecture.svg diff --git a/web/flat-web/src/assets/image/cloud-storage.svg b/packages/flat-pages/src/assets/image/cloud-storage.svg similarity index 100% rename from web/flat-web/src/assets/image/cloud-storage.svg rename to packages/flat-pages/src/assets/image/cloud-storage.svg diff --git a/web/flat-web/src/assets/image/cocos.svg b/packages/flat-pages/src/assets/image/cocos.svg similarity index 100% rename from web/flat-web/src/assets/image/cocos.svg rename to packages/flat-pages/src/assets/image/cocos.svg diff --git a/web/flat-web/src/assets/image/code-editor.svg b/packages/flat-pages/src/assets/image/code-editor.svg similarity index 100% rename from web/flat-web/src/assets/image/code-editor.svg rename to packages/flat-pages/src/assets/image/code-editor.svg diff --git a/web/flat-web/src/assets/image/countdown.svg b/packages/flat-pages/src/assets/image/countdown.svg similarity index 100% rename from web/flat-web/src/assets/image/countdown.svg rename to packages/flat-pages/src/assets/image/countdown.svg diff --git a/web/flat-web/src/assets/image/default-avatars/0.png b/packages/flat-pages/src/assets/image/default-avatars/0.png similarity index 100% rename from web/flat-web/src/assets/image/default-avatars/0.png rename to packages/flat-pages/src/assets/image/default-avatars/0.png diff --git a/web/flat-web/src/assets/image/default-avatars/1.png b/packages/flat-pages/src/assets/image/default-avatars/1.png similarity index 100% rename from web/flat-web/src/assets/image/default-avatars/1.png rename to packages/flat-pages/src/assets/image/default-avatars/1.png diff --git a/web/flat-web/src/assets/image/default-avatars/2.png b/packages/flat-pages/src/assets/image/default-avatars/2.png similarity index 100% rename from web/flat-web/src/assets/image/default-avatars/2.png rename to packages/flat-pages/src/assets/image/default-avatars/2.png diff --git a/web/flat-web/src/assets/image/default-avatars/3.png b/packages/flat-pages/src/assets/image/default-avatars/3.png similarity index 100% rename from web/flat-web/src/assets/image/default-avatars/3.png rename to packages/flat-pages/src/assets/image/default-avatars/3.png diff --git a/web/flat-web/src/assets/image/default-avatars/4.png b/packages/flat-pages/src/assets/image/default-avatars/4.png similarity index 100% rename from web/flat-web/src/assets/image/default-avatars/4.png rename to packages/flat-pages/src/assets/image/default-avatars/4.png diff --git a/web/flat-web/src/assets/image/folder.svg b/packages/flat-pages/src/assets/image/folder.svg similarity index 100% rename from web/flat-web/src/assets/image/folder.svg rename to packages/flat-pages/src/assets/image/folder.svg diff --git a/web/flat-web/src/assets/image/geogebra.svg b/packages/flat-pages/src/assets/image/geogebra.svg similarity index 100% rename from web/flat-web/src/assets/image/geogebra.svg rename to packages/flat-pages/src/assets/image/geogebra.svg diff --git a/web/flat-web/src/assets/image/invite-active.svg b/packages/flat-pages/src/assets/image/invite-active.svg similarity index 100% rename from web/flat-web/src/assets/image/invite-active.svg rename to packages/flat-pages/src/assets/image/invite-active.svg diff --git a/web/flat-web/src/assets/image/invite.svg b/packages/flat-pages/src/assets/image/invite.svg similarity index 100% rename from web/flat-web/src/assets/image/invite.svg rename to packages/flat-pages/src/assets/image/invite.svg diff --git a/web/flat-web/src/assets/image/pages.svg b/packages/flat-pages/src/assets/image/pages.svg similarity index 100% rename from web/flat-web/src/assets/image/pages.svg rename to packages/flat-pages/src/assets/image/pages.svg diff --git a/web/flat-web/src/assets/image/tool-countdown.svg b/packages/flat-pages/src/assets/image/tool-countdown.svg similarity index 100% rename from web/flat-web/src/assets/image/tool-countdown.svg rename to packages/flat-pages/src/assets/image/tool-countdown.svg diff --git a/web/flat-web/src/assets/image/tool-geogebra.svg b/packages/flat-pages/src/assets/image/tool-geogebra.svg similarity index 100% rename from web/flat-web/src/assets/image/tool-geogebra.svg rename to packages/flat-pages/src/assets/image/tool-geogebra.svg diff --git a/web/flat-web/src/assets/image/tool-monaco.svg b/packages/flat-pages/src/assets/image/tool-monaco.svg similarity index 100% rename from web/flat-web/src/assets/image/tool-monaco.svg rename to packages/flat-pages/src/assets/image/tool-monaco.svg diff --git a/web/flat-web/src/assets/image/tool-presets.svg b/packages/flat-pages/src/assets/image/tool-presets.svg similarity index 100% rename from web/flat-web/src/assets/image/tool-presets.svg rename to packages/flat-pages/src/assets/image/tool-presets.svg diff --git a/web/flat-web/src/assets/image/tool-save.svg b/packages/flat-pages/src/assets/image/tool-save.svg similarity index 100% rename from web/flat-web/src/assets/image/tool-save.svg rename to packages/flat-pages/src/assets/image/tool-save.svg diff --git a/web/flat-web/src/assets/image/video-play.svg b/packages/flat-pages/src/assets/image/video-play.svg similarity index 100% rename from web/flat-web/src/assets/image/video-play.svg rename to packages/flat-pages/src/assets/image/video-play.svg diff --git a/packages/flat-pages/src/components/MainPageLayout.tsx b/packages/flat-pages/src/components/MainPageLayout.tsx index 7d697565285..4eff7151d12 100644 --- a/packages/flat-pages/src/components/MainPageLayout.tsx +++ b/packages/flat-pages/src/components/MainPageLayout.tsx @@ -1,8 +1,8 @@ import React, { useContext } from "react"; import { observer } from "mobx-react-lite"; import { MainPageLayoutHorizontalContainer } from "./MainPageLayoutHorizontalContainer"; -import { routePages } from "../AppRoutes/route-pages"; import { PageStoreContext } from "./StoreProvider"; +import { routePages } from "../AppRoutes/route-pages"; export const MainPageLayout = observer(function MainPageLayout({ children }) { const pageStore = useContext(PageStoreContext); diff --git a/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx b/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx index a58ab2b531b..f5dfe0bf5cf 100644 --- a/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx +++ b/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx @@ -17,10 +17,10 @@ import { SVGSetting, } from "flat-components"; import { useTranslation } from "react-i18next"; -import { routeConfig, RouteNameType } from "../../route-config"; import { GlobalStoreContext } from "../StoreProvider"; -import { generateAvatar } from "../../utils/generate-avatar"; import { FLAT_DOWNLOAD_URL } from "../../constants/process"; +import { routeConfig, RouteNameType } from "../../route-config"; +import { generateAvatar } from "../../utils/generate-avatar"; export interface MainPageLayoutHorizontalContainerProps { subMenu?: MainPageLayoutItem[]; diff --git a/packages/flat-pages/src/components/StoreProvider.tsx b/packages/flat-pages/src/components/StoreProvider.tsx index f9f565e5a6d..bf2173d3470 100644 --- a/packages/flat-pages/src/components/StoreProvider.tsx +++ b/packages/flat-pages/src/components/StoreProvider.tsx @@ -1,6 +1,6 @@ import React, { createContext, FC } from "react"; import { preferencesStore, globalStore, roomStore } from "@netless/flat-stores"; -import { pageStore } from "../stores/page-store"; +import { pageStore } from "./page-store"; export const GlobalStoreContext = createContext(globalStore); diff --git a/web/flat-web/src/stores/page-store.ts b/packages/flat-pages/src/components/page-store.ts similarity index 86% rename from web/flat-web/src/stores/page-store.ts rename to packages/flat-pages/src/components/page-store.ts index 3d313fba6e0..2c67e587bd4 100644 --- a/web/flat-web/src/stores/page-store.ts +++ b/packages/flat-pages/src/components/page-store.ts @@ -1,6 +1,6 @@ import { makeAutoObservable } from "mobx"; -import { MainPageLayoutHorizontalContainerProps } from "../components/MainPageLayoutHorizontalContainer"; -import { RouteNameType } from "../route-config"; +import { MainPageLayoutHorizontalContainerProps } from "./MainPageLayoutHorizontalContainer"; +import { RouteNameType } from "../../src/route-config"; type DelegateProps = MainPageLayoutHorizontalContainerProps; diff --git a/packages/flat-stores/package.json b/packages/flat-stores/package.json index 6b29ab8148b..a857f119fe0 100644 --- a/packages/flat-stores/package.json +++ b/packages/flat-stores/package.json @@ -13,7 +13,7 @@ "mobx": "6.x", "white-web-sdk": ">=2.16" }, - "devDependencies": { +"devDependencies": { "@netless/fastboard-react": "^0.3.5-canary.5", "@netless/window-manager": "^0.4.31", "mobx": "^6.4.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01c0da581fb..02d554e15da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -152,7 +152,7 @@ importers: '@netless/app-plyr': ^0.1.3 '@netless/app-slide': ^0.2.2 '@netless/combine-player': ^1.1.6 - '@netless/fastboard-react': ^0.3.5-canary.1 + '@netless/fastboard-react': ^0.3.5-canary.5 '@netless/flat-rtc': workspace:* '@netless/flat-rtc-agora-electron': workspace:* '@netless/player-controller': ^0.0.9 @@ -210,7 +210,7 @@ importers: '@netless/app-plyr': 0.1.3 '@netless/app-slide': 0.2.2 '@netless/combine-player': 1.1.6 - '@netless/fastboard-react': 0.3.5-canary.1_75wc7cfqgpdqty56nasvdvou34 + '@netless/fastboard-react': 0.3.5-canary.5_75wc7cfqgpdqty56nasvdvou34 '@netless/flat-rtc': link:../../services/rtc/flat-rtc '@netless/flat-rtc-agora-electron': link:../../services/rtc/flat-rtc-agora-electron '@netless/player-controller': 0.0.9_7wevdi4665xpaid7wna2nfytg4 @@ -266,6 +266,8 @@ importers: '@ant-design/icons': ^4.7.0 '@babel/core': ^7.17.7 '@netless/flat-rtc': workspace:* + '@netless/flat-rtm': workspace:* + '@netless/flat-server-api': workspace:* '@storybook/addon-actions': ~6.3.7 '@storybook/addon-essentials': ~6.3.7 '@storybook/addon-links': ~6.3.7 @@ -289,6 +291,7 @@ importers: css-loader: ^6.7.1 date-fns: ^2.28.0 faker: ^5.5.3 + flat-i18n: workspace:* i18next: ^21.6.14 i18next-browser-languagedetector: ^6.1.3 less-loader: ^10.2.0 @@ -334,6 +337,8 @@ importers: react-virtualized: 9.22.3_sfoxds7t5ydpegc3knd667wn6m devDependencies: '@babel/core': 7.17.10 + '@netless/flat-rtm': link:../../services/rtm/flat-rtm + '@netless/flat-server-api': link:../flat-server-api '@storybook/addon-actions': 6.3.13_sfoxds7t5ydpegc3knd667wn6m '@storybook/addon-essentials': 6.3.13_wladcboei6tkrkz43kewnxzjda '@storybook/addon-links': 6.3.13_sfoxds7t5ydpegc3knd667wn6m @@ -354,6 +359,7 @@ importers: chance: 1.1.8 css-loader: 6.7.1 faker: 5.5.3 + flat-i18n: link:../flat-i18n less-loader: 10.2.0 lodash-es: 4.17.21 sass: 1.51.0 @@ -363,11 +369,213 @@ importers: tachyons: 4.12.0 packages/flat-i18n: - specifiers: {} + specifiers: + i18next: ^21.6.14 + prettier: ^2.3.0 + react: ^17.0.2 + react-i18next: ^11.15.7 + typescript: ^4.6.2 + devDependencies: + i18next: 21.7.1 + prettier: 2.6.2 + react: 17.0.2 + react-i18next: 11.16.9_6paiyehwr4ov62opw6r6idgboa + typescript: 4.6.4 + + packages/flat-pages: + specifiers: + '@ant-design/icons': ^4.7.0 + '@babel/standalone': 7.17.8 + '@netless/app-countdown': ^0.0.2 + '@netless/app-geogebra': ^0.0.4 + '@netless/app-iframe-bridge': ^0.0.2 + '@netless/app-monaco': ^0.1.14-beta.1 + '@netless/app-plyr': ^0.1.3 + '@netless/app-slide': ^0.2.2 + '@netless/combine-player': ^1.1.6 + '@netless/fastboard-react': ^0.3.5-canary.5 + '@netless/flat-rtc': workspace:* + '@netless/flat-rtc-agora-web': workspace:* + '@netless/flat-rtm': workspace:* + '@netless/flat-rtm-agora': workspace:* + '@netless/flat-server-api': workspace:* + '@netless/flat-services': workspace:* + '@netless/flat-stores': workspace:* + '@netless/mini-svg-data-uri': 0.0.1 + '@netless/player-controller': ^0.0.9 + '@netless/video-js-plugin': ^0.3.8 + '@netless/window-manager': ^0.4.31 + '@types/loadable__component': ^5.13.4 + '@types/mime': ^2.0.3 + antd: ^4.19.2 + axios: ^0.26.1 + classnames: ^2.3.1 + date-fns: ^2.28.0 + dotenv: ^16.0.0 + dotenv-expand: ^8.0.2 + eslint-loader: ^4.0.2 + flat-components: workspace:* + flat-i18n: workspace:* + flat-types: workspace:* + i18next: ^21.6.14 + i18next-browser-languagedetector: ^6.1.3 + lodash-es: ^4.17.21 + mime: ^3.0.0 + mobx: ^6.4.2 + mobx-react-lite: ^3.3.0 + polly-js: ^1.8.3 + react: ^17.0.2 + react-device-detect: ^2.1.2 + react-dom: ^17.0.2 + react-i18next: ^11.15.7 + react-router-dom: ^5.2.0 + react-router-last-location: ^2.0.1 + react-use: ^17.3.2 + side-effect-manager: ^0.1.5 + uuid: ^8.3.2 + value-enhancer: ^1.0.3 + video.js: 7.10.2 + white-web-sdk: npm:white-web-sdk-esm@2.16.24 + dependencies: + '@ant-design/icons': 4.7.0_sfoxds7t5ydpegc3knd667wn6m + '@netless/app-countdown': 0.0.2 + '@netless/app-geogebra': 0.0.4 + '@netless/app-iframe-bridge': 0.0.2 + '@netless/app-monaco': 0.1.14-beta.1 + '@netless/app-plyr': 0.1.3 + '@netless/app-slide': 0.2.2 + '@netless/combine-player': 1.1.6 + '@netless/fastboard-react': 0.3.5-canary.5_75wc7cfqgpdqty56nasvdvou34 + '@netless/flat-rtc': link:../../services/rtc/flat-rtc + '@netless/flat-rtc-agora-web': link:../../services/rtc/flat-rtc-agora-web + '@netless/flat-rtm': link:../../services/rtm/flat-rtm + '@netless/flat-rtm-agora': link:../../services/rtm/flat-rtm-agora + '@netless/flat-server-api': link:../flat-server-api + '@netless/flat-services': link:../flat-services + '@netless/flat-stores': link:../flat-stores + '@netless/player-controller': 0.0.9_7wevdi4665xpaid7wna2nfytg4 + '@netless/video-js-plugin': 0.3.8_igmyzdvqqkv6gevwhshexnrgbm + '@netless/window-manager': 0.4.31_white-web-sdk-esm@2.16.24 + antd: 4.20.2_sfoxds7t5ydpegc3knd667wn6m + axios: 0.26.1 + classnames: 2.3.1 + date-fns: 2.28.0 + flat-components: link:../flat-components + flat-i18n: link:../flat-i18n + flat-types: link:../flat-types + i18next: 21.7.1 + i18next-browser-languagedetector: 6.1.4 + lodash-es: 4.17.21 + mobx: 6.6.0 + mobx-react-lite: 3.4.0_5mmsvx7kyvezfxuro7wjt7ivm4 + polly-js: 1.8.3 + react: 17.0.2 + react-device-detect: 2.2.2_sfoxds7t5ydpegc3knd667wn6m + react-dom: 17.0.2_react@17.0.2 + react-i18next: 11.16.9_jzsml6ph5qfrjyi3jkdinvojay + react-router-dom: 5.3.1_react@17.0.2 + react-router-last-location: 2.0.1_hkqeomzib2ptgykess74qeszhm + react-use: 17.3.2_sfoxds7t5ydpegc3knd667wn6m + side-effect-manager: 0.1.5 + uuid: 8.3.2 + value-enhancer: 1.3.2 + video.js: 7.10.2 + white-web-sdk: /white-web-sdk-esm/2.16.24 + devDependencies: + '@babel/standalone': 7.17.8 + '@netless/mini-svg-data-uri': 0.0.1 + '@types/loadable__component': 5.13.4 + '@types/mime': 2.0.3 + dotenv: 16.0.0 + dotenv-expand: 8.0.3 + eslint-loader: 4.0.2 + mime: 3.0.0 + + packages/flat-server-api: + specifiers: + axios: ^0.26.1 + prettier: ^2.3.0 + typescript: ^4.6.2 + devDependencies: + axios: 0.26.1 + prettier: 2.6.2 + typescript: 4.6.4 + + packages/flat-services: + specifiers: + '@netless/flat-rtc': workspace:* + '@netless/flat-rtm': workspace:* + prettier: ^2.3.0 + typescript: ^4.6.2 + dependencies: + '@netless/flat-rtc': link:../../services/rtc/flat-rtc + '@netless/flat-rtm': link:../../services/rtm/flat-rtm + devDependencies: + prettier: 2.6.2 + typescript: 4.6.4 + + packages/flat-stores: + specifiers: + '@netless/fastboard-react': ^0.3.5-canary.5 + '@netless/flat-rtc': workspace:* + '@netless/flat-rtm': workspace:* + '@netless/flat-server-api': workspace:* + '@netless/window-manager': ^0.4.31 + flat-components: workspace:* + flat-i18n: workspace:* + mobx: ^6.4.2 + prettier: ^2.3.0 + react: ^17.0.2 + side-effect-manager: ^0.1.5 + typescript: ^4.6.2 + uuid: ^8.3.2 + white-web-sdk: npm:white-web-sdk-esm@2.16.24 + dependencies: + '@netless/flat-rtc': link:../../services/rtc/flat-rtc + '@netless/flat-rtm': link:../../services/rtm/flat-rtm + '@netless/flat-server-api': link:../flat-server-api + flat-components: link:../flat-components + flat-i18n: link:../flat-i18n + side-effect-manager: 0.1.5 + uuid: 8.3.2 + devDependencies: + '@netless/fastboard-react': 0.3.5-canary.5_75wc7cfqgpdqty56nasvdvou34 + '@netless/window-manager': 0.4.31_white-web-sdk-esm@2.16.24 + mobx: 6.6.0 + prettier: 2.6.2 + react: 17.0.2 + typescript: 4.6.4 + white-web-sdk: /white-web-sdk-esm/2.16.24 packages/flat-types: specifiers: {} + services/rtc-recording/flat-rtc-recording: + specifiers: + '@netless/flat-rtc': workspace:* + prettier: ^2.3.0 + typescript: ^4.6.2 + devDependencies: + '@netless/flat-rtc': link:../../rtc/flat-rtc + prettier: 2.6.2 + typescript: 4.6.4 + + services/rtc-recording/flat-rtc-recording-agora: + specifiers: + '@netless/flat-rtc-recording': workspace:* + emittery: ^0.10.2 + prettier: ^2.3.0 + side-effect-manager: ^0.1.5 + typescript: ^4.6.2 + value-enhancer: ^1.0.3 + devDependencies: + '@netless/flat-rtc-recording': link:../flat-rtc-recording + emittery: 0.10.2 + prettier: 2.6.2 + side-effect-manager: 0.1.5 + typescript: 4.6.4 + value-enhancer: 1.3.2 + services/rtc/flat-rtc: specifiers: emittery: ^0.10.2 @@ -418,6 +626,37 @@ importers: typescript: 4.6.4 value-enhancer: 1.0.3 + services/rtm/flat-rtm: + specifiers: + emittery: ^0.10.2 + prettier: ^2.3.0 + typescript: ^4.6.2 + devDependencies: + emittery: 0.10.2 + prettier: 2.6.2 + typescript: 4.6.4 + + services/rtm/flat-rtm-agora: + specifiers: + '@netless/flat-rtm': workspace:* + agora-rtm-sdk: ^1.4.4 + emittery: ^0.10.2 + prettier: ^2.3.0 + side-effect-manager: ^0.1.5 + typescript: ^4.6.2 + uuid: ^8.3.2 + value-enhancer: ^1.0.3 + dependencies: + agora-rtm-sdk: 1.4.4 + devDependencies: + '@netless/flat-rtm': link:../flat-rtm + emittery: 0.10.2 + prettier: 2.6.2 + side-effect-manager: 0.1.5 + typescript: 4.6.4 + uuid: 8.3.2 + value-enhancer: 1.3.2 + web/flat-web: specifiers: '@ant-design/icons': ^4.7.0 @@ -430,11 +669,18 @@ importers: '@netless/app-plyr': ^0.1.3 '@netless/app-slide': ^0.2.2 '@netless/combine-player': ^1.1.6 - '@netless/fastboard-react': ^0.3.5-canary.1 + '@netless/fastboard-react': ^0.3.5-canary.5 + '@netless/flat-pages': workspace:* '@netless/flat-rtc': workspace:* '@netless/flat-rtc-agora-web': workspace:* + '@netless/flat-rtm': workspace:* + '@netless/flat-rtm-agora': workspace:* + '@netless/flat-server-api': workspace:* + '@netless/flat-services': workspace:* + '@netless/flat-stores': workspace:* '@netless/mini-svg-data-uri': 0.0.1 '@netless/player-controller': ^0.0.9 + '@netless/synced-store': ^1.1.1 '@netless/video-js-plugin': ^0.3.8 '@netless/window-manager': ^0.4.31 '@types/loadable__component': ^5.13.4 @@ -485,10 +731,17 @@ importers: '@netless/app-plyr': 0.1.3 '@netless/app-slide': 0.2.2 '@netless/combine-player': 1.1.6 - '@netless/fastboard-react': 0.3.5-canary.1_75wc7cfqgpdqty56nasvdvou34 + '@netless/fastboard-react': 0.3.5-canary.5_75wc7cfqgpdqty56nasvdvou34 + '@netless/flat-pages': link:../../packages/flat-pages '@netless/flat-rtc': link:../../services/rtc/flat-rtc '@netless/flat-rtc-agora-web': link:../../services/rtc/flat-rtc-agora-web + '@netless/flat-rtm': link:../../services/rtm/flat-rtm + '@netless/flat-rtm-agora': link:../../services/rtm/flat-rtm-agora + '@netless/flat-server-api': link:../../packages/flat-server-api + '@netless/flat-services': link:../../packages/flat-services + '@netless/flat-stores': link:../../packages/flat-stores '@netless/player-controller': 0.0.9_7wevdi4665xpaid7wna2nfytg4 + '@netless/synced-store': 1.1.5_white-web-sdk-esm@2.16.24 '@netless/video-js-plugin': 0.3.8_igmyzdvqqkv6gevwhshexnrgbm '@netless/window-manager': 0.4.31_white-web-sdk-esm@2.16.24 '@videojs/vhs-utils': 2.3.0 @@ -2766,7 +3019,6 @@ packages: /@juggle/resize-observer/3.3.1: resolution: {integrity: sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==} - dev: false /@loadable/component/5.15.2_react@17.0.2: resolution: {integrity: sha512-ryFAZOX5P2vFkUdzaAtTG88IGnr9qxSdvLRvJySXcUA4B4xVWurUNADu3AnKPksxOZajljqTrDEDcYjeL4lvLw==} @@ -2878,11 +3130,9 @@ packages: /@netless/app-slide/0.2.2: resolution: {integrity: sha512-2+EFJUT5PHDbcgfIP1P2/BKE/c/I+Etr9YD0y4zSym2UoqS3GyZWgQLIES1d2nQVnaRomOjppighlbNZ/ccbZA==} - dev: false /@netless/canvas-polyfill/0.0.4: resolution: {integrity: sha512-7NzsJrba0R/mq/l10SkIZQwbrNVJyPxZYrjK6xL3Ts732iWAVuS2UB0u3s6iGeUVcqV39A679yva8APWRl4M0A==} - dev: false /@netless/combine-player/1.1.6: resolution: {integrity: sha512-UUGRxF0kY6fD+HqGTQU9vFKbpiFNcvQTMd217M+AbjT/nsYXgznmySRXqMfuZVUHy+76767mj1yVyPkRF0cQxw==} @@ -2900,39 +3150,36 @@ packages: - supports-color dev: true - /@netless/fastboard-core/0.3.5-canary.1_q34arnsiowzfmfxqxfjik5rqta: - resolution: {integrity: sha512-MlZFdh2nyMzmmQW/8RvrMS6V6TuFaTdl5qsdhCqgt0AI/VmVIRzlA/ngjUETghxd4QmtQF0YWFTJP05FuAPoxQ==} + /@netless/fastboard-core/0.3.5-canary.5_q34arnsiowzfmfxqxfjik5rqta: + resolution: {integrity: sha512-JR+o7/tGW5CgbVBB5cDiL5JC+QFNGPNcQVwV0aXO1wwMTaAY6II0NvJROYLMS3GfjGdl9/dWPjdGwXF81Qs6Ig==} peerDependencies: '@netless/window-manager': '>=0.4.0' white-web-sdk: '>=2.16.0' dependencies: '@netless/app-slide': 0.2.2 - '@netless/synced-store': 2.0.1_white-web-sdk-esm@2.16.24 + '@netless/synced-store': 2.0.2_white-web-sdk-esm@2.16.24 '@netless/window-manager': 0.4.31_white-web-sdk-esm@2.16.24 white-web-sdk: /white-web-sdk-esm/2.16.24 - dev: false - /@netless/fastboard-react/0.3.5-canary.1_75wc7cfqgpdqty56nasvdvou34: - resolution: {integrity: sha512-uPEh1NiTcP1XvhAvbeENEWPBRHxBW/38p5uAyk8qV3Q/vjIk/FrWpsMJtqlrMT8fomf0QyDLe9p9mMvKwSki5g==} + /@netless/fastboard-react/0.3.5-canary.5_75wc7cfqgpdqty56nasvdvou34: + resolution: {integrity: sha512-s4rBw7IQJuOABZLc4F3wAHNF1fHa/Wu5Q9U1mQbCMgPjqYAneGLAbSfURCfGxwL8zGItcUVNt05W679FUOXlMA==} peerDependencies: react: '*' dependencies: - '@netless/fastboard-core': 0.3.5-canary.1_q34arnsiowzfmfxqxfjik5rqta - '@netless/fastboard-ui': 0.3.5-canary.1_hgp66s44te76bsgdnzu6rhfcbm + '@netless/fastboard-core': 0.3.5-canary.5_q34arnsiowzfmfxqxfjik5rqta + '@netless/fastboard-ui': 0.3.5-canary.5_hpb5a7khnei5y7v7wamgkf2hii react: 17.0.2 transitivePeerDependencies: - '@netless/window-manager' - white-web-sdk - dev: false - /@netless/fastboard-ui/0.3.5-canary.1_hgp66s44te76bsgdnzu6rhfcbm: - resolution: {integrity: sha512-duDhaa5yBUzYKzbu/Ot0WrJjVMRdZJTJ0Vw8pe1OoujRfIZwW17faq5LsV36C0optI2lLzI2rvXsz4nPT0dMRQ==} + /@netless/fastboard-ui/0.3.5-canary.5_hpb5a7khnei5y7v7wamgkf2hii: + resolution: {integrity: sha512-XZzHT+0C3bshSifPoGW0INmLo4hycFczncRwUjJ3aXvYfErSLQFEvfyhi4BrZDZS17snw7E94t0nHK1+hJQBmw==} peerDependencies: - '@netless/fastboard-core': 0.3.5-canary.1 + '@netless/fastboard-core': 0.3.5-canary.5 dependencies: - '@netless/fastboard-core': 0.3.5-canary.1_q34arnsiowzfmfxqxfjik5rqta + '@netless/fastboard-core': 0.3.5-canary.5_q34arnsiowzfmfxqxfjik5rqta tippy.js: 6.3.7 - dev: false /@netless/mini-svg-data-uri/0.0.1: resolution: {integrity: sha512-HsQ04Yzuh8PV4+N31erOeS2pEC6IHGCO/Y7RNwi3AWaQ5ASRpzUka5TxWE4QEXZoseccthcjVL5XN687b/cwRg==} @@ -2955,8 +3202,17 @@ packages: white-web-sdk: /white-web-sdk-esm/2.16.24 dev: false - /@netless/synced-store/2.0.1_white-web-sdk-esm@2.16.24: - resolution: {integrity: sha512-8hyeMb3DPv1lMSC2vTZ03MGhcMXvtBUw7ZEiM7wCTu9WSZZwv5WAT/sSJzKitEPxZ+c2F9V9o52vaunkbJDTbg==} + /@netless/synced-store/1.1.5_white-web-sdk-esm@2.16.24: + resolution: {integrity: sha512-ERXoJiPhsK26udMKhvcHhfzyUk1Q3JIIT71wgGoSoNiPpW2VCWQ4+FAFsoRwa0c1pM0wVHGRRcZkxvOTkXZvdg==} + requiresBuild: true + peerDependencies: + white-web-sdk: '>= 2.16' + dependencies: + white-web-sdk: /white-web-sdk-esm/2.16.24 + dev: false + + /@netless/synced-store/2.0.2_white-web-sdk-esm@2.16.24: + resolution: {integrity: sha512-SrzwqFMssdo15o9hxtDzo93W4++TevGbuxFGfICECLdfgea0R/GNWk9fwBZ0jrT03C7FrEfHNsQTTNRbGiOETA==} requiresBuild: true peerDependencies: white-web-sdk: '>= 2.16' @@ -2966,7 +3222,6 @@ packages: side-effect-manager: 1.1.1 value-enhancer: 1.3.2 white-web-sdk: /white-web-sdk-esm/2.16.24 - dev: false /@netless/telebox-insider/0.2.26: resolution: {integrity: sha512-HOBi9HWK0Zf0nvzfjM0V/0QmZ69ec7L/lCKMwRcfiQHxAAJ/zo9fEm468WocYFsliixWW5L7HwMN0eHb0mw7hA==} @@ -2977,7 +3232,6 @@ packages: side-effect-manager: 0.1.5 stylefire: 7.0.3 value-enhancer: 0.0.8 - dev: false /@netless/video-js-plugin/0.3.8_igmyzdvqqkv6gevwhshexnrgbm: resolution: {integrity: sha512-xCLfL8ISjPD5XQbeGWT/pwKdWXqYXmaEXiP4jcX8oaR83+vJo463znIg2JW8EXHkTq7KRrYnZqqlQdI6It4L+A==} @@ -3013,12 +3267,10 @@ packages: uuid: 7.0.3 video.js: 7.10.2 white-web-sdk: /white-web-sdk-esm/2.16.24 - dev: false /@netless/xml-js/1.6.15: resolution: {integrity: sha512-e0emMs7YtDB/ATUns1SJ61R9n9nfVvwwFodoc539Qt0ScksaCLCaFWgpEbLloj9sr60ry6Xd8QFHKULFIZB6zA==} hasBin: true - dev: false /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -3142,7 +3394,6 @@ packages: /@popmotion/easing/1.0.2: resolution: {integrity: sha512-IkdW0TNmRnWTeWI7aGQIVDbKXPWHVEYdGgd5ZR4SH/Ty/61p63jCjrPxX1XrR7IGkl08bjhJROStD7j+RKgoIw==} - dev: false /@popmotion/popcorn/0.4.4: resolution: {integrity: sha512-jYO/8319fKoNLMlY4ZJPiPu8Ea8occYwRZhxpaNn/kZsK4QG2E7XFlXZMJBsTWDw7I1i0uaqyC4zn1nwEezLzg==} @@ -3152,53 +3403,42 @@ packages: hey-listen: 1.0.8 style-value-types: 3.2.0 tslib: 1.14.1 - dev: false /@popperjs/core/2.11.5: resolution: {integrity: sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==} /@protobufjs/aspromise/1.1.2: resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} - dev: false /@protobufjs/base64/1.1.2: resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==} - dev: false /@protobufjs/codegen/2.0.4: resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==} - dev: false /@protobufjs/eventemitter/1.1.0: resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==} - dev: false /@protobufjs/fetch/1.1.0: resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==} dependencies: '@protobufjs/aspromise': 1.1.2 '@protobufjs/inquire': 1.1.0 - dev: false /@protobufjs/float/1.0.2: resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==} - dev: false /@protobufjs/inquire/1.1.0: resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==} - dev: false /@protobufjs/path/1.1.2: resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==} - dev: false /@protobufjs/pool/1.1.0: resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==} - dev: false /@protobufjs/utf8/1.1.0: resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} - dev: false /@reach/router/1.3.4_sfoxds7t5ydpegc3knd667wn6m: resolution: {integrity: sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==} @@ -4862,7 +5102,6 @@ packages: /@types/long/4.0.2: resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==} - dev: false /@types/markdown-to-jsx/6.11.3: resolution: {integrity: sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==} @@ -5035,7 +5274,6 @@ packages: /@types/retry/0.12.0: resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==} - dev: false /@types/scheduler/0.16.2: resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==} @@ -5047,7 +5285,6 @@ packages: /@types/shallowequal/1.1.1: resolution: {integrity: sha512-Lhni3aX80zbpdxRuWhnuYPm8j8UQaa571lHP/xI4W+7BAFhSIhRReXnqjEgT/XzPoXZTJkCqstFMJ8CZTK6IlQ==} - dev: false /@types/source-list-map/0.1.2: resolution: {integrity: sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==} @@ -5306,7 +5543,6 @@ packages: mpd-parser: 0.14.0 mux.js: 5.6.7 video.js: 7.10.2 - dev: false /@videojs/vhs-utils/2.3.0: resolution: {integrity: sha512-ThSmm91S7tuIJ757ON50K4y7S/bvKN4+B0tu303gCOxaG57PoP1UvPfMQZ90XGhxwNgngexVojOqbBHhTvXVHQ==} @@ -5315,7 +5551,6 @@ packages: '@babel/runtime': 7.17.9 global: 4.4.0 url-toolkit: 2.2.5 - dev: false /@videojs/xhr/2.5.1: resolution: {integrity: sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==} @@ -5323,7 +5558,6 @@ packages: '@babel/runtime': 7.17.9 global: 4.4.0 is-function: 1.0.2 - dev: false /@vitejs/plugin-react/1.3.2: resolution: {integrity: sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA==} @@ -5711,7 +5945,6 @@ packages: '@videojs/vhs-utils': 2.3.0 global: 4.4.0 pkcs7: 1.0.4 - dev: false /agent-base/6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} @@ -6360,7 +6593,6 @@ packages: follow-redirects: 1.15.0 transitivePeerDependencies: - debug - dev: false /axobject-query/2.2.0: resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==} @@ -6650,7 +6882,6 @@ packages: /bezier-js/2.6.1: resolution: {integrity: sha512-jelZM33eNzcZ9snJ/5HqJLw3IzXvA8RFcBjkdOB8SDYyOvW8Y2tTosojAiBTnD1MhbHoWUYNbxUXxBl61TxbRg==} - dev: false /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} @@ -7423,14 +7654,12 @@ packages: dependencies: color-name: 1.1.4 simple-swizzle: 0.2.2 - dev: false /color/3.2.1: resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} dependencies: color-convert: 1.9.3 color-string: 1.9.1 - dev: false /colorette/1.4.0: resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} @@ -7529,7 +7758,6 @@ packages: /complex.js/2.1.1: resolution: {integrity: sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==} - dev: false /component-emitter/1.3.0: resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==} @@ -7704,7 +7932,6 @@ packages: resolution: {integrity: sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==} deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. requiresBuild: true - dev: false /core-util-is/1.0.2: resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==} @@ -8196,7 +8423,6 @@ packages: /decimal.js/10.3.1: resolution: {integrity: sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==} - dev: false /decode-uri-component/0.2.0: resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==} @@ -8376,7 +8602,6 @@ packages: /detect-hover/1.0.3: resolution: {integrity: sha512-HtLoY+tClgYucJNiovNICGWFp9nOGVmHY44s7L62iPqORXM9vujeWFaVcqtA7XRvp/2Y+4RBUfHbDKFGN+xxZQ==} - dev: false /detect-it/3.0.7: resolution: {integrity: sha512-RxpgcdbatUX6epJE09K16iJqF7x6iEcEdoL18FR2zpBO4JhnL7aMOAUoUEyexdtbWOSfTmoDWmeD6mwRBQyRXg==} @@ -8385,7 +8610,6 @@ packages: detect-passive-events: 1.0.5 detect-pointer: 1.0.3 detect-touch-events: 2.0.2 - dev: false /detect-node/2.1.0: resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==} @@ -8394,11 +8618,9 @@ packages: /detect-passive-events/1.0.5: resolution: {integrity: sha512-foW7Q35wwOCxVzW0xLf5XeB5Fhe7oyRgvkBYdiP9IWgLMzjqUqTvsJv9ymuEWGjY6AoDXD3OC294+Z9iuOw0QA==} - dev: false /detect-pointer/1.0.3: resolution: {integrity: sha512-d0o/Puo3fiGSCXy6H039h9Kwz+mmYCGKZ/qtPFnpN3WfsumjC1C9b5KKvRu+aYnfdI8peqN/iAe7dPd85qIt2g==} - dev: false /detect-port-alt/1.1.6: resolution: {integrity: sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==} @@ -8424,7 +8646,6 @@ packages: /detect-touch-events/2.0.2: resolution: {integrity: sha512-g8GWBkJLiIDRJfRXEdrd1wMXpNyGId2DkbfuwFahSb4OCvn717hyRJtAcEDISfp3zkwEhZ4Y4woHPA6DeyB3Fw==} - dev: false /diff/4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} @@ -8858,7 +9079,6 @@ packages: /emittery/0.9.2: resolution: {integrity: sha512-sweWHu3j4dQm+NjLPu17pv+m5lCeK7g4Ov0NgfbRUEyzLc59DYDeRYXqlxEvuolaToI0VR3ThjFAghzl7Acjfw==} engines: {node: '>=12'} - dev: false /emoji-regex/8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -9294,7 +9514,6 @@ packages: /escape-latex/1.2.0: resolution: {integrity: sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==} - dev: false /escape-string-regexp/1.0.5: resolution: {integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=} @@ -9810,7 +10029,6 @@ packages: /eventemitter3/4.0.7: resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} - dev: false /events/3.3.0: resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} @@ -10319,7 +10537,6 @@ packages: peerDependenciesMeta: debug: optional: true - dev: false /for-in/1.0.2: resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==} @@ -10549,7 +10766,6 @@ packages: /fraction.js/4.2.0: resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==} - dev: false /fragment-cache/0.2.1: resolution: {integrity: sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=} @@ -10562,7 +10778,6 @@ packages: resolution: {integrity: sha512-MmgZ4wCoeVxNbx2xp5hN/zPDCbLSKiDt4BbbslK7j/pM2lg5S0vhTNv1v8BCVb99JPIo6hXBFdwzU7Q4qcAaoQ==} dependencies: hey-listen: 1.0.8 - dev: false /fresh/0.5.2: resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=} @@ -10979,7 +11194,6 @@ packages: dependencies: min-document: 2.19.0 process: 0.5.2 - dev: false /global/4.4.0: resolution: {integrity: sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==} @@ -11325,7 +11539,6 @@ packages: /hey-listen/1.0.8: resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} - dev: false /highlight.js/10.7.3: resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} @@ -11685,7 +11898,6 @@ packages: /individual/2.0.0: resolution: {integrity: sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=} - dev: false /infer-owner/1.0.4: resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} @@ -11812,7 +12024,6 @@ packages: /is-arrayish/0.3.2: resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} - dev: false /is-bigint/1.0.4: resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} @@ -12309,7 +12520,6 @@ packages: /javascript-natural-sort/0.7.1: resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} - dev: false /jest-haste-map/26.6.2: resolution: {integrity: sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==} @@ -12549,7 +12759,6 @@ packages: /keycode/2.2.1: resolution: {integrity: sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==} - dev: false /keyv/3.0.0: resolution: {integrity: sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==} @@ -12862,7 +13071,6 @@ packages: /long/4.0.0: resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==} - dev: false /loose-envify/1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} @@ -12915,7 +13123,6 @@ packages: '@babel/runtime': 7.18.3 '@videojs/vhs-utils': 2.3.0 global: 4.4.0 - dev: false /make-dir/1.3.0: resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==} @@ -13036,7 +13243,6 @@ packages: seedrandom: 3.0.5 tiny-emitter: 2.1.0 typed-function: 2.1.0 - dev: false /md5.js/1.3.5: resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==} @@ -13395,6 +13601,24 @@ packages: engines: {node: '>=10'} hasBin: true + /mobx-react-lite/3.4.0_5mmsvx7kyvezfxuro7wjt7ivm4: + resolution: {integrity: sha512-bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ==} + peerDependencies: + mobx: ^6.1.0 + react: ^16.8.0 || ^17 || ^18 + react-dom: '*' + react-native: '*' + peerDependenciesMeta: + react-dom: + optional: true + react-native: + optional: true + dependencies: + mobx: 6.6.0 + react: 17.0.2 + react-dom: 17.0.2_react@17.0.2 + dev: false + /mobx-react-lite/3.4.0_hmiq3xiffx2tpvk3y5rm3vgqxa: resolution: {integrity: sha512-bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ==} peerDependencies: @@ -13419,7 +13643,6 @@ packages: /mobx/6.6.0: resolution: {integrity: sha512-MNTKevLH/6DShLZcmSL351+JgiJPO56A4GUpoiDQ3/yZ0mAtclNLdHK9q4BcQhibx8/JSDupfTpbX2NZPemlRg==} - dev: false /moment/2.29.3: resolution: {integrity: sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==} @@ -13455,7 +13678,6 @@ packages: '@videojs/vhs-utils': 2.3.0 global: 4.4.0 xmldom: 0.1.31 - dev: false /ms/2.0.0: resolution: {integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=} @@ -13473,7 +13695,6 @@ packages: /mux.js/5.6.7: resolution: {integrity: sha512-YSr6B8MUgE4S18MptbY2XM+JKGbw9JDkgs7YkuE/T2fpDKjOhZfb/nD6vmsVxvLYOExWNaQn1UGBp6PGsnTtew==} - dev: false /mv/2.1.1: resolution: {integrity: sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=} @@ -14172,7 +14393,6 @@ packages: dependencies: '@types/retry': 0.12.0 retry: 0.13.1 - dev: false /p-timeout/2.0.1: resolution: {integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==} @@ -14459,7 +14679,6 @@ packages: hasBin: true dependencies: '@babel/runtime': 7.18.3 - dev: false /pkg-dir/3.0.0: resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==} @@ -14748,7 +14967,6 @@ packages: /process/0.5.2: resolution: {integrity: sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=} engines: {node: '>= 0.6.0'} - dev: false /progress/2.0.3: resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} @@ -14846,7 +15064,6 @@ packages: '@types/long': 4.0.2 '@types/node': 17.0.40 long: 4.0.0 - dev: false /proxy-addr/2.0.7: resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} @@ -14963,7 +15180,6 @@ packages: decode-uri-component: 0.2.0 object-assign: 4.1.1 strict-uri-encode: 1.1.0 - dev: false /querystring-es3/0.2.1: resolution: {integrity: sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=} @@ -14984,7 +15200,6 @@ packages: /querystringify/2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} - dev: false /queue-microtask/1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} @@ -15732,7 +15947,6 @@ packages: prop-types: 15.8.1 react: 16.14.0 scheduler: 0.19.1 - dev: false /react-dom/17.0.2_react@17.0.2: resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==} @@ -15792,6 +16006,26 @@ packages: shallowequal: 1.1.0 dev: true + /react-i18next/11.16.9_6paiyehwr4ov62opw6r6idgboa: + resolution: {integrity: sha512-euXxWvcEAvsY7ZVkwx9ztCq4butqtsGHEkpkuo0RMj8Ru09IF9o2KxCyN+zyv51Nr0aBh/elaTIiR6fMb8YfVg==} + peerDependencies: + i18next: '>= 19.0.0' + react: '>= 16.8.0 || ^17' + react-dom: '*' + react-native: '*' + peerDependenciesMeta: + react-dom: + optional: true + react-native: + optional: true + dependencies: + '@babel/runtime': 7.17.9 + html-escaper: 2.0.2 + html-parse-stringify: 3.0.1 + i18next: 21.7.1 + react: 17.0.2 + dev: true + /react-i18next/11.16.9_jzsml6ph5qfrjyi3jkdinvojay: resolution: {integrity: sha512-euXxWvcEAvsY7ZVkwx9ztCq4butqtsGHEkpkuo0RMj8Ru09IF9o2KxCyN+zyv51Nr0aBh/elaTIiR6fMb8YfVg==} peerDependencies: @@ -16038,7 +16272,6 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 prop-types: 15.8.1 - dev: false /react/17.0.2: resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} @@ -16311,7 +16544,6 @@ packages: /remitter/0.2.6: resolution: {integrity: sha512-vg6psVwfJsg7zcX7HVJ0UxZiRc0V7EfFOOzcp6WAEP2Br0G75DEM5KUglyxyMuxG57ntrfEBzqP6Cd91Nf2CBw==} - dev: false /remove-trailing-separator/1.1.0: resolution: {integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8=} @@ -16380,7 +16612,6 @@ packages: /requires-port/1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} - dev: false /resize-observer-polyfill/1.5.1: resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==} @@ -16460,7 +16691,6 @@ packages: /retry/0.13.1: resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} engines: {node: '>= 4'} - dev: false /reusify/1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} @@ -16573,7 +16803,6 @@ packages: resolution: {integrity: sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=} dependencies: individual: 2.0.0 - dev: false /rxjs/7.5.5: resolution: {integrity: sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==} @@ -16595,7 +16824,6 @@ packages: resolution: {integrity: sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=} dependencies: rust-result: 1.0.0 - dev: false /safe-regex/1.1.0: resolution: {integrity: sha1-QKNmnzsHfR6UPURinhV91IAjvy4=} @@ -16675,7 +16903,6 @@ packages: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - dev: false /scheduler/0.20.2: resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==} @@ -16738,7 +16965,6 @@ packages: /seedrandom/3.0.5: resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==} - dev: false /seek-bzip/1.0.6: resolution: {integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==} @@ -16946,7 +17172,6 @@ packages: /side-effect-manager/1.1.1: resolution: {integrity: sha512-ppUBbzOXLydre40Yz553eIIlTdf2WCJcqMI4n06sTRCA2o5AwG5WQ2qq6fHp5C8RK3TAfgtZKrhllNG2F1jzCA==} - dev: false /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -16955,7 +17180,6 @@ packages: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} dependencies: is-arrayish: 0.3.2 - dev: false /sisteransi/1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -17142,7 +17366,6 @@ packages: /spark-md5/3.0.2: resolution: {integrity: sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==} - dev: false /spdx-correct/3.1.1: resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==} @@ -17401,7 +17624,6 @@ packages: /strict-uri-encode/1.1.0: resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==} engines: {node: '>=0.10.0'} - dev: false /string-argv/0.3.1: resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==} @@ -17623,7 +17845,6 @@ packages: dependencies: hey-listen: 1.0.8 tslib: 1.14.1 - dev: false /stylefire/7.0.3: resolution: {integrity: sha512-Q0l7NSeFz/OkX+o6/7Zg3VZxSAZeQzQpYomWmIpOehFM/rJNMSLVX5fgg6Q48ut2ETNKwdhm97mPNU643EBCoQ==} @@ -17633,7 +17854,6 @@ packages: hey-listen: 1.0.8 style-value-types: 3.2.0 tslib: 1.14.1 - dev: false /stylis/4.1.1: resolution: {integrity: sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ==} @@ -17909,7 +18129,6 @@ packages: /textarea-caret-ts/4.1.1: resolution: {integrity: sha512-kEL3aQ99r8jJR2RfB6g74LEzrt9NTXkyjPvvP3vzhNkQ+zAaXitKCq8BUEueepULWCCxtpRaRjtnYHaR45FDMg==} - dev: false /thenify-all/1.6.0: resolution: {integrity: sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=} @@ -17962,7 +18181,6 @@ packages: /tiny-emitter/2.1.0: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} - dev: false /tiny-invariant/1.2.0: resolution: {integrity: sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==} @@ -17976,7 +18194,6 @@ packages: resolution: {integrity: sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==} dependencies: '@popperjs/core': 2.11.5 - dev: false /tmp-promise/3.0.3: resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==} @@ -18300,7 +18517,6 @@ packages: /typed-function/2.1.0: resolution: {integrity: sha512-bctQIOqx2iVbWGDGPWwIm18QScpu2XRmkC19D8rQGFsjKSgteq/o1hTZvIG/wuDq8fanpBDrLkLq+aEN/6y5XQ==} engines: {node: '>= 10'} - dev: false /typedarray-to-buffer/3.1.5: resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} @@ -18602,7 +18818,6 @@ packages: dependencies: querystringify: 2.2.0 requires-port: 1.0.0 - dev: false /url-to-options/1.0.1: resolution: {integrity: sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==} @@ -18611,7 +18826,6 @@ packages: /url-toolkit/2.2.5: resolution: {integrity: sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==} - dev: false /url/0.11.0: resolution: {integrity: sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=} @@ -18752,12 +18966,10 @@ packages: /uuid/7.0.3: resolution: {integrity: sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==} hasBin: true - dev: false /uuid/8.3.2: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} hasBin: true - dev: false /v8-compile-cache-lib/3.0.1: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} @@ -18792,7 +19004,6 @@ packages: resolution: {integrity: sha512-ba8Rcyp9ItqlLWoyZVqHGaEdY1tqP1mcbRhlOrCnIrDxdl8rKNH1Rq45syo4IMYNSkwC2oV9xBWcV9dmL14aQg==} dependencies: side-effect-manager: 0.1.5 - dev: false /value-enhancer/1.0.3: resolution: {integrity: sha512-pIYwtL9F+T1uh82eV7MG+T3KWBXPMEwr3rVMwt6szfL7ID7YXW/VbnLEqrueEPuiHxje8EybO4wncjIM6eZaug==} @@ -18800,7 +19011,6 @@ packages: /value-enhancer/1.3.2: resolution: {integrity: sha512-RC+yfNMwuLZO2iDtHh4dxvtHP00DnSO0VARBkVoxT1eOwMJ/Rs5jKh6nBUcotWncJhjfGGhQE4SUK8goLEC5oQ==} - dev: false /value-equal/1.0.1: resolution: {integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==} @@ -18861,17 +19071,14 @@ packages: safe-json-parse: 4.0.0 videojs-font: 3.2.0 videojs-vtt.js: 0.15.3 - dev: false /videojs-font/3.2.0: resolution: {integrity: sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==} - dev: false /videojs-vtt.js/0.15.3: resolution: {integrity: sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==} dependencies: global: 4.4.0 - dev: false /vite/2.9.10_less@4.1.2: resolution: {integrity: sha512-TwZRuSMYjpTurLqXspct+HZE7ONiW9d+wSWgvADGxhDPPyoIcNywY+RX4ng+QpK30DCa1l/oZgi2PLZDibhzbQ==} @@ -19303,7 +19510,6 @@ packages: textarea-caret-ts: 4.1.1 url-parse: 1.5.10 uuid: 7.0.3 - dev: false /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} @@ -19401,7 +19607,6 @@ packages: resolution: {integrity: sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==} engines: {node: '>=0.1'} deprecated: Deprecated due to CVE-2021-21366 resolved in 0.5.0 - dev: false /xregexp/2.0.0: resolution: {integrity: sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=} diff --git a/web/flat-web/package.json b/web/flat-web/package.json index 2efc54b5eb5..76cba59b80e 100644 --- a/web/flat-web/package.json +++ b/web/flat-web/package.json @@ -22,6 +22,7 @@ "@netless/app-slide": "^0.2.2", "@netless/combine-player": "^1.1.6", "@netless/fastboard-react": "^0.3.5-canary.5", + "@netless/flat-pages": "workspace:*", "@netless/flat-rtc": "workspace:*", "@netless/flat-rtc-agora-web": "workspace:*", "@netless/flat-rtm": "workspace:*", diff --git a/web/flat-web/src/tasks/init-ui.tsx b/web/flat-web/src/tasks/init-ui.tsx index 92803ac3d1f..59ea02b4d6a 100644 --- a/web/flat-web/src/tasks/init-ui.tsx +++ b/web/flat-web/src/tasks/init-ui.tsx @@ -11,10 +11,10 @@ import zhCN from "antd/es/locale/zh_CN"; import enUS from "antd/es/locale/en_US"; import { I18nextProvider } from "react-i18next"; -import { i18n } from "../utils/i18n"; -import { AppRoutes } from "../AppRoutes"; -import { StoreProvider } from "../components/StoreProvider"; -import { FlatServicesContextProvider } from "../components/FlatServicesContext"; +import { i18n } from "@netless/flat-pages/src/utils/i18n"; +import { AppRoutes } from "@netless/flat-pages/src/AppRoutes"; +import { StoreProvider } from "@netless/flat-pages/src/components/StoreProvider"; +import { FlatServicesContextProvider } from "@netless/flat-pages/src/components/FlatServicesContext"; /** configure right after import */ import { configure } from "mobx"; From 76259b2eee14659fea6c4389d0a1d6a9f97c0e06 Mon Sep 17 00:00:00 2001 From: cheerchen Date: Thu, 21 Jul 2022 10:01:25 +0800 Subject: [PATCH 2/2] chore(flat-pages): move file --- packages/flat-pages/src/components/MainPageLayout.tsx | 2 +- .../components/MainPageLayoutHorizontalContainer/index.tsx | 4 ++-- packages/flat-pages/src/components/StoreProvider.tsx | 2 +- packages/flat-pages/src/{components => stores}/page-store.ts | 4 ++-- packages/flat-stores/package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename packages/flat-pages/src/{components => stores}/page-store.ts (86%) diff --git a/packages/flat-pages/src/components/MainPageLayout.tsx b/packages/flat-pages/src/components/MainPageLayout.tsx index 4eff7151d12..7d697565285 100644 --- a/packages/flat-pages/src/components/MainPageLayout.tsx +++ b/packages/flat-pages/src/components/MainPageLayout.tsx @@ -1,8 +1,8 @@ import React, { useContext } from "react"; import { observer } from "mobx-react-lite"; import { MainPageLayoutHorizontalContainer } from "./MainPageLayoutHorizontalContainer"; -import { PageStoreContext } from "./StoreProvider"; import { routePages } from "../AppRoutes/route-pages"; +import { PageStoreContext } from "./StoreProvider"; export const MainPageLayout = observer(function MainPageLayout({ children }) { const pageStore = useContext(PageStoreContext); diff --git a/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx b/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx index f5dfe0bf5cf..a58ab2b531b 100644 --- a/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx +++ b/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx @@ -17,10 +17,10 @@ import { SVGSetting, } from "flat-components"; import { useTranslation } from "react-i18next"; -import { GlobalStoreContext } from "../StoreProvider"; -import { FLAT_DOWNLOAD_URL } from "../../constants/process"; import { routeConfig, RouteNameType } from "../../route-config"; +import { GlobalStoreContext } from "../StoreProvider"; import { generateAvatar } from "../../utils/generate-avatar"; +import { FLAT_DOWNLOAD_URL } from "../../constants/process"; export interface MainPageLayoutHorizontalContainerProps { subMenu?: MainPageLayoutItem[]; diff --git a/packages/flat-pages/src/components/StoreProvider.tsx b/packages/flat-pages/src/components/StoreProvider.tsx index bf2173d3470..f9f565e5a6d 100644 --- a/packages/flat-pages/src/components/StoreProvider.tsx +++ b/packages/flat-pages/src/components/StoreProvider.tsx @@ -1,6 +1,6 @@ import React, { createContext, FC } from "react"; import { preferencesStore, globalStore, roomStore } from "@netless/flat-stores"; -import { pageStore } from "./page-store"; +import { pageStore } from "../stores/page-store"; export const GlobalStoreContext = createContext(globalStore); diff --git a/packages/flat-pages/src/components/page-store.ts b/packages/flat-pages/src/stores/page-store.ts similarity index 86% rename from packages/flat-pages/src/components/page-store.ts rename to packages/flat-pages/src/stores/page-store.ts index 2c67e587bd4..3d313fba6e0 100644 --- a/packages/flat-pages/src/components/page-store.ts +++ b/packages/flat-pages/src/stores/page-store.ts @@ -1,6 +1,6 @@ import { makeAutoObservable } from "mobx"; -import { MainPageLayoutHorizontalContainerProps } from "./MainPageLayoutHorizontalContainer"; -import { RouteNameType } from "../../src/route-config"; +import { MainPageLayoutHorizontalContainerProps } from "../components/MainPageLayoutHorizontalContainer"; +import { RouteNameType } from "../route-config"; type DelegateProps = MainPageLayoutHorizontalContainerProps; diff --git a/packages/flat-stores/package.json b/packages/flat-stores/package.json index a857f119fe0..6b29ab8148b 100644 --- a/packages/flat-stores/package.json +++ b/packages/flat-stores/package.json @@ -13,7 +13,7 @@ "mobx": "6.x", "white-web-sdk": ">=2.16" }, -"devDependencies": { + "devDependencies": { "@netless/fastboard-react": "^0.3.5-canary.5", "@netless/window-manager": "^0.4.31", "mobx": "^6.4.2",