From 17f3638641e665e1e2d54088e7e179e7a68a018a Mon Sep 17 00:00:00 2001 From: hyrious Date: Mon, 10 May 2021 18:49:15 +0800 Subject: [PATCH] chore(package): remove react-router, consist react version (#622) * chore(flat-components): move some dependencies to peer * chore(package): remove react-router, consist react version --- desktop/renderer-app/package.json | 5 +- .../src/AppRoutes/AppRouteContainer.tsx | 2 +- desktop/renderer-app/src/AppRoutes/index.tsx | 3 +- .../src/pages/BigClassPage/index.tsx | 2 +- .../DeviceCheckLayoutContainer.tsx | 2 +- .../OrdinaryRoomForm.tsx | 2 +- .../PeriodicSubRoomForm.tsx | 2 +- .../src/pages/OneToOnePage/index.tsx | 2 +- .../src/pages/ReplayPage/index.tsx | 3 +- .../src/pages/ScheduleRoomPage/index.tsx | 2 +- .../src/pages/SmallClassPage/index.tsx | 2 +- .../src/pages/UserScheduledPage/index.tsx | 2 +- desktop/renderer-app/src/utils/routes.ts | 2 +- packages/flat-components/package.json | 62 ++++++++++--------- yarn.lock | 27 +------- 15 files changed, 49 insertions(+), 71 deletions(-) diff --git a/desktop/renderer-app/package.json b/desktop/renderer-app/package.json index e5d09a188e3..8a55a93c04d 100644 --- a/desktop/renderer-app/package.json +++ b/desktop/renderer-app/package.json @@ -32,11 +32,10 @@ "mobx-react-lite": "^3.1.6", "node-downloader-helper": "^1.0.13", "polly-js": "^1.6.7", - "react": "^17.0.1", + "react": "^17.0.2", "react-device-detect": "^1.17.0", - "react-dom": "^17.0.1", + "react-dom": "^17.0.2", "react-i18next": "^11.8.4", - "react-router": "^5.2.0", "react-router-dom": "^5.2.0", "react-router-last-location": "^2.0.1", "react-use": "^15.3.8", diff --git a/desktop/renderer-app/src/AppRoutes/AppRouteContainer.tsx b/desktop/renderer-app/src/AppRoutes/AppRouteContainer.tsx index 754c0fb0b22..75a8e4847f9 100644 --- a/desktop/renderer-app/src/AppRoutes/AppRouteContainer.tsx +++ b/desktop/renderer-app/src/AppRoutes/AppRouteContainer.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { RouteComponentProps } from "react-router"; +import { RouteComponentProps } from "react-router-dom"; import PageError from "../PageError"; import { ipcAsyncByMainWindow } from "../utils/ipc"; diff --git a/desktop/renderer-app/src/AppRoutes/index.tsx b/desktop/renderer-app/src/AppRoutes/index.tsx index bb5e3108622..985e43a0986 100644 --- a/desktop/renderer-app/src/AppRoutes/index.tsx +++ b/desktop/renderer-app/src/AppRoutes/index.tsx @@ -1,6 +1,5 @@ import React from "react"; -import { HashRouter } from "react-router-dom"; -import { Route, Switch } from "react-router"; +import { HashRouter, Route, Switch } from "react-router-dom"; import { message } from "antd"; import { LastLocationProvider } from "react-router-last-location"; import { RouteConfig, routeConfig } from "../route-config"; diff --git a/desktop/renderer-app/src/pages/BigClassPage/index.tsx b/desktop/renderer-app/src/pages/BigClassPage/index.tsx index f8dad7eda46..0cf751ede6b 100644 --- a/desktop/renderer-app/src/pages/BigClassPage/index.tsx +++ b/desktop/renderer-app/src/pages/BigClassPage/index.tsx @@ -2,7 +2,7 @@ import { message } from "antd"; import classNames from "classnames"; import { observer } from "mobx-react-lite"; import React, { useEffect, useRef, useState } from "react"; -import { useParams } from "react-router"; +import { useParams } from "react-router-dom"; import { RoomPhase, ViewMode } from "white-web-sdk"; import { AgoraCloudRecordBackgroundConfigItem } from "../../apiMiddleware/flatServer/agora"; import { RoomStatus, RoomType } from "../../apiMiddleware/flatServer/constants"; diff --git a/desktop/renderer-app/src/pages/DeviceCheckPages/DeviceCheckLayoutContainer.tsx b/desktop/renderer-app/src/pages/DeviceCheckPages/DeviceCheckLayoutContainer.tsx index 98cb93fcede..60b956fcecf 100644 --- a/desktop/renderer-app/src/pages/DeviceCheckPages/DeviceCheckLayoutContainer.tsx +++ b/desktop/renderer-app/src/pages/DeviceCheckPages/DeviceCheckLayoutContainer.tsx @@ -9,7 +9,7 @@ import React from "react"; import { MainPageLayoutContainer } from "../../components/MainPageLayoutContainer"; import { useWindowSize } from "../../utils/hooks/useWindowSize"; import { routeConfig, RouteNameType } from "../../route-config"; -import { useHistory, useLocation } from "react-router"; +import { useHistory, useLocation } from "react-router-dom"; import { DeviceCheckState } from "./utils"; import { MainPageLayoutItem } from "flat-components"; diff --git a/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/OrdinaryRoomForm.tsx b/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/OrdinaryRoomForm.tsx index d03b7ca2332..e6143469671 100644 --- a/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/OrdinaryRoomForm.tsx +++ b/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/OrdinaryRoomForm.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { observer } from "mobx-react-lite"; -import { useHistory } from "react-router"; +import { useHistory } from "react-router-dom"; import { message } from "antd"; import { ordinaryRoomInfo, updateOrdinaryRoom } from "../../apiMiddleware/flatServer"; import EditRoomPage, { diff --git a/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/PeriodicSubRoomForm.tsx b/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/PeriodicSubRoomForm.tsx index 79552d5b1c4..ab97708b8a5 100644 --- a/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/PeriodicSubRoomForm.tsx +++ b/desktop/renderer-app/src/pages/ModifyOrdinaryRoomPage/PeriodicSubRoomForm.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { observer } from "mobx-react-lite"; -import { useHistory } from "react-router"; +import { useHistory } from "react-router-dom"; import { message } from "antd"; import { periodicSubRoomInfo, updatePeriodicSubRoom } from "../../apiMiddleware/flatServer"; import { diff --git a/desktop/renderer-app/src/pages/OneToOnePage/index.tsx b/desktop/renderer-app/src/pages/OneToOnePage/index.tsx index cc21c3b3855..1cc0adfe7cc 100644 --- a/desktop/renderer-app/src/pages/OneToOnePage/index.tsx +++ b/desktop/renderer-app/src/pages/OneToOnePage/index.tsx @@ -1,7 +1,7 @@ import "./OneToOnePage.less"; import React, { useEffect, useRef, useState } from "react"; -import { useParams } from "react-router"; +import { useParams } from "react-router-dom"; import { observer } from "mobx-react-lite"; import { message } from "antd"; import { RoomPhase, ViewMode } from "white-web-sdk"; diff --git a/desktop/renderer-app/src/pages/ReplayPage/index.tsx b/desktop/renderer-app/src/pages/ReplayPage/index.tsx index 8e75e40a03c..0a7dd0e8b72 100644 --- a/desktop/renderer-app/src/pages/ReplayPage/index.tsx +++ b/desktop/renderer-app/src/pages/ReplayPage/index.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useRef, useState } from "react"; -import { RouteComponentProps, useParams } from "react-router"; +import { RouteComponentProps, useParams, useHistory } from "react-router-dom"; import PlayerController from "@netless/player-controller"; import LoadingPage from "../../LoadingPage"; import { ipcAsyncByMainWindow, ipcReceive, ipcReceiveRemove } from "../../utils/ipc"; @@ -16,7 +16,6 @@ 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"; -import { useHistory } from "react-router-dom"; import { errorTips } from "../../components/Tips/ErrorTips"; import { useWindowSize } from "../../utils/hooks/useWindowSize"; diff --git a/desktop/renderer-app/src/pages/ScheduleRoomPage/index.tsx b/desktop/renderer-app/src/pages/ScheduleRoomPage/index.tsx index 5016bac8b1d..88f3e06bc3e 100644 --- a/desktop/renderer-app/src/pages/ScheduleRoomPage/index.tsx +++ b/desktop/renderer-app/src/pages/ScheduleRoomPage/index.tsx @@ -6,7 +6,7 @@ import { format, formatWithOptions } from "date-fns/fp"; import { zhCN } from "date-fns/locale"; import { observer } from "mobx-react-lite"; import React, { useContext, useEffect, useState } from "react"; -import { useHistory, useParams } from "react-router"; +import { useHistory, useParams } from "react-router-dom"; import { useLastLocation } from "react-router-last-location"; import backSVG from "../../assets/image/back.svg"; import moreBtnSVG from "../../assets/image/moreBtn.svg"; diff --git a/desktop/renderer-app/src/pages/SmallClassPage/index.tsx b/desktop/renderer-app/src/pages/SmallClassPage/index.tsx index 46fcb9cbf6f..68c3ec7f710 100644 --- a/desktop/renderer-app/src/pages/SmallClassPage/index.tsx +++ b/desktop/renderer-app/src/pages/SmallClassPage/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from "react"; import { message } from "antd"; import { RoomPhase, ViewMode } from "white-web-sdk"; import { observer } from "mobx-react-lite"; -import { useParams } from "react-router"; +import { useParams } from "react-router-dom"; import InviteButton from "../../components/InviteButton"; import { TopBar, TopBarDivider } from "../../components/TopBar"; diff --git a/desktop/renderer-app/src/pages/UserScheduledPage/index.tsx b/desktop/renderer-app/src/pages/UserScheduledPage/index.tsx index cccc1d2ff1e..267f1209cac 100644 --- a/desktop/renderer-app/src/pages/UserScheduledPage/index.tsx +++ b/desktop/renderer-app/src/pages/UserScheduledPage/index.tsx @@ -6,7 +6,7 @@ import { PeriodicEndType } from "../../constants/Periodic"; import { GlobalStoreContext, RoomStoreContext } from "../../components/StoreProvider"; import { useSafePromise } from "../../utils/hooks/lifecycle"; import EditRoomPage, { EditRoomFormValues, EditRoomType } from "../../components/EditRoomPage"; -import { useHistory } from "react-router"; +import { useHistory } from "react-router-dom"; import { errorTips } from "../../components/Tips/ErrorTips"; import { useWindowSize } from "../../utils/hooks/useWindowSize"; diff --git a/desktop/renderer-app/src/utils/routes.ts b/desktop/renderer-app/src/utils/routes.ts index 12c4102a1ee..618239965f3 100644 --- a/desktop/renderer-app/src/utils/routes.ts +++ b/desktop/renderer-app/src/utils/routes.ts @@ -1,5 +1,5 @@ import { routeConfig, RouteConfig, RouteNameType, ExtraRouteConfig } from "../route-config"; -import { generatePath, useHistory } from "react-router"; +import { generatePath, useHistory } from "react-router-dom"; import { useCallback } from "react"; export { RouteNameType } from "../route-config"; diff --git a/packages/flat-components/package.json b/packages/flat-components/package.json index d960669f2ca..ff32b0f73da 100644 --- a/packages/flat-components/package.json +++ b/packages/flat-components/package.json @@ -1,13 +1,21 @@ { "name": "flat-components", - "description": "Reusable components for the Flat app.", "version": "0.1.0", "private": false, + "description": "Reusable components for the Flat app.", + "homepage": "https://github.com/netless-io/flat", + "license": "MIT", "sideEffects": [ "*.css" ], - "license": "MIT", - "homepage": "https://github.com/netless-io/flat", + "main": "./build/cjs/index.js", + "module": "./build/index.js", + "types": "./build/index.d.ts", + "files": [ + "theme", + "src", + "build" + ], "scripts": { "lint": "lint-staged", "storybook": "start-storybook -p 6006", @@ -16,35 +24,12 @@ "deploy-storybook": "yarn run build-storybook && node scripts/deploy-storybook.js", "cleanup": "rimraf ./build" }, - "files": [ - "theme", - "src", - "build" - ], - "main": "./build/cjs/index.js", - "module": "./build/index.js", - "types": "./build/index.d.ts", "dependencies": { - "@types/react-transition-group": "^4.4.1", - "classnames": "^2.2.6", - "date-fns": "^2.19.0", - "i18next": "^19.8.4", - "i18next-browser-languagedetector": "^6.0.1", "pretty-bytes": "^5.6.0", - "rc-picker": "^2.5.10", - "react-i18next": "^11.8.4", "react-resize-detector": "^6.6.4", "react-transition-group": "^4.4.1", "react-use": "^15.3.8" }, - "peerDependencies": { - "@ant-design/icons": "^4.2.2", - "antd": "^4.9.3", - "mobx": "^6.1.0", - "mobx-react-lite": "^3.1.6", - "react": "^17.0.1", - "react-dom": "^17.0.1" - }, "devDependencies": { "@ant-design/icons": "^4.2.2", "@babel/plugin-proposal-class-properties": "^7.13.0", @@ -64,12 +49,15 @@ "@types/node": "^14.14.16", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", + "@types/react-transition-group": "^4.4.1", "@typescript-eslint/eslint-plugin": "^4.11.0", "@typescript-eslint/parser": "^4.11.0", "antd": "^4.15.0", "bulma": "^0.9.2", "chance": "^1.1.7", + "classnames": "^2.2.6", "cross-env": "^7.0.2", + "date-fns": "^2.19.0", "eslint": "^7.7.0", "eslint-config-prettier": "^6.11.0", "eslint-config-react-app": "^6.0.0", @@ -81,6 +69,8 @@ "faker": "^5.4.0", "flat-types": "^0.1.0", "fork-ts-checker-webpack-plugin": "^6.0.4", + "i18next": "^19.8.4", + "i18next-browser-languagedetector": "^6.0.1", "less": "^3.12.2", "less-loader": "^6.2.0", "lint-staged": "^10.5.4", @@ -88,8 +78,10 @@ "mobx": "^6.1.0", "mobx-react-lite": "^3.1.6", "prettier": "^2.0.5", - "react": "^17.0.1", - "react-dom": "^17.0.1", + "rc-picker": "^2.5.10", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-i18next": "^11.8.4", "react-refresh": "^0.8.3", "rimraf": "^3.0.0", "rollup": "^2.41.1", @@ -102,5 +94,19 @@ "sass-loader": "^10.1.1", "tachyons": "^4.12.0", "typescript": "^4.1.2" + }, + "peerDependencies": { + "@ant-design/icons": "^4.2.2", + "antd": "^4.9.3", + "classnames": "^2.2.6", + "date-fns": "^2.19.0", + "i18next": "^19.8.4", + "i18next-browser-languagedetector": "^6.0.1", + "mobx": "^6.1.0", + "mobx-react-lite": "^3.1.6", + "rc-picker": "^2.5.10", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-i18next": "^11.8.4" } } diff --git a/yarn.lock b/yarn.lock index bfe01806444..427c6b8a6b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14787,15 +14787,6 @@ react-dom@^16.8.0: prop-types "^15.6.2" scheduler "^0.19.1" -react-dom@^17.0.1: - version "17.0.1" - resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" - integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.1" - react-dom@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" @@ -14936,7 +14927,7 @@ react-router-last-location@^2.0.1: resolved "https://registry.yarnpkg.com/react-router-last-location/-/react-router-last-location-2.0.1.tgz#54d625876dd1448594fa1114aa02e7e21db12970" integrity sha512-3FbFIWwUr2qN28vN9DNdFp6RhUH/yif6ILVff1zT+hLdyGmlNPh3GuPhveb7bHQLgB744QW8L0qtWjX58ESuZQ== -react-router@5.2.0, react-router@^5.2.0: +react-router@5.2.0: version "5.2.0" resolved "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293" integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw== @@ -15038,14 +15029,6 @@ react@^16.8.0: object-assign "^4.1.1" prop-types "^15.6.2" -react@^17.0.1: - version "17.0.1" - resolved "https://registry.npmjs.org/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" - integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - react@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" @@ -15814,14 +15797,6 @@ scheduler@^0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" -scheduler@^0.20.1: - version "0.20.1" - resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" - integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@^0.20.2: version "0.20.2" resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"