From 7941bddf72076b1760b92ea060bfe5b9386b6be0 Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Fri, 21 Jul 2023 11:34:22 +0800 Subject: [PATCH] chore: updates --- package.json | 6 +- src/app/services/base.query.ts | 7 +- src/app/slices/server.ts | 2 +- src/components/Voice/index.tsx | 2 +- src/hooks/useStreaming/index.ts | 2 + src/routes/login/index.tsx | 4 +- yarn.lock | 200 ++++++++++++++++---------------- 7 files changed, 116 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index 80082082..6ac8bc16 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "emoji-mart": "5.5.2", "eslint": "^8.45.0", "file-loader": "^6.2.0", - "firebase": "^9.23.0", - "framer-motion": "^10.12.22", + "firebase": "^10.1.0", + "framer-motion": "^10.13.0", "fs-extra": "^11.1.1", "heic2any": "^0.0.4", "html-webpack-plugin": "^5.5.3", @@ -140,7 +140,7 @@ "eslint-config-prettier": "^8.8.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-prettier": "^5.0.0", - "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react": "^7.33.0", "eslint-plugin-react-hooks": "^4.6.0", "gh-pages": "^5.0.0", "husky": "^8.0.3", diff --git a/src/app/services/base.query.ts b/src/app/services/base.query.ts index 1fca8c3f..12386739 100644 --- a/src/app/services/base.query.ts +++ b/src/app/services/base.query.ts @@ -35,8 +35,9 @@ const whiteList401 = ["getAgoraVoicingList", "getAgoraChannels"]; const errorWhiteList = ["preCheckFileFromUrl", "getFavoriteDetails"]; const baseQuery = fetchBaseQuery({ baseUrl: BASE_URL, - prepareHeaders: (headers, { getState, endpoint }) => { - const { token } = (getState() as RootState).authData; + prepareHeaders: (headers, { endpoint }) => { + const { token } = getLocalAuthData(); + // const { token } = (getState() as RootState).authData; if (token && !whiteList.includes(endpoint)) { headers.set(tokenHeader, token); } @@ -80,7 +81,7 @@ const baseQueryWithTokenCheck = async (args: any, api: any, extraOptions: any) = result = await baseQuery(args, api, extraOptions); } if (result?.error) { - console.error("api error", result.error, api.endpoint); + console.error("api error", result.error, args, api.endpoint); if (errorWhiteList.includes(api.endpoint)) return result; switch (result.error.originalStatus || result.error.status) { case "FETCH_ERROR": diff --git a/src/app/slices/server.ts b/src/app/slices/server.ts index c69a9141..497a1e17 100644 --- a/src/app/slices/server.ts +++ b/src/app/slices/server.ts @@ -54,7 +54,7 @@ const serverSlice = createSlice({ version, upgraded, name, - logo, + logo: state.logo || logo, description, inviteLink, show_user_online_status, diff --git a/src/components/Voice/index.tsx b/src/components/Voice/index.tsx index bb2b4226..014a7f51 100644 --- a/src/components/Voice/index.tsx +++ b/src/components/Voice/index.tsx @@ -41,7 +41,7 @@ const Voice = () => { { page_no: 0, page_size: 100 }, { skip: !enabled || !navigator.onLine, - pollingInterval: 5000 + pollingInterval: 10000 } ); const dispatch = useDispatch(); diff --git a/src/hooks/useStreaming/index.ts b/src/hooks/useStreaming/index.ts index 6663cb28..b8e103fb 100644 --- a/src/hooks/useStreaming/index.ts +++ b/src/hooks/useStreaming/index.ts @@ -106,6 +106,8 @@ export default function useStreaming() { if (dayjs().isAfter(new Date(expireTime - 20 * 1000))) { const resp = await renewToken({ token, refresh_token: refreshToken }); if ("error" in resp) { + // 停止循环 + stopStreaming(); return; } else { _token = resp.data.token; diff --git a/src/routes/login/index.tsx b/src/routes/login/index.tsx index 26e535bc..5cc1e97e 100644 --- a/src/routes/login/index.tsx +++ b/src/routes/login/index.tsx @@ -22,7 +22,7 @@ const defaultInput = { password: "" }; export default function LoginPage() { - const serverName = useAppSelector((store) => store.server.name); + const { name: serverName, logo } = useAppSelector((store) => store.server); const { t } = useTranslation("auth"); const { t: ct } = useTranslation(); const { data: enableSMTP, isLoading: loadingSMTPStatus } = useGetSMTPStatusQuery(); @@ -138,7 +138,7 @@ export default function LoginPage() { )}
logo diff --git a/yarn.lock b/yarn.lock index 92f549ae..ac0812cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1419,12 +1419,12 @@ "@firebase/util" "1.9.3" tslib "^2.1.0" -"@firebase/app-compat@0.2.13": - version "0.2.13" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/app-compat/-/app-compat-0.2.13.tgz#c42d392f45f2c9fef1631cb3ae36d53296aa6407" - integrity sha512-j6ANZaWjeVy5zg6X7uiqh6lM6o3n3LD1+/SJFNs9V781xyryyZWXe+tmnWNWPkP086QfJoNkWN9pMQRqSG4vMg== +"@firebase/app-compat@0.2.15": + version "0.2.15" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/app-compat/-/app-compat-0.2.15.tgz#06a932311d340dd94666b9e9cb15ca5fc8bdc434" + integrity sha512-ttEbOEtO1SSz27cRPrwXAmrqDjdQ33sQc7rqqQuSMUuPRdYCQEcYdqzpkbvqgdkzGksx2kfH4JqQ6R/hI12nDw== dependencies: - "@firebase/app" "0.9.13" + "@firebase/app" "0.9.15" "@firebase/component" "0.6.4" "@firebase/logger" "0.4.0" "@firebase/util" "1.9.3" @@ -1435,10 +1435,10 @@ resolved "https://mirrors.cloud.tencent.com/npm/@firebase/app-types/-/app-types-0.9.0.tgz#35b5c568341e9e263b29b3d2ba0e9cfc9ec7f01e" integrity sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q== -"@firebase/app@0.9.13": - version "0.9.13" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/app/-/app-0.9.13.tgz#b1d3ad63d52f235a0d70a9b4261cabb3a24690d7" - integrity sha512-GfiI1JxJ7ecluEmDjPzseRXk/PX31hS7+tjgBopL7XjB2hLUdR+0FTMXy2Q3/hXezypDvU6or7gVFizDESrkXw== +"@firebase/app@0.9.15": + version "0.9.15" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/app/-/app-0.9.15.tgz#8c5b7a85c6f856f3292c1fcc2a029c12a63b9ad9" + integrity sha512-xxQi6mkhRjtXeFUwleSF4zU7lwEH+beNhLE7VmkzEzjEsjAS14QPQPZ35gpgSD+/NigOeho7wgEXd4C/bOkRfA== dependencies: "@firebase/component" "0.6.4" "@firebase/logger" "0.4.0" @@ -1446,12 +1446,12 @@ idb "7.1.1" tslib "^2.1.0" -"@firebase/auth-compat@0.4.2": - version "0.4.2" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/auth-compat/-/auth-compat-0.4.2.tgz#cb65edc2fbd5f72fff32310409f2fd702b5145e7" - integrity sha512-Q30e77DWXFmXEt5dg5JbqEDpjw9y3/PcP9LslDPR7fARmAOTIY9MM6HXzm9KC+dlrKH/+p6l8g9ifJiam9mc4A== +"@firebase/auth-compat@0.4.4": + version "0.4.4" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/auth-compat/-/auth-compat-0.4.4.tgz#062dd397a508c7a442f36c014133ded4d29c62bb" + integrity sha512-B2DctJDJ05djBwebNEdC3zbKWzKdIdxpbca8u9P/NSjqaJNSFq3fhz8h8bjlS9ufSrxaQWFSJMMH3dRmx3FlEA== dependencies: - "@firebase/auth" "0.23.2" + "@firebase/auth" "1.1.0" "@firebase/auth-types" "0.12.0" "@firebase/component" "0.6.4" "@firebase/util" "1.9.3" @@ -1468,14 +1468,15 @@ resolved "https://mirrors.cloud.tencent.com/npm/@firebase/auth-types/-/auth-types-0.12.0.tgz#f28e1b68ac3b208ad02a15854c585be6da3e8e79" integrity sha512-pPwaZt+SPOshK8xNoiQlK5XIrS97kFYc3Rc7xmy373QsOJ9MmqXxLaYssP5Kcds4wd2qK//amx/c+A8O2fVeZA== -"@firebase/auth@0.23.2": - version "0.23.2" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/auth/-/auth-0.23.2.tgz#9e6d8dd550a28053c1825fb98c7dc9b37119254d" - integrity sha512-dM9iJ0R6tI1JczuGSxXmQbXAgtYie0K4WvKcuyuSTCu9V8eEDiz4tfa1sO3txsfvwg7nOY3AjoCyMYEdqZ8hdg== +"@firebase/auth@1.1.0": + version "1.1.0" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/auth/-/auth-1.1.0.tgz#106cad08f977245e641642ac9b7c3a2dae46400d" + integrity sha512-5RJQMXG0p/tSvtqpfM8jA+heELjVCgHHASq3F7NglAa/CWUGCAE4g2F4YDPW5stDkvtKKRez0WYAWnbcuQ5P4w== dependencies: "@firebase/component" "0.6.4" "@firebase/logger" "0.4.0" "@firebase/util" "1.9.3" + "@react-native-async-storage/async-storage" "^1.18.1" node-fetch "2.6.7" tslib "^2.1.0" @@ -1487,30 +1488,30 @@ "@firebase/util" "1.9.3" tslib "^2.1.0" -"@firebase/database-compat@0.3.4": - version "0.3.4" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/database-compat/-/database-compat-0.3.4.tgz#4e57932f7a5ba761cd5ac946ab6b6ab3f660522c" - integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg== +"@firebase/database-compat@1.0.1": + version "1.0.1" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/database-compat/-/database-compat-1.0.1.tgz#ab0acbbfb0031080cc16504cef6d00c95cf27ff1" + integrity sha512-ky82yLIboLxtAIWyW/52a6HLMVTzD2kpZlEilVDok73pNPLjkJYowj8iaIWK5nTy7+6Gxt7d00zfjL6zckGdXQ== dependencies: "@firebase/component" "0.6.4" - "@firebase/database" "0.14.4" - "@firebase/database-types" "0.10.4" + "@firebase/database" "1.0.1" + "@firebase/database-types" "1.0.0" "@firebase/logger" "0.4.0" "@firebase/util" "1.9.3" tslib "^2.1.0" -"@firebase/database-types@0.10.4": - version "0.10.4" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/database-types/-/database-types-0.10.4.tgz#47ba81113512dab637abace61cfb65f63d645ca7" - integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ== +"@firebase/database-types@1.0.0": + version "1.0.0" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/database-types/-/database-types-1.0.0.tgz#3f7f71c2c3fd1e29d15fce513f14dae2e7543f2a" + integrity sha512-SjnXStoE0Q56HcFgNQ+9SsmJc0c8TqGARdI/T44KXy+Ets3r6x/ivhQozT66bMnCEjJRywYoxNurRTMlZF8VNg== dependencies: "@firebase/app-types" "0.9.0" "@firebase/util" "1.9.3" -"@firebase/database@0.14.4": - version "0.14.4" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/database/-/database-0.14.4.tgz#9e7435a16a540ddfdeb5d99d45618e6ede179aa6" - integrity sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ== +"@firebase/database@1.0.1": + version "1.0.1" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/database/-/database-1.0.1.tgz#28830f1d0c05ec2f7014658a3165129cec891bcb" + integrity sha512-VAhF7gYwunW4Lw/+RQZvW8dlsf2r0YYqV9W0Gi2Mz8+0TGg1mBJWoUtsHfOr8kPJXhcLsC4eP/z3x6L/Fvjk/A== dependencies: "@firebase/auth-interop-types" "0.2.1" "@firebase/component" "0.6.4" @@ -1519,32 +1520,32 @@ faye-websocket "0.11.4" tslib "^2.1.0" -"@firebase/firestore-compat@0.3.12": - version "0.3.12" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/firestore-compat/-/firestore-compat-0.3.12.tgz#c08b24c76da7af75598f3c28432b6eb22f959b56" - integrity sha512-mazuNGAx5Kt9Nph0pm6ULJFp/+j7GSsx+Ncw1GrnKl+ft1CQ4q2LcUssXnjqkX2Ry0fNGqUzC1mfIUrk9bYtjQ== +"@firebase/firestore-compat@0.3.14": + version "0.3.14" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/firestore-compat/-/firestore-compat-0.3.14.tgz#f1ceac5a85da52c6b5b9d65136456e3eaec7b227" + integrity sha512-sOjaYefSPXJXdFH6qyxSwJVakEqAAote6jjrJk/ZCoiX90rs9r3yYV90wP4gmaTKyXjkt8EMlwuapekgGsE5Tw== dependencies: "@firebase/component" "0.6.4" - "@firebase/firestore" "3.13.0" - "@firebase/firestore-types" "2.5.1" + "@firebase/firestore" "4.1.0" + "@firebase/firestore-types" "3.0.0" "@firebase/util" "1.9.3" tslib "^2.1.0" -"@firebase/firestore-types@2.5.1": - version "2.5.1" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/firestore-types/-/firestore-types-2.5.1.tgz#464b2ee057956599ca34de50eae957c30fdbabb7" - integrity sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw== +"@firebase/firestore-types@3.0.0": + version "3.0.0" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/firestore-types/-/firestore-types-3.0.0.tgz#f3440d5a1cc2a722d361b24cefb62ca8b3577af3" + integrity sha512-Meg4cIezHo9zLamw0ymFYBD4SMjLb+ZXIbuN7T7ddXN6MGoICmOTq3/ltdCGoDCS2u+H1XJs2u/cYp75jsX9Qw== -"@firebase/firestore@3.13.0": - version "3.13.0" - resolved "https://mirrors.cloud.tencent.com/npm/@firebase/firestore/-/firestore-3.13.0.tgz#f924a3bb462bc3ac666dc5d375f3f8c4e1a72345" - integrity sha512-NwcnU+madJXQ4fbLkGx1bWvL612IJN/qO6bZ6dlPmyf7QRyu5azUosijdAN675r+bOOJxMtP1Bv981bHBXAbUg== +"@firebase/firestore@4.1.0": + version "4.1.0" + resolved "https://mirrors.cloud.tencent.com/npm/@firebase/firestore/-/firestore-4.1.0.tgz#fcdd4e033c258fccbe4d47dadf625faa1f62272f" + integrity sha512-FEd+4R0QL9RAJVcdqXgbdIuQYpvzkeKNBVxNM5qcWDPMurjNpja8VaWpVZmT3JXG8FfO+NGTnHJtsW/nWO7XiQ== dependencies: "@firebase/component" "0.6.4" "@firebase/logger" "0.4.0" "@firebase/util" "1.9.3" "@firebase/webchannel-wrapper" "0.10.1" - "@grpc/grpc-js" "~1.7.0" + "@grpc/grpc-js" "~1.8.17" "@grpc/proto-loader" "^0.6.13" node-fetch "2.6.7" tslib "^2.1.0" @@ -1761,10 +1762,10 @@ "@floating-ui/dom" "^0.5.3" use-isomorphic-layout-effect "^1.1.1" -"@grpc/grpc-js@~1.7.0": - version "1.7.3" - resolved "https://mirrors.cloud.tencent.com/npm/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a" - integrity sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog== +"@grpc/grpc-js@~1.8.17": + version "1.8.18" + resolved "https://mirrors.cloud.tencent.com/npm/@grpc/grpc-js/-/grpc-js-1.8.18.tgz#fdbf2728064fd3db7e72e970372db28bd0f6fafb" + integrity sha512-2uWPtxhsXmVgd8WzDhfamSjHpZDXfMjMDciY6VRTq4Sn7rFzazyf0LLDa0oav+61UHIoEZb4KKaAV6S7NuJFbQ== dependencies: "@grpc/proto-loader" "^0.7.0" "@types/node" ">=12.12.47" @@ -2235,7 +2236,7 @@ "@protobufjs/path@^1.1.2": version "1.1.2" resolved "https://mirrors.cloud.tencent.com/npm/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== "@protobufjs/pool@^1.1.0": version "1.1.0" @@ -2282,6 +2283,13 @@ resolved "https://mirrors.cloud.tencent.com/npm/@react-hook/merged-ref/-/merged-ref-1.3.2.tgz#919b387a5f79ed67f2578f2015ab7b7d337787d2" integrity sha512-cQ9Y8m4zlrw/qotReo33E+3Sy9FVqMZb5JwUlb3wj3IJJ1cNJtxcgfWF6rS2NZQrfBJ2nAnckUdPJjMyIJTNZg== +"@react-native-async-storage/async-storage@^1.18.1": + version "1.19.1" + resolved "https://mirrors.cloud.tencent.com/npm/@react-native-async-storage/async-storage/-/async-storage-1.19.1.tgz#09d35caaa31823b40fdfeebf95decf8f992a6274" + integrity sha512-5QXuGCtB+HL3VtKL2JN3+6t4qh8VXizK+aGDAv6Dqiq3MLrzgZHb4tjVgtEWMd8CcDtD/JqaAI1b6/EaYGtFIA== + dependencies: + merge-options "^3.0.4" + "@react-oauth/google@^0.11.0": version "0.11.0" resolved "https://mirrors.cloud.tencent.com/npm/@react-oauth/google/-/google-0.11.0.tgz#9d3814e54fbfc0452525397238ad2372a9aaaef9" @@ -4693,9 +4701,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503: - version "1.0.30001516" - resolved "https://mirrors.cloud.tencent.com/npm/caniuse-lite/-/caniuse-lite-1.0.30001516.tgz#621b1be7d85a8843ee7d210fd9d87b52e3daab3a" - integrity sha512-Wmec9pCBY8CWbmI4HsjBeQLqDTqV91nFVR83DnZpYyRnPI1wePDsTg0bGLPC5VU/3OIZV1fmxEea1b+tFKe86g== + version "1.0.30001517" + resolved "https://mirrors.cloud.tencent.com/npm/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz#90fabae294215c3495807eb24fc809e11dc2f0a8" + integrity sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" @@ -5786,9 +5794,9 @@ ejs@^3.1.6: jake "^10.8.5" electron-to-chromium@^1.4.431: - version "1.4.463" - resolved "https://mirrors.cloud.tencent.com/npm/electron-to-chromium/-/electron-to-chromium-1.4.463.tgz#8eb04355f24fef5c8097661d14e143f6d8554055" - integrity sha512-fT3hvdUWLjDbaTGzyOjng/CQhQJSQP8ThO3XZAoaxHvHo2kUXiRQVMj9M235l8uDFiNPsPa6KHT1p3RaR6ugRw== + version "1.4.467" + resolved "https://mirrors.cloud.tencent.com/npm/electron-to-chromium/-/electron-to-chromium-1.4.467.tgz#b0660bf644baff7eedea33b8c742fb53ec60e3c2" + integrity sha512-2qI70O+rR4poYeF2grcuS/bCps5KJh6y1jtZMDDEteyKJQrzLOEhFyXCLcHW6DTBjKjWkk26JhWoAi+Ux9A0fg== email-addresses@^5.0.0: version "5.0.0" @@ -6090,10 +6098,10 @@ eslint-plugin-react-hooks@^4.3.0, eslint-plugin-react-hooks@^4.6.0: resolved "https://mirrors.cloud.tencent.com/npm/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== -eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.32.2: - version "7.32.2" - resolved "https://mirrors.cloud.tencent.com/npm/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10" - integrity sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg== +eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.33.0: + version "7.33.0" + resolved "https://mirrors.cloud.tencent.com/npm/eslint-plugin-react/-/eslint-plugin-react-7.33.0.tgz#6c356fb0862fec2cd1b04426c669ea746e9b6eb3" + integrity sha512-qewL/8P34WkY8jAqdQxsiL82pDUeT7nhs8IsuXgfgnsEloKCT4miAV9N9kGtx7/KM9NH/NCGUE7Edt9iGxLXFw== dependencies: array-includes "^3.1.6" array.prototype.flatmap "^1.3.1" @@ -6108,7 +6116,7 @@ eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.32.2: object.values "^1.1.6" prop-types "^15.8.1" resolve "^2.0.0-next.4" - semver "^6.3.0" + semver "^6.3.1" string.prototype.matchall "^4.0.8" eslint-plugin-testing-library@^5.0.1: @@ -6543,24 +6551,24 @@ find-yarn-workspace-root@^2.0.0: dependencies: micromatch "^4.0.2" -firebase@^9.23.0: - version "9.23.0" - resolved "https://mirrors.cloud.tencent.com/npm/firebase/-/firebase-9.23.0.tgz#71fea60d704bfed8e92162911544fd6564a04d0e" - integrity sha512-/4lUVY0lUvBDIaeY1q6dUYhS8Sd18Qb9CgWkPZICUo9IXpJNCEagfNZXBBFCkMTTN5L5gx2Hjr27y21a9NzUcA== +firebase@^10.1.0: + version "10.1.0" + resolved "https://mirrors.cloud.tencent.com/npm/firebase/-/firebase-10.1.0.tgz#07281ac2fe4bcf3886eeddcea8903ad17f1aec67" + integrity sha512-ghcdCe2G9DeGmLOrBgR7XPswuc9BFUfjnU93ABopIisMfbJFzoqpSp4emwNiZt+vVGZV1ifeU3DLfhxlujxhCg== dependencies: "@firebase/analytics" "0.10.0" "@firebase/analytics-compat" "0.2.6" - "@firebase/app" "0.9.13" + "@firebase/app" "0.9.15" "@firebase/app-check" "0.8.0" "@firebase/app-check-compat" "0.3.7" - "@firebase/app-compat" "0.2.13" + "@firebase/app-compat" "0.2.15" "@firebase/app-types" "0.9.0" - "@firebase/auth" "0.23.2" - "@firebase/auth-compat" "0.4.2" - "@firebase/database" "0.14.4" - "@firebase/database-compat" "0.3.4" - "@firebase/firestore" "3.13.0" - "@firebase/firestore-compat" "0.3.12" + "@firebase/auth" "1.1.0" + "@firebase/auth-compat" "0.4.4" + "@firebase/database" "1.0.1" + "@firebase/database-compat" "1.0.1" + "@firebase/firestore" "4.1.0" + "@firebase/firestore-compat" "0.3.14" "@firebase/functions" "0.10.0" "@firebase/functions-compat" "0.3.5" "@firebase/installations" "0.6.4" @@ -6650,10 +6658,10 @@ fraction.js@^4.2.0: resolved "https://mirrors.cloud.tencent.com/npm/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== -framer-motion@^10.12.22: - version "10.12.22" - resolved "https://mirrors.cloud.tencent.com/npm/framer-motion/-/framer-motion-10.12.22.tgz#f1e7e36cc24fa5407ea33ccbd6d2996f50ceb503" - integrity sha512-bBGYPOxvxcfzS7/py9MEqDucmXBkVl2g42HNlXXPieSTSGGkr8L7+MilCnrU6uX3HrNk/tcB++1SkWE8BosHFw== +framer-motion@^10.13.0: + version "10.13.0" + resolved "https://mirrors.cloud.tencent.com/npm/framer-motion/-/framer-motion-10.13.0.tgz#0e0d45f693e21d23443317db12cd14c4f8d99cd2" + integrity sha512-xKhw9VCizmwEHbopOfluaoVunGHSZyMztGbTvsgOYqCjaKu6qtlwWY1J+6GhL41NY1P157JgEikjDm67XCFnvQ== dependencies: tslib "^2.4.0" optionalDependencies: @@ -7301,7 +7309,7 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: inherits@2.0.3: version "2.0.3" resolved "https://mirrors.cloud.tencent.com/npm/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== ini@^1.3.5: version "1.3.8" @@ -7499,7 +7507,7 @@ is-path-inside@^3.0.3: resolved "https://mirrors.cloud.tencent.com/npm/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-obj@^2.0.0: +is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: version "2.1.0" resolved "https://mirrors.cloud.tencent.com/npm/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== @@ -8676,6 +8684,13 @@ merge-descriptors@1.0.1: resolved "https://mirrors.cloud.tencent.com/npm/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge-options@^3.0.4: + version "3.0.4" + resolved "https://mirrors.cloud.tencent.com/npm/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" + integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== + dependencies: + is-plain-obj "^2.1.0" + merge-stream@^2.0.0: version "2.0.0" resolved "https://mirrors.cloud.tencent.com/npm/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -10946,16 +10961,7 @@ resolve.exports@^1.1.0: resolved "https://mirrors.cloud.tencent.com/npm/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999" integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ== -resolve@^1.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.2: - version "1.22.2" - resolved "https://mirrors.cloud.tencent.com/npm/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== - dependencies: - is-core-module "^2.11.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^1.22.3: +resolve@^1.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.2, resolve@^1.22.3: version "1.22.3" resolved "https://mirrors.cloud.tencent.com/npm/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283" integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw== @@ -11764,9 +11770,9 @@ stylis@^4.0.6: integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ== sucrase@^3.32.0: - version "3.33.0" - resolved "https://mirrors.cloud.tencent.com/npm/sucrase/-/sucrase-3.33.0.tgz#092c8d2f99a191f2cd9f1fdd52113772f4241f6e" - integrity sha512-ARGC7vbufOHfpvyGcZZXFaXCMZ9A4fffOGC5ucOW7+WHDGlAe8LJdf3Jts1sWhDeiI1RSWrKy5Hodl+JWGdW2A== + version "3.34.0" + resolved "https://mirrors.cloud.tencent.com/npm/sucrase/-/sucrase-3.34.0.tgz#1e0e2d8fcf07f8b9c3569067d92fbd8690fb576f" + integrity sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw== dependencies: "@jridgewell/gen-mapping" "^0.3.2" commander "^4.0.0" @@ -12662,9 +12668,9 @@ whatwg-encoding@^1.0.5: iconv-lite "0.4.24" whatwg-fetch@^3.6.2: - version "3.6.2" - resolved "https://mirrors.cloud.tencent.com/npm/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" - integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== + version "3.6.17" + resolved "https://mirrors.cloud.tencent.com/npm/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz#009bbbfc122b227b74ba1ff31536b3a1a0e0e212" + integrity sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ== whatwg-mimetype@^2.3.0: version "2.3.0"